commit 45e0833d4fb5ace1d8d6718a1b35017355bd2f2b
author Tamas Kenez <tamaskenez@google.com> Mon Apr 15 09:12:05 2019 +0000
committer Tamas Kenez <tamaskenez@google.com> Mon Apr 15 09:12:05 2019 +0000
tree dce695df0b84f794a2534239e834298615254096
parent 224276328a804f422710ac7f481d1ebfe3fec67d

Revert "Update D8 and R8 to 1.5.18-dev"

This reverts commit 224276328a804f422710ac7f481d1ebfe3fec67d.

Reason for revert: cf_x86_phone-userdebug (linux) build 5469465 in git_master is broken

Change-Id: Ic65fb32f399fd104ddaf1975d765879f2f6126df

compatdx-master.jar

diff --git a/compatdx-master.jar b/compatdx-master.jar
index ec42fa6..b4e623b 100644
--- a/compatdx-master.jar
+++ b/compatdx-master.jar
Binary files differ

compatdx-master.jar.map

diff --git a/compatdx-master.jar.map b/compatdx-master.jar.map
index af226af..84a4ac2 100644
--- a/compatdx-master.jar.map
+++ b/compatdx-master.jar.map
@@ -1,9 +1,8 @@
 # compiler: R8
-# compiler_version: 1.5.18-dev
+# compiler_version: 1.5.13-dev
 # compiler_hash: engineering
-# pg_map_id: 495ad1b
+# pg_map_id: ed750dd
 com.android.tools.r8.ApiLevelException -> a.a.a.a.a:
-    boolean $assertionsDisabled -> c
     1:1:void <clinit>():10:10 -> <clinit>
     1:8:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):21:28 -> <init>
     1:8:void <init>(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):14 -> <init>
@@ -29,19 +28,19 @@
     1:6:com.android.tools.r8.BaseCommand build():138:143 -> a
     7:19:com.android.tools.r8.BaseCommand$Builder addProgramFiles(java.util.Collection):167:179 -> a
     20:23:void lambda$addProgramFiles$0(java.nio.file.Path):172:175 -> a
-    24:24:void error(com.android.tools.r8.origin.Origin,java.lang.Throwable):360:360 -> a
+    24:24:void error(com.android.tools.r8.origin.Origin,java.lang.Throwable):338:338 -> a
     24:24:void lambda$addProgramFiles$0(java.nio.file.Path):175 -> a
-    25:33:com.android.tools.r8.BaseCommand$Builder addMainDexListFiles(java.nio.file.Path[]):260:268 -> a
-    34:34:void setIgnoreDexInArchive(boolean):352:352 -> a
-    35:37:void guard(java.lang.Runnable):366:368 -> a
+    25:33:com.android.tools.r8.BaseCommand$Builder addMainDexListFiles(java.nio.file.Path[]):238:246 -> a
+    34:34:void setIgnoreDexInArchive(boolean):330:330 -> a
+    35:37:void guard(java.lang.Runnable):344:346 -> a
     1:1:com.android.tools.r8.utils.AndroidApp$Builder getAppBuilder():152:152 -> b
     2:2:void lambda$addProgramFiles$1(java.util.Collection):169:169 -> b
-    3:6:void lambda$addMainDexListFiles$11(java.nio.file.Path[]):262:265 -> b
-    7:7:void lambda$addMainDexListFiles$11(java.nio.file.Path[]):264:264 -> b
-    8:8:void lambda$setIgnoreDexInArchive$15(boolean):352:352 -> b
+    3:6:void lambda$addMainDexListFiles$7(java.nio.file.Path[]):240:243 -> b
+    7:7:void lambda$addMainDexListFiles$7(java.nio.file.Path[]):242:242 -> b
+    8:8:void lambda$setIgnoreDexInArchive$11(boolean):330:330 -> b
     1:1:com.android.tools.r8.utils.Reporter getReporter():162:162 -> c
-    1:1:boolean isPrintHelp():316:316 -> d
-    1:1:boolean isPrintVersion():327:327 -> e
+    1:1:boolean isPrintHelp():294:294 -> d
+    1:1:boolean isPrintVersion():305:305 -> e
     com.android.tools.r8.BaseCommand makeCommand() -> f
     void validate() -> g
 com.android.tools.r8.BaseCommand$ProgramInputOrigin -> a.a.a.a.c:
@@ -69,7 +68,6 @@
     1:1:boolean isOptimizeMultidexForLinearAlloc():105:105 -> g
 com.android.tools.r8.BaseCompilerCommandParser -> a.a.a.a.f:
 com.android.tools.r8.ByteBufferProvider -> a.a.a.a.g:
-    void releaseByteBuffer(java.nio.ByteBuffer) -> a
     1:1:java.nio.ByteBuffer acquireByteBuffer(int):24:24 -> a
 com.android.tools.r8.ByteDataView -> a.a.a.a.h:
     byte[] buffer -> a
@@ -118,15 +116,15 @@
     39:49:void com.android.tools.r8.D8.runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):132 -> a
     50:52:void com.android.tools.r8.D8.lambda$runForTesting$3(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):136:138 -> a
     53:64:com.android.tools.r8.dex.Marker com.android.tools.r8.D8.getMarker(com.android.tools.r8.utils.InternalOptions):145:156 -> a
-    65:65:void com.android.tools.r8.D8.lambda$run$4(java.lang.String):178:178 -> a
-    66:79:com.android.tools.r8.graph.DexApplication com.android.tools.r8.D8.optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):226:239 -> a
-    80:84:com.android.tools.r8.graph.DexApplication com.android.tools.r8.D8.optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):235:239 -> a
-    85:85:com.android.tools.r8.graph.DexApplication com.android.tools.r8.D8.optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):233:233 -> a
-    1:11:void com.android.tools.r8.D8.run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):163:173 -> b
-    12:12:boolean com.android.tools.r8.utils.InternalOptions.hasMethodsFilter():541:541 -> b
-    12:12:void com.android.tools.r8.D8.run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):176 -> b
-    13:50:void com.android.tools.r8.D8.run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):177:214 -> b
-    51:56:void com.android.tools.r8.D8.run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):209:214 -> b
+    65:65:void com.android.tools.r8.D8.lambda$run$4(java.lang.String):187:187 -> a
+    66:79:com.android.tools.r8.graph.DexApplication com.android.tools.r8.D8.optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):235:248 -> a
+    80:84:com.android.tools.r8.graph.DexApplication com.android.tools.r8.D8.optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):244:248 -> a
+    85:85:com.android.tools.r8.graph.DexApplication com.android.tools.r8.D8.optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):242:242 -> a
+    1:20:void com.android.tools.r8.D8.run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):163:182 -> b
+    21:21:boolean com.android.tools.r8.utils.InternalOptions.hasMethodsFilter():514:514 -> b
+    21:21:void com.android.tools.r8.D8.run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):185 -> b
+    22:59:void com.android.tools.r8.D8.run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):186:223 -> b
+    60:65:void com.android.tools.r8.D8.run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):218:223 -> b
 com.android.tools.r8.CompilationFailedException -> a.a.a.a.k:
     1:1:void <init>(java.lang.Throwable):18:18 -> <init>
 com.android.tools.r8.CompilationMode -> a.a.a.a.l:
@@ -138,17 +136,17 @@
 com.android.tools.r8.D8Command -> a.a.a.a.p:
     boolean intermediate -> j
     boolean $assertionsDisabled -> k
-    1:143:void <clinit>():30:172 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean):226:226 -> <init>
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean,com.android.tools.r8.D8Command$1):31 -> <init>
-    2:63:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean):174:235 -> <init>
-    2:63:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean,com.android.tools.r8.D8Command$1):31 -> <init>
-    64:64:void <init>(boolean,boolean):239:239 -> <init>
-    64:64:void <init>(boolean,boolean,com.android.tools.r8.D8Command$1):31 -> <init>
-    65:65:void <init>(boolean,boolean):174:174 -> <init>
-    65:65:void <init>(boolean,boolean,com.android.tools.r8.D8Command$1):31 -> <init>
-    1:1:com.android.tools.r8.D8Command$Builder builder():177:177 -> h
-    1:27:com.android.tools.r8.utils.InternalOptions getInternalOptions():244:270 -> i
+    1:147:void <clinit>():31:177 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean):231:231 -> <init>
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean,com.android.tools.r8.D8Command$1):32 -> <init>
+    2:63:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean):179:240 -> <init>
+    2:63:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean,com.android.tools.r8.D8Command$1):32 -> <init>
+    64:64:void <init>(boolean,boolean):244:244 -> <init>
+    64:64:void <init>(boolean,boolean,com.android.tools.r8.D8Command$1):32 -> <init>
+    65:65:void <init>(boolean,boolean):179:179 -> <init>
+    65:65:void <init>(boolean,boolean,com.android.tools.r8.D8Command$1):32 -> <init>
+    1:1:com.android.tools.r8.D8Command$Builder builder():182:182 -> h
+    1:37:com.android.tools.r8.utils.InternalOptions getInternalOptions():249:285 -> i
 com.android.tools.r8.D8Command$1 -> a.a.a.a.m:
 com.android.tools.r8.D8Command$Builder -> a.a.a.a.n:
     boolean com.android.tools.r8.BaseCompilerCommand$Builder.$assertionsDisabled -> m
@@ -160,70 +158,70 @@
     boolean intermediate -> l
     com.android.tools.r8.ProgramConsumer com.android.tools.r8.BaseCompilerCommand$Builder.programConsumer -> f
     1:1:void com.android.tools.r8.BaseCompilerCommand$Builder.<clinit>():118:118 -> <clinit>
-    1:1:void <init>():68:68 -> <init>
-    1:1:void <init>(com.android.tools.r8.D8Command$1):63 -> <init>
+    1:1:void <init>():69:69 -> <init>
+    1:1:void <init>(com.android.tools.r8.D8Command$1):64 -> <init>
     2:2:void com.android.tools.r8.BaseCompilerCommand$Builder.<init>(com.android.tools.r8.DiagnosticsHandler):140:140 -> <init>
-    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler):72 -> <init>
-    2:2:void <init>():68 -> <init>
-    2:2:void <init>(com.android.tools.r8.D8Command$1):63 -> <init>
+    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler):73 -> <init>
+    2:2:void <init>():69 -> <init>
+    2:2:void <init>(com.android.tools.r8.D8Command$1):64 -> <init>
     3:12:void com.android.tools.r8.BaseCompilerCommand$Builder.<init>(com.android.tools.r8.DiagnosticsHandler):122:131 -> <init>
-    3:12:void <init>(com.android.tools.r8.DiagnosticsHandler):72 -> <init>
-    3:12:void <init>():68 -> <init>
-    3:12:void <init>(com.android.tools.r8.D8Command$1):63 -> <init>
-    13:13:com.android.tools.r8.CompilationMode defaultCompilationMode():121:121 -> <init>
+    3:12:void <init>(com.android.tools.r8.DiagnosticsHandler):73 -> <init>
+    3:12:void <init>():69 -> <init>
+    3:12:void <init>(com.android.tools.r8.D8Command$1):64 -> <init>
+    13:13:com.android.tools.r8.CompilationMode defaultCompilationMode():126:126 -> <init>
     13:13:void com.android.tools.r8.BaseCompilerCommand$Builder.<init>(com.android.tools.r8.DiagnosticsHandler):141 -> <init>
-    13:13:void <init>(com.android.tools.r8.DiagnosticsHandler):72 -> <init>
-    13:13:void <init>():68 -> <init>
-    13:13:void <init>(com.android.tools.r8.D8Command$1):63 -> <init>
+    13:13:void <init>(com.android.tools.r8.DiagnosticsHandler):73 -> <init>
+    13:13:void <init>():69 -> <init>
+    13:13:void <init>(com.android.tools.r8.D8Command$1):64 -> <init>
     14:14:void com.android.tools.r8.BaseCompilerCommand$Builder.<init>(com.android.tools.r8.DiagnosticsHandler):141:141 -> <init>
-    14:14:void <init>(com.android.tools.r8.DiagnosticsHandler):72 -> <init>
-    14:14:void <init>():68 -> <init>
-    14:14:void <init>(com.android.tools.r8.D8Command$1):63 -> <init>
-    15:15:void <init>(com.android.tools.r8.DiagnosticsHandler):65:65 -> <init>
-    15:15:void <init>():68 -> <init>
-    15:15:void <init>(com.android.tools.r8.D8Command$1):63 -> <init>
+    14:14:void <init>(com.android.tools.r8.DiagnosticsHandler):73 -> <init>
+    14:14:void <init>():69 -> <init>
+    14:14:void <init>(com.android.tools.r8.D8Command$1):64 -> <init>
+    15:15:void <init>(com.android.tools.r8.DiagnosticsHandler):66:66 -> <init>
+    15:15:void <init>():69 -> <init>
+    15:15:void <init>(com.android.tools.r8.D8Command$1):64 -> <init>
     1:2:com.android.tools.r8.BaseCompilerCommand$Builder com.android.tools.r8.BaseCompilerCommand$Builder.setMode(com.android.tools.r8.CompilationMode):167:168 -> a
     1:2:com.android.tools.r8.BaseCompilerCommand$Builder com.android.tools.r8.BaseCompilerCommand$Builder.setMode(com.android.tools.r8.CompilationMode):0 -> a
     3:5:com.android.tools.r8.BaseCompilerCommand$Builder com.android.tools.r8.BaseCompilerCommand$Builder.setProgramConsumer(com.android.tools.r8.ProgramConsumer):239:241 -> a
     3:5:com.android.tools.r8.BaseCompilerCommand$Builder com.android.tools.r8.BaseCompilerCommand$Builder.setProgramConsumer(com.android.tools.r8.ProgramConsumer):0 -> a
     6:8:com.android.tools.r8.BaseCompilerCommand$Builder com.android.tools.r8.BaseCompilerCommand$Builder.setMinApiLevel(int):347:349 -> a
     6:8:com.android.tools.r8.BaseCompilerCommand$Builder com.android.tools.r8.BaseCompilerCommand$Builder.setMinApiLevel(int):0 -> a
-    1:8:com.android.tools.r8.D8Command makeCommand():153:160 -> f
-    1:8:com.android.tools.r8.BaseCommand makeCommand():62 -> f
+    1:8:com.android.tools.r8.D8Command makeCommand():158:165 -> f
+    1:8:com.android.tools.r8.BaseCommand makeCommand():63 -> f
     9:9:com.android.tools.r8.CompilationMode com.android.tools.r8.BaseCompilerCommand$Builder.getMode():160:160 -> f
     9:9:com.android.tools.r8.CompilationMode com.android.tools.r8.BaseCompilerCommand$Builder.getMode():0 -> f
-    9:9:com.android.tools.r8.D8Command makeCommand():161 -> f
-    9:9:com.android.tools.r8.BaseCommand makeCommand():62 -> f
+    9:9:com.android.tools.r8.D8Command makeCommand():166 -> f
+    9:9:com.android.tools.r8.BaseCommand makeCommand():63 -> f
     10:10:com.android.tools.r8.ProgramConsumer com.android.tools.r8.BaseCompilerCommand$Builder.getProgramConsumer():200:200 -> f
     10:10:com.android.tools.r8.ProgramConsumer com.android.tools.r8.BaseCompilerCommand$Builder.getProgramConsumer():0 -> f
-    10:10:com.android.tools.r8.D8Command makeCommand():162 -> f
-    10:10:com.android.tools.r8.BaseCommand makeCommand():62 -> f
-    11:12:com.android.tools.r8.D8Command makeCommand():164:165 -> f
-    11:12:com.android.tools.r8.BaseCommand makeCommand():62 -> f
+    10:10:com.android.tools.r8.D8Command makeCommand():167 -> f
+    10:10:com.android.tools.r8.BaseCommand makeCommand():63 -> f
+    11:12:com.android.tools.r8.D8Command makeCommand():169:170 -> f
+    11:12:com.android.tools.r8.BaseCommand makeCommand():63 -> f
     13:13:boolean com.android.tools.r8.BaseCompilerCommand$Builder.getDisableDesugaring():378:378 -> f
     13:13:boolean com.android.tools.r8.BaseCompilerCommand$Builder.getDisableDesugaring():0 -> f
-    13:13:com.android.tools.r8.D8Command makeCommand():166 -> f
-    13:13:com.android.tools.r8.BaseCommand makeCommand():62 -> f
-    14:14:com.android.tools.r8.D8Command makeCommand():166:166 -> f
-    14:14:com.android.tools.r8.BaseCommand makeCommand():62 -> f
+    13:13:com.android.tools.r8.D8Command makeCommand():171 -> f
+    13:13:com.android.tools.r8.BaseCommand makeCommand():63 -> f
+    14:14:com.android.tools.r8.D8Command makeCommand():171:171 -> f
+    14:14:com.android.tools.r8.BaseCommand makeCommand():63 -> f
     15:15:boolean com.android.tools.r8.BaseCompilerCommand$Builder.isOptimizeMultidexForLinearAlloc():225:225 -> f
     15:15:boolean com.android.tools.r8.BaseCompilerCommand$Builder.isOptimizeMultidexForLinearAlloc():0 -> f
-    15:15:com.android.tools.r8.D8Command makeCommand():168 -> f
-    15:15:com.android.tools.r8.BaseCommand makeCommand():62 -> f
-    16:16:com.android.tools.r8.D8Command makeCommand():168:168 -> f
-    16:16:com.android.tools.r8.BaseCommand makeCommand():62 -> f
-    17:17:com.android.tools.r8.D8Command makeCommand():154:154 -> f
-    17:17:com.android.tools.r8.BaseCommand makeCommand():62 -> f
-    1:19:void validate():126:144 -> g
-    20:20:void validate():142:142 -> g
+    15:15:com.android.tools.r8.D8Command makeCommand():173 -> f
+    15:15:com.android.tools.r8.BaseCommand makeCommand():63 -> f
+    16:16:com.android.tools.r8.D8Command makeCommand():173:173 -> f
+    16:16:com.android.tools.r8.BaseCommand makeCommand():63 -> f
+    17:17:com.android.tools.r8.D8Command makeCommand():159:159 -> f
+    17:17:com.android.tools.r8.BaseCommand makeCommand():63 -> f
+    1:19:void validate():131:149 -> g
+    20:20:void validate():147:147 -> g
     21:25:void com.android.tools.r8.BaseCompilerCommand$Builder.validate():383:387 -> g
-    21:25:void validate():148 -> g
+    21:25:void validate():153 -> g
     26:26:com.android.tools.r8.ProgramConsumer com.android.tools.r8.BaseCompilerCommand$Builder.getProgramConsumer():200:200 -> g
     26:26:com.android.tools.r8.ProgramConsumer com.android.tools.r8.BaseCompilerCommand$Builder.getProgramConsumer():0 -> g
     26:26:void com.android.tools.r8.BaseCompilerCommand$Builder.validate():388 -> g
-    26:26:void validate():148 -> g
+    26:26:void validate():153 -> g
     27:48:void com.android.tools.r8.BaseCompilerCommand$Builder.validate():390:411 -> g
-    27:48:void validate():148 -> g
+    27:48:void validate():153 -> g
     1:1:boolean com.android.tools.r8.BaseCompilerCommand$Builder.isMinApiLevelSet():341:341 -> h
     1:1:boolean com.android.tools.r8.BaseCompilerCommand$Builder.isMinApiLevelSet():0 -> h
     1:1:int com.android.tools.r8.BaseCompilerCommand$Builder.getMinApiLevel():337 -> h
@@ -236,10 +234,10 @@
     4:4:int com.android.tools.r8.BaseCompilerCommand$Builder.getMinApiLevel():337:337 -> h
     4:4:int com.android.tools.r8.BaseCompilerCommand$Builder.getMinApiLevel():0 -> h
 com.android.tools.r8.D8Command$DefaultD8DiagnosticsHandler -> a.a.a.a.o:
-    1:1:void <init>():40:40 -> <init>
-    1:1:void <init>(com.android.tools.r8.D8Command$1):40 -> <init>
-    1:6:void error(com.android.tools.r8.Diagnostic):44:49 -> c
-    7:13:void error(com.android.tools.r8.Diagnostic):47:53 -> c
+    1:1:void <init>():41:41 -> <init>
+    1:1:void <init>(com.android.tools.r8.D8Command$1):41 -> <init>
+    1:6:void error(com.android.tools.r8.Diagnostic):45:50 -> c
+    7:13:void error(com.android.tools.r8.Diagnostic):48:54 -> c
 com.android.tools.r8.D8CommandParser -> a.a.a.a.q:
     java.lang.String USAGE_MESSAGE -> a
     1:82:void <clinit>():26:107 -> <clinit>
@@ -280,7 +278,7 @@
 com.android.tools.r8.DexFilePerClassFileConsumer -> a.a.a.a.B:
 com.android.tools.r8.DexIndexedConsumer -> a.a.a.a.F:
     void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler) -> a
-    1:1:com.android.tools.r8.DexIndexedConsumer emptyConsumer():75:75 -> b
+    1:1:com.android.tools.r8.DexIndexedConsumer emptyConsumer():75:75 -> a
 com.android.tools.r8.DexIndexedConsumer$ArchiveConsumer -> a.a.a.a.C:
     com.android.tools.r8.utils.OutputBuilder outputBuilder -> c
     boolean consumeDataResources -> d
@@ -293,7 +291,7 @@
     6:6:void <init>(java.nio.file.Path):129 -> <init>
     1:2:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):162:163 -> a
     3:4:void finished(com.android.tools.r8.DiagnosticsHandler):178:179 -> a
-    1:1:com.android.tools.r8.origin.Origin getOrigin():151:151 -> d
+    1:1:com.android.tools.r8.origin.Origin getOrigin():151:151 -> c
 com.android.tools.r8.DexIndexedConsumer$DirectoryConsumer -> a.a.a.a.D:
     java.nio.file.Path directory -> c
     com.android.tools.r8.utils.OutputBuilder outputBuilder -> e
@@ -305,11 +303,11 @@
     1:7:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):246:252 -> a
     8:9:void finished(com.android.tools.r8.DiagnosticsHandler):267:268 -> a
     10:10:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):286:286 -> a
-    1:5:void prepareDirectory():272:276 -> d
-    6:12:void deleteClassesDexFiles(java.nio.file.Path):280:286 -> d
-    6:12:void prepareDirectory():276 -> d
-    13:19:void deleteClassesDexFiles(java.nio.file.Path):280:286 -> d
-    13:19:void prepareDirectory():276 -> d
+    1:5:void prepareDirectory():272:276 -> c
+    6:12:void deleteClassesDexFiles(java.nio.file.Path):280:286 -> c
+    6:12:void prepareDirectory():276 -> c
+    13:19:void deleteClassesDexFiles(java.nio.file.Path):280:286 -> c
+    13:19:void prepareDirectory():276 -> c
 com.android.tools.r8.DexIndexedConsumer$ForwardingConsumer -> a.a.a.a.E:
     com.android.tools.r8.DexIndexedConsumer EMPTY_CONSUMER -> b
     com.android.tools.r8.DexIndexedConsumer consumer -> a
@@ -317,13 +315,12 @@
     1:2:void <init>(com.android.tools.r8.DexIndexedConsumer):86:87 -> <init>
     1:2:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):108:109 -> a
     3:4:void finished(com.android.tools.r8.DiagnosticsHandler):115:116 -> a
-    1:1:java.lang.String getDefaultDexFileName(int):93:93 -> b
-    1:1:java.lang.String getDexFileName(int):97 -> b
-    1:1:com.android.tools.r8.DexIndexedConsumer access$000():80:80 -> c
+    1:1:com.android.tools.r8.DexIndexedConsumer access$000():80:80 -> b
+    2:2:java.lang.String getDefaultDexFileName(int):93:93 -> b
+    2:2:java.lang.String getDexFileName(int):97 -> b
 com.android.tools.r8.Diagnostic -> a.a.a.a.G:
     com.android.tools.r8.origin.Origin getOrigin() -> a
     java.lang.String getDiagnosticMessage() -> b
-    com.android.tools.r8.position.Position getPosition() -> c
 com.android.tools.r8.DiagnosticsHandler -> a.a.a.a.H:
     1:4:void info(com.android.tools.r8.Diagnostic):55:58 -> a
     1:6:void warning(com.android.tools.r8.Diagnostic):41:46 -> b
@@ -331,33 +328,14 @@
 com.android.tools.r8.GeneratedOutlineSupport -> a.a.a.a.I:
     long outline0(long,long,long) -> a
     com.android.tools.r8.ir.code.BasicBlock outline1(com.android.tools.r8.ir.code.BasicBlock) -> a
-    java.lang.Object outline2(java.util.List,int) -> a
-    java.lang.String outline3(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.lang.StringBuilder) -> a
-    java.lang.String outline4(java.lang.String,int) -> a
-    java.lang.String outline5(java.lang.String,java.lang.Object) -> a
-    java.lang.String outline6(java.lang.StringBuilder,java.lang.Object,java.lang.String) -> a
-    java.lang.StringBuilder outline7(java.lang.String) -> a
-    java.lang.StringBuilder outline8(java.lang.String,int,java.lang.String) -> a
+    java.lang.String outline2(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.lang.StringBuilder) -> a
+    java.lang.String outline3(java.lang.String,int) -> a
+    java.lang.String outline4(java.lang.String,java.lang.Object) -> a
+    java.lang.String outline5(java.lang.StringBuilder,java.lang.Object,java.lang.String) -> a
+    java.lang.StringBuilder outline6(java.lang.String) -> a
+    java.lang.StringBuilder outline7(java.lang.String,int,java.lang.String) -> a
 com.android.tools.r8.InternalProgramOutputPathConsumer -> a.a.a.a.J:
-com.android.tools.r8.OptionalBool -> a.a.a.a.N:
-    com.android.tools.r8.OptionalBool TRUE -> a
-    com.android.tools.r8.OptionalBool FALSE -> b
-    com.android.tools.r8.OptionalBool UNKNOWN -> c
-    1:27:void <clinit>():9:35 -> <clinit>
-    1:1:void <init>():56:56 -> <init>
-    1:1:void <init>(com.android.tools.r8.OptionalBool$1):7 -> <init>
-    boolean isFalse() -> a
-    boolean isTrue() -> b
-    1:1:com.android.tools.r8.OptionalBool unknown():53:53 -> c
-com.android.tools.r8.OptionalBool$1 -> a.a.a.a.K:
-    1:1:void <init>():10:10 -> <init>
-    boolean isTrue() -> b
-com.android.tools.r8.OptionalBool$2 -> a.a.a.a.L:
-    1:1:void <init>():23:23 -> <init>
-    boolean isFalse() -> a
-com.android.tools.r8.OptionalBool$3 -> a.a.a.a.M:
-    1:1:void <init>():36:36 -> <init>
-com.android.tools.r8.OutputMode -> a.a.a.a.O:
+com.android.tools.r8.OutputMode -> a.a.a.a.K:
     com.android.tools.r8.OutputMode DexIndexed -> a
     com.android.tools.r8.OutputMode DexFilePerClassFile -> b
     com.android.tools.r8.OutputMode DexFilePerClass -> c
@@ -365,15 +343,13 @@
     1:16:void <clinit>():11:26 -> <clinit>
     17:17:void <clinit>():7:7 -> <clinit>
     1:1:void <init>(java.lang.String,int):8:8 -> <init>
-com.android.tools.r8.ProgramConsumer -> a.a.a.a.P:
+com.android.tools.r8.ProgramConsumer -> a.a.a.a.L:
     void finished(com.android.tools.r8.DiagnosticsHandler) -> a
-com.android.tools.r8.ProgramResource -> a.a.a.a.U:
+com.android.tools.r8.ProgramResource -> a.a.a.a.P:
     1:1:com.android.tools.r8.ProgramResource fromFile(com.android.tools.r8.ProgramResource$Kind,java.nio.file.Path):41:41 -> a
     java.util.Set getClassDescriptors() -> b
-    com.android.tools.r8.ProgramResource$Kind getKind() -> c
-    java.io.InputStream getByteStream() -> d
-com.android.tools.r8.ProgramResource$1 -> a.a.a.a.Q:
-com.android.tools.r8.ProgramResource$FileResource -> a.a.a.a.S:
+com.android.tools.r8.ProgramResource$1 -> a.a.a.a.M:
+com.android.tools.r8.ProgramResource$FileResource -> a.a.a.a.N:
     com.android.tools.r8.origin.Origin origin -> a
     java.nio.file.Path file -> c
     java.util.Set classDescriptors -> d
@@ -382,37 +358,37 @@
     1:5:void <init>(com.android.tools.r8.ProgramResource$Kind,java.nio.file.Path,java.util.Set,com.android.tools.r8.ProgramResource$1):72 -> <init>
     1:1:com.android.tools.r8.origin.Origin getOrigin():87:87 -> a
     1:1:java.util.Set getClassDescriptors():106:106 -> b
-    1:1:com.android.tools.r8.ProgramResource$Kind getKind():92:92 -> c
-    1:3:java.io.InputStream getByteStream():98:100 -> d
-    4:4:com.android.tools.r8.origin.Origin getOrigin():87:87 -> d
-    4:4:java.io.InputStream getByteStream():100 -> d
-    5:5:java.io.InputStream getByteStream():100:100 -> d
-com.android.tools.r8.ProgramResource$Kind -> a.a.a.a.T:
+    1:3:java.io.InputStream getByteStream():98:100 -> getByteStream
+    4:4:com.android.tools.r8.origin.Origin getOrigin():87:87 -> getByteStream
+    4:4:java.io.InputStream getByteStream():100 -> getByteStream
+    5:5:java.io.InputStream getByteStream():100:100 -> getByteStream
+    1:1:com.android.tools.r8.ProgramResource$Kind getKind():92:92 -> getKind
+com.android.tools.r8.ProgramResource$Kind -> a.a.a.a.O:
     com.android.tools.r8.ProgramResource$Kind DEX -> b
     com.android.tools.r8.ProgramResource$Kind CF -> a
     1:3:void <clinit>():30:32 -> <clinit>
     4:4:void <clinit>():27:27 -> <clinit>
     1:1:void <init>(java.lang.String,int):28:28 -> <init>
-com.android.tools.r8.ProgramResourceProvider -> a.a.a.a.V:
-    java.util.Collection getProgramResources() -> a
-    com.android.tools.r8.DataResourceProvider getDataResourceProvider() -> b
-com.android.tools.r8.R8 -> a.a.a.a.W:
+com.android.tools.r8.ProgramResourceProvider -> a.a.a.a.Q:
+    com.android.tools.r8.DataResourceProvider getDataResourceProvider() -> a
+    java.util.Collection getProgramResources() -> b
+com.android.tools.r8.R8 -> a.a.a.a.S:
     1:1:void <clinit>():125:125 -> <clinit>
-    1:10:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):720:729 -> a
-    11:12:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):723:724 -> a
-com.android.tools.r8.Resource -> a.a.a.a.X:
+    1:10:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):703:712 -> a
+    11:12:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):706:707 -> a
+com.android.tools.r8.Resource -> a.a.a.a.T:
     com.android.tools.r8.origin.Origin getOrigin() -> a
-com.android.tools.r8.ResourceException -> a.a.a.a.Y:
+com.android.tools.r8.ResourceException -> a.a.a.a.U:
     com.android.tools.r8.origin.Origin origin -> a
     1:2:void <init>(com.android.tools.r8.origin.Origin,java.lang.Throwable):25:26 -> <init>
     1:1:com.android.tools.r8.origin.Origin getOrigin():35:35 -> a
-com.android.tools.r8.StringConsumer -> a.a.a.a.Z:
+com.android.tools.r8.StringConsumer -> a.a.a.a.V:
     void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler) -> a
-com.android.tools.r8.StringResource -> a.a.a.a.ca:
+com.android.tools.r8.StringResource -> a.a.a.a.Y:
     1:1:com.android.tools.r8.StringResource fromFile(java.nio.file.Path):37:37 -> a
     2:2:com.android.tools.r8.StringResource fromFile(java.nio.file.Path,java.nio.charset.Charset):49:49 -> a
-com.android.tools.r8.StringResource$1 -> a.a.a.a.aa:
-com.android.tools.r8.StringResource$FileResource -> a.a.a.a.ba:
+com.android.tools.r8.StringResource$1 -> a.a.a.a.W:
+com.android.tools.r8.StringResource$FileResource -> a.a.a.a.X:
     java.nio.charset.Charset charset -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.nio.file.Path file -> a
@@ -422,7 +398,7 @@
     1:6:void <init>(java.nio.file.Path,java.nio.charset.Charset,com.android.tools.r8.StringResource$1):82 -> <init>
     1:1:com.android.tools.r8.origin.Origin getOrigin():97:97 -> a
     1:3:java.lang.String getString():103:105 -> b
-com.android.tools.r8.Version -> a.a.a.a.da:
+com.android.tools.r8.Version -> a.a.a.a.Z:
     boolean com.android.tools.r8.utils.NumberUtils.is16Bit(long) -> a
     1:3:java.util.List com.android.tools.r8.utils.ListUtils.map(java.util.Collection,java.util.function.Function):15:17 -> a
     4:12:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):21:29 -> a
@@ -471,117 +447,112 @@
     24:24:int lambda$computeLocalsAtLabels$1(com.android.tools.r8.graph.CfCode$LocalVariableInfo,com.android.tools.r8.graph.CfCode$LocalVariableInfo):207:207 -> a
     25:26:java.util.List getSortedLocalVariables(com.android.tools.r8.graph.CfCode):214:215 -> a
     27:28:void print(java.lang.String):236:237 -> a
-    27:28:void print(com.android.tools.r8.cf.code.CfNop):241 -> a
-    29:58:void print(com.android.tools.r8.cf.code.CfStackInstruction):245:274 -> a
-    59:60:void print(java.lang.String):236:237 -> a
-    59:60:void print(com.android.tools.r8.cf.code.CfStackInstruction):271 -> a
-    61:62:void print(java.lang.String):236:237 -> a
-    61:62:void print(com.android.tools.r8.cf.code.CfStackInstruction):268 -> a
-    63:64:void print(java.lang.String):236:237 -> a
-    63:64:void print(com.android.tools.r8.cf.code.CfStackInstruction):265 -> a
-    65:66:void print(java.lang.String):236:237 -> a
-    65:66:void print(com.android.tools.r8.cf.code.CfStackInstruction):262 -> a
+    27:28:void print(com.android.tools.r8.cf.code.CfArrayLength):479 -> a
+    29:30:void print(java.lang.String):236:237 -> a
+    29:30:void print(com.android.tools.r8.cf.code.CfConstNull):283 -> a
+    31:32:void print(java.lang.String):236:237 -> a
+    31:32:void print(com.android.tools.r8.cf.code.CfNop):241 -> a
+    33:34:void print(java.lang.String):236:237 -> a
+    33:34:void print(com.android.tools.r8.cf.code.CfReturnVoid):314 -> a
+    35:36:void print(java.lang.String):236:237 -> a
+    35:36:void print(com.android.tools.r8.cf.code.CfThrow):279 -> a
+    37:66:void print(com.android.tools.r8.cf.code.CfStackInstruction):245:274 -> a
     67:68:void print(java.lang.String):236:237 -> a
-    67:68:void print(com.android.tools.r8.cf.code.CfStackInstruction):259 -> a
+    67:68:void print(com.android.tools.r8.cf.code.CfStackInstruction):271 -> a
     69:70:void print(java.lang.String):236:237 -> a
-    69:70:void print(com.android.tools.r8.cf.code.CfStackInstruction):256 -> a
+    69:70:void print(com.android.tools.r8.cf.code.CfStackInstruction):268 -> a
     71:72:void print(java.lang.String):236:237 -> a
-    71:72:void print(com.android.tools.r8.cf.code.CfStackInstruction):253 -> a
+    71:72:void print(com.android.tools.r8.cf.code.CfStackInstruction):265 -> a
     73:74:void print(java.lang.String):236:237 -> a
-    73:74:void print(com.android.tools.r8.cf.code.CfStackInstruction):250 -> a
+    73:74:void print(com.android.tools.r8.cf.code.CfStackInstruction):262 -> a
     75:76:void print(java.lang.String):236:237 -> a
-    75:76:void print(com.android.tools.r8.cf.code.CfStackInstruction):247 -> a
-    77:93:void print(com.android.tools.r8.cf.code.CfConstNumber):287:303 -> a
-    94:94:void print(com.android.tools.r8.cf.code.CfConstNumber):300:300 -> a
-    95:95:void print(com.android.tools.r8.cf.code.CfConstNumber):297:297 -> a
-    96:96:void print(com.android.tools.r8.cf.code.CfConstNumber):294:294 -> a
-    97:97:void print(com.android.tools.r8.cf.code.CfConstNumber):291:291 -> a
-    98:100:void print(com.android.tools.r8.cf.code.CfConstClass):308:310 -> a
-    101:101:void print(com.android.tools.r8.cf.code.CfReturn):318:318 -> a
-    102:102:void print(com.android.tools.r8.cf.code.CfMonitor):322:322 -> a
-    103:104:void print(java.lang.String):236:237 -> a
-    103:104:void print(com.android.tools.r8.cf.code.CfMonitor):322 -> a
-    105:105:void print(com.android.tools.r8.cf.code.CfArithmeticBinop):326:326 -> a
-    106:106:void print(com.android.tools.r8.cf.code.CfCmp):330:330 -> a
-    107:107:void print(com.android.tools.r8.cf.code.CfLogicalBinop):334:334 -> a
-    108:108:void print(com.android.tools.r8.cf.code.CfNeg):338:338 -> a
-    109:109:void print(com.android.tools.r8.cf.code.CfNumberConversion):342:342 -> a
-    110:111:void print(com.android.tools.r8.cf.code.CfConstString):346:347 -> a
-    112:113:void print(com.android.tools.r8.cf.code.CfArrayLoad):356:357 -> a
-    114:115:void print(com.android.tools.r8.cf.code.CfArrayStore):361:362 -> a
-    116:118:void print(com.android.tools.r8.cf.code.CfInvoke):366:368 -> a
-    119:122:void print(com.android.tools.r8.cf.code.CfInvokeDynamic):372:375 -> a
-    123:142:void print(com.android.tools.r8.cf.code.CfFrame):379:398 -> a
-    143:146:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):402:405 -> a
-    147:150:void appendType(com.android.tools.r8.graph.DexType):688:691 -> a
-    147:150:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):405 -> a
-    151:151:void appendType(com.android.tools.r8.graph.DexType):689:689 -> a
-    151:151:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):405 -> a
-    152:152:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):407:407 -> a
-    153:155:void print(com.android.tools.r8.cf.code.CfInstanceOf):412:414 -> a
-    156:158:void print(com.android.tools.r8.cf.code.CfCheckCast):418:420 -> a
-    159:174:void print(com.android.tools.r8.cf.code.CfFieldInstruction):424:439 -> a
-    175:175:void print(com.android.tools.r8.cf.code.CfFieldInstruction):430:430 -> a
-    176:185:void print(com.android.tools.r8.cf.code.CfFieldInstruction):427:436 -> a
-    186:194:void print(com.android.tools.r8.cf.code.CfFieldInstruction):433:441 -> a
-    195:196:void appendField(com.android.tools.r8.graph.DexField):709:710 -> a
-    195:196:void print(com.android.tools.r8.cf.code.CfFieldInstruction):441 -> a
-    197:197:java.lang.String com.android.tools.r8.naming.MemberNaming$FieldSignature.toString():193:193 -> a
-    197:197:void appendField(com.android.tools.r8.graph.DexField):710 -> a
-    197:197:void print(com.android.tools.r8.cf.code.CfFieldInstruction):441 -> a
-    198:202:void appendField(com.android.tools.r8.graph.DexField):710:714 -> a
-    198:202:void print(com.android.tools.r8.cf.code.CfFieldInstruction):441 -> a
-    203:204:void print(com.android.tools.r8.cf.code.CfFieldInstruction):442:443 -> a
-    205:209:void appendDescriptor(com.android.tools.r8.graph.DexType):680:684 -> a
-    205:209:void print(com.android.tools.r8.cf.code.CfFieldInstruction):443 -> a
-    210:212:void print(com.android.tools.r8.cf.code.CfNew):447:449 -> a
-    213:226:void print(com.android.tools.r8.cf.code.CfNewArray):453:466 -> a
-    227:230:void print(com.android.tools.r8.cf.code.CfMultiANewArray):472:475 -> a
-    231:241:void print(com.android.tools.r8.cf.code.CfLabel):483:493 -> a
-    242:242:void print(com.android.tools.r8.cf.code.CfLabel):491:491 -> a
-    243:243:void print(com.android.tools.r8.cf.code.CfLabel):489:489 -> a
-    244:248:void print(com.android.tools.r8.cf.code.CfPosition):498:502 -> a
-    249:250:void print(com.android.tools.r8.cf.code.CfGoto):507:508 -> a
-    251:255:void print(com.android.tools.r8.cf.code.CfIf):516:520 -> a
-    256:256:java.lang.String ifPostfix(com.android.tools.r8.ir.code.If$Type):512:512 -> a
-    256:256:void print(com.android.tools.r8.cf.code.CfIf):520 -> a
-    257:259:void print(com.android.tools.r8.cf.code.CfIf):520:522 -> a
-    260:263:void print(com.android.tools.r8.cf.code.CfIfCmp):526:529 -> a
-    264:264:java.lang.String ifPostfix(com.android.tools.r8.ir.code.If$Type):512:512 -> a
-    264:264:void print(com.android.tools.r8.cf.code.CfIfCmp):529 -> a
-    265:267:void print(com.android.tools.r8.cf.code.CfIfCmp):529:531 -> a
-    268:285:void print(com.android.tools.r8.cf.code.CfSwitch):535:552 -> a
-    286:286:void print(com.android.tools.r8.cf.code.CfLoad):556:556 -> a
-    287:287:void print(com.android.tools.r8.cf.code.CfStore):560:560 -> a
-    288:293:void print(com.android.tools.r8.cf.code.CfIinc):564:569 -> a
-    294:295:void printPrefixed(com.android.tools.r8.ir.code.ValueType,java.lang.String,int):573:574 -> a
-    296:308:char typePrefix(com.android.tools.r8.ir.code.ValueType):578:590 -> a
-    309:328:char typePrefix(com.android.tools.r8.ir.code.MemberType):595:614 -> a
-    329:331:void print(com.android.tools.r8.cf.code.CfConstMethodHandle):637:639 -> a
-    332:334:void print(com.android.tools.r8.cf.code.CfConstMethodType):643:645 -> a
-    335:335:void appendComment(java.lang.String):676:676 -> a
-    336:344:void appendClass(com.android.tools.r8.graph.DexType):696:704 -> a
-    345:345:void appendClass(com.android.tools.r8.graph.DexType):703:703 -> a
-    346:346:void appendClass(com.android.tools.r8.graph.DexType):702:702 -> a
-    347:350:void appendMethod(com.android.tools.r8.graph.DexMethod):718:721 -> a
-    351:358:java.lang.String com.android.tools.r8.naming.MemberNaming$MethodSignature.toDescriptor():325:332 -> a
-    351:358:void appendMethod(com.android.tools.r8.graph.DexMethod):721 -> a
-    359:363:void appendMethod(com.android.tools.r8.graph.DexMethod):721:725 -> a
-    364:364:java.lang.String opcodeName(int):729:729 -> a
+    75:76:void print(com.android.tools.r8.cf.code.CfStackInstruction):259 -> a
+    77:78:void print(java.lang.String):236:237 -> a
+    77:78:void print(com.android.tools.r8.cf.code.CfStackInstruction):256 -> a
+    79:80:void print(java.lang.String):236:237 -> a
+    79:80:void print(com.android.tools.r8.cf.code.CfStackInstruction):253 -> a
+    81:82:void print(java.lang.String):236:237 -> a
+    81:82:void print(com.android.tools.r8.cf.code.CfStackInstruction):250 -> a
+    83:84:void print(java.lang.String):236:237 -> a
+    83:84:void print(com.android.tools.r8.cf.code.CfStackInstruction):247 -> a
+    85:101:void print(com.android.tools.r8.cf.code.CfConstNumber):287:303 -> a
+    102:102:void print(com.android.tools.r8.cf.code.CfConstNumber):300:300 -> a
+    103:103:void print(com.android.tools.r8.cf.code.CfConstNumber):297:297 -> a
+    104:104:void print(com.android.tools.r8.cf.code.CfConstNumber):294:294 -> a
+    105:105:void print(com.android.tools.r8.cf.code.CfConstNumber):291:291 -> a
+    106:108:void print(com.android.tools.r8.cf.code.CfConstClass):308:310 -> a
+    109:109:void print(com.android.tools.r8.cf.code.CfReturn):318:318 -> a
+    110:110:void print(com.android.tools.r8.cf.code.CfMonitor):322:322 -> a
+    111:112:void print(java.lang.String):236:237 -> a
+    111:112:void print(com.android.tools.r8.cf.code.CfMonitor):322 -> a
+    113:113:void print(com.android.tools.r8.cf.code.CfArithmeticBinop):326:326 -> a
+    114:114:void print(com.android.tools.r8.cf.code.CfCmp):330:330 -> a
+    115:115:void print(com.android.tools.r8.cf.code.CfLogicalBinop):334:334 -> a
+    116:116:void print(com.android.tools.r8.cf.code.CfNeg):338:338 -> a
+    117:117:void print(com.android.tools.r8.cf.code.CfNumberConversion):342:342 -> a
+    118:119:void print(com.android.tools.r8.cf.code.CfConstString):346:347 -> a
+    120:121:void print(com.android.tools.r8.cf.code.CfArrayLoad):356:357 -> a
+    122:123:void print(com.android.tools.r8.cf.code.CfArrayStore):361:362 -> a
+    124:126:void print(com.android.tools.r8.cf.code.CfInvoke):366:368 -> a
+    127:130:void print(com.android.tools.r8.cf.code.CfInvokeDynamic):372:375 -> a
+    131:150:void print(com.android.tools.r8.cf.code.CfFrame):379:398 -> a
+    151:154:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):402:405 -> a
+    155:158:void appendType(com.android.tools.r8.graph.DexType):688:691 -> a
+    155:158:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):405 -> a
+    159:159:void appendType(com.android.tools.r8.graph.DexType):689:689 -> a
+    159:159:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):405 -> a
+    160:160:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):407:407 -> a
+    161:163:void print(com.android.tools.r8.cf.code.CfInstanceOf):412:414 -> a
+    164:166:void print(com.android.tools.r8.cf.code.CfCheckCast):418:420 -> a
+    167:182:void print(com.android.tools.r8.cf.code.CfFieldInstruction):424:439 -> a
+    183:183:void print(com.android.tools.r8.cf.code.CfFieldInstruction):430:430 -> a
+    184:193:void print(com.android.tools.r8.cf.code.CfFieldInstruction):427:436 -> a
+    194:202:void print(com.android.tools.r8.cf.code.CfFieldInstruction):433:441 -> a
+    203:208:void appendField(com.android.tools.r8.graph.DexField):709:714 -> a
+    203:208:void print(com.android.tools.r8.cf.code.CfFieldInstruction):441 -> a
+    209:210:void print(com.android.tools.r8.cf.code.CfFieldInstruction):442:443 -> a
+    211:215:void appendDescriptor(com.android.tools.r8.graph.DexType):680:684 -> a
+    211:215:void print(com.android.tools.r8.cf.code.CfFieldInstruction):443 -> a
+    216:218:void print(com.android.tools.r8.cf.code.CfNew):447:449 -> a
+    219:232:void print(com.android.tools.r8.cf.code.CfNewArray):453:466 -> a
+    233:236:void print(com.android.tools.r8.cf.code.CfMultiANewArray):472:475 -> a
+    237:247:void print(com.android.tools.r8.cf.code.CfLabel):483:493 -> a
+    248:248:void print(com.android.tools.r8.cf.code.CfLabel):491:491 -> a
+    249:249:void print(com.android.tools.r8.cf.code.CfLabel):489:489 -> a
+    250:254:void print(com.android.tools.r8.cf.code.CfPosition):498:502 -> a
+    255:256:void print(com.android.tools.r8.cf.code.CfGoto):507:508 -> a
+    257:261:void print(com.android.tools.r8.cf.code.CfIf):516:520 -> a
+    262:262:java.lang.String ifPostfix(com.android.tools.r8.ir.code.If$Type):512:512 -> a
+    262:262:void print(com.android.tools.r8.cf.code.CfIf):520 -> a
+    263:265:void print(com.android.tools.r8.cf.code.CfIf):520:522 -> a
+    266:269:void print(com.android.tools.r8.cf.code.CfIfCmp):526:529 -> a
+    270:270:java.lang.String ifPostfix(com.android.tools.r8.ir.code.If$Type):512:512 -> a
+    270:270:void print(com.android.tools.r8.cf.code.CfIfCmp):529 -> a
+    271:273:void print(com.android.tools.r8.cf.code.CfIfCmp):529:531 -> a
+    274:291:void print(com.android.tools.r8.cf.code.CfSwitch):535:552 -> a
+    292:292:void print(com.android.tools.r8.cf.code.CfLoad):556:556 -> a
+    293:293:void print(com.android.tools.r8.cf.code.CfStore):560:560 -> a
+    294:299:void print(com.android.tools.r8.cf.code.CfIinc):564:569 -> a
+    300:301:void printPrefixed(com.android.tools.r8.ir.code.ValueType,java.lang.String,int):573:574 -> a
+    302:314:char typePrefix(com.android.tools.r8.ir.code.ValueType):578:590 -> a
+    315:334:char typePrefix(com.android.tools.r8.ir.code.MemberType):595:614 -> a
+    335:337:void print(com.android.tools.r8.cf.code.CfConstMethodHandle):637:639 -> a
+    338:340:void print(com.android.tools.r8.cf.code.CfConstMethodType):643:645 -> a
+    341:343:void indent():665:667 -> a
+    344:344:void appendComment(java.lang.String):676:676 -> a
+    345:353:void appendClass(com.android.tools.r8.graph.DexType):696:704 -> a
+    354:354:void appendClass(com.android.tools.r8.graph.DexType):703:703 -> a
+    355:355:void appendClass(com.android.tools.r8.graph.DexType):702:702 -> a
+    356:359:void appendMethod(com.android.tools.r8.graph.DexMethod):718:721 -> a
+    360:367:java.lang.String com.android.tools.r8.naming.MemberNaming$MethodSignature.toDescriptor():320:327 -> a
+    360:367:void appendMethod(com.android.tools.r8.graph.DexMethod):721 -> a
+    368:372:void appendMethod(com.android.tools.r8.graph.DexMethod):721:725 -> a
+    373:373:java.lang.String opcodeName(int):729:729 -> a
     1:13:int lambda$getSortedLocalVariables$2(com.android.tools.r8.graph.CfCode$LocalVariableInfo,com.android.tools.r8.graph.CfCode$LocalVariableInfo):218:230 -> b
     14:15:void print(java.lang.String):236:237 -> b
-    16:17:void print(java.lang.String):236:237 -> b
-    16:17:void print(com.android.tools.r8.cf.code.CfThrow):279 -> b
-    18:18:java.lang.String getLabel(com.android.tools.r8.cf.code.CfLabel):649:649 -> b
-    1:2:void print(java.lang.String):236:237 -> c
-    1:2:void print(com.android.tools.r8.cf.code.CfConstNull):283 -> c
-    1:2:void print(java.lang.String):236:237 -> d
-    1:2:void print(com.android.tools.r8.cf.code.CfReturnVoid):314 -> d
-    1:2:void print(java.lang.String):236:237 -> e
-    1:2:void print(com.android.tools.r8.cf.code.CfArrayLength):479 -> e
-    1:3:void indent():665:667 -> f
-    1:2:void instructionIndex():659:660 -> g
-    1:2:void newline():653:654 -> h
+    16:16:java.lang.String getLabel(com.android.tools.r8.cf.code.CfLabel):649:649 -> b
+    17:18:void instructionIndex():659:660 -> b
+    1:2:void newline():653:654 -> c
     1:1:java.lang.String toString():734:734 -> toString
 com.android.tools.r8.cf.FixedLocalValue -> a.a.a.a.a.b:
     com.android.tools.r8.ir.code.Phi getPhi() -> Z
@@ -798,7 +769,7 @@
     boolean isInitialized() -> c
     1:1:boolean isWide():112:112 -> g
     1:1:java.lang.String toString():86:86 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():118:118 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():360:360 -> toString
     2:2:java.lang.String toString():86 -> toString
 com.android.tools.r8.cf.code.CfFrame$Top -> a.a.a.a.a.a.r:
     com.android.tools.r8.cf.code.CfFrame$Top SINGLETON -> a
@@ -1738,19 +1709,7 @@
     java.lang.String getName() -> d
     int getOpcode() -> e
     1:1:long decodedValue():43:43 -> p
-com.android.tools.r8.code.DexItemBasedConstString -> a.a.a.a.b.fa:
-    com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo classNameComputationInfo -> i
-    1:2:void <init>(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo):24:25 -> <init>
-    1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):65:65 -> a
-    2:2:void com.android.tools.r8.code.Format21c.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):15 -> a
-    3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):76:76 -> a
-    4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):89:89 -> a
-    boolean canThrow() -> c
-    java.lang.String getName() -> d
-    1:1:int getOpcode():48:48 -> e
-    boolean isDexItemBasedConstString() -> l
-com.android.tools.r8.code.DivDouble -> a.a.a.a.b.ha:
+com.android.tools.r8.code.DivDouble -> a.a.a.a.b.ga:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -1759,7 +1718,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.DivDouble2Addr -> a.a.a.a.b.ga:
+com.android.tools.r8.code.DivDouble2Addr -> a.a.a.a.b.fa:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -1769,7 +1728,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.DivFloat -> a.a.a.a.b.ja:
+com.android.tools.r8.code.DivFloat -> a.a.a.a.b.ia:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -1778,7 +1737,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.DivFloat2Addr -> a.a.a.a.b.ia:
+com.android.tools.r8.code.DivFloat2Addr -> a.a.a.a.b.ha:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -1788,7 +1747,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.DivInt -> a.a.a.a.b.la:
+com.android.tools.r8.code.DivInt -> a.a.a.a.b.ka:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -1798,7 +1757,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.DivInt2Addr -> a.a.a.a.b.ka:
+com.android.tools.r8.code.DivInt2Addr -> a.a.a.a.b.ja:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -1809,21 +1768,21 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.DivIntLit16 -> a.a.a.a.b.ma:
+com.android.tools.r8.code.DivIntLit16 -> a.a.a.a.b.la:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.DivIntLit8 -> a.a.a.a.b.na:
+com.android.tools.r8.code.DivIntLit8 -> a.a.a.a.b.ma:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.DivLong -> a.a.a.a.b.pa:
+com.android.tools.r8.code.DivLong -> a.a.a.a.b.oa:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -1833,7 +1792,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.DivLong2Addr -> a.a.a.a.b.oa:
+com.android.tools.r8.code.DivLong2Addr -> a.a.a.a.b.na:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -1844,7 +1803,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.DoubleToFloat -> a.a.a.a.b.qa:
+com.android.tools.r8.code.DoubleToFloat -> a.a.a.a.b.pa:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -1854,7 +1813,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.DoubleToInt -> a.a.a.a.b.ra:
+com.android.tools.r8.code.DoubleToInt -> a.a.a.a.b.qa:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -1864,7 +1823,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.DoubleToLong -> a.a.a.a.b.sa:
+com.android.tools.r8.code.DoubleToLong -> a.a.a.a.b.ra:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -1874,7 +1833,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.FillArrayData -> a.a.a.a.b.ta:
+com.android.tools.r8.code.FillArrayData -> a.a.a.a.b.sa:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
@@ -1886,7 +1845,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.FillArrayDataPayload -> a.a.a.a.b.ua:
+com.android.tools.r8.code.FillArrayDataPayload -> a.a.a.a.b.ta:
     short[] data -> h
     boolean $assertionsDisabled -> i
     long size -> g
@@ -1901,7 +1860,7 @@
     1:1:int getSize():75:75 -> g
     1:4:int hashCode():66:69 -> hashCode
     boolean isPayload() -> m
-com.android.tools.r8.code.FilledNewArray -> a.a.a.a.b.va:
+com.android.tools.r8.code.FilledNewArray -> a.a.a.a.b.ua:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):17:17 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexType,int,int,int,int,int):21:21 -> <init>
     1:1:com.android.tools.r8.graph.DexType getType():40:40 -> a
@@ -1910,7 +1869,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.FilledNewArrayRange -> a.a.a.a.b.wa:
+com.android.tools.r8.code.FilledNewArrayRange -> a.a.a.a.b.va:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):17:17 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexType):21:21 -> <init>
     1:1:com.android.tools.r8.graph.DexType getType():40:40 -> a
@@ -1919,7 +1878,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.FloatToDouble -> a.a.a.a.b.xa:
+com.android.tools.r8.code.FloatToDouble -> a.a.a.a.b.wa:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -1929,7 +1888,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.FloatToInt -> a.a.a.a.b.ya:
+com.android.tools.r8.code.FloatToInt -> a.a.a.a.b.xa:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -1939,7 +1898,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.FloatToLong -> a.a.a.a.b.za:
+com.android.tools.r8.code.FloatToLong -> a.a.a.a.b.ya:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -1949,10 +1908,10 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.Format10x -> a.a.a.a.b.Aa:
+com.android.tools.r8.code.Format10x -> a.a.a.a.b.za:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):17:17 -> <init>
     2:2:void <init>():20:20 -> <init>
-com.android.tools.r8.code.Format11x -> a.a.a.a.b.Ba:
+com.android.tools.r8.code.Format11x -> a.a.a.a.b.Aa:
     short AA -> f
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():13:13 -> <clinit>
@@ -1961,7 +1920,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> a
     1:4:boolean equals(java.lang.Object):40:43 -> equals
     1:1:int hashCode():35:35 -> hashCode
-com.android.tools.r8.code.Format12x -> a.a.a.a.b.Ca:
+com.android.tools.r8.code.Format12x -> a.a.a.a.b.Ba:
     boolean $assertionsDisabled -> h
     byte A -> f
     byte B -> g
@@ -1971,7 +1930,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):52:52 -> a
     1:5:boolean equals(java.lang.Object):43:47 -> equals
     1:1:int hashCode():38:38 -> hashCode
-com.android.tools.r8.code.Format21c -> a.a.a.a.b.Da:
+com.android.tools.r8.code.Format21c -> a.a.a.a.b.Ca:
     short AA -> f
     com.android.tools.r8.graph.IndexedDexItem BBBB -> g
     boolean $assertionsDisabled -> h
@@ -1982,7 +1941,7 @@
     3:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):55:55 -> a
     1:5:boolean equals(java.lang.Object):46:50 -> equals
     1:1:int hashCode():41:41 -> hashCode
-com.android.tools.r8.code.Format21h -> a.a.a.a.b.Ea:
+com.android.tools.r8.code.Format21h -> a.a.a.a.b.Da:
     char BBBB -> g
     short AA -> f
     boolean $assertionsDisabled -> h
@@ -1991,7 +1950,7 @@
     4:8:void <init>(int,int):24:28 -> <init>
     1:5:boolean equals(java.lang.Object):44:48 -> equals
     1:1:int hashCode():39:39 -> hashCode
-com.android.tools.r8.code.Format21s -> a.a.a.a.b.Fa:
+com.android.tools.r8.code.Format21s -> a.a.a.a.b.Ea:
     short BBBB -> g
     short AA -> f
     boolean $assertionsDisabled -> h
@@ -2000,7 +1959,7 @@
     4:8:void <init>(int,int):26:30 -> <init>
     1:5:boolean equals(java.lang.Object):46:50 -> equals
     1:1:int hashCode():41:41 -> hashCode
-com.android.tools.r8.code.Format21t -> a.a.a.a.b.Ga:
+com.android.tools.r8.code.Format21t -> a.a.a.a.b.Fa:
     short BBBB -> g
     short AA -> f
     boolean $assertionsDisabled -> h
@@ -2018,7 +1977,7 @@
     1:1:int hashCode():43:43 -> hashCode
     com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint() -> p
     com.android.tools.r8.ir.code.If$Type getType() -> q
-com.android.tools.r8.code.Format22b -> a.a.a.a.b.Ha:
+com.android.tools.r8.code.Format22b -> a.a.a.a.b.Ga:
     short BB -> g
     short AA -> f
     boolean $assertionsDisabled -> i
@@ -2034,7 +1993,7 @@
     3:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):59:59 -> a
     1:5:boolean equals(java.lang.Object):50:54 -> equals
     1:1:int hashCode():45:45 -> hashCode
-com.android.tools.r8.code.Format22c -> a.a.a.a.b.Ia:
+com.android.tools.r8.code.Format22c -> a.a.a.a.b.Ha:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.IndexedDexItem CCCC -> h
     byte A -> f
@@ -2048,7 +2007,7 @@
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):72:72 -> a
     1:5:boolean equals(java.lang.Object):50:54 -> equals
     1:1:int hashCode():45:45 -> hashCode
-com.android.tools.r8.code.Format22s -> a.a.a.a.b.Ja:
+com.android.tools.r8.code.Format22s -> a.a.a.a.b.Ia:
     short CCCC -> h
     boolean $assertionsDisabled -> i
     byte A -> f
@@ -2061,7 +2020,7 @@
     3:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):59:59 -> a
     1:5:boolean equals(java.lang.Object):50:54 -> equals
     1:1:int hashCode():45:45 -> hashCode
-com.android.tools.r8.code.Format22t -> a.a.a.a.b.Ka:
+com.android.tools.r8.code.Format22t -> a.a.a.a.b.Ja:
     short CCCC -> h
     boolean $assertionsDisabled -> i
     byte A -> f
@@ -2080,7 +2039,7 @@
     1:1:int hashCode():47:47 -> hashCode
     com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint() -> p
     com.android.tools.r8.ir.code.If$Type getType() -> q
-com.android.tools.r8.code.Format22x -> a.a.a.a.b.La:
+com.android.tools.r8.code.Format22x -> a.a.a.a.b.Ka:
     char BBBB -> g
     short AA -> f
     boolean $assertionsDisabled -> h
@@ -2090,7 +2049,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
     1:5:boolean equals(java.lang.Object):45:49 -> equals
     1:1:int hashCode():40:40 -> hashCode
-com.android.tools.r8.code.Format23x -> a.a.a.a.b.Ma:
+com.android.tools.r8.code.Format23x -> a.a.a.a.b.La:
     short BB -> g
     short CC -> h
     short AA -> f
@@ -2102,7 +2061,7 @@
     3:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):58:58 -> a
     1:5:boolean equals(java.lang.Object):49:53 -> equals
     1:1:int hashCode():44:44 -> hashCode
-com.android.tools.r8.code.Format31i -> a.a.a.a.b.Na:
+com.android.tools.r8.code.Format31i -> a.a.a.a.b.Ma:
     short AA -> f
     int BBBBBBBB -> g
     boolean $assertionsDisabled -> h
@@ -2111,7 +2070,7 @@
     4:7:void <init>(int,int):25:28 -> <init>
     1:5:boolean equals(java.lang.Object):44:48 -> equals
     1:1:int hashCode():39:39 -> hashCode
-com.android.tools.r8.code.Format31t -> a.a.a.a.b.Oa:
+com.android.tools.r8.code.Format31t -> a.a.a.a.b.Na:
     short AA -> f
     int BBBBBBBB -> g
     boolean $assertionsDisabled -> h
@@ -2129,7 +2088,7 @@
     1:1:int getPayloadOffset():45:45 -> f
     1:1:int hashCode():54:54 -> hashCode
     boolean hasPayload() -> i
-com.android.tools.r8.code.Format32x -> a.a.a.a.b.Pa:
+com.android.tools.r8.code.Format32x -> a.a.a.a.b.Oa:
     int AAAA -> f
     int BBBB -> g
     boolean $assertionsDisabled -> h
@@ -2140,7 +2099,7 @@
     4:4:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):56:56 -> a
     1:5:boolean equals(java.lang.Object):47:51 -> equals
     1:1:int hashCode():42:42 -> hashCode
-com.android.tools.r8.code.Format35c -> a.a.a.a.b.Qa:
+com.android.tools.r8.code.Format35c -> a.a.a.a.b.Pa:
     boolean $assertionsDisabled -> m
     byte F -> j
     byte E -> i
@@ -2160,7 +2119,7 @@
     21:21:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):116:116 -> a
     1:6:boolean equals(java.lang.Object):70:75 -> equals
     1:2:int hashCode():64:65 -> hashCode
-com.android.tools.r8.code.Format3rc -> a.a.a.a.b.Ra:
+com.android.tools.r8.code.Format3rc -> a.a.a.a.b.Qa:
     char CCCC -> g
     short AA -> f
     boolean $assertionsDisabled -> i
@@ -2176,7 +2135,7 @@
     19:19:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):94:94 -> a
     1:5:boolean equals(java.lang.Object):51:55 -> equals
     1:1:int hashCode():46:46 -> hashCode
-com.android.tools.r8.code.Goto -> a.a.a.a.b.Ua:
+com.android.tools.r8.code.Goto -> a.a.a.a.b.Ta:
     boolean com.android.tools.r8.code.Format10t.$assertionsDisabled -> g
     byte com.android.tools.r8.code.Format10t.AA -> f
     1:1:void com.android.tools.r8.code.Format10t.<clinit>():12:12 -> <clinit>
@@ -2199,7 +2158,7 @@
     1:1:int[] getTargets():39:39 -> h
     1:1:int com.android.tools.r8.code.Format10t.hashCode():35:35 -> hashCode
     1:1:int com.android.tools.r8.code.Format10t.hashCode():0 -> hashCode
-com.android.tools.r8.code.Goto16 -> a.a.a.a.b.Sa:
+com.android.tools.r8.code.Goto16 -> a.a.a.a.b.Ra:
     short com.android.tools.r8.code.Format20t.AAAA -> f
     boolean com.android.tools.r8.code.Format20t.$assertionsDisabled -> g
     1:1:void com.android.tools.r8.code.Format20t.<clinit>():12:12 -> <clinit>
@@ -2222,7 +2181,7 @@
     1:1:int[] getTargets():39:39 -> h
     1:1:int com.android.tools.r8.code.Format20t.hashCode():35:35 -> hashCode
     1:1:int com.android.tools.r8.code.Format20t.hashCode():0 -> hashCode
-com.android.tools.r8.code.Goto32 -> a.a.a.a.b.Ta:
+com.android.tools.r8.code.Goto32 -> a.a.a.a.b.Sa:
     int com.android.tools.r8.code.Format30t.AAAAAAAA -> f
     1:2:void com.android.tools.r8.code.Format30t.<init>(int,com.android.tools.r8.code.BytecodeStream):18:19 -> <init>
     1:2:void <init>(int,com.android.tools.r8.code.BytecodeStream):15 -> <init>
@@ -2243,91 +2202,91 @@
     1:1:int[] getTargets():39:39 -> h
     1:1:int com.android.tools.r8.code.Format30t.hashCode():34:34 -> hashCode
     1:1:int com.android.tools.r8.code.Format30t.hashCode():0 -> hashCode
-com.android.tools.r8.code.IfEq -> a.a.a.a.b.Va:
+com.android.tools.r8.code.IfEq -> a.a.a.a.b.Ua:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     java.lang.String getName() -> d
     int getOpcode() -> e
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> p
     1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> q
-com.android.tools.r8.code.IfEqz -> a.a.a.a.b.Wa:
+com.android.tools.r8.code.IfEqz -> a.a.a.a.b.Va:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     java.lang.String getName() -> d
     int getOpcode() -> e
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> p
     1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> q
-com.android.tools.r8.code.IfGe -> a.a.a.a.b.Xa:
+com.android.tools.r8.code.IfGe -> a.a.a.a.b.Wa:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     java.lang.String getName() -> d
     int getOpcode() -> e
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> p
     1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> q
-com.android.tools.r8.code.IfGez -> a.a.a.a.b.Ya:
+com.android.tools.r8.code.IfGez -> a.a.a.a.b.Xa:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     java.lang.String getName() -> d
     int getOpcode() -> e
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> p
     1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> q
-com.android.tools.r8.code.IfGt -> a.a.a.a.b.Za:
+com.android.tools.r8.code.IfGt -> a.a.a.a.b.Ya:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     java.lang.String getName() -> d
     int getOpcode() -> e
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> p
     1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> q
-com.android.tools.r8.code.IfGtz -> a.a.a.a.b._a:
+com.android.tools.r8.code.IfGtz -> a.a.a.a.b.Za:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     java.lang.String getName() -> d
     int getOpcode() -> e
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> p
     1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> q
-com.android.tools.r8.code.IfLe -> a.a.a.a.b.ab:
+com.android.tools.r8.code.IfLe -> a.a.a.a.b._a:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     java.lang.String getName() -> d
     int getOpcode() -> e
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> p
     1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> q
-com.android.tools.r8.code.IfLez -> a.a.a.a.b.bb:
+com.android.tools.r8.code.IfLez -> a.a.a.a.b.ab:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     java.lang.String getName() -> d
     int getOpcode() -> e
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> p
     1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> q
-com.android.tools.r8.code.IfLt -> a.a.a.a.b.cb:
+com.android.tools.r8.code.IfLt -> a.a.a.a.b.bb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     java.lang.String getName() -> d
     int getOpcode() -> e
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> p
     1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> q
-com.android.tools.r8.code.IfLtz -> a.a.a.a.b.db:
+com.android.tools.r8.code.IfLtz -> a.a.a.a.b.cb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     java.lang.String getName() -> d
     int getOpcode() -> e
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> p
     1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> q
-com.android.tools.r8.code.IfNe -> a.a.a.a.b.eb:
+com.android.tools.r8.code.IfNe -> a.a.a.a.b.db:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     java.lang.String getName() -> d
     int getOpcode() -> e
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> p
     1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> q
-com.android.tools.r8.code.IfNez -> a.a.a.a.b.fb:
+com.android.tools.r8.code.IfNez -> a.a.a.a.b.eb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     java.lang.String getName() -> d
     int getOpcode() -> e
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> p
     1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> q
-com.android.tools.r8.code.Iget -> a.a.a.a.b.gb:
+com.android.tools.r8.code.Iget -> a.a.a.a.b.fb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
@@ -2337,7 +2296,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.IgetBoolean -> a.a.a.a.b.hb:
+com.android.tools.r8.code.IgetBoolean -> a.a.a.a.b.gb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
@@ -2347,7 +2306,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.IgetByte -> a.a.a.a.b.ib:
+com.android.tools.r8.code.IgetByte -> a.a.a.a.b.hb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):51:51 -> a
@@ -2357,7 +2316,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.IgetChar -> a.a.a.a.b.jb:
+com.android.tools.r8.code.IgetChar -> a.a.a.a.b.ib:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):51:51 -> a
@@ -2367,7 +2326,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.IgetObject -> a.a.a.a.b.kb:
+com.android.tools.r8.code.IgetObject -> a.a.a.a.b.jb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
@@ -2377,7 +2336,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.IgetShort -> a.a.a.a.b.lb:
+com.android.tools.r8.code.IgetShort -> a.a.a.a.b.kb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
@@ -2387,7 +2346,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.IgetWide -> a.a.a.a.b.mb:
+com.android.tools.r8.code.IgetWide -> a.a.a.a.b.lb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
@@ -2397,7 +2356,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.InstanceOf -> a.a.a.a.b.nb:
+com.android.tools.r8.code.InstanceOf -> a.a.a.a.b.mb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexType):22:22 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):51:51 -> a
@@ -2407,7 +2366,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.Instruction -> a.a.a.a.b.ob:
+com.android.tools.r8.code.Instruction -> a.a.a.a.b.nb:
     int[] NO_TARGETS -> c
     int[] EXIT_TARGET -> d
     boolean $assertionsDisabled -> e
@@ -2459,7 +2418,7 @@
     boolean isSwitch() -> n
     boolean isSwitchPayload() -> o
     1:1:java.lang.String toString():265:265 -> toString
-com.android.tools.r8.code.InstructionFactory -> a.a.a.a.b.qb:
+com.android.tools.r8.code.InstructionFactory -> a.a.a.a.b.pb:
     1:1:void com.android.tools.r8.code.BaseInstructionFactory.<init>():8:8 -> <init>
     1:1:void <init>():11 -> <init>
     1:4:com.android.tools.r8.code.Instruction[] readSequenceFrom(java.nio.ShortBuffer,int,int,com.android.tools.r8.graph.OffsetToObjectMapping):22:25 -> a
@@ -3129,7 +3088,7 @@
     979:979:com.android.tools.r8.code.Instruction readFrom(com.android.tools.r8.code.InstructionFactory$ShortBufferBytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):17 -> a
     979:979:com.android.tools.r8.code.Instruction[] readSequenceFrom(java.nio.ShortBuffer,int,int,com.android.tools.r8.graph.OffsetToObjectMapping):26 -> a
     980:982:com.android.tools.r8.code.Instruction[] readSequenceFrom(java.nio.ShortBuffer,int,int,com.android.tools.r8.graph.OffsetToObjectMapping):27:29 -> a
-com.android.tools.r8.code.InstructionFactory$ShortBufferBytecodeStream -> a.a.a.a.b.pb:
+com.android.tools.r8.code.InstructionFactory$ShortBufferBytecodeStream -> a.a.a.a.b.ob:
     boolean cacheContainsValidByte -> f
     boolean $assertionsDisabled -> g
     int offset -> d
@@ -3144,7 +3103,7 @@
     1:1:boolean hasMore():72:72 -> b
     1:7:int nextByte():59:65 -> c
     1:4:int nextShort():50:53 -> d
-com.android.tools.r8.code.IntToByte -> a.a.a.a.b.rb:
+com.android.tools.r8.code.IntToByte -> a.a.a.a.b.qb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3154,7 +3113,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.IntToChar -> a.a.a.a.b.sb:
+com.android.tools.r8.code.IntToChar -> a.a.a.a.b.rb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3164,7 +3123,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.IntToDouble -> a.a.a.a.b.tb:
+com.android.tools.r8.code.IntToDouble -> a.a.a.a.b.sb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3174,7 +3133,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.IntToFloat -> a.a.a.a.b.ub:
+com.android.tools.r8.code.IntToFloat -> a.a.a.a.b.tb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3184,7 +3143,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.IntToLong -> a.a.a.a.b.vb:
+com.android.tools.r8.code.IntToLong -> a.a.a.a.b.ub:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3194,7 +3153,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.IntToShort -> a.a.a.a.b.wb:
+com.android.tools.r8.code.IntToShort -> a.a.a.a.b.vb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3204,7 +3163,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.InvokeCustom -> a.a.a.a.b.xb:
+com.android.tools.r8.code.InvokeCustom -> a.a.a.a.b.wb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):19:19 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.IndexedDexItem,int,int,int,int,int):23:23 -> <init>
     1:1:com.android.tools.r8.graph.DexCallSite getCallSite():48:48 -> a
@@ -3213,7 +3172,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.InvokeCustomRange -> a.a.a.a.b.yb:
+com.android.tools.r8.code.InvokeCustomRange -> a.a.a.a.b.xb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexCallSite):22:22 -> <init>
     1:1:com.android.tools.r8.graph.DexCallSite getCallSite():42:42 -> a
@@ -3222,7 +3181,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.InvokeDirect -> a.a.a.a.b.zb:
+com.android.tools.r8.code.InvokeDirect -> a.a.a.a.b.yb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):20:20 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.IndexedDexItem,int,int,int,int,int):24:24 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):54:54 -> a
@@ -3232,7 +3191,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.InvokeDirectRange -> a.a.a.a.b.Ab:
+com.android.tools.r8.code.InvokeDirectRange -> a.a.a.a.b.zb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):19:19 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexMethod):23:23 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
@@ -3242,7 +3201,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.InvokeInterface -> a.a.a.a.b.Bb:
+com.android.tools.r8.code.InvokeInterface -> a.a.a.a.b.Ab:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):20:20 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.IndexedDexItem,int,int,int,int,int):24:24 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):54:54 -> a
@@ -3253,7 +3212,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.InvokeInterfaceRange -> a.a.a.a.b.Cb:
+com.android.tools.r8.code.InvokeInterfaceRange -> a.a.a.a.b.Bb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):19:19 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexMethod):23:23 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
@@ -3263,7 +3222,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.InvokePolymorphic -> a.a.a.a.b.Db:
+com.android.tools.r8.code.InvokePolymorphic -> a.a.a.a.b.Cb:
     byte com.android.tools.r8.code.Format45cc.F -> j
     boolean com.android.tools.r8.code.Format45cc.$assertionsDisabled -> n
     byte com.android.tools.r8.code.Format45cc.E -> i
@@ -3312,7 +3271,7 @@
     1:12:boolean com.android.tools.r8.code.Format45cc.equals(java.lang.Object):0 -> equals
     1:9:int com.android.tools.r8.code.Format45cc.hashCode():62:70 -> hashCode
     1:9:int com.android.tools.r8.code.Format45cc.hashCode():0 -> hashCode
-com.android.tools.r8.code.InvokePolymorphicRange -> a.a.a.a.b.Eb:
+com.android.tools.r8.code.InvokePolymorphicRange -> a.a.a.a.b.Db:
     char com.android.tools.r8.code.Format4rcc.CCCC -> g
     com.android.tools.r8.graph.DexProto com.android.tools.r8.code.Format4rcc.HHHH -> i
     short com.android.tools.r8.code.Format4rcc.AA -> f
@@ -3338,27 +3297,15 @@
     10:16:void com.android.tools.r8.code.Format4rcc.appendRegisterRange(java.lang.StringBuilder):115:121 -> a
     10:16:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):68 -> a
     10:16:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
-    17:19:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):69:71 -> a
-    17:19:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
-    20:20:java.lang.String com.android.tools.r8.graph.DexMethod.toSmaliString():161:161 -> a
-    20:20:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):71 -> a
-    20:20:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
-    21:21:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():113:113 -> a
-    21:21:java.lang.String com.android.tools.r8.graph.DexMethod.toSmaliString():161 -> a
-    21:21:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):71 -> a
-    21:21:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
-    22:22:java.lang.String com.android.tools.r8.graph.DexMethod.toSmaliString():161:161 -> a
-    22:22:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):71 -> a
-    22:22:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
-    23:32:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):71:80 -> a
-    23:32:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
-    33:33:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):98:98 -> a
-    33:33:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
-    34:35:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):45:46 -> a
-    34:35:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):98 -> a
-    34:35:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
-    36:36:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):99:99 -> a
-    36:36:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
+    17:28:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):69:80 -> a
+    17:28:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
+    29:29:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):98:98 -> a
+    29:29:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
+    30:31:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):45:46 -> a
+    30:31:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):98 -> a
+    30:31:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
+    32:32:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):99:99 -> a
+    32:32:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
@@ -3366,7 +3313,7 @@
     1:5:boolean com.android.tools.r8.code.Format4rcc.equals(java.lang.Object):0 -> equals
     1:2:int com.android.tools.r8.code.Format4rcc.hashCode():52:53 -> hashCode
     1:2:int com.android.tools.r8.code.Format4rcc.hashCode():0 -> hashCode
-com.android.tools.r8.code.InvokeStatic -> a.a.a.a.b.Fb:
+com.android.tools.r8.code.InvokeStatic -> a.a.a.a.b.Eb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):19:19 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexMethod,int,int,int,int,int):23:23 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
@@ -3376,7 +3323,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.InvokeStaticRange -> a.a.a.a.b.Gb:
+com.android.tools.r8.code.InvokeStaticRange -> a.a.a.a.b.Fb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):19:19 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexMethod):23:23 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
@@ -3386,7 +3333,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.InvokeSuper -> a.a.a.a.b.Hb:
+com.android.tools.r8.code.InvokeSuper -> a.a.a.a.b.Gb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):20:20 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.IndexedDexItem,int,int,int,int,int):24:24 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):54:54 -> a
@@ -3396,7 +3343,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.InvokeSuperRange -> a.a.a.a.b.Ib:
+com.android.tools.r8.code.InvokeSuperRange -> a.a.a.a.b.Hb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):19:19 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexMethod):23:23 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
@@ -3406,7 +3353,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.InvokeVirtual -> a.a.a.a.b.Jb:
+com.android.tools.r8.code.InvokeVirtual -> a.a.a.a.b.Ib:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):19:19 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexMethod,int,int,int,int,int):23:23 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
@@ -3416,7 +3363,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.InvokeVirtualRange -> a.a.a.a.b.Kb:
+com.android.tools.r8.code.InvokeVirtualRange -> a.a.a.a.b.Jb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):19:19 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexMethod):23:23 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
@@ -3426,7 +3373,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.Iput -> a.a.a.a.b.Lb:
+com.android.tools.r8.code.Iput -> a.a.a.a.b.Kb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
@@ -3436,7 +3383,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.IputBoolean -> a.a.a.a.b.Mb:
+com.android.tools.r8.code.IputBoolean -> a.a.a.a.b.Lb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
@@ -3446,7 +3393,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.IputByte -> a.a.a.a.b.Nb:
+com.android.tools.r8.code.IputByte -> a.a.a.a.b.Mb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
@@ -3456,7 +3403,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.IputChar -> a.a.a.a.b.Ob:
+com.android.tools.r8.code.IputChar -> a.a.a.a.b.Nb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
@@ -3466,7 +3413,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.IputObject -> a.a.a.a.b.Pb:
+com.android.tools.r8.code.IputObject -> a.a.a.a.b.Ob:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
@@ -3476,7 +3423,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.IputShort -> a.a.a.a.b.Qb:
+com.android.tools.r8.code.IputShort -> a.a.a.a.b.Pb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
@@ -3486,7 +3433,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.IputWide -> a.a.a.a.b.Rb:
+com.android.tools.r8.code.IputWide -> a.a.a.a.b.Qb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
@@ -3496,7 +3443,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.LongToDouble -> a.a.a.a.b.Sb:
+com.android.tools.r8.code.LongToDouble -> a.a.a.a.b.Rb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3506,7 +3453,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.LongToFloat -> a.a.a.a.b.Tb:
+com.android.tools.r8.code.LongToFloat -> a.a.a.a.b.Sb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3516,7 +3463,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.LongToInt -> a.a.a.a.b.Ub:
+com.android.tools.r8.code.LongToInt -> a.a.a.a.b.Tb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3526,7 +3473,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.MonitorEnter -> a.a.a.a.b.Vb:
+com.android.tools.r8.code.MonitorEnter -> a.a.a.a.b.Ub:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3537,7 +3484,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.MonitorExit -> a.a.a.a.b.Wb:
+com.android.tools.r8.code.MonitorExit -> a.a.a.a.b.Vb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3548,7 +3495,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.Move -> a.a.a.a.b.Yb:
+com.android.tools.r8.code.Move -> a.a.a.a.b.Xb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3558,7 +3505,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.Move16 -> a.a.a.a.b.Xb:
+com.android.tools.r8.code.Move16 -> a.a.a.a.b.Wb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3567,7 +3514,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.MoveException -> a.a.a.a.b.Zb:
+com.android.tools.r8.code.MoveException -> a.a.a.a.b.Yb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3577,7 +3524,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.MoveFrom16 -> a.a.a.a.b._b:
+com.android.tools.r8.code.MoveFrom16 -> a.a.a.a.b.Zb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3587,7 +3534,7 @@
     4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.MoveObject -> a.a.a.a.b.bc:
+com.android.tools.r8.code.MoveObject -> a.a.a.a.b.ac:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3597,7 +3544,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.MoveObject16 -> a.a.a.a.b.ac:
+com.android.tools.r8.code.MoveObject16 -> a.a.a.a.b._b:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3606,7 +3553,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.MoveObjectFrom16 -> a.a.a.a.b.cc:
+com.android.tools.r8.code.MoveObjectFrom16 -> a.a.a.a.b.bc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3616,7 +3563,7 @@
     4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.MoveResult -> a.a.a.a.b.dc:
+com.android.tools.r8.code.MoveResult -> a.a.a.a.b.cc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):14:14 -> <init>
     2:2:void <init>(int):18:18 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3626,7 +3573,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):38:38 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.MoveResultObject -> a.a.a.a.b.ec:
+com.android.tools.r8.code.MoveResultObject -> a.a.a.a.b.dc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3636,7 +3583,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.MoveResultWide -> a.a.a.a.b.fc:
+com.android.tools.r8.code.MoveResultWide -> a.a.a.a.b.ec:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3646,7 +3593,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.MoveWide -> a.a.a.a.b.hc:
+com.android.tools.r8.code.MoveWide -> a.a.a.a.b.gc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3656,7 +3603,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.MoveWide16 -> a.a.a.a.b.gc:
+com.android.tools.r8.code.MoveWide16 -> a.a.a.a.b.fc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3665,7 +3612,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.MoveWideFrom16 -> a.a.a.a.b.ic:
+com.android.tools.r8.code.MoveWideFrom16 -> a.a.a.a.b.hc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3675,7 +3622,7 @@
     4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.MulDouble -> a.a.a.a.b.kc:
+com.android.tools.r8.code.MulDouble -> a.a.a.a.b.jc:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
@@ -3686,7 +3633,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):45:45 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.MulDouble2Addr -> a.a.a.a.b.jc:
+com.android.tools.r8.code.MulDouble2Addr -> a.a.a.a.b.ic:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3696,7 +3643,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.MulFloat -> a.a.a.a.b.mc:
+com.android.tools.r8.code.MulFloat -> a.a.a.a.b.lc:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
@@ -3707,7 +3654,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):45:45 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.MulFloat2Addr -> a.a.a.a.b.lc:
+com.android.tools.r8.code.MulFloat2Addr -> a.a.a.a.b.kc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3717,7 +3664,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.MulInt -> a.a.a.a.b.oc:
+com.android.tools.r8.code.MulInt -> a.a.a.a.b.nc:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
@@ -3728,7 +3675,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.MulInt2Addr -> a.a.a.a.b.nc:
+com.android.tools.r8.code.MulInt2Addr -> a.a.a.a.b.mc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3738,19 +3685,19 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.MulIntLit16 -> a.a.a.a.b.pc:
+com.android.tools.r8.code.MulIntLit16 -> a.a.a.a.b.oc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.MulIntLit8 -> a.a.a.a.b.qc:
+com.android.tools.r8.code.MulIntLit8 -> a.a.a.a.b.pc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.MulLong -> a.a.a.a.b.sc:
+com.android.tools.r8.code.MulLong -> a.a.a.a.b.rc:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
@@ -3761,7 +3708,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):45:45 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.MulLong2Addr -> a.a.a.a.b.rc:
+com.android.tools.r8.code.MulLong2Addr -> a.a.a.a.b.qc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3771,7 +3718,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.NegDouble -> a.a.a.a.b.tc:
+com.android.tools.r8.code.NegDouble -> a.a.a.a.b.sc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3781,7 +3728,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.NegFloat -> a.a.a.a.b.uc:
+com.android.tools.r8.code.NegFloat -> a.a.a.a.b.tc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3791,7 +3738,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.NegInt -> a.a.a.a.b.vc:
+com.android.tools.r8.code.NegInt -> a.a.a.a.b.uc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3801,7 +3748,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.NegLong -> a.a.a.a.b.wc:
+com.android.tools.r8.code.NegLong -> a.a.a.a.b.vc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3811,7 +3758,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.NewArray -> a.a.a.a.b.xc:
+com.android.tools.r8.code.NewArray -> a.a.a.a.b.wc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexType):22:22 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):51:51 -> a
@@ -3821,7 +3768,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.NewInstance -> a.a.a.a.b.yc:
+com.android.tools.r8.code.NewInstance -> a.a.a.a.b.xc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexType):22:22 -> <init>
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> a
@@ -3836,7 +3783,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.Nop -> a.a.a.a.b.zc:
+com.android.tools.r8.code.Nop -> a.a.a.a.b.yc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>():18:18 -> <init>
     void buildIR(com.android.tools.r8.ir.conversion.IRBuilder) -> a
@@ -3856,7 +3803,7 @@
     1:1:int hashCode():36:36 -> hashCode
     2:2:int com.android.tools.r8.code.Format10x.hashCode():30:30 -> hashCode
     2:2:int hashCode():36 -> hashCode
-com.android.tools.r8.code.NotInt -> a.a.a.a.b.Ac:
+com.android.tools.r8.code.NotInt -> a.a.a.a.b.zc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3866,7 +3813,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.NotLong -> a.a.a.a.b.Bc:
+com.android.tools.r8.code.NotLong -> a.a.a.a.b.Ac:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3876,7 +3823,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.OrInt -> a.a.a.a.b.Dc:
+com.android.tools.r8.code.OrInt -> a.a.a.a.b.Cc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3885,7 +3832,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.OrInt2Addr -> a.a.a.a.b.Cc:
+com.android.tools.r8.code.OrInt2Addr -> a.a.a.a.b.Bc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3895,19 +3842,19 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.OrIntLit16 -> a.a.a.a.b.Ec:
+com.android.tools.r8.code.OrIntLit16 -> a.a.a.a.b.Dc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.OrIntLit8 -> a.a.a.a.b.Fc:
+com.android.tools.r8.code.OrIntLit8 -> a.a.a.a.b.Ec:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.OrLong -> a.a.a.a.b.Hc:
+com.android.tools.r8.code.OrLong -> a.a.a.a.b.Gc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3916,7 +3863,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.OrLong2Addr -> a.a.a.a.b.Gc:
+com.android.tools.r8.code.OrLong2Addr -> a.a.a.a.b.Fc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3926,7 +3873,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.PackedSwitch -> a.a.a.a.b.Ic:
+com.android.tools.r8.code.PackedSwitch -> a.a.a.a.b.Hc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):17:17 -> <init>
     2:2:void <init>(int):21:21 -> <init>
     1:1:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
@@ -3937,7 +3884,7 @@
     java.lang.String getName() -> d
     int getOpcode() -> e
     boolean isSwitch() -> n
-com.android.tools.r8.code.PackedSwitchPayload -> a.a.a.a.b.Jc:
+com.android.tools.r8.code.PackedSwitchPayload -> a.a.a.a.b.Ic:
     int[] targets -> h
     boolean $assertionsDisabled -> i
     int size -> f
@@ -3959,7 +3906,7 @@
     1:1:int[] keys():85:85 -> p
     1:1:int numberOfKeys():75:75 -> q
     1:1:int[] switchTargetOffsets():80:80 -> r
-com.android.tools.r8.code.RemDouble -> a.a.a.a.b.Lc:
+com.android.tools.r8.code.RemDouble -> a.a.a.a.b.Kc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3968,7 +3915,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.RemDouble2Addr -> a.a.a.a.b.Kc:
+com.android.tools.r8.code.RemDouble2Addr -> a.a.a.a.b.Jc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3978,7 +3925,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.RemFloat -> a.a.a.a.b.Nc:
+com.android.tools.r8.code.RemFloat -> a.a.a.a.b.Mc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3987,7 +3934,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.RemFloat2Addr -> a.a.a.a.b.Mc:
+com.android.tools.r8.code.RemFloat2Addr -> a.a.a.a.b.Lc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3997,7 +3944,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.RemInt -> a.a.a.a.b.Pc:
+com.android.tools.r8.code.RemInt -> a.a.a.a.b.Oc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4007,7 +3954,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.RemInt2Addr -> a.a.a.a.b.Oc:
+com.android.tools.r8.code.RemInt2Addr -> a.a.a.a.b.Nc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4018,21 +3965,21 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.RemIntLit16 -> a.a.a.a.b.Qc:
+com.android.tools.r8.code.RemIntLit16 -> a.a.a.a.b.Pc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.RemIntLit8 -> a.a.a.a.b.Rc:
+com.android.tools.r8.code.RemIntLit8 -> a.a.a.a.b.Qc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.RemLong -> a.a.a.a.b.Tc:
+com.android.tools.r8.code.RemLong -> a.a.a.a.b.Sc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4042,7 +3989,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.RemLong2Addr -> a.a.a.a.b.Sc:
+com.android.tools.r8.code.RemLong2Addr -> a.a.a.a.b.Rc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4053,7 +4000,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.Return -> a.a.a.a.b.Uc:
+com.android.tools.r8.code.Return -> a.a.a.a.b.Tc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4064,7 +4011,7 @@
     java.lang.String getName() -> d
     int getOpcode() -> e
     1:1:int[] getTargets():39:39 -> h
-com.android.tools.r8.code.ReturnObject -> a.a.a.a.b.Vc:
+com.android.tools.r8.code.ReturnObject -> a.a.a.a.b.Uc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4075,7 +4022,7 @@
     java.lang.String getName() -> d
     int getOpcode() -> e
     1:1:int[] getTargets():39:39 -> h
-com.android.tools.r8.code.ReturnVoid -> a.a.a.a.b.Wc:
+com.android.tools.r8.code.ReturnVoid -> a.a.a.a.b.Vc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>():18:18 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4091,7 +4038,7 @@
     1:1:int[] getTargets():37:37 -> h
     1:1:int com.android.tools.r8.code.Format10x.hashCode():30:30 -> hashCode
     1:1:int hashCode():8 -> hashCode
-com.android.tools.r8.code.ReturnWide -> a.a.a.a.b.Xc:
+com.android.tools.r8.code.ReturnWide -> a.a.a.a.b.Wc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4102,19 +4049,19 @@
     java.lang.String getName() -> d
     int getOpcode() -> e
     1:1:int[] getTargets():39:39 -> h
-com.android.tools.r8.code.RsubInt -> a.a.a.a.b.Yc:
+com.android.tools.r8.code.RsubInt -> a.a.a.a.b.Xc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.RsubIntLit8 -> a.a.a.a.b.Zc:
+com.android.tools.r8.code.RsubIntLit8 -> a.a.a.a.b.Yc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.Sget -> a.a.a.a.b._c:
+com.android.tools.r8.code.Sget -> a.a.a.a.b.Zc:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> a
@@ -4129,7 +4076,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.SgetBoolean -> a.a.a.a.b.ad:
+com.android.tools.r8.code.SgetBoolean -> a.a.a.a.b._c:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> a
@@ -4144,7 +4091,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.SgetByte -> a.a.a.a.b.bd:
+com.android.tools.r8.code.SgetByte -> a.a.a.a.b.ad:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> a
@@ -4159,7 +4106,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.SgetChar -> a.a.a.a.b.cd:
+com.android.tools.r8.code.SgetChar -> a.a.a.a.b.bd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> a
@@ -4174,7 +4121,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.SgetObject -> a.a.a.a.b.dd:
+com.android.tools.r8.code.SgetObject -> a.a.a.a.b.cd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> a
@@ -4189,7 +4136,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.SgetShort -> a.a.a.a.b.ed:
+com.android.tools.r8.code.SgetShort -> a.a.a.a.b.dd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> a
@@ -4204,7 +4151,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.SgetWide -> a.a.a.a.b.fd:
+com.android.tools.r8.code.SgetWide -> a.a.a.a.b.ed:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> a
@@ -4219,7 +4166,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.ShlInt -> a.a.a.a.b.hd:
+com.android.tools.r8.code.ShlInt -> a.a.a.a.b.gd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4228,7 +4175,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.ShlInt2Addr -> a.a.a.a.b.gd:
+com.android.tools.r8.code.ShlInt2Addr -> a.a.a.a.b.fd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4238,13 +4185,13 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.ShlIntLit8 -> a.a.a.a.b.id:
+com.android.tools.r8.code.ShlIntLit8 -> a.a.a.a.b.hd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.ShlLong -> a.a.a.a.b.kd:
+com.android.tools.r8.code.ShlLong -> a.a.a.a.b.jd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4253,7 +4200,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.ShlLong2Addr -> a.a.a.a.b.jd:
+com.android.tools.r8.code.ShlLong2Addr -> a.a.a.a.b.id:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4263,7 +4210,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.ShrInt -> a.a.a.a.b.md:
+com.android.tools.r8.code.ShrInt -> a.a.a.a.b.ld:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4272,7 +4219,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.ShrInt2Addr -> a.a.a.a.b.ld:
+com.android.tools.r8.code.ShrInt2Addr -> a.a.a.a.b.kd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4282,13 +4229,13 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.ShrIntLit8 -> a.a.a.a.b.nd:
+com.android.tools.r8.code.ShrIntLit8 -> a.a.a.a.b.md:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.ShrLong -> a.a.a.a.b.pd:
+com.android.tools.r8.code.ShrLong -> a.a.a.a.b.od:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4297,7 +4244,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.ShrLong2Addr -> a.a.a.a.b.od:
+com.android.tools.r8.code.ShrLong2Addr -> a.a.a.a.b.nd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4307,7 +4254,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.SparseSwitch -> a.a.a.a.b.qd:
+com.android.tools.r8.code.SparseSwitch -> a.a.a.a.b.pd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int):20:20 -> <init>
     1:1:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
@@ -4318,7 +4265,7 @@
     java.lang.String getName() -> d
     int getOpcode() -> e
     boolean isSwitch() -> n
-com.android.tools.r8.code.SparseSwitchPayload -> a.a.a.a.b.rd:
+com.android.tools.r8.code.SparseSwitchPayload -> a.a.a.a.b.qd:
     int[] keys -> g
     int[] targets -> h
     boolean $assertionsDisabled -> i
@@ -4340,7 +4287,7 @@
     1:1:int[] keys():87:87 -> p
     1:1:int numberOfKeys():82:82 -> q
     1:1:int[] switchTargetOffsets():92:92 -> r
-com.android.tools.r8.code.Sput -> a.a.a.a.b.sd:
+com.android.tools.r8.code.Sput -> a.a.a.a.b.rd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> a
@@ -4355,7 +4302,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.SputBoolean -> a.a.a.a.b.td:
+com.android.tools.r8.code.SputBoolean -> a.a.a.a.b.sd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> a
@@ -4370,7 +4317,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.SputByte -> a.a.a.a.b.ud:
+com.android.tools.r8.code.SputByte -> a.a.a.a.b.td:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> a
@@ -4385,7 +4332,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.SputChar -> a.a.a.a.b.vd:
+com.android.tools.r8.code.SputChar -> a.a.a.a.b.ud:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> a
@@ -4400,7 +4347,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.SputObject -> a.a.a.a.b.wd:
+com.android.tools.r8.code.SputObject -> a.a.a.a.b.vd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> a
@@ -4415,7 +4362,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.SputShort -> a.a.a.a.b.xd:
+com.android.tools.r8.code.SputShort -> a.a.a.a.b.wd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> a
@@ -4430,7 +4377,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.SputWide -> a.a.a.a.b.yd:
+com.android.tools.r8.code.SputWide -> a.a.a.a.b.xd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> a
@@ -4445,7 +4392,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.SubDouble -> a.a.a.a.b.Ad:
+com.android.tools.r8.code.SubDouble -> a.a.a.a.b.zd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4454,7 +4401,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.SubDouble2Addr -> a.a.a.a.b.zd:
+com.android.tools.r8.code.SubDouble2Addr -> a.a.a.a.b.yd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4464,7 +4411,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.SubFloat -> a.a.a.a.b.Cd:
+com.android.tools.r8.code.SubFloat -> a.a.a.a.b.Bd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4473,7 +4420,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.SubFloat2Addr -> a.a.a.a.b.Bd:
+com.android.tools.r8.code.SubFloat2Addr -> a.a.a.a.b.Ad:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4483,7 +4430,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.SubInt -> a.a.a.a.b.Ed:
+com.android.tools.r8.code.SubInt -> a.a.a.a.b.Dd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4492,7 +4439,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.SubInt2Addr -> a.a.a.a.b.Dd:
+com.android.tools.r8.code.SubInt2Addr -> a.a.a.a.b.Cd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4502,7 +4449,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.SubLong -> a.a.a.a.b.Gd:
+com.android.tools.r8.code.SubLong -> a.a.a.a.b.Fd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4511,7 +4458,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.SubLong2Addr -> a.a.a.a.b.Fd:
+com.android.tools.r8.code.SubLong2Addr -> a.a.a.a.b.Ed:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4521,7 +4468,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.SwitchPayload -> a.a.a.a.b.Hd:
+com.android.tools.r8.code.SwitchPayload -> a.a.a.a.b.Gd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):11:11 -> <init>
     2:2:void <init>():14:14 -> <init>
     void buildIR(com.android.tools.r8.ir.conversion.IRBuilder) -> a
@@ -4529,7 +4476,7 @@
     int[] keys() -> p
     int numberOfKeys() -> q
     int[] switchTargetOffsets() -> r
-com.android.tools.r8.code.Throw -> a.a.a.a.b.Id:
+com.android.tools.r8.code.Throw -> a.a.a.a.b.Hd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4540,7 +4487,7 @@
     boolean canThrow() -> c
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.UshrInt -> a.a.a.a.b.Kd:
+com.android.tools.r8.code.UshrInt -> a.a.a.a.b.Jd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4549,7 +4496,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.UshrInt2Addr -> a.a.a.a.b.Jd:
+com.android.tools.r8.code.UshrInt2Addr -> a.a.a.a.b.Id:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4559,13 +4506,13 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.UshrIntLit8 -> a.a.a.a.b.Ld:
+com.android.tools.r8.code.UshrIntLit8 -> a.a.a.a.b.Kd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.UshrLong -> a.a.a.a.b.Nd:
+com.android.tools.r8.code.UshrLong -> a.a.a.a.b.Md:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4574,7 +4521,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.UshrLong2Addr -> a.a.a.a.b.Md:
+com.android.tools.r8.code.UshrLong2Addr -> a.a.a.a.b.Ld:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4584,7 +4531,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.XorInt -> a.a.a.a.b.Pd:
+com.android.tools.r8.code.XorInt -> a.a.a.a.b.Od:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4593,7 +4540,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.XorInt2Addr -> a.a.a.a.b.Od:
+com.android.tools.r8.code.XorInt2Addr -> a.a.a.a.b.Nd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4603,19 +4550,19 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.XorIntLit16 -> a.a.a.a.b.Qd:
+com.android.tools.r8.code.XorIntLit16 -> a.a.a.a.b.Pd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.XorIntLit8 -> a.a.a.a.b.Rd:
+com.android.tools.r8.code.XorIntLit8 -> a.a.a.a.b.Qd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.XorLong -> a.a.a.a.b.Td:
+com.android.tools.r8.code.XorLong -> a.a.a.a.b.Sd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4624,7 +4571,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> d
     int getOpcode() -> e
-com.android.tools.r8.code.XorLong2Addr -> a.a.a.a.b.Sd:
+com.android.tools.r8.code.XorLong2Addr -> a.a.a.a.b.Rd:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4684,8 +4631,7 @@
     boolean matches(char) -> a
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.none():117:117 -> negate
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher negate():1209 -> negate
-    2:2:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.none():117:117 -> negate
-    2:2:com.android.tools.r8.com.google.common.base.CharMatcher negate():1209 -> negate
+    2:2:com.android.tools.r8.com.google.common.base.CharMatcher negate():1209:1209 -> negate
     2:2:java.util.function.Predicate negate():1117 -> negate
 com.android.tools.r8.com.google.common.base.CharMatcher$Ascii -> a.a.a.a.c.a.a.a.c:
     com.android.tools.r8.com.google.common.base.CharMatcher$Ascii INSTANCE -> b
@@ -4807,10 +4753,7 @@
     1:3:void <clinit>():1326:1328 -> <clinit>
     1:1:void <init>():1331:1331 -> <init>
     1:1:boolean matches(char):1336:1336 -> a
-com.android.tools.r8.com.google.common.base.CommonPattern -> a.a.a.a.c.a.a.a.u:
-    1:1:void <init>():25:25 -> <init>
-    com.android.tools.r8.com.google.common.base.CommonMatcher matcher(java.lang.CharSequence) -> a
-com.android.tools.r8.com.google.common.base.Equivalence -> a.a.a.a.c.a.a.a.x:
+com.android.tools.r8.com.google.common.base.Equivalence -> a.a.a.a.c.a.a.a.w:
     1:1:void <init>():41:41 -> <init>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
     int doHash(java.lang.Object) -> a
@@ -4818,8 +4761,8 @@
     2:2:int hash(java.lang.Object):113:113 -> b
     1:1:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(java.lang.Object):162:162 -> c
     1:1:boolean test(java.lang.Object,java.lang.Object):78:78 -> test
-com.android.tools.r8.com.google.common.base.Equivalence$1 -> a.a.a.a.c.a.a.a.v:
-com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> a.a.a.a.c.a.a.a.w:
+com.android.tools.r8.com.google.common.base.Equivalence$1 -> a.a.a.a.c.a.a.a.u:
+com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> a.a.a.a.c.a.a.a.v:
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> a
     java.lang.Object reference -> b
     1:3:void <init>(com.android.tools.r8.com.google.common.base.Equivalence,java.lang.Object):187:189 -> <init>
@@ -4830,45 +4773,13 @@
     1:11:boolean equals(java.lang.Object):208:218 -> equals
     1:1:int hashCode():229:229 -> hashCode
     1:1:java.lang.String toString():238:238 -> toString
-com.android.tools.r8.com.google.common.base.Function -> a.a.a.a.c.a.a.a.y:
-com.android.tools.r8.com.google.common.base.JdkPattern -> a.a.a.a.c.a.a.a.A:
-    java.util.regex.Pattern pattern -> a
-    1:2:void <init>(java.util.regex.Pattern):29:30 -> <init>
-    3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
-    3:3:void <init>(java.util.regex.Pattern):30 -> <init>
-    1:1:com.android.tools.r8.com.google.common.base.CommonMatcher matcher(java.lang.CharSequence):35:35 -> a
-    1:4:boolean equals(java.lang.Object):60:63 -> equals
-    1:1:int hashCode():55:55 -> hashCode
-    1:1:java.lang.String toString():50:50 -> toString
-com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> a.a.a.a.c.a.a.a.z:
-    java.util.regex.Matcher matcher -> a
-    1:1:void com.android.tools.r8.com.google.common.base.CommonMatcher.<init>():25:25 -> <init>
-    1:1:void <init>(java.util.regex.Matcher):69 -> <init>
-    2:2:void <init>(java.util.regex.Matcher):70:70 -> <init>
-    3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
-    3:3:void <init>(java.util.regex.Matcher):70 -> <init>
-com.android.tools.r8.com.google.common.base.Optional -> a.a.a.a.c.a.a.a.B:
+com.android.tools.r8.com.google.common.base.Function -> a.a.a.a.c.a.a.a.x:
+com.android.tools.r8.com.google.common.base.Optional -> a.a.a.a.c.a.a.a.y:
     1:1:void <init>():150:150 -> <init>
     java.lang.Object or(java.lang.Object) -> a
     1:1:com.android.tools.r8.com.google.common.base.Optional com.android.tools.r8.com.google.common.base.Absent.withType():33:33 -> a
     1:1:com.android.tools.r8.com.google.common.base.Optional absent():93 -> a
-com.android.tools.r8.com.google.common.base.Platform -> a.a.a.a.c.a.a.a.E:
-    com.android.tools.r8.com.google.common.base.PatternCompiler patternCompiler -> b
-    java.util.logging.Logger logger -> a
-    1:1:void <clinit>():35:35 -> <clinit>
-    2:16:com.android.tools.r8.com.google.common.base.PatternCompiler loadPatternCompiler():74:88 -> <clinit>
-    2:16:void <clinit>():36 -> <clinit>
-    17:17:void <clinit>():36:36 -> <clinit>
-    1:1:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):66:66 -> a
-    2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    2:2:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):65 -> a
-    3:3:void logPatternCompilerError(java.util.ServiceConfigurationError):92:92 -> a
-com.android.tools.r8.com.google.common.base.Platform$1 -> a.a.a.a.c.a.a.a.C:
-com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> a.a.a.a.c.a.a.a.D:
-    1:1:void <init>():95:95 -> <init>
-    1:1:void <init>(com.android.tools.r8.com.google.common.base.Platform$1):95 -> <init>
-    1:1:com.android.tools.r8.com.google.common.base.CommonPattern compile(java.lang.String):98:98 -> a
-com.android.tools.r8.com.google.common.base.Preconditions -> a.a.a.a.c.a.a.a.F:
+com.android.tools.r8.com.google.common.base.Preconditions -> a.a.a.a.c.a.a.a.z:
     1:1:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.alwaysFalse():62:62 -> a
     2:6:com.android.tools.r8.com.google.common.base.Supplier com.android.tools.r8.com.google.common.base.Suppliers.memoize(com.android.tools.r8.com.google.common.base.Supplier):97:101 -> a
     7:7:void checkArgument(boolean):121:121 -> a
@@ -4877,41 +4788,40 @@
     10:10:void checkArgument(boolean,java.lang.String,int):181:181 -> a
     11:11:void checkArgument(boolean,java.lang.String,long):192:192 -> a
     12:12:void checkArgument(boolean,java.lang.String,java.lang.Object):204:204 -> a
-    13:13:void checkArgument(boolean,java.lang.String,int,int):276:276 -> a
-    14:14:java.lang.Object checkNotNull(java.lang.Object):787:787 -> a
-    15:15:java.lang.Object checkNotNull(java.lang.Object,java.lang.Object):805:805 -> a
-    16:16:int checkElementIndex(int,int,java.lang.String):1196:1196 -> a
+    13:13:java.lang.Object checkNotNull(java.lang.Object):787:787 -> a
+    14:14:java.lang.Object checkNotNull(java.lang.Object,java.lang.Object):805:805 -> a
+    15:15:int checkElementIndex(int,int,java.lang.String):1196:1196 -> a
+    15:15:int checkElementIndex(int,int):1178 -> a
+    16:16:java.lang.String badElementIndex(int,int,java.lang.String):1207:1207 -> a
+    16:16:int checkElementIndex(int,int,java.lang.String):1196 -> a
     16:16:int checkElementIndex(int,int):1178 -> a
-    17:17:java.lang.String badElementIndex(int,int,java.lang.String):1207:1207 -> a
+    17:17:java.lang.String badElementIndex(int,int,java.lang.String):1205:1205 -> a
     17:17:int checkElementIndex(int,int,java.lang.String):1196 -> a
     17:17:int checkElementIndex(int,int):1178 -> a
-    18:18:java.lang.String badElementIndex(int,int,java.lang.String):1205:1205 -> a
+    18:18:java.lang.String badElementIndex(int,int,java.lang.String):1203:1203 -> a
     18:18:int checkElementIndex(int,int,java.lang.String):1196 -> a
     18:18:int checkElementIndex(int,int):1178 -> a
-    19:19:java.lang.String badElementIndex(int,int,java.lang.String):1203:1203 -> a
-    19:19:int checkElementIndex(int,int,java.lang.String):1196 -> a
+    19:19:int checkElementIndex(int,int,java.lang.String):1196:1196 -> a
     19:19:int checkElementIndex(int,int):1178 -> a
-    20:20:int checkElementIndex(int,int,java.lang.String):1196:1196 -> a
-    20:20:int checkElementIndex(int,int):1178 -> a
-    21:25:java.lang.String badPositionIndex(int,int,java.lang.String):1248:1252 -> a
-    26:26:java.lang.String badPositionIndex(int,int,java.lang.String):1250:1250 -> a
-    27:27:void checkPositionIndexes(int,int,int):1271:1271 -> a
-    28:28:java.lang.String badPositionIndexes(int,int,int):1283:1283 -> a
+    20:24:java.lang.String badPositionIndex(int,int,java.lang.String):1248:1252 -> a
+    25:25:java.lang.String badPositionIndex(int,int,java.lang.String):1250:1250 -> a
+    26:26:void checkPositionIndexes(int,int,int):1271:1271 -> a
+    27:27:java.lang.String badPositionIndexes(int,int,int):1283:1283 -> a
+    27:27:void checkPositionIndexes(int,int,int):1271 -> a
+    28:28:java.lang.String badPositionIndexes(int,int,int):1280:1280 -> a
     28:28:void checkPositionIndexes(int,int,int):1271 -> a
-    29:29:java.lang.String badPositionIndexes(int,int,int):1280:1280 -> a
+    29:29:java.lang.String badPositionIndexes(int,int,int):1277:1277 -> a
     29:29:void checkPositionIndexes(int,int,int):1271 -> a
-    30:30:java.lang.String badPositionIndexes(int,int,int):1277:1277 -> a
-    30:30:void checkPositionIndexes(int,int,int):1271 -> a
-    31:31:void checkPositionIndexes(int,int,int):1271:1271 -> a
-    32:60:java.lang.String format(java.lang.String,java.lang.Object[]):1298:1326 -> a
+    30:30:void checkPositionIndexes(int,int,int):1271:1271 -> a
+    31:59:java.lang.String format(java.lang.String,java.lang.Object[]):1298:1326 -> a
     1:1:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.alwaysTrue():54:54 -> b
     2:2:void checkState(boolean):443:443 -> b
     3:3:int checkPositionIndex(int,int,java.lang.String):1241:1241 -> b
     3:3:int checkPositionIndex(int,int):1223 -> b
-com.android.tools.r8.com.google.common.base.Predicate -> a.a.a.a.c.a.a.a.G:
+com.android.tools.r8.com.google.common.base.Predicate -> a.a.a.a.c.a.a.a.A:
     1:1:boolean test(java.lang.Object):80:80 -> test
-com.android.tools.r8.com.google.common.base.Predicates$1 -> a.a.a.a.c.a.a.a.H:
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> a.a.a.a.c.a.a.a.M:
+com.android.tools.r8.com.google.common.base.Predicates$1 -> a.a.a.a.c.a.a.a.B:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> a.a.a.a.c.a.a.a.G:
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate NOT_NULL -> d
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate ALWAYS_FALSE -> b
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate IS_NULL -> c
@@ -4921,30 +4831,16 @@
     1:1:void <init>(java.lang.String,int):281:281 -> <init>
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.base.Predicates$1):281 -> <init>
     com.android.tools.r8.com.google.common.base.Predicate withNarrowedType() -> a
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> a.a.a.a.c.a.a.a.I:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> a.a.a.a.c.a.a.a.C:
     1:1:void <init>(java.lang.String,int):283:283 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> a.a.a.a.c.a.a.a.J:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> a.a.a.a.c.a.a.a.D:
     1:1:void <init>(java.lang.String,int):295:295 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> a.a.a.a.c.a.a.a.K:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> a.a.a.a.c.a.a.a.E:
     1:1:void <init>(java.lang.String,int):307:307 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> a.a.a.a.c.a.a.a.L:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> a.a.a.a.c.a.a.a.F:
     1:1:void <init>(java.lang.String,int):319:319 -> <init>
-com.android.tools.r8.com.google.common.base.Splitter -> a.a.a.a.c.a.a.a.O:
-    1:1:void <init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy):100:100 -> <init>
-    2:2:void <init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy,boolean,com.android.tools.r8.com.google.common.base.CharMatcher,int):103:103 -> <init>
-    2:2:void <init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy):100 -> <init>
-    1:1:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252:252 -> a
-    2:2:com.android.tools.r8.com.google.common.base.Splitter on(com.android.tools.r8.com.google.common.base.CommonPattern):214:214 -> a
-    2:2:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252 -> a
-    3:3:boolean com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher.matches():75:75 -> a
-    3:3:com.android.tools.r8.com.google.common.base.Splitter on(com.android.tools.r8.com.google.common.base.CommonPattern):214 -> a
-    3:3:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252 -> a
-    4:9:com.android.tools.r8.com.google.common.base.Splitter on(com.android.tools.r8.com.google.common.base.CommonPattern):213:218 -> a
-    4:9:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252 -> a
-com.android.tools.r8.com.google.common.base.Splitter$3 -> a.a.a.a.c.a.a.a.N:
-    1:1:void <init>(com.android.tools.r8.com.google.common.base.CommonPattern):219:219 -> <init>
-com.android.tools.r8.com.google.common.base.Supplier -> a.a.a.a.c.a.a.a.P:
-com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> a.a.a.a.c.a.a.a.Q:
+com.android.tools.r8.com.google.common.base.Supplier -> a.a.a.a.c.a.a.a.H:
+com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> a.a.a.a.c.a.a.a.I:
     com.android.tools.r8.com.google.common.base.Supplier delegate -> a
     java.lang.Object value -> c
     boolean initialized -> b
@@ -4953,7 +4849,7 @@
     3:3:void <init>(com.android.tools.r8.com.google.common.base.Supplier):115 -> <init>
     1:11:java.lang.Object get():121:131 -> get
     1:1:java.lang.String toString():136:136 -> toString
-com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> a.a.a.a.c.a.a.a.S:
+com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> a.a.a.a.c.a.a.a.J:
     com.android.tools.r8.com.google.common.base.Supplier delegate -> a
     java.lang.Object value -> c
     boolean initialized -> b
@@ -4962,7 +4858,7 @@
     3:3:void <init>(com.android.tools.r8.com.google.common.base.Supplier):151 -> <init>
     1:13:java.lang.Object get():157:169 -> get
     1:1:java.lang.String toString():174:174 -> toString
-com.android.tools.r8.com.google.common.base.Throwables -> a.a.a.a.c.a.a.a.T:
+com.android.tools.r8.com.google.common.base.Throwables -> a.a.a.a.c.a.a.a.K:
     java.lang.Object jla -> a
     1:3:java.lang.Object getJLA():482:484 -> <clinit>
     1:3:void <clinit>():452 -> <clinit>
@@ -5006,8 +4902,8 @@
     com.android.tools.r8.com.google.common.collect.AbstractIterator$State state -> a
     1:1:void <init>():68:68 -> <init>
     2:2:void <init>():65:65 -> <init>
-    java.lang.Object computeNext() -> e
-    1:1:java.lang.Object endOfData():125:125 -> f
+    java.lang.Object computeNext() -> d
+    1:1:java.lang.Object endOfData():125:125 -> e
     1:2:boolean hasNext():132:133 -> hasNext
     3:6:boolean tryToComputeNext():144:147 -> hasNext
     3:6:boolean hasNext():140 -> hasNext
@@ -5055,32 +4951,32 @@
     24:24:void com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.access$400(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object):91 -> a
     25:28:java.util.Spliterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.lambda$entrySpliterator$1(java.util.Map$Entry):1266:1269 -> a
     29:29:java.util.Spliterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.lambda$entrySpliterator$1(java.util.Map$Entry):1268:1268 -> a
+    30:35:java.util.Map com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.createAsMap():1284:1289 -> a
+    30:35:java.util.Map com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.createAsMap():0 -> a
+    1:1:java.util.Map asMap():117:117 -> asMap
     1:1:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.access$200(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap):91:91 -> b
-    2:2:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entries():1240:1240 -> b
-    2:2:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entries():0 -> b
-    3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.lambda$null$0(java.lang.Object,java.lang.Object):1269:1269 -> b
+    2:2:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.lambda$null$0(java.lang.Object,java.lang.Object):1269:1269 -> b
     1:1:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.access$208(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap):91:91 -> c
-    2:2:java.util.Map asMap():117:117 -> c
+    2:7:java.util.Set com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.createKeySet():932:937 -> c
+    2:7:java.util.Set com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.createKeySet():0 -> c
     1:5:void com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.clear():288:292 -> clear
     1:5:void com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.clear():0 -> clear
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.containsKey(java.lang.Object):185:185 -> containsKey
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.containsKey(java.lang.Object):0 -> containsKey
     1:1:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.access$210(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap):91:91 -> d
-    2:7:java.util.Map com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.createAsMap():1284:1289 -> d
-    2:7:java.util.Map com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.createAsMap():0 -> d
+    1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entryIterator():1253:1253 -> e
+    1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entryIterator():0 -> e
+    1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entries():1240:1240 -> entries
+    1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entries():0 -> entries
     1:1:boolean equals(java.lang.Object):129:129 -> equals
-    1:6:java.util.Set com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.createKeySet():932:937 -> f
-    1:6:java.util.Set com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.createKeySet():0 -> f
+    java.util.Spliterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entrySpliterator() -> f
+    java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.createCollection() -> g
     1:1:java.util.Collection get(java.lang.Object):35:35 -> get
     2:6:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.get(java.lang.Object):304:308 -> get
     2:6:java.util.List get(java.lang.Object):67 -> get
     7:7:java.util.List get(java.lang.Object):67:67 -> get
-    1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entryIterator():1253:1253 -> h
-    1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entryIterator():0 -> h
-    java.util.Spliterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entrySpliterator() -> i
-    java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.createCollection() -> j
-    1:10:java.util.Spliterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entrySpliterator():1263:1272 -> k
-    11:11:java.util.Spliterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entrySpliterator():1263:1263 -> k
+    1:10:java.util.Spliterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entrySpliterator():1263:1272 -> h
+    11:11:java.util.Spliterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entrySpliterator():1263:1263 -> h
     1:12:boolean com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.put(java.lang.Object,java.lang.Object):192:203 -> put
     1:12:boolean put(java.lang.Object,java.lang.Object):106 -> put
     1:1:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.size():180:180 -> size
@@ -5104,10 +5000,10 @@
     1:5:void com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$Itr.remove():1187:1191 -> remove
     1:5:void com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$Itr.remove():0 -> remove
 com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap -> a.a.a.a.c.a.a.b.h:
-    java.util.Map submap -> c
-    java.util.Collection com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap.values -> b
-    com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> d
+    java.util.Map submap -> b
+    com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> c
     java.util.Set com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap.entrySet -> a
+    java.util.Collection com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap.values -> values
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.Map):1301:1301 -> <init>
     2:2:void com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap.<init>():3612:3612 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.Map):1301 -> <init>
@@ -5223,7 +5119,7 @@
     1:2:java.lang.Object next():960:961 -> next
     1:5:void remove():966:970 -> remove
 com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$NavigableAsMap -> a.a.a.a.c.a.a.b.k:
-    com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> g
+    com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> f
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.NavigableMap):1500:1501 -> <init>
     1:8:java.util.Map$Entry pollAsMapEntry(java.util.Iterator):1576:1583 -> a
     9:18:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.unmodifiableCollectionSubclass(java.util.Collection):272:281 -> a
@@ -5322,8 +5218,8 @@
 com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$RandomAccessWrappedList -> a.a.a.a.c.a.a.b.m:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object,java.util.List,com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection):926:926 -> <init>
 com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$SortedAsMap -> a.a.a.a.c.a.a.b.n:
-    java.util.SortedSet sortedKeySet -> e
-    com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> f
+    java.util.SortedSet sortedKeySet -> d
+    com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> e
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.SortedMap):1444:1445 -> <init>
     1:1:java.util.Comparator comparator():1454:1454 -> comparator
     1:1:java.lang.Object firstKey():1459:1459 -> firstKey
@@ -5391,7 +5287,7 @@
     9:9:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection):469:469 -> <init>
     10:10:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection,java.util.Iterator):472:472 -> <init>
     11:18:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection,java.util.Iterator):466:473 -> <init>
-    1:3:void validateIterator():481:483 -> e
+    1:3:void validateIterator():481:483 -> d
     1:2:boolean hasNext():489:490 -> hasNext
     1:2:java.lang.Object next():495:496 -> next
     1:3:void remove():501:503 -> remove
@@ -5428,9 +5324,9 @@
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedList):872:872 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedList,int):874:875 -> <init>
     1:5:void add(java.lang.Object):909:913 -> add
-    1:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection$WrappedIterator.getDelegateIterator():507:508 -> f
-    1:2:java.util.ListIterator getDelegateListIterator():879 -> f
-    3:3:java.util.ListIterator getDelegateListIterator():879:879 -> f
+    1:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection$WrappedIterator.getDelegateIterator():507:508 -> e
+    1:2:java.util.ListIterator getDelegateListIterator():879 -> e
+    3:3:java.util.ListIterator getDelegateListIterator():879:879 -> e
     1:1:boolean hasPrevious():884:884 -> hasPrevious
     1:1:int nextIndex():894:894 -> nextIndex
     1:1:java.lang.Object previous():889:889 -> previous
@@ -5511,11 +5407,11 @@
     java.util.Map$Entry val$mapEntry -> a
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$1 this$1 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$1,java.util.Map$Entry):99:99 -> <init>
-    1:1:java.lang.Object getElement():102:102 -> a
-    1:3:int getCount():107:109 -> b
-    4:4:java.lang.Object getElement():102:102 -> b
-    4:4:int getCount():109 -> b
-    5:10:int getCount():109:114 -> b
+    1:3:int getCount():107:109 -> getCount
+    4:4:java.lang.Object getElement():102:102 -> getCount
+    4:4:int getCount():109 -> getCount
+    5:10:int getCount():109:114 -> getCount
+    1:1:java.lang.Object getElement():102:102 -> getElement
 com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$MapBasedMultisetIterator -> a.a.a.a.c.a.a.b.y:
     java.util.Map$Entry currentEntry -> b
     java.util.Iterator entryIterator -> a
@@ -5539,24 +5435,24 @@
     java.util.Set keySet -> b
     com.android.tools.r8.com.google.common.collect.Multiset keys -> c
     1:1:void <init>():40:40 -> <init>
+    java.util.Map createAsMap() -> a
     1:2:boolean containsEntry(java.lang.Object,java.lang.Object):59:60 -> a
     3:8:boolean putAll(java.lang.Object,java.lang.Iterable):82:87 -> a
     9:9:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     9:9:boolean putAll(java.lang.Object,java.lang.Iterable):79 -> a
-    10:11:com.android.tools.r8.com.google.common.collect.Multiset keys():180:181 -> a
-    1:2:java.util.Collection entries():114:115 -> b
-    1:2:java.util.Map asMap():240:241 -> c
-    java.util.Map createAsMap() -> d
-    1:1:java.util.Collection createEntries():122:122 -> e
+    1:2:java.util.Map asMap():240:241 -> asMap
+    1:1:java.util.Collection createEntries():122:122 -> b
+    1:1:java.util.Set createKeySet():173:173 -> c
+    1:1:com.android.tools.r8.com.google.common.collect.Multiset createKeys():185:185 -> d
+    java.util.Iterator entryIterator() -> e
+    1:2:java.util.Collection entries():114:115 -> entries
     1:3:boolean com.android.tools.r8.com.google.common.collect.Multimaps.equalsImpl(com.android.tools.r8.com.google.common.collect.Multimap,java.lang.Object):2220:2222 -> equals
     1:3:boolean equals(java.lang.Object):250 -> equals
-    1:1:java.util.Set createKeySet():173:173 -> f
-    1:1:com.android.tools.r8.com.google.common.collect.Multiset createKeys():185:185 -> g
-    java.util.Iterator entryIterator() -> h
+    java.util.Spliterator entrySpliterator() -> f
     1:1:int hashCode():263:263 -> hashCode
-    java.util.Spliterator entrySpliterator() -> i
     1:1:boolean isEmpty():43:43 -> isEmpty
     1:2:java.util.Set keySet():168:169 -> keySet
+    1:2:com.android.tools.r8.com.google.common.collect.Multiset keys():180:181 -> keys
     1:2:boolean remove(java.lang.Object,java.lang.Object):66:67 -> remove
     1:1:java.lang.String toString():274:274 -> toString
 com.android.tools.r8.com.google.common.collect.AbstractMultimap$1 -> a.a.a.a.c.a.a.b.A:
@@ -5596,9 +5492,10 @@
     java.util.Set elementSet -> a
     java.util.Set entrySet -> b
     1:1:void <init>():47:47 -> <init>
-    1:1:int add(java.lang.Object,int):91:91 -> a
-    2:6: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):966:970 -> a
-    2:6:boolean setCount(java.lang.Object,int,int):115 -> a
+    1:9:int com.android.tools.r8.com.google.common.collect.Multisets.setCountImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.lang.Object,int):948:956 -> a
+    1:9:int setCount(java.lang.Object,int):109 -> a
+    10:14: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):966:970 -> a
+    10:14:boolean setCount(java.lang.Object,int,int):115 -> a
     1:1:boolean add(java.lang.Object):84:84 -> add
     1:4:boolean com.android.tools.r8.com.google.common.collect.Multisets.addAllImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.util.Collection):905:908 -> addAll
     1:4:boolean addAll(java.util.Collection):129 -> addAll
@@ -5609,8 +5506,7 @@
     6:10:boolean addAll(java.util.Collection):129 -> addAll
     int count(java.lang.Object) -> b
     int remove(java.lang.Object,int) -> b
-    1:9:int com.android.tools.r8.com.google.common.collect.Multisets.setCountImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.lang.Object,int):948:956 -> c
-    1:9:int setCount(java.lang.Object,int):109 -> c
+    1:1:int add(java.lang.Object,int):91:91 -> c
     1:1:java.util.Set elementSet():155:155 -> d
     2:2:java.util.Set createElementSet():167:167 -> d
     2:2:java.util.Set elementSet():157 -> d
@@ -5688,26 +5584,26 @@
     2:2:void <init>():112 -> <init>
     3:3:void <init>():113:113 -> <init>
     1:1:boolean containsEntry(java.lang.Object,java.lang.Object):65:65 -> a
-    2:2:com.android.tools.r8.com.google.common.collect.Multiset keys():65:65 -> a
-    3:8:boolean com.android.tools.r8.com.google.common.collect.AbstractMultimap.putAll(java.lang.Object,java.lang.Iterable):82:87 -> a
-    3:8:boolean putAll(java.lang.Object,java.lang.Iterable):65 -> a
-    9:9:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    9:9:boolean com.android.tools.r8.com.google.common.collect.AbstractMultimap.putAll(java.lang.Object,java.lang.Iterable):79 -> a
-    9:9:boolean putAll(java.lang.Object,java.lang.Iterable):65 -> a
-    1:1:java.util.Collection entries():65:65 -> b
-    1:1:java.util.Map asMap():65:65 -> c
+    2:7:boolean com.android.tools.r8.com.google.common.collect.AbstractMultimap.putAll(java.lang.Object,java.lang.Iterable):82:87 -> a
+    2:7:boolean putAll(java.lang.Object,java.lang.Iterable):65 -> a
+    8:8:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    8:8:boolean com.android.tools.r8.com.google.common.collect.AbstractMultimap.putAll(java.lang.Object,java.lang.Iterable):79 -> a
+    8:8:boolean putAll(java.lang.Object,java.lang.Iterable):65 -> a
+    1:1:java.util.Map asMap():65:65 -> asMap
     1:1:void clear():65:65 -> clear
     1:1:boolean containsKey(java.lang.Object):65:65 -> containsKey
+    1:1:java.util.Collection entries():65:65 -> entries
     1:1:boolean equals(java.lang.Object):65:65 -> equals
+    1:1:java.util.List createCollection():137:137 -> g
+    1:1:java.util.Collection createCollection():65 -> g
     1:1:java.util.List get(java.lang.Object):65:65 -> get
+    1:1:com.android.tools.r8.com.google.common.collect.ArrayListMultimap create():80:80 -> h
     1:1:int com.android.tools.r8.com.google.common.collect.AbstractMultimap.hashCode():263:263 -> hashCode
     1:1:int hashCode():65 -> hashCode
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractMultimap.isEmpty():43:43 -> isEmpty
     1:1:boolean isEmpty():65 -> isEmpty
-    1:1:java.util.List createCollection():137:137 -> j
-    1:1:java.util.Collection createCollection():65 -> j
-    1:1:com.android.tools.r8.com.google.common.collect.ArrayListMultimap create():80:80 -> k
     1:1:java.util.Set keySet():65:65 -> keySet
+    1:1:com.android.tools.r8.com.google.common.collect.Multiset keys():65:65 -> keys
     1:1:boolean put(java.lang.Object,java.lang.Object):65:65 -> put
     1:2:boolean com.android.tools.r8.com.google.common.collect.AbstractMultimap.remove(java.lang.Object,java.lang.Object):66:67 -> remove
     1:2:boolean remove(java.lang.Object,java.lang.Object):65 -> remove
@@ -5930,12 +5826,12 @@
 com.android.tools.r8.com.google.common.collect.Count -> a.a.a.a.c.a.a.b.Q:
     int value -> a
     1:2:void <init>(int):30:31 -> <init>
-    1:1:int get():35:35 -> a
-    2:2:void add(int):39:39 -> a
+    1:1:void add(int):39:39 -> a
     1:1:int addAndGet(int):43:43 -> b
     1:2:int getAndSet(int):51:52 -> c
     1:1:void set(int):47:47 -> d
     1:1:boolean equals(java.lang.Object):63:63 -> equals
+    1:1:int get():35:35 -> get
     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 -> a.a.a.a.c.a.a.b.S:
@@ -6208,12 +6104,12 @@
     2:4:void <init>():70 -> <init>
     1:1:java.util.Map com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.access$000(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset):48:48 -> a
     2:2:long com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.access$102(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset,long):48:48 -> a
-    3:17:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.add(java.lang.Object,int):225:239 -> a
-    3:17:int add(java.lang.Object,int):33 -> a
-    18:18:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.getAndSet(com.android.tools.r8.com.google.common.collect.Count,int):299:299 -> a
-    19:23: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):966:970 -> a
-    19:23:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.setCount(java.lang.Object,int,int):115 -> a
-    19:23:boolean setCount(java.lang.Object,int,int):33 -> a
+    3:19:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.setCount(java.lang.Object,int):274:290 -> a
+    3:19:int setCount(java.lang.Object,int):33 -> a
+    20:20:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.getAndSet(com.android.tools.r8.com.google.common.collect.Count,int):299:299 -> a
+    21:25: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):966:970 -> a
+    21:25:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.setCount(java.lang.Object,int,int):115 -> a
+    21:25:boolean setCount(java.lang.Object,int,int):33 -> a
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.add(java.lang.Object):84:84 -> add
     1:1:boolean add(java.lang.Object):33 -> add
     1:4:boolean com.android.tools.r8.com.google.common.collect.Multisets.addAllImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.util.Collection):905:908 -> addAll
@@ -6232,8 +6128,8 @@
     4:23:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.remove(java.lang.Object,int):247:266 -> b
     4:23:int remove(java.lang.Object,int):33 -> b
     1:1:long com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.access$110(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset):48:48 -> c
-    2:18:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.setCount(java.lang.Object,int):274:290 -> c
-    2:18:int setCount(java.lang.Object,int):33 -> c
+    2:16:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.add(java.lang.Object,int):225:239 -> c
+    2:16:int add(java.lang.Object,int):33 -> c
     1:5:void com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.clear():136:140 -> clear
     1:5:void clear():33 -> clear
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.contains(java.lang.Object):62:62 -> contains
@@ -6479,9 +6375,9 @@
     com.android.tools.r8.com.google.common.collect.ImmutableList forwardList -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):604:605 -> <init>
     1:1:boolean contains(java.lang.Object):623:623 -> contains
-    1:1:int reverseIndex(int):609:609 -> e
-    1:1:int reversePosition(int):613:613 -> f
-    2:2:boolean isPartialView():657:657 -> f
+    1:1:int reverseIndex(int):609:609 -> d
+    1:1:int reversePosition(int):613:613 -> e
+    1:1:boolean isPartialView():657:657 -> f
     1:2:java.lang.Object get(int):646:647 -> get
     3:3:int reverseIndex(int):609:609 -> get
     3:3:java.lang.Object get(int):647 -> get
@@ -6735,39 +6631,39 @@
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):354:356 -> <init>
     1:1:boolean containsEntry(java.lang.Object,java.lang.Object):67:67 -> a
     2:2:boolean putAll(java.lang.Object,java.lang.Iterable):440:440 -> a
-    3:6:java.util.Spliterator lambda$entrySpliterator$1(java.util.Map$Entry):608:611 -> a
-    7:7:java.util.Spliterator lambda$entrySpliterator$1(java.util.Map$Entry):610:610 -> a
-    8:8:com.android.tools.r8.com.google.common.collect.ImmutableMultiset keys():632:632 -> a
-    8:8:com.android.tools.r8.com.google.common.collect.Multiset keys():67 -> a
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection entries():528:528 -> b
-    1:1:java.util.Collection entries():67 -> b
+    3:3:java.util.Map createAsMap():520:520 -> a
+    4:7:java.util.Spliterator lambda$entrySpliterator$1(java.util.Map$Entry):608:611 -> a
+    8:8:java.util.Spliterator lambda$entrySpliterator$1(java.util.Map$Entry):610:610 -> a
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap asMap():515:515 -> asMap
+    1:1:java.util.Map asMap():67 -> asMap
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createEntries():533:533 -> b
+    1:1:java.util.Collection createEntries():67 -> b
     2:2:java.util.Map$Entry lambda$null$0(java.lang.Object,java.lang.Object):611:611 -> b
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap asMap():515:515 -> c
-    1:1:java.util.Map asMap():67 -> c
     1:1:void clear():396:396 -> clear
     1:1:boolean containsKey(java.lang.Object):483:483 -> containsKey
-    1:1:java.util.Map createAsMap():520:520 -> d
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createEntries():533:533 -> e
-    1:1:java.util.Collection createEntries():67 -> e
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMultiset createKeys():637:637 -> d
+    1:1:com.android.tools.r8.com.google.common.collect.Multiset createKeys():67 -> d
+    1:1:java.util.Iterator entryIterator():67:67 -> e
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator():595:595 -> e
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection entries():528:528 -> entries
+    1:1:java.util.Collection entries():67 -> entries
     1:1:boolean equals(java.lang.Object):67:67 -> equals
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMultiset createKeys():637:637 -> g
-    1:1:com.android.tools.r8.com.google.common.collect.Multiset createKeys():67 -> g
-    1:1:java.util.Iterator entryIterator():67:67 -> h
-    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator():595:595 -> h
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap asMap():515:515 -> f
+    1:1:java.util.Spliterator entrySpliterator():606 -> f
+    2:2:java.util.Spliterator entrySpliterator():606:606 -> f
+    3:3:int size():493:493 -> f
+    3:3:java.util.Spliterator entrySpliterator():614 -> f
+    4:4:java.util.Spliterator entrySpliterator():605:605 -> f
+    1:1:boolean isPartialView():476:476 -> g
     1:1:int com.android.tools.r8.com.google.common.collect.AbstractMultimap.hashCode():263:263 -> hashCode
     1:1:int hashCode():67 -> hashCode
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap asMap():515:515 -> i
-    1:1:java.util.Spliterator entrySpliterator():606 -> i
-    2:2:java.util.Spliterator entrySpliterator():606:606 -> i
-    3:3:int size():493:493 -> i
-    3:3:java.util.Spliterator entrySpliterator():614 -> i
-    4:4:java.util.Spliterator entrySpliterator():605:605 -> i
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractMultimap.isEmpty():43:43 -> isEmpty
     1:1:boolean isEmpty():67 -> isEmpty
-    1:1:boolean isPartialView():476:476 -> j
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet keySet():504:504 -> keySet
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet keySet():504:504 -> keySet
     2:2:java.util.Set keySet():67 -> keySet
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMultiset keys():632:632 -> keys
+    1:1:com.android.tools.r8.com.google.common.collect.Multiset keys():67 -> keys
     1:1:boolean put(java.lang.Object,java.lang.Object):427:427 -> put
     1:1:boolean remove(java.lang.Object,java.lang.Object):466:466 -> remove
     1:1:int size():493:493 -> size
@@ -6843,9 +6739,9 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():656 -> d
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():656:656 -> d
     3:3:java.util.Set elementSet():640 -> d
-    1:2:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):666:667 -> e
-    3:3:com.android.tools.r8.com.google.common.collect.Multiset$Entry com.android.tools.r8.com.google.common.collect.Multisets.immutableEntry(java.lang.Object,int):251:251 -> e
-    3:3:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):667 -> e
+    4:5:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):666:667 -> d
+    6:6:com.android.tools.r8.com.google.common.collect.Multiset$Entry com.android.tools.r8.com.google.common.collect.Multisets.immutableEntry(java.lang.Object,int):251:251 -> d
+    6:6:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):667 -> d
     boolean isPartialView() -> f
     1:1:int size():661:661 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.ImmutableMultimap.size():493:493 -> size
@@ -6858,14 +6754,14 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableMultiset of():101:101 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableMultiset copyFromEntries(java.util.Collection):217 -> a
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableMultiset copyFromEntries(java.util.Collection):219:219 -> a
-    4:4:int add(java.lang.Object,int):286:286 -> a
+    4:4:int setCount(java.lang.Object,int):312:312 -> a
     5:5:boolean setCount(java.lang.Object,int,int):325:325 -> a
     6:8:int copyIntoArray(java.lang.Object[],int):331:333 -> a
     1:1:int remove(java.lang.Object,int):299:299 -> b
-    1:1:int setCount(java.lang.Object,int):312:312 -> c
+    1:1:int add(java.lang.Object,int):286:286 -> c
     1:1:boolean contains(java.lang.Object):273:273 -> contains
     com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet() -> d
-    com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int) -> e
+    com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int) -> d
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList asList():267:267 -> e
     2:8:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableCollection.asList():311:317 -> e
     2:8:com.android.tools.r8.com.google.common.collect.ImmutableList asList():268 -> e
@@ -6912,18 +6808,17 @@
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet of(java.lang.Object,java.lang.Object):92:92 -> a
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet of(java.lang.Object,java.lang.Object,java.lang.Object):101:101 -> a
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableSet of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):110:110 -> a
-    6:6:com.android.tools.r8.com.google.common.collect.ImmutableSet of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):119:119 -> a
-    7:15:com.android.tools.r8.com.google.common.collect.ImmutableSet of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object[]):132:140 -> a
-    16:23:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.util.Collection):259:266 -> a
-    24:24:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOfEnumSet(java.util.EnumSet):329:329 -> a
-    24:24:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.util.Collection):266 -> a
-    25:26:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.util.Collection):268:269 -> a
+    6:14:com.android.tools.r8.com.google.common.collect.ImmutableSet of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object[]):132:140 -> a
+    15:22:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.util.Collection):259:266 -> a
+    23:23:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOfEnumSet(java.util.EnumSet):329:329 -> a
+    23:23:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.util.Collection):266 -> a
+    24:25:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.util.Collection):268:269 -> a
     1:36:com.android.tools.r8.com.google.common.collect.ImmutableSet construct(int,java.lang.Object[]):169:204 -> b
     37:38:com.android.tools.r8.com.google.common.collect.ImmutableSet construct(int,java.lang.Object[]):164:165 -> b
     39:39:com.android.tools.r8.com.google.common.collect.ImmutableSet of():74:74 -> b
     39:39:com.android.tools.r8.com.google.common.collect.ImmutableSet construct(int,java.lang.Object[]):161 -> b
-    1:9:int chooseTableSize(int):229:237 -> e
-    10:11:com.android.tools.r8.com.google.common.collect.ImmutableList asList():368:369 -> e
+    1:9:int chooseTableSize(int):229:237 -> d
+    1:2:com.android.tools.r8.com.google.common.collect.ImmutableList asList():368:369 -> e
     1:7:boolean equals(java.lang.Object):343:349 -> equals
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder builder():445:445 -> g
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():373:373 -> h
@@ -6996,7 +6891,7 @@
     java.util.Iterator val$unfiltered -> c
     com.android.tools.r8.com.google.common.base.Predicate val$retainIfTrue -> d
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):659:659 -> <init>
-    1:7:java.lang.Object computeNext():662:668 -> e
+    1:7:java.lang.Object computeNext():662:668 -> d
 com.android.tools.r8.com.google.common.collect.Iterators$6 -> a.a.a.a.c.a.a.b.fb:
     com.android.tools.r8.com.google.common.base.Function val$function -> b
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):817:817 -> <init>
@@ -7074,8 +6969,8 @@
     2:3:void add(int,java.lang.Object):876 -> add
     4:4:void add(int,java.lang.Object):876:876 -> add
     1:1:void clear():881:881 -> clear
+    1:2:int reverseIndex(int):863:864 -> d
     1:1:java.util.List getForwardList():859:859 -> e
-    2:3:int reverseIndex(int):863:864 -> e
     1:1:java.lang.Object get(int):901:901 -> get
     1:1:java.util.Iterator iterator():917:917 -> iterator
     1:2:int reversePosition(int):869:870 -> listIterator
@@ -7286,10 +7181,7 @@
     2:2:int size():4093:4093 -> size
 com.android.tools.r8.com.google.common.collect.Multimap -> a.a.a.a.c.a.a.b.Ab:
     boolean containsEntry(java.lang.Object,java.lang.Object) -> a
-    com.android.tools.r8.com.google.common.collect.Multiset keys() -> a
     boolean putAll(java.lang.Object,java.lang.Iterable) -> a
-    java.util.Collection entries() -> b
-    java.util.Map asMap() -> c
 com.android.tools.r8.com.google.common.collect.MultimapBuilder$2 -> a.a.a.a.c.a.a.b.Bb:
     int val$expectedKeys -> a
     1:1:void <init>(int):127:127 -> <init>
@@ -7327,8 +7219,8 @@
     1:2:void <init>(java.util.Map,com.android.tools.r8.com.google.common.base.Supplier):301:302 -> <init>
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
     3:3:void <init>(java.util.Map,com.android.tools.r8.com.google.common.base.Supplier):302 -> <init>
-    1:1:java.util.List createCollection():307:307 -> j
-    1:1:java.util.Collection createCollection():297 -> j
+    1:1:java.util.List createCollection():307:307 -> g
+    1:1:java.util.Collection createCollection():297 -> g
 com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> a.a.a.a.c.a.a.b.Kb:
     com.android.tools.r8.com.google.common.collect.Multimap multimap -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multimap):1645:1646 -> <init>
@@ -7357,8 +7249,8 @@
 com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> a.a.a.a.c.a.a.b.Hb:
     java.util.Map$Entry val$backingEntry -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1,java.util.Map$Entry):1655:1655 -> <init>
-    1:1:java.lang.Object getElement():1658:1658 -> a
-    1:1:int getCount():1663:1663 -> b
+    1:1:int getCount():1663:1663 -> getCount
+    1:1:java.lang.Object getElement():1658:1658 -> getElement
 com.android.tools.r8.com.google.common.collect.Multimaps$Keys$KeysEntrySet -> a.a.a.a.c.a.a.b.Jb:
     com.android.tools.r8.com.google.common.collect.Multimaps$Keys this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys):1692:1692 -> <init>
@@ -7366,27 +7258,23 @@
     1:1:com.android.tools.r8.com.google.common.collect.Multiset multiset():1695:1695 -> e
     1:1:boolean isEmpty():1710:1710 -> isEmpty
     1:1:java.util.Iterator iterator():1700:1700 -> iterator
-    2:3:java.util.Iterator com.android.tools.r8.com.google.common.collect.Multimaps$Keys.entryIterator():1651:1652 -> iterator
-    2:3:java.util.Iterator iterator():1700 -> iterator
     1:5:boolean remove(java.lang.Object):1725:1729 -> remove
     1:1:int size():1705:1705 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.Multimaps$Keys.distinctElements():1683:1683 -> size
     2:2:int size():1705 -> size
 com.android.tools.r8.com.google.common.collect.Multiset -> a.a.a.a.c.a.a.b.Mb:
-    int add(java.lang.Object,int) -> a
+    int setCount(java.lang.Object,int) -> a
     boolean setCount(java.lang.Object,int,int) -> a
     1:4:void lambda$forEach$1(java.util.function.Consumer,com.android.tools.r8.com.google.common.collect.Multiset$Entry):494:497 -> a
     int count(java.lang.Object) -> b
     int remove(java.lang.Object,int) -> b
-    int setCount(java.lang.Object,int) -> c
+    int add(java.lang.Object,int) -> c
     java.util.Set elementSet() -> d
     1:2:void forEach(java.util.function.Consumer):491:492 -> forEach
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> forEach
     3:3:void forEach(java.util.function.Consumer):490 -> forEach
     1:1:java.util.Spliterator spliterator():504:504 -> spliterator
 com.android.tools.r8.com.google.common.collect.Multiset$Entry -> a.a.a.a.c.a.a.b.Lb:
-    java.lang.Object getElement() -> a
-    int getCount() -> b
 com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> a.a.a.a.c.a.a.b.Nb:
     1:1:void <init>():833:833 -> <init>
     1:4:boolean equals(java.lang.Object):840:843 -> equals
@@ -7414,9 +7302,9 @@
     java.lang.Object element -> a
     int count -> b
     1:4:void <init>(java.lang.Object,int):258:261 -> <init>
-    1:1:java.lang.Object getElement():267:267 -> a
-    1:1:int getCount():272:272 -> b
-    com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket() -> c
+    com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket() -> a
+    1:1:int getCount():272:272 -> getCount
+    1:1:java.lang.Object getElement():267:267 -> getElement
 com.android.tools.r8.com.google.common.collect.Ordering -> a.a.a.a.c.a.a.b.Sb:
     1:1:void <init>():390:390 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.Function com.android.tools.r8.com.google.common.collect.Maps.keyFunction():111:111 -> a
@@ -7590,7 +7478,7 @@
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():140:141 -> d
     3:4:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():140:141 -> d
     3:4:java.util.Set elementSet():34 -> d
-    1:1:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):170:170 -> e
+    5:5:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):170:170 -> d
     boolean isPartialView() -> f
     1:1:int hashCode():175:175 -> hashCode
     1:1:int size():135:135 -> size
@@ -7606,7 +7494,7 @@
 com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> a.a.a.a.c.a.a.b.ec:
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket -> c
     1:2:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry):100:101 -> <init>
-    1:1:com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket():106:106 -> c
+    1:1:com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket():106:106 -> a
 com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> a.a.a.a.c.a.a.b.gc:
     java.lang.Object[] table -> d
     com.android.tools.r8.com.google.common.collect.RegularImmutableSet EMPTY -> g
@@ -7645,7 +7533,7 @@
     java.util.Iterator itr1 -> c
     com.android.tools.r8.com.google.common.collect.Sets$1 this$0 -> e
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.Sets$1):763:765 -> <init>
-    1:10:java.lang.Object computeNext():769:778 -> e
+    1:10:java.lang.Object computeNext():769:778 -> d
 com.android.tools.r8.com.google.common.collect.Sets$2 -> a.a.a.a.c.a.a.b.kc:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
@@ -7662,7 +7550,7 @@
     java.util.Iterator itr -> c
     com.android.tools.r8.com.google.common.collect.Sets$2 this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$2):845:846 -> <init>
-    1:7:java.lang.Object computeNext():850:856 -> e
+    1:7:java.lang.Object computeNext():850:856 -> d
 com.android.tools.r8.com.google.common.collect.Sets$3 -> a.a.a.a.c.a.a.b.mc:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
@@ -7680,7 +7568,7 @@
     java.util.Iterator itr -> c
     com.android.tools.r8.com.google.common.collect.Sets$3 this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$3):917:918 -> <init>
-    1:7:java.lang.Object computeNext():921:927 -> e
+    1:7:java.lang.Object computeNext():921:927 -> d
 com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> a.a.a.a.c.a.a.b.nc:
     1:1:void <init>():77:77 -> <init>
     1:1:boolean removeAll(java.util.Collection):80:80 -> removeAll
@@ -7900,51 +7788,10 @@
     1:1:void write(byte[]):603 -> write
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> write
     2:2:void write(byte[],int,int):609 -> write
-com.android.tools.r8.com.google.common.io.CharSequenceReader -> a.a.a.a.c.a.a.c.h:
-    java.lang.CharSequence seq -> a
-    int pos -> b
-    int mark -> c
-    1:2:void <init>(java.lang.CharSequence):43:44 -> <init>
-    3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
-    3:3:void <init>(java.lang.CharSequence):44 -> <init>
-    1:2:void checkOpen():48:49 -> a
-    1:1:boolean hasRemaining():54:54 -> b
-    1:1:int remaining():58:58 -> c
-    1:1:void close():130:130 -> close
-    1:3:void mark(int):117:119 -> mark
-    1:7:int read(java.nio.CharBuffer):64:70 -> read
-    8:8:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> read
-    8:8:int read(java.nio.CharBuffer):63 -> read
-    9:10:int read():77:78 -> read
-    11:18:int read(char[],int,int):83:90 -> read
-    1:1:boolean ready():106:106 -> ready
-    1:2:void reset():124:125 -> reset
-    1:4:long skip(long):97:100 -> skip
-com.android.tools.r8.com.google.common.io.CharSource -> a.a.a.a.c.a.a.c.k:
-    1:1:void <init>():76:76 -> <init>
-    java.io.Reader openStream() -> a
-    1:1:com.android.tools.r8.com.google.common.io.CharSource wrap(java.lang.CharSequence):479:479 -> a
-com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> a.a.a.a.c.a.a.c.i:
-    java.lang.CharSequence seq -> a
-    1:1:void <clinit>():525:525 -> <clinit>
-    1:2:void <init>(java.lang.CharSequence):529:530 -> <init>
-    3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
-    3:3:void <init>(java.lang.CharSequence):530 -> <init>
-    1:1:java.io.Reader openStream():535:535 -> a
-    1:1:java.lang.String toString():609:609 -> toString
-    2:20:java.lang.String com.android.tools.r8.com.google.common.base.Ascii.truncate(java.lang.CharSequence,int,java.lang.String):553:571 -> toString
-    2:20:java.lang.String toString():609 -> toString
-    21:21:java.lang.String toString():609:609 -> toString
-    22:22:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> toString
-    22:22:java.lang.String com.android.tools.r8.com.google.common.base.Ascii.truncate(java.lang.CharSequence,int,java.lang.String):546 -> toString
-    22:22:java.lang.String toString():609 -> toString
-com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> a.a.a.a.c.a.a.c.j:
-    1:1:void <init>(java.lang.String):630:630 -> <init>
-    1:1:java.io.Reader openStream():635:635 -> a
-com.android.tools.r8.com.google.common.io.Closeables -> a.a.a.a.c.a.a.c.l:
+com.android.tools.r8.com.google.common.io.Closeables -> a.a.a.a.c.a.a.c.h:
     java.util.logging.Logger logger -> a
     1:1:void <clinit>():37:37 -> <clinit>
-com.android.tools.r8.com.google.common.io.Closer -> a.a.a.a.c.a.a.c.p:
+com.android.tools.r8.com.google.common.io.Closer -> a.a.a.a.c.a.a.c.l:
     com.android.tools.r8.com.google.common.io.Closer$Suppressor suppressor -> a
     java.util.Deque stack -> b
     java.lang.Throwable thrown -> c
@@ -7959,12 +7806,12 @@
     1:1:com.android.tools.r8.com.google.common.io.Closer create():104:104 -> a
     2:2:java.io.Closeable register(java.io.Closeable):128:128 -> a
     1:19:void close():210:228 -> close
-com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> a.a.a.a.c.a.a.c.m:
+com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> a.a.a.a.c.a.a.c.i:
     com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor INSTANCE -> a
     1:1:void <clinit>():251:251 -> <clinit>
     1:1:void <init>():249:249 -> <init>
     1:1:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):256:256 -> a
-com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> a.a.a.a.c.a.a.c.n:
+com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> a.a.a.a.c.a.a.c.j:
     com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor INSTANCE -> a
     java.lang.reflect.Method addSuppressed -> b
     1:1:void <clinit>():268:268 -> <clinit>
@@ -7975,7 +7822,7 @@
     1:1:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):291:291 -> a
     2:2:void com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor.suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):256:256 -> a
     2:2:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):294 -> a
-com.android.tools.r8.com.google.common.io.Closer$Suppressor -> a.a.a.a.c.a.a.c.o:
+com.android.tools.r8.com.google.common.io.Closer$Suppressor -> a.a.a.a.c.a.a.c.k:
     void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable) -> a
 com.android.tools.r8.com.google.common.math.IntMath -> a.a.a.a.c.a.a.d.b:
     1:474:void <clinit>():202:675 -> <clinit>
@@ -8107,12 +7954,11 @@
     1:1:java.lang.String toString():68:68 -> toString
 com.android.tools.r8.com.google.gson.internal.LinkedTreeMap -> a.a.a.a.c.a.b.a.i:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node header -> e
-    java.util.Comparator NATURAL_ORDER -> h
-    boolean $assertionsDisabled -> i
-    com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet keySet -> g
+    java.util.Comparator NATURAL_ORDER -> g
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node root -> b
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet entrySet -> f
     int modCount -> d
+    boolean $assertionsDisabled -> h
     int size -> c
     java.util.Comparator comparator -> a
     1:3:void <clinit>():38:40 -> <clinit>
@@ -8185,9 +8031,9 @@
     int expectedModCount -> c
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):531:531 -> <init>
     2:4:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):527:529 -> <init>
-    1:9:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():539:547 -> e
-    10:10:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():544:544 -> e
-    11:11:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():541:541 -> e
+    1:9:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():539:547 -> d
+    10:10:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():544:544 -> d
+    11:11:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():541:541 -> d
     1:1:boolean hasNext():535:535 -> hasNext
     1:6:void remove():551:556 -> remove
     7:7:void remove():552:552 -> remove
@@ -8857,9 +8703,9 @@
     97:107:void write(java.util.concurrent.ExecutorService):285:295 -> a
     108:108:void lambda$write$0(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):226:226 -> a
     109:116:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):240:247 -> a
-    117:117:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():228:228 -> a
+    117:117:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():209:209 -> a
     117:117:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):247 -> a
-    118:118:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():228:228 -> a
+    118:118:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():209:209 -> a
     118:118:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):248 -> a
     119:122:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):250:253 -> a
     123:123:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):252:252 -> a
@@ -9065,199 +8911,176 @@
     19:21:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):129:131 -> <init>
     22:25:void com.android.tools.r8.dex.DexReader.setByteOrder():83:86 -> <init>
     22:25:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):132 -> <init>
-    26:48:com.android.tools.r8.dex.DexSection[] parseMap():741:763 -> <init>
+    26:48:com.android.tools.r8.dex.DexSection[] parseMap():736:758 -> <init>
     26:48:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):133 -> <init>
     49:49:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> <init>
     49:49:int com.android.tools.r8.dex.BinaryReader.end():0 -> <init>
-    49:49:com.android.tools.r8.dex.DexSection[] parseMap():763 -> <init>
+    49:49:com.android.tools.r8.dex.DexSection[] parseMap():758 -> <init>
     49:49:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):133 -> <init>
-    50:50:com.android.tools.r8.dex.DexSection[] parseMap():763:763 -> <init>
+    50:50:com.android.tools.r8.dex.DexSection[] parseMap():758:758 -> <init>
     50:50:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):133 -> <init>
     51:51:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):133:133 -> <init>
-    52:59:void parseStringIDs():718:725 -> <init>
+    52:59:void parseStringIDs():713:720 -> <init>
     52:59:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):134 -> <init>
     60:60:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):135:135 -> <init>
     61:61:void com.android.tools.r8.dex.DexReader.setByteOrder():89:89 -> <init>
     61:61:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):132 -> <init>
     1:16:void ensureCodesInited():140:155 -> a
-    1:16:void addClassDefsTo(java.util.function.Consumer):617 -> a
-    17:29:com.android.tools.r8.graph.DexCode parseCodeItem():768:780 -> a
+    1:16:void addClassDefsTo(java.util.function.Consumer):612 -> a
+    17:29:com.android.tools.r8.graph.DexCode parseCodeItem():763:775 -> a
     17:29:void ensureCodesInited():156 -> a
-    17:29:void addClassDefsTo(java.util.function.Consumer):617 -> a
+    17:29:void addClassDefsTo(java.util.function.Consumer):612 -> a
     30:30:short com.android.tools.r8.dex.BinaryReader.getShort():68:68 -> a
     30:30:short com.android.tools.r8.dex.BinaryReader.getShort():0 -> a
-    30:30:com.android.tools.r8.graph.DexCode parseCodeItem():780 -> a
+    30:30:com.android.tools.r8.graph.DexCode parseCodeItem():775 -> a
     30:30:void ensureCodesInited():156 -> a
-    30:30:void addClassDefsTo(java.util.function.Consumer):617 -> a
-    31:72:com.android.tools.r8.graph.DexCode parseCodeItem():780:821 -> a
+    30:30:void addClassDefsTo(java.util.function.Consumer):612 -> a
+    31:72:com.android.tools.r8.graph.DexCode parseCodeItem():775:816 -> a
     31:72:void ensureCodesInited():156 -> a
-    31:72:void addClassDefsTo(java.util.function.Consumer):617 -> a
+    31:72:void addClassDefsTo(java.util.function.Consumer):612 -> a
     73:73:void com.android.tools.r8.graph.DexCode$Try.setHandlerIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):467:467 -> a
-    73:73:com.android.tools.r8.graph.DexCode parseCodeItem():822 -> a
+    73:73:com.android.tools.r8.graph.DexCode parseCodeItem():817 -> a
     73:73:void ensureCodesInited():156 -> a
-    73:73:void addClassDefsTo(java.util.function.Consumer):617 -> a
-    74:80:com.android.tools.r8.graph.DexCode parseCodeItem():827:833 -> a
+    73:73:void addClassDefsTo(java.util.function.Consumer):612 -> a
+    74:80:com.android.tools.r8.graph.DexCode parseCodeItem():822:828 -> a
     74:80:void ensureCodesInited():156 -> a
-    74:80:void addClassDefsTo(java.util.function.Consumer):617 -> a
+    74:80:void addClassDefsTo(java.util.function.Consumer):612 -> a
     81:81:void ensureCodesInited():157:157 -> a
-    81:81:void addClassDefsTo(java.util.function.Consumer):617 -> a
-    82:105:void addClassDefsTo(java.util.function.Consumer):618:641 -> a
+    81:81:void addClassDefsTo(java.util.function.Consumer):612 -> a
+    82:105:void addClassDefsTo(java.util.function.Consumer):613:636 -> a
     106:106:int com.android.tools.r8.dex.BinaryReader.getInt():78:78 -> a
     106:106:int com.android.tools.r8.dex.BinaryReader.getInt():0 -> a
-    106:106:void addClassDefsTo(java.util.function.Consumer):641 -> a
-    107:109:void addClassDefsTo(java.util.function.Consumer):641:643 -> a
+    106:106:void addClassDefsTo(java.util.function.Consumer):636 -> a
+    107:109:void addClassDefsTo(java.util.function.Consumer):636:638 -> a
     110:110:int com.android.tools.r8.dex.BinaryReader.getInt():78:78 -> a
     110:110:int com.android.tools.r8.dex.BinaryReader.getInt():0 -> a
-    110:110:void addClassDefsTo(java.util.function.Consumer):643 -> a
-    111:145:void addClassDefsTo(java.util.function.Consumer):643:677 -> a
-    146:182:void addClassDefsTo(java.util.function.Consumer):676:712 -> a
-    183:199:void addClassDefsTo(java.util.function.Consumer):697:713 -> a
-    200:200:void addClassDefsTo(java.util.function.Consumer):659:659 -> a
+    110:110:void addClassDefsTo(java.util.function.Consumer):638 -> a
+    111:145:void addClassDefsTo(java.util.function.Consumer):638:672 -> a
+    146:182:void addClassDefsTo(java.util.function.Consumer):671:707 -> a
+    183:199:void addClassDefsTo(java.util.function.Consumer):692:708 -> a
+    200:200:void addClassDefsTo(java.util.function.Consumer):654:654 -> a
     201:206:java.lang.Object cacheAt(int,java.util.function.Supplier):394:399 -> a
     207:207:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
     207:207:void com.android.tools.r8.dex.BinaryReader.position(int):0 -> a
     207:207:java.lang.Object cacheAt(int,java.util.function.Supplier):399 -> a
     208:211:java.lang.Object cacheAt(int,java.util.function.Supplier):400:403 -> a
     212:212:com.android.tools.r8.graph.DexAnnotation annotationAt(int):416:416 -> a
-    213:228:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):572:587 -> a
-    229:246:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):594:611 -> a
-    247:249:void populateStrings():848:850 -> a
-    247:249:void populateIndexTables():838 -> a
-    250:259:com.android.tools.r8.graph.DexString stringAt(int):1062:1071 -> a
-    250:259:void populateStrings():850 -> a
-    250:259:void populateIndexTables():838 -> a
-    260:260:void populateStrings():850:850 -> a
-    260:260:void populateIndexTables():838 -> a
-    261:262:void populateTypes():871:872 -> a
-    261:262:void populateIndexTables():839 -> a
-    263:282:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):885:904 -> a
-    263:282:void populateTypes():872 -> a
-    263:282:void populateIndexTables():839 -> a
-    283:283:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):899:899 -> a
-    283:283:void populateTypes():872 -> a
-    283:283:void populateIndexTables():839 -> a
-    284:286:void populateTypes():873:875 -> a
-    284:286:void populateIndexTables():839 -> a
-    287:293:com.android.tools.r8.graph.DexType typeAt(int):1075:1081 -> a
-    287:293:void populateTypes():875 -> a
-    287:293:void populateIndexTables():839 -> a
-    294:294:void populateTypes():875:875 -> a
-    294:294:void populateIndexTables():839 -> a
-    295:296:void populateFields():913:914 -> a
-    295:296:void populateIndexTables():840 -> a
-    297:332:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):929:964 -> a
-    297:332:void populateFields():914 -> a
-    297:332:void populateIndexTables():840 -> a
-    333:343:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):961:971 -> a
-    333:343:void populateFields():914 -> a
-    333:343:void populateIndexTables():840 -> a
-    344:348:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):968:972 -> a
-    344:348:void populateFields():914 -> a
-    344:348:void populateIndexTables():840 -> a
-    349:349:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):957:957 -> a
-    349:349:void populateFields():914 -> a
-    349:349:void populateIndexTables():840 -> a
-    350:352:void populateFields():915:917 -> a
-    350:352:void populateIndexTables():840 -> a
-    353:365:com.android.tools.r8.graph.DexField fieldAt(int):1085:1097 -> a
-    353:365:void populateFields():917 -> a
-    353:365:void populateIndexTables():840 -> a
-    366:366:void populateFields():917:917 -> a
-    366:366:void populateIndexTables():840 -> a
-    367:370:void populateProtos():983:986 -> a
-    367:370:void populateIndexTables():841 -> a
-    371:383:com.android.tools.r8.graph.DexProto protoAt(int):1158:1170 -> a
-    371:383:void populateProtos():986 -> a
-    371:383:void populateIndexTables():841 -> a
-    384:384:void populateProtos():986:986 -> a
-    384:384:void populateIndexTables():841 -> a
-    385:386:void populateMethods():991:992 -> a
-    385:386:void populateIndexTables():842 -> a
-    387:422:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1008:1043 -> a
-    387:422:void populateMethods():992 -> a
-    387:422:void populateIndexTables():842 -> a
-    423:433:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1040:1050 -> a
-    423:433:void populateMethods():992 -> a
-    423:433:void populateIndexTables():842 -> a
-    434:438:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1047:1051 -> a
-    434:438:void populateMethods():992 -> a
-    434:438:void populateIndexTables():842 -> a
-    439:439:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1036:1036 -> a
-    439:439:void populateMethods():992 -> a
-    439:439:void populateIndexTables():842 -> a
-    440:442:void populateMethods():993:995 -> a
-    440:442:void populateIndexTables():842 -> a
-    443:455:com.android.tools.r8.graph.DexMethod methodAt(int):1174:1186 -> a
-    443:455:void populateMethods():995 -> a
-    443:455:void populateIndexTables():842 -> a
-    456:456:com.android.tools.r8.graph.DexMethod methodAt(int):1183:1183 -> a
-    456:456:void populateMethods():995 -> a
-    456:456:void populateIndexTables():842 -> a
-    457:457:void populateMethods():995:995 -> a
-    457:457:void populateIndexTables():842 -> a
-    458:461:void populateMethodHandles():855:858 -> a
-    458:461:void populateIndexTables():843 -> a
-    462:489:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1101:1128 -> a
-    462:489:void populateMethodHandles():858 -> a
-    462:489:void populateIndexTables():843 -> a
-    490:490:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1124:1124 -> a
-    490:490:void populateMethodHandles():858 -> a
-    490:490:void populateIndexTables():843 -> a
-    491:507:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1116:1132 -> a
-    491:507:void populateMethodHandles():858 -> a
-    491:507:void populateIndexTables():843 -> a
-    508:508:void populateMethodHandles():858:858 -> a
-    508:508:void populateIndexTables():843 -> a
-    509:512:void populateCallSites():863:866 -> a
-    509:512:void populateIndexTables():844 -> a
-    513:530:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1137:1154 -> a
-    513:530:void populateCallSites():866 -> a
-    513:530:void populateIndexTables():844 -> a
-    531:531:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1149:1149 -> a
-    531:531:void populateCallSites():866 -> a
-    531:531:void populateIndexTables():844 -> a
-    532:532:void populateCallSites():866:866 -> a
-    532:532:void populateIndexTables():844 -> a
+    213:228:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):567:582 -> a
+    229:246:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):589:606 -> a
+    247:249:void populateStrings():843:845 -> a
+    247:249:void populateIndexTables():833 -> a
+    250:259:com.android.tools.r8.graph.DexString stringAt(int):960:969 -> a
+    250:259:void populateStrings():845 -> a
+    250:259:void populateIndexTables():833 -> a
+    260:260:void populateStrings():845:845 -> a
+    260:260:void populateIndexTables():833 -> a
+    261:264:void populateTypes():866:869 -> a
+    261:264:void populateIndexTables():834 -> a
+    265:271:com.android.tools.r8.graph.DexType typeAt(int):973:979 -> a
+    265:271:void populateTypes():869 -> a
+    265:271:void populateIndexTables():834 -> a
+    272:272:void populateTypes():869:869 -> a
+    272:272:void populateIndexTables():834 -> a
+    273:274:void populateFields():874:875 -> a
+    273:274:void populateIndexTables():835 -> a
+    275:310:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):890:925 -> a
+    275:310:void populateFields():875 -> a
+    275:310:void populateIndexTables():835 -> a
+    311:321:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):922:932 -> a
+    311:321:void populateFields():875 -> a
+    311:321:void populateIndexTables():835 -> a
+    322:326:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):929:933 -> a
+    322:326:void populateFields():875 -> a
+    322:326:void populateIndexTables():835 -> a
+    327:327:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):918:918 -> a
+    327:327:void populateFields():875 -> a
+    327:327:void populateIndexTables():835 -> a
+    328:330:void populateFields():876:878 -> a
+    328:330:void populateIndexTables():835 -> a
+    331:343:com.android.tools.r8.graph.DexField fieldAt(int):983:995 -> a
+    331:343:void populateFields():878 -> a
+    331:343:void populateIndexTables():835 -> a
+    344:344:void populateFields():878:878 -> a
+    344:344:void populateIndexTables():835 -> a
+    345:348:void populateProtos():944:947 -> a
+    345:348:void populateIndexTables():836 -> a
+    349:361:com.android.tools.r8.graph.DexProto protoAt(int):1055:1067 -> a
+    349:361:void populateProtos():947 -> a
+    349:361:void populateIndexTables():836 -> a
+    362:362:void populateProtos():947:947 -> a
+    362:362:void populateIndexTables():836 -> a
+    363:366:void populateMethods():952:955 -> a
+    363:366:void populateIndexTables():837 -> a
+    367:379:com.android.tools.r8.graph.DexMethod methodAt(int):1071:1083 -> a
+    367:379:void populateMethods():955 -> a
+    367:379:void populateIndexTables():837 -> a
+    380:380:com.android.tools.r8.graph.DexMethod methodAt(int):1080:1080 -> a
+    380:380:void populateMethods():955 -> a
+    380:380:void populateIndexTables():837 -> a
+    381:381:void populateMethods():955:955 -> a
+    381:381:void populateIndexTables():837 -> a
+    382:385:void populateMethodHandles():850:853 -> a
+    382:385:void populateIndexTables():838 -> a
+    386:413:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):999:1026 -> a
+    386:413:void populateMethodHandles():853 -> a
+    386:413:void populateIndexTables():838 -> a
+    414:414:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1022:1022 -> a
+    414:414:void populateMethodHandles():853 -> a
+    414:414:void populateIndexTables():838 -> a
+    415:431:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1014:1030 -> a
+    415:431:void populateMethodHandles():853 -> a
+    415:431:void populateIndexTables():838 -> a
+    432:432:void populateMethodHandles():853:853 -> a
+    432:432:void populateIndexTables():838 -> a
+    433:436:void populateCallSites():858:861 -> a
+    433:436:void populateIndexTables():839 -> a
+    437:454:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1034:1051 -> a
+    437:454:void populateCallSites():861 -> a
+    437:454:void populateIndexTables():839 -> a
+    455:455:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1046:1046 -> a
+    455:455:void populateCallSites():861 -> a
+    455:455:void populateIndexTables():839 -> a
+    456:456:void populateCallSites():861:861 -> a
+    456:456:void populateIndexTables():839 -> a
     1:2:com.android.tools.r8.graph.DexAnnotation parseAnnotation():411:412 -> b
-    3:3:com.android.tools.r8.graph.DexAnnotationSet annotationSetAt(int):441:441 -> b
+    3:3:com.android.tools.r8.graph.DexAnnotationSet annotationSetAt(int):436:436 -> b
     4:6:java.lang.Object cacheAt(int,java.util.function.Supplier,java.util.function.Supplier):385:387 -> b
-    4:6:com.android.tools.r8.graph.DexAnnotationSet annotationSetAt(int):441 -> b
-    7:7:com.android.tools.r8.graph.DexAnnotationSet annotationSetAt(int):441:441 -> b
+    4:6:com.android.tools.r8.graph.DexAnnotationSet annotationSetAt(int):436 -> b
+    7:7:com.android.tools.r8.graph.DexAnnotationSet annotationSetAt(int):436:436 -> b
     1:1:com.android.tools.r8.graph.ParameterAnnotationsList annotationSetRefListAt(int):344:344 -> c
-    2:16:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():423:437 -> c
-    17:18:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():434:435 -> c
+    2:11:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():423:432 -> c
     1:10:com.android.tools.r8.graph.ParameterAnnotationsList parseAnnotationSetRefList():348:357 -> d
     11:11:void com.android.tools.r8.graph.ParameterAnnotationsList.<init>(com.android.tools.r8.graph.DexAnnotationSet[]):54:54 -> d
     11:11:com.android.tools.r8.graph.ParameterAnnotationsList parseAnnotationSetRefList():357 -> d
-    12:12:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):445:445 -> d
+    12:12:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):440:440 -> d
     13:15:java.lang.Object cacheAt(int,java.util.function.Supplier,java.util.function.Supplier):385:387 -> d
-    13:15:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):445 -> d
-    16:16:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):445:445 -> d
-    1:4:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():450:453 -> e
+    13:15:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):440 -> d
+    16:16:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):440:440 -> d
+    1:4:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():445:448 -> e
     5:18:com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[] parseFieldAnnotations(int):305:318 -> e
-    5:18:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():454 -> e
+    5:18:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():449 -> e
     19:32:com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[] parseMethodAnnotations(int):326:339 -> e
-    19:32:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():455 -> e
+    19:32:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():450 -> e
     33:48:com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[] parseParameterAnnotations(int):364:379 -> e
-    33:48:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():456 -> e
-    49:50:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():457:458 -> e
-    51:51:com.android.tools.r8.graph.DexDebugInfo debugInfoAt(int):465:465 -> e
+    33:48:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():451 -> e
+    49:50:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():452:453 -> e
+    51:51:com.android.tools.r8.graph.DexDebugInfo debugInfoAt(int):460:460 -> e
     1:1:com.android.tools.r8.graph.DexEncodedArray encodedArrayAt(int):298:298 -> f
-    2:66:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():469:533 -> f
-    67:69:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():527:529 -> f
-    70:70:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():523:523 -> f
-    71:71:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():519:519 -> f
-    72:72:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():515:515 -> f
-    73:73:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():511:511 -> f
-    74:82:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():499:507 -> f
-    83:83:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():503:503 -> f
-    84:90:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():488:494 -> f
-    91:91:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():491:491 -> f
-    92:92:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():485:485 -> f
-    93:145:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():482:534 -> f
-    146:205:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():479:538 -> f
+    2:66:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():464:528 -> f
+    67:69:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():522:524 -> f
+    70:70:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():518:518 -> f
+    71:71:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():514:514 -> f
+    72:72:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():510:510 -> f
+    73:73:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():506:506 -> f
+    74:82:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():494:502 -> f
+    83:83:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():498:498 -> f
+    84:90:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():483:489 -> f
+    91:91:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():486:486 -> f
+    92:92:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():480:480 -> f
+    93:145:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():477:529 -> f
+    146:205:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():474:533 -> f
     1:9:com.android.tools.r8.graph.DexEncodedAnnotation parseEncodedAnnotation():272:280 -> g
-    10:16:com.android.tools.r8.dex.DexSection lookupSection(int):730:736 -> g
+    10:16:com.android.tools.r8.dex.DexSection lookupSection(int):725:731 -> g
     1:3:com.android.tools.r8.graph.DexTypeList typeListAt(int):171:173 -> h
     4:4:com.android.tools.r8.graph.DexEncodedArray parseEncodedArray():294:294 -> h
     1:4:com.android.tools.r8.graph.DexValue[] parseEncodedArrayValues():284:287 -> i
@@ -9295,52 +9118,52 @@
     com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[] NO_FIELD_ANNOTATIONS -> f
     com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[] methods -> c
     com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[] parameters -> d
-    1:11:void <clinit>():1191:1201 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[]):1213:1217 -> <init>
-    1:1:com.android.tools.r8.dex.DexParser$AnnotationsDirectory empty():1221:1221 -> a
+    1:11:void <clinit>():1088:1098 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[]):1110:1114 -> <init>
+    1:1:com.android.tools.r8.dex.DexParser$AnnotationsDirectory empty():1118:1118 -> a
 com.android.tools.r8.dex.DexParser$AttributesAndAnnotations -> a.a.a.a.d.m:
     com.android.tools.r8.graph.EnclosingMethodAttribute enclosingMethodAttribute -> b
     java.util.List lazyAnnotations -> d
     com.android.tools.r8.graph.DexAnnotationSet originalAnnotations -> a
     java.util.List innerClasses -> c
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():1225:1225 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1251:1251 -> <init>
-    2:32:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1228:1258 -> <init>
+    1:1:void <clinit>():1122:1122 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1148:1148 -> <init>
+    2:32:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1125:1155 -> <init>
     33:33:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):99:99 -> <init>
-    33:33:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1259 -> <init>
-    34:35:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1260:1261 -> <init>
+    33:33:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1156 -> <init>
+    34:35:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1157:1158 -> <init>
     36:36:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingMethodAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):104:104 -> <init>
-    36:36:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1262 -> <init>
-    37:38:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1263:1264 -> <init>
+    36:36:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1159 -> <init>
+    37:38:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1160:1161 -> <init>
     39:39:boolean com.android.tools.r8.graph.DexAnnotation.isInnerClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):108:108 -> <init>
-    39:39:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1265 -> <init>
-    40:47:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1266:1273 -> <init>
-    48:48:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1272:1272 -> <init>
+    39:39:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1162 -> <init>
+    40:47:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1163:1170 -> <init>
+    48:48:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1169:1169 -> <init>
     49:49:boolean com.android.tools.r8.graph.DexAnnotation.isMemberClassesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):113:113 -> <init>
-    49:49:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1274 -> <init>
-    50:55:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1275:1280 -> <init>
-    56:57:void copyAnnotation(com.android.tools.r8.graph.DexAnnotation):1340:1341 -> <init>
-    56:57:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1283 -> <init>
-    58:87:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1288:1317 -> <init>
-    88:103:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1312:1327 -> <init>
-    104:104:com.android.tools.r8.graph.InnerClassAttribute com.android.tools.r8.graph.InnerClassAttribute.createUnknownNamedInnerClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):30:30 -> <init>
-    104:104:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1327 -> <init>
-    105:105:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1327:1327 -> <init>
-    1:7:com.android.tools.r8.graph.DexAnnotationSet getAnnotations():1233:1239 -> a
-    8:10:void ensureAnnotations(int):1333:1335 -> a
-    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():1247:1247 -> b
-    1:1:java.util.List getInnerClasses():1243:1243 -> c
+    49:49:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1171 -> <init>
+    50:55:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1172:1177 -> <init>
+    56:57:void copyAnnotation(com.android.tools.r8.graph.DexAnnotation):1237:1238 -> <init>
+    56:57:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1180 -> <init>
+    58:87:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1185:1214 -> <init>
+    88:103:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1209:1224 -> <init>
+    104:104:com.android.tools.r8.graph.InnerClassAttribute com.android.tools.r8.graph.InnerClassAttribute.createUnknownNamedInnerClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):29:29 -> <init>
+    104:104:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1224 -> <init>
+    105:105:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1224:1224 -> <init>
+    1:7:com.android.tools.r8.graph.DexAnnotationSet getAnnotations():1130:1136 -> a
+    8:10:void ensureAnnotations(int):1230:1232 -> a
+    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():1144:1144 -> b
+    1:1:java.util.List getInnerClasses():1140:1140 -> c
 com.android.tools.r8.dex.DexParser$MemberAnnotationIterator -> a.a.a.a.d.n:
     java.util.function.Supplier emptyValue -> c
     com.android.tools.r8.graph.DexMemberAnnotation[] annotations -> b
     int index -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier):548:548 -> <init>
-    1:1:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier,com.android.tools.r8.dex.DexParser$1):541 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier):543:550 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier,com.android.tools.r8.dex.DexParser$1):541 -> <init>
-    1:7:com.android.tools.r8.graph.DexItem getNextFor(com.android.tools.r8.graph.Descriptor):560:566 -> a
-    8:8:com.android.tools.r8.graph.DexItem getNextFor(com.android.tools.r8.graph.Descriptor):564:564 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier):543:543 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier,com.android.tools.r8.dex.DexParser$1):536 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier):538:545 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier,com.android.tools.r8.dex.DexParser$1):536 -> <init>
+    1:7:com.android.tools.r8.graph.DexItem getNextFor(com.android.tools.r8.graph.Descriptor):555:561 -> a
+    8:8:com.android.tools.r8.graph.DexItem getNextFor(com.android.tools.r8.graph.Descriptor):559:559 -> a
 com.android.tools.r8.dex.DexReader -> a.a.a.a.d.p:
     com.android.tools.r8.origin.Origin com.android.tools.r8.dex.BinaryReader.origin -> a
     com.android.tools.r8.dex.CompatByteBuffer com.android.tools.r8.dex.BinaryReader.buffer -> b
@@ -9461,36 +9284,48 @@
     32:69:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):244:281 -> a
     70:71:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):257:258 -> a
     72:77:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):291:296 -> a
-    78:84:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):312:318 -> a
-    78:84:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):295 -> a
-    85:87:void writeFixedSectionItems(java.util.Collection,int,java.util.function.Consumer):323:325 -> a
-    88:88:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):339:339 -> a
-    89:93:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer,int):344:348 -> a
-    94:95:void writeTypeItem(com.android.tools.r8.graph.DexType):397:398 -> a
-    96:98:void writeProtoItem(com.android.tools.r8.graph.DexProto):402:404 -> a
-    99:106:void writeFieldItem(com.android.tools.r8.graph.DexField):408:415 -> a
-    107:114:void writeMethodItem(com.android.tools.r8.graph.DexMethod):419:426 -> a
-    115:116:void writeDebugItem(com.android.tools.r8.graph.DexDebugInfo):443:444 -> a
-    117:164:void writeCodeItem(com.android.tools.r8.graph.DexCode):448:495 -> a
-    165:170:void writeTypeList(com.android.tools.r8.graph.DexTypeList):500:505 -> a
-    171:173:void writeStringData(com.android.tools.r8.graph.DexString):510:512 -> a
-    174:174:com.android.tools.r8.graph.DexType lambda$writeAnnotationSet$2(com.android.tools.r8.graph.DexAnnotation):525:525 -> a
-    175:175:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):525:525 -> a
-    176:176:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    176:176:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):526 -> a
-    177:184:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):526:533 -> a
-    185:194:void writeAnnotationSetRefList(com.android.tools.r8.graph.ParameterAnnotationsList):538:547 -> a
-    195:197:void writeMemberAnnotations(java.util.List,java.util.function.ToIntFunction):553:555 -> a
-    198:210:void writeAnnotationDirectory(com.android.tools.r8.graph.DexAnnotationDirectory):560:572 -> a
-    211:211:int lambda$writeAnnotationDirectory$3(com.android.tools.r8.graph.DexEncodedField):569:569 -> a
-    212:219:void writeEncodedFields(java.util.List):577:584 -> a
-    220:236:void writeEncodedMethods(java.util.List,boolean):589:605 -> a
-    237:243:void addStaticFieldValues(com.android.tools.r8.graph.DexProgramClass):625:631 -> a
-    244:251:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):636:643 -> a
-    252:270:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):640:658 -> a
-    271:273:void writeCallSite(com.android.tools.r8.graph.DexCallSite):662:664 -> a
-    274:280:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):668:674 -> a
-    281:284:int writeMapItem(int,int,int):685:688 -> a
+    78:81:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):312:315 -> a
+    78:81:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):295 -> a
+    82:88:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):226:232 -> a
+    82:88:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.fromDexMethod(com.android.tools.r8.graph.DexMethod):222 -> a
+    82:88:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):315 -> a
+    82:88:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):295 -> a
+    89:89:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
+    89:89:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):232 -> a
+    89:89:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.fromDexMethod(com.android.tools.r8.graph.DexMethod):222 -> a
+    89:89:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):315 -> a
+    89:89:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):295 -> a
+    90:91:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):232:233 -> a
+    90:91:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.fromDexMethod(com.android.tools.r8.graph.DexMethod):222 -> a
+    90:91:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):315 -> a
+    90:91:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):295 -> a
+    92:94:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):316:318 -> a
+    92:94:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):295 -> a
+    95:97:void writeFixedSectionItems(java.util.Collection,int,java.util.function.Consumer):323:325 -> a
+    98:98:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):339:339 -> a
+    99:103:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer,int):344:348 -> a
+    104:105:void writeTypeItem(com.android.tools.r8.graph.DexType):397:398 -> a
+    106:108:void writeProtoItem(com.android.tools.r8.graph.DexProto):402:404 -> a
+    109:116:void writeFieldItem(com.android.tools.r8.graph.DexField):408:415 -> a
+    117:124:void writeMethodItem(com.android.tools.r8.graph.DexMethod):419:426 -> a
+    125:126:void writeDebugItem(com.android.tools.r8.graph.DexDebugInfo):443:444 -> a
+    127:174:void writeCodeItem(com.android.tools.r8.graph.DexCode):448:495 -> a
+    175:180:void writeTypeList(com.android.tools.r8.graph.DexTypeList):500:505 -> a
+    181:183:void writeStringData(com.android.tools.r8.graph.DexString):510:512 -> a
+    184:184:com.android.tools.r8.graph.DexType lambda$writeAnnotationSet$2(com.android.tools.r8.graph.DexAnnotation):525:525 -> a
+    185:192:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):525:532 -> a
+    193:202:void writeAnnotationSetRefList(com.android.tools.r8.graph.ParameterAnnotationsList):537:546 -> a
+    203:205:void writeMemberAnnotations(java.util.List,java.util.function.ToIntFunction):552:554 -> a
+    206:218:void writeAnnotationDirectory(com.android.tools.r8.graph.DexAnnotationDirectory):559:571 -> a
+    219:219:int lambda$writeAnnotationDirectory$3(com.android.tools.r8.graph.DexEncodedField):568:568 -> a
+    220:227:void writeEncodedFields(java.util.List):576:583 -> a
+    228:244:void writeEncodedMethods(java.util.List,boolean):588:604 -> a
+    245:251:void addStaticFieldValues(com.android.tools.r8.graph.DexProgramClass):624:630 -> a
+    252:259:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):635:642 -> a
+    260:278:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):639:657 -> a
+    279:281:void writeCallSite(com.android.tools.r8.graph.DexCallSite):661:663 -> a
+    282:288:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):667:673 -> a
+    289:292:int writeMapItem(int,int,int):684:687 -> a
     1:7:void checkInterfaceMethods():225:231 -> b
     1:7:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():155 -> b
     8:18:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():157:167 -> b
@@ -9507,77 +9342,77 @@
     34:40:int sizeOfCodeItems(java.lang.Iterable):356 -> b
     34:40:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():167 -> b
     41:73:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():167:199 -> b
-    74:79:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):693:698 -> b
+    74:79:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):692:697 -> b
     74:79:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    80:83:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):697:700 -> b
+    80:83:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):696:699 -> b
     80:83:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    84:87:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):699:702 -> b
+    84:87:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):698:701 -> b
     84:87:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    88:91:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):701:704 -> b
+    88:91:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):700:703 -> b
     88:91:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    92:95:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):703:706 -> b
+    92:95:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):702:705 -> b
     92:95:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    96:99:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):705:708 -> b
+    96:99:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):704:707 -> b
     96:99:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    100:103:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):707:710 -> b
+    100:103:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):706:709 -> b
     100:103:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    104:107:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):709:712 -> b
+    104:107:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):708:711 -> b
     104:107:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    108:111:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):711:714 -> b
+    108:111:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):710:713 -> b
     108:111:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    112:115:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):713:716 -> b
+    112:115:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):712:715 -> b
     112:115:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    116:119:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):715:718 -> b
+    116:119:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):714:717 -> b
     116:119:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    120:123:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):717:720 -> b
+    120:123:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):716:719 -> b
     120:123:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    124:127:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):719:722 -> b
+    124:127:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):718:721 -> b
     124:127:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    128:131:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):721:724 -> b
+    128:131:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):720:723 -> b
     128:131:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    132:135:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):723:726 -> b
+    132:135:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):722:725 -> b
     132:135:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    136:139:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):725:728 -> b
+    136:139:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):724:727 -> b
     136:139:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    140:144:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):727:731 -> b
+    140:144:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):726:730 -> b
     140:144:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    145:150:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):729:734 -> b
+    145:150:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):728:733 -> b
     145:150:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    151:157:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):732:738 -> b
+    151:157:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):731:737 -> b
     151:157:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
     158:167:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():201:210 -> b
     168:170:void writeFixedSectionItems(com.android.tools.r8.graph.DexProgramClass[],int,java.util.function.Consumer):331:333 -> b
     168:170:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():210 -> b
     171:173:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():211:213 -> b
     174:174:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():212:212 -> b
-    175:180:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):742:747 -> b
+    175:180:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):741:746 -> b
     175:180:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():216 -> b
-    181:214:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):744:777 -> b
+    181:214:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):743:776 -> b
     181:214:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():216 -> b
-    215:217:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):782:784 -> b
+    215:217:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):781:783 -> b
     215:217:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():217 -> b
-    218:220:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):783:785 -> b
+    218:220:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):782:784 -> b
     218:220:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():217 -> b
-    221:223:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):792:794 -> b
+    221:223:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):791:793 -> b
     221:223:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():218 -> b
-    224:227:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):793:796 -> b
+    224:227:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):792:795 -> b
     224:227:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():218 -> b
     228:228:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():221:221 -> b
-    229:229:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):787:787 -> b
+    229:229:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):786:786 -> b
     229:229:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():217 -> b
     230:230:void writeStringItem(com.android.tools.r8.graph.DexString):393:393 -> b
     231:236:void writeAnnotation(com.android.tools.r8.graph.DexAnnotation):516:521 -> b
-    237:237:int lambda$writeAnnotationDirectory$4(com.android.tools.r8.graph.DexEncodedMethod):571:571 -> b
-    238:248:void writeClassData(com.android.tools.r8.graph.DexProgramClass):611:621 -> b
+    237:237:int lambda$writeAnnotationDirectory$4(com.android.tools.r8.graph.DexEncodedMethod):570:570 -> b
+    238:248:void writeClassData(com.android.tools.r8.graph.DexProgramClass):610:620 -> b
     1:4:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):430:433 -> c
     5:9:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):432:436 -> c
     10:14:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):435:439 -> c
-    15:15:int lambda$writeAnnotationDirectory$5(com.android.tools.r8.graph.DexEncodedMethod):573:573 -> c
-    16:17:void checkThatInvokeCustomIsAllowed():1330:1331 -> c
+    15:15:int lambda$writeAnnotationDirectory$5(com.android.tools.r8.graph.DexEncodedMethod):572:572 -> c
+    16:17:void checkThatInvokeCustomIsAllowed():1329:1330 -> c
     1:15:java.util.List sortDexCodesByClassName():286:300 -> d
 com.android.tools.r8.dex.FileWriter$1 -> a.a.a.a.d.r:
     int[] $SwitchMap$com$android$tools$r8$graph$DexMethodHandle$MethodHandleType -> a
-    1:1:void <clinit>():638:638 -> <clinit>
+    1:1:void <clinit>():637:637 -> <clinit>
 com.android.tools.r8.dex.FileWriter$ByteBufferResult -> a.a.a.a.d.s:
     com.android.tools.r8.dex.CompatByteBuffer buffer -> a
     int length -> b
@@ -9606,39 +9441,39 @@
     int encodedArrarysOffset -> s
     int annotationSetRefListsOffset -> p
     int annotationDirectoriesOffset -> q
-    1:1:void <clinit>():804:804 -> <clinit>
-    1:1:void <init>(int,int,int,int,int,int,int,int,int):836:836 -> <init>
-    2:35:void <init>(int,int,int,int,int,int,int,int,int):820:853 -> <init>
+    1:1:void <clinit>():803:803 -> <clinit>
+    1:1:void <init>(int,int,int,int,int,int,int,int,int):835:835 -> <init>
+    2:35:void <init>(int,int,int,int,int,int,int,int,int):819:852 -> <init>
     void alreadySetOffset(int) -> a
-    1:10:com.android.tools.r8.dex.FileWriter$Layout from(com.android.tools.r8.graph.ObjectToOffsetMapping):858:867 -> a
-    11:11:boolean isValidOffset(int,boolean):877:877 -> a
-    12:13:int getAnnotationDirectoriesOffset():955:956 -> a
-    1:2:int getAnnotationSetRefListsOffset():945:946 -> b
-    3:4:void setAnnotationDirectoriesOffset(int):960:961 -> b
-    1:2:int getAnnotationSetsOffset():931:932 -> c
-    3:4:void setAnnotationSetRefListsOffset(int):950:951 -> c
-    1:2:int getAnnotationsOffset():921:922 -> d
-    3:4:void setAnnotationSetsOffset(int):940:941 -> d
-    1:2:void setAnnotationsOffset(int):926:927 -> e
-    3:4:int getClassDataOffset():965:966 -> e
-    1:2:int getCodesOffset():881:882 -> f
-    3:4:void setClassDataOffset(int):970:971 -> f
-    1:2:void setCodesOffset(int):886:887 -> g
-    3:3:int getEndOfFile():993:993 -> g
-    3:3:int getDataSectionSize():871 -> g
-    4:5:int getDataSectionSize():871:872 -> g
-    1:2:int getDebugInfosOffset():891:892 -> h
-    3:4:void setDebugInfosOffset(int):896:897 -> h
-    1:2:int getEncodedArrarysOffset():975:976 -> i
-    3:4:void setEncodedArrarysOffset(int):980:981 -> i
-    1:1:int getEndOfFile():993:993 -> j
-    2:2:void setEndOfFile(int):997:997 -> j
-    1:1:int getMapOffset():985:985 -> k
-    2:2:void setMapOffset(int):989:989 -> k
-    1:2:int getStringDataOffsets():911:912 -> l
-    3:4:void setStringDataOffsets(int):916:917 -> l
-    1:2:int getTypeListsOffset():901:902 -> m
-    3:4:void setTypeListsOffset(int):906:907 -> m
+    1:10:com.android.tools.r8.dex.FileWriter$Layout from(com.android.tools.r8.graph.ObjectToOffsetMapping):857:866 -> a
+    11:11:boolean isValidOffset(int,boolean):876:876 -> a
+    12:13:int getAnnotationDirectoriesOffset():954:955 -> a
+    1:2:int getAnnotationSetRefListsOffset():944:945 -> b
+    3:4:void setAnnotationDirectoriesOffset(int):959:960 -> b
+    1:2:int getAnnotationSetsOffset():930:931 -> c
+    3:4:void setAnnotationSetRefListsOffset(int):949:950 -> c
+    1:2:int getAnnotationsOffset():920:921 -> d
+    3:4:void setAnnotationSetsOffset(int):939:940 -> d
+    1:2:void setAnnotationsOffset(int):925:926 -> e
+    3:4:int getClassDataOffset():964:965 -> e
+    1:2:int getCodesOffset():880:881 -> f
+    3:4:void setClassDataOffset(int):969:970 -> f
+    1:2:void setCodesOffset(int):885:886 -> g
+    3:3:int getEndOfFile():992:992 -> g
+    3:3:int getDataSectionSize():870 -> g
+    4:5:int getDataSectionSize():870:871 -> g
+    1:2:int getDebugInfosOffset():890:891 -> h
+    3:4:void setDebugInfosOffset(int):895:896 -> h
+    1:2:int getEncodedArrarysOffset():974:975 -> i
+    3:4:void setEncodedArrarysOffset(int):979:980 -> i
+    1:1:int getEndOfFile():992:992 -> j
+    2:2:void setEndOfFile(int):996:996 -> j
+    1:1:int getMapOffset():984:984 -> k
+    2:2:void setMapOffset(int):988:988 -> k
+    1:2:int getStringDataOffsets():910:911 -> l
+    3:4:void setStringDataOffsets(int):915:916 -> l
+    1:2:int getTypeListsOffset():900:901 -> m
+    3:4:void setTypeListsOffset(int):905:906 -> m
 com.android.tools.r8.dex.FileWriter$MixedSectionOffsets -> a.a.a.a.d.u:
     boolean $assertionsDisabled -> n
     int minApiLevel -> m
@@ -9654,102 +9489,102 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap classesWithData -> j
     java.util.Map clazzToAnnotationDirectory -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap encodedArrays -> k
-    1:1:void <clinit>():1009:1009 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping):1045:1045 -> <init>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.dex.FileWriter$1):1009 -> <init>
-    2:33:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping):1016:1047 -> <init>
-    2:33:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.dex.FileWriter$1):1009 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$100(com.android.tools.r8.dex.FileWriter$MixedSectionOffsets):1009:1009 -> a
-    2:3:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,java.lang.Object):1051:1052 -> a
-    4:4:boolean add(com.android.tools.r8.graph.DexProgramClass):1068:1068 -> a
-    5:5:boolean add(com.android.tools.r8.graph.DexEncodedArray):1073:1073 -> a
-    6:9:boolean add(com.android.tools.r8.graph.DexAnnotationSet):1080:1083 -> a
-    10:10:void visit(com.android.tools.r8.graph.DexEncodedMethod):1088:1088 -> a
-    11:11:boolean add(com.android.tools.r8.graph.DexCode):1093:1093 -> a
-    12:13:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1059:1060 -> a
-    12:13:boolean add(com.android.tools.r8.graph.DexCode):1093 -> a
-    14:14:boolean add(com.android.tools.r8.graph.DexDebugInfo):1098:1098 -> a
-    15:18:boolean add(com.android.tools.r8.graph.DexTypeList):1103:1106 -> a
-    19:22:boolean add(com.android.tools.r8.graph.ParameterAnnotationsList):1111:1114 -> a
-    23:23:boolean add(com.android.tools.r8.graph.DexAnnotation):1119:1119 -> a
-    24:26:boolean setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory):1125:1127 -> a
-    27:27:boolean add(com.android.tools.r8.graph.DexString):1131:1131 -> a
-    28:29:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1059:1060 -> a
-    28:29:boolean add(com.android.tools.r8.graph.DexString):1131 -> a
-    30:30:java.util.Collection getAnnotationDirectories():1167:1167 -> a
+    1:1:void <clinit>():1008:1008 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping):1044:1044 -> <init>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.dex.FileWriter$1):1008 -> <init>
+    2:33:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping):1015:1046 -> <init>
+    2:33:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.dex.FileWriter$1):1008 -> <init>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$100(com.android.tools.r8.dex.FileWriter$MixedSectionOffsets):1008:1008 -> a
+    2:3:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,java.lang.Object):1050:1051 -> a
+    4:4:boolean add(com.android.tools.r8.graph.DexProgramClass):1067:1067 -> a
+    5:5:boolean add(com.android.tools.r8.graph.DexEncodedArray):1072:1072 -> a
+    6:9:boolean add(com.android.tools.r8.graph.DexAnnotationSet):1079:1082 -> a
+    10:10:void visit(com.android.tools.r8.graph.DexEncodedMethod):1087:1087 -> a
+    11:11:boolean add(com.android.tools.r8.graph.DexCode):1092:1092 -> a
+    12:13:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1058:1059 -> a
+    12:13:boolean add(com.android.tools.r8.graph.DexCode):1092 -> a
+    14:14:boolean add(com.android.tools.r8.graph.DexDebugInfo):1097:1097 -> a
+    15:18:boolean add(com.android.tools.r8.graph.DexTypeList):1102:1105 -> a
+    19:22:boolean add(com.android.tools.r8.graph.ParameterAnnotationsList):1110:1113 -> a
+    23:23:boolean add(com.android.tools.r8.graph.DexAnnotation):1118:1118 -> a
+    24:26:boolean setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory):1124:1126 -> a
+    27:27:boolean add(com.android.tools.r8.graph.DexString):1130:1130 -> a
+    28:29:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1058:1059 -> a
+    28:29:boolean add(com.android.tools.r8.graph.DexString):1130 -> a
+    30:30:java.util.Collection getAnnotationDirectories():1166:1166 -> a
     31:31:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.keySet():87:87 -> a
-    31:31:java.util.Collection getAnnotationDirectories():1167 -> a
-    32:33:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1178:1179 -> a
-    34:35:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1187:1188 -> a
-    36:37:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1250:1251 -> a
-    38:39:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1255:1256 -> a
-    40:40:void setOffsetFor(com.android.tools.r8.graph.DexDebugInfo,int):1260:1260 -> a
-    41:41:void setOffsetFor(com.android.tools.r8.graph.DexCode,int):1264:1264 -> a
-    42:43:void setOffsetFor(com.android.tools.r8.graph.DexTypeList,int):1268:1269 -> a
-    44:44:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1273:1273 -> a
-    45:45:void setOffsetFor(com.android.tools.r8.graph.DexAnnotation,int):1277:1277 -> a
-    46:47:void setOffsetFor(com.android.tools.r8.graph.DexAnnotationSet,int):1283:1284 -> a
-    48:48:void setOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexAnnotationDirectory,int):1288:1288 -> a
-    49:49:void setOffsetFor(com.android.tools.r8.graph.DexProgramClass,int):1292:1292 -> a
-    50:50:void setOffsetFor(com.android.tools.r8.graph.DexEncodedArray,int):1296:1296 -> a
-    51:52:void setOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList,int):1300:1301 -> a
-    1:1:java.util.Collection getAnnotationSetRefLists():1159:1159 -> b
+    31:31:java.util.Collection getAnnotationDirectories():1166 -> a
+    32:33:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1177:1178 -> a
+    34:35:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1186:1187 -> a
+    36:37:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1249:1250 -> a
+    38:39:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1254:1255 -> a
+    40:40:void setOffsetFor(com.android.tools.r8.graph.DexDebugInfo,int):1259:1259 -> a
+    41:41:void setOffsetFor(com.android.tools.r8.graph.DexCode,int):1263:1263 -> a
+    42:43:void setOffsetFor(com.android.tools.r8.graph.DexTypeList,int):1267:1268 -> a
+    44:44:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1272:1272 -> a
+    45:45:void setOffsetFor(com.android.tools.r8.graph.DexAnnotation,int):1276:1276 -> a
+    46:47:void setOffsetFor(com.android.tools.r8.graph.DexAnnotationSet,int):1282:1283 -> a
+    48:48:void setOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexAnnotationDirectory,int):1287:1287 -> a
+    49:49:void setOffsetFor(com.android.tools.r8.graph.DexProgramClass,int):1291:1291 -> a
+    50:50:void setOffsetFor(com.android.tools.r8.graph.DexEncodedArray,int):1295:1295 -> a
+    51:52:void setOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList,int):1299:1300 -> a
+    1:1:java.util.Collection getAnnotationSetRefLists():1158:1158 -> b
     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 -> b
-    2:2:java.util.Collection getAnnotationSetRefLists():1159 -> b
-    3:3:int getOffsetFor(com.android.tools.r8.graph.DexString):1193:1193 -> b
-    4:7:int getOffsetFor(com.android.tools.r8.graph.DexTypeList):1197:1200 -> b
-    8:8:int getOffsetFor(com.android.tools.r8.graph.DexProgramClass):1204:1204 -> b
-    9:9:int getOffsetFor(com.android.tools.r8.graph.DexEncodedArray):1208:1208 -> b
-    10:10:int getOffsetFor(com.android.tools.r8.graph.DexDebugInfo):1212:1212 -> b
-    11:11:int getOffsetFor(com.android.tools.r8.graph.DexAnnotation):1226:1226 -> b
-    12:15:int getOffsetFor(com.android.tools.r8.graph.DexAnnotationSet):1232:1235 -> b
-    16:19:int getOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList):1239:1242 -> b
-    20:20:int getOffsetFor(com.android.tools.r8.graph.DexCode):1246:1246 -> b
-    1:1:java.util.Collection getAnnotationSets():1155:1155 -> c
+    2:2:java.util.Collection getAnnotationSetRefLists():1158 -> b
+    3:3:int getOffsetFor(com.android.tools.r8.graph.DexString):1192:1192 -> b
+    4:7:int getOffsetFor(com.android.tools.r8.graph.DexTypeList):1196:1199 -> b
+    8:8:int getOffsetFor(com.android.tools.r8.graph.DexProgramClass):1203:1203 -> b
+    9:9:int getOffsetFor(com.android.tools.r8.graph.DexEncodedArray):1207:1207 -> b
+    10:10:int getOffsetFor(com.android.tools.r8.graph.DexDebugInfo):1211:1211 -> b
+    11:11:int getOffsetFor(com.android.tools.r8.graph.DexAnnotation):1225:1225 -> b
+    12:15:int getOffsetFor(com.android.tools.r8.graph.DexAnnotationSet):1231:1234 -> b
+    16:19:int getOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList):1238:1241 -> b
+    20:20:int getOffsetFor(com.android.tools.r8.graph.DexCode):1245:1245 -> b
+    1:1:java.util.Collection getAnnotationSets():1154:1154 -> 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 getAnnotationSets():1155 -> c
-    3:7:int getOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexProgramClass):1217:1221 -> c
-    1:1:java.util.Collection getAnnotations():1151:1151 -> d
+    2:2:java.util.Collection getAnnotationSets():1154 -> c
+    3:7:int getOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexProgramClass):1216:1220 -> c
+    1:1:java.util.Collection getAnnotations():1150:1150 -> d
     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 -> d
-    2:2:java.util.Collection getAnnotations():1151 -> d
-    1:1:java.util.Collection getClassesWithData():1163:1163 -> e
+    2:2:java.util.Collection getAnnotations():1150 -> d
+    1:1:java.util.Collection getClassesWithData():1162:1162 -> e
     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 -> e
-    2:2:java.util.Collection getClassesWithData():1163 -> e
-    1:1:java.util.Collection getCodes():1135:1135 -> f
-    1:1:java.util.Collection getDebugInfos():1139:1139 -> g
+    2:2:java.util.Collection getClassesWithData():1162 -> e
+    1:1:java.util.Collection getCodes():1134:1134 -> f
+    1:1:java.util.Collection getDebugInfos():1138:1138 -> g
     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 -> g
-    2:2:java.util.Collection getDebugInfos():1139 -> g
-    1:1:java.util.Collection getEncodedArrays():1171:1171 -> h
+    2:2:java.util.Collection getDebugInfos():1138 -> g
+    1:1:java.util.Collection getEncodedArrays():1170:1170 -> h
     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 -> h
-    2:2:java.util.Collection getEncodedArrays():1171 -> h
-    1:1:java.util.Collection getStringData():1147:1147 -> i
-    1:1:java.util.Collection getTypeLists():1143:1143 -> j
+    2:2:java.util.Collection getEncodedArrays():1170 -> h
+    1:1:java.util.Collection getStringData():1146:1146 -> i
+    1:1:java.util.Collection getTypeLists():1142:1142 -> j
     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 -> j
-    2:2:java.util.Collection getTypeLists():1143 -> j
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap createObject2IntMap():1034:1035 -> k
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1040:1040 -> l
+    2:2:java.util.Collection getTypeLists():1142 -> j
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap createObject2IntMap():1033:1034 -> k
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1039:1039 -> l
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.<init>():176:176 -> l
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1040 -> l
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1041:1041 -> l
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1039 -> l
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1040:1040 -> l
 com.android.tools.r8.dex.FileWriter$ProgramClassDependencyCollector -> a.a.a.a.d.v:
     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[]):1309:1310 -> <init>
-    3:7:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1307:1311 -> <init>
+    1:2:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1308:1309 -> <init>
+    3:7:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1306:1310 -> <init>
     void visit(com.android.tools.r8.graph.DexType) -> a
-    1:4:void visit(com.android.tools.r8.graph.DexClass):1322:1325 -> a
+    1:4:void visit(com.android.tools.r8.graph.DexClass):1321:1324 -> a
 com.android.tools.r8.dex.IndexedItemCollection -> a.a.a.a.d.x:
     boolean addCallSite(com.android.tools.r8.graph.DexCallSite) -> a
     boolean addClass(com.android.tools.r8.graph.DexProgramClass) -> a
+    boolean addField(com.android.tools.r8.graph.DexField) -> a
+    boolean addMethod(com.android.tools.r8.graph.DexMethod) -> a
     boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle) -> a
     boolean addProto(com.android.tools.r8.graph.DexProto) -> a
     boolean addString(com.android.tools.r8.graph.DexString) -> a
-    com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType) -> a
-    com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField) -> a
-    com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod) -> a
-    boolean addField(com.android.tools.r8.graph.DexField) -> b
-    boolean addMethod(com.android.tools.r8.graph.DexMethod) -> b
-    boolean addType(com.android.tools.r8.graph.DexType) -> b
+    boolean addType(com.android.tools.r8.graph.DexType) -> a
+    com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType) -> b
+    com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField) -> b
+    com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod) -> b
 com.android.tools.r8.dex.InheritanceClassInDexDistributor -> a.a.a.a.d.B:
     com.android.tools.r8.dex.VirtualFile mainDex -> b
     com.android.tools.r8.dex.InheritanceClassInDexDistributor$DirectSubClassesInfo directSubClasses -> i
@@ -9789,7 +9624,7 @@
     102:102:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):447 -> a
     103:106:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):450:453 -> a
     107:107:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):442:442 -> a
-    108:108:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():628:628 -> a
+    108:108:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():624:624 -> a
     108:108:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):443 -> a
     109:109:java.lang.String com.android.tools.r8.origin.Origin.toString():153:153 -> a
     109:109:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):443 -> a
@@ -9822,7 +9657,7 @@
     108:108:void markDexFull(com.android.tools.r8.dex.VirtualFile):716:716 -> b
     108:108:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):643 -> b
     109:109:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):637:637 -> b
-    110:110:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():628:628 -> b
+    110:110:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():624:624 -> b
     110:110:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):638 -> b
     111:111:java.lang.String com.android.tools.r8.origin.Origin.toString():153:153 -> b
     111:111:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):638 -> b
@@ -10359,21 +10194,21 @@
     1:1:java.util.Set access$1400(com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction):523:523 -> a
     2:5:boolean maybeInsert(com.android.tools.r8.graph.DexItem,java.util.Set,java.util.Set):544:547 -> a
     6:6:boolean addClass(com.android.tools.r8.graph.DexProgramClass):557:557 -> a
-    7:7:boolean addString(com.android.tools.r8.graph.DexString):572:572 -> a
-    8:8:boolean addProto(com.android.tools.r8.graph.DexProto):577:577 -> a
-    9:9:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):587:587 -> a
-    10:10:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):592:592 -> a
-    11:11:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):597:597 -> a
-    12:13:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):602:603 -> a
-    14:14:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):608:608 -> a
-    15:19:void commitItemsIn(java.util.Set,java.util.function.Function):620:624 -> a
-    20:21:void lambda$commitItemsIn$0(java.util.function.Function,com.android.tools.r8.graph.DexItem):621:622 -> a
-    22:27:void abort():639:644 -> a
+    7:7:boolean addField(com.android.tools.r8.graph.DexField):562:562 -> a
+    8:8:boolean addMethod(com.android.tools.r8.graph.DexMethod):567:567 -> a
+    9:9:boolean addString(com.android.tools.r8.graph.DexString):572:572 -> a
+    10:10:boolean addProto(com.android.tools.r8.graph.DexProto):577:577 -> a
+    11:11:boolean addType(com.android.tools.r8.graph.DexType):582:582 -> a
+    12:12:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):587:587 -> a
+    13:13:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):592:592 -> a
+    14:18:void commitItemsIn(java.util.Set,java.util.function.Function):620:624 -> a
+    19:20:void lambda$commitItemsIn$0(java.util.function.Function,com.android.tools.r8.graph.DexItem):621:622 -> a
+    21:26:void abort():639:644 -> a
     1:1:void addClassAndDependencies(com.android.tools.r8.graph.DexProgramClass):552:552 -> b
-    2:2:boolean addField(com.android.tools.r8.graph.DexField):562:562 -> b
-    3:3:boolean addMethod(com.android.tools.r8.graph.DexMethod):567:567 -> b
-    4:4:boolean addType(com.android.tools.r8.graph.DexType):582:582 -> b
-    5:12:void commit():628:635 -> b
+    2:2:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):597:597 -> b
+    3:4:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):602:603 -> b
+    5:5:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):608:608 -> b
+    6:13:void commit():628:635 -> b
     1:1:int getNumberOfClasses():653:653 -> c
     1:1:int getNumberOfFields():616:616 -> d
     1:1:int getNumberOfMethods():612:612 -> e
@@ -10434,19 +10269,19 @@
     2:13:void <init>(com.android.tools.r8.naming.NamingLens):439:450 -> <init>
     1:1:java.util.Set access$100(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):435:435 -> a
     2:2:boolean addClass(com.android.tools.r8.graph.DexProgramClass):456:456 -> a
-    3:3:boolean addString(com.android.tools.r8.graph.DexString):471:471 -> a
-    4:4:boolean addProto(com.android.tools.r8.graph.DexProto):476:476 -> a
-    5:5:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):486:486 -> a
-    6:6:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):491:491 -> a
-    7:7:int getNumberOfFields():499:499 -> a
-    8:8:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):508:508 -> a
-    9:10:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):513:514 -> a
-    11:11:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):519:519 -> a
+    3:3:boolean addField(com.android.tools.r8.graph.DexField):461:461 -> a
+    4:4:boolean addMethod(com.android.tools.r8.graph.DexMethod):466:466 -> a
+    5:5:boolean addString(com.android.tools.r8.graph.DexString):471:471 -> a
+    6:6:boolean addProto(com.android.tools.r8.graph.DexProto):476:476 -> a
+    7:7:boolean addType(com.android.tools.r8.graph.DexType):481:481 -> a
+    8:8:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):486:486 -> a
+    9:9:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):491:491 -> a
+    10:10:int getNumberOfFields():499:499 -> a
     1:1:java.util.Set access$200(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):435:435 -> b
-    2:2:boolean addField(com.android.tools.r8.graph.DexField):461:461 -> b
-    3:3:boolean addMethod(com.android.tools.r8.graph.DexMethod):466:466 -> b
-    4:4:boolean addType(com.android.tools.r8.graph.DexType):481:481 -> b
-    5:5:int getNumberOfMethods():495:495 -> b
+    2:2:int getNumberOfMethods():495:495 -> b
+    3:3:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):508:508 -> b
+    4:5:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):513:514 -> b
+    6:6:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):519:519 -> b
     1:1:java.util.Set access$300(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):435:435 -> c
     1:1:java.util.Set access$400(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):435:435 -> d
     1:1:java.util.Set access$500(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):435:435 -> e
@@ -10465,7 +10300,7 @@
     6:8:void <init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):37:39 -> <init>
     1:1:com.android.tools.r8.origin.Origin getOrigin():44:44 -> a
     1:1:java.lang.String getDiagnosticMessage():54:54 -> b
-    1:1:com.android.tools.r8.position.Position getPosition():49:49 -> c
+    1:1:com.android.tools.r8.position.Position getPosition():49:49 -> getPosition
 com.android.tools.r8.errors.DexFileOverflowDiagnostic -> a.a.a.a.e.b:
     long numOfMethods -> b
     long numOfFields -> c
@@ -10491,8 +10326,7 @@
     19:19:long getNumberOfFields():34:34 -> b
     19:19:java.lang.String getDiagnosticMessage():92 -> b
     20:24:java.lang.String getDiagnosticMessage():92:96 -> b
-    com.android.tools.r8.position.Position getPosition() -> c
-    1:1:boolean hasMainDexSpecification():54:54 -> d
+    1:1:boolean hasMainDexSpecification():54:54 -> c
 com.android.tools.r8.errors.InternalCompilerError -> a.a.a.a.e.c:
     1:1:void <init>():14:14 -> <init>
     2:2:void <init>(java.lang.String):18:18 -> <init>
@@ -10549,88 +10383,84 @@
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexApplication):34:34 -> <init>
     2:15:void <init>(com.android.tools.r8.graph.DexApplication):23:36 -> <init>
-    1:1:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getKey():72:72 -> a
-    1:1:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):96 -> a
-    2:2:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):96:96 -> a
-    3:4:com.android.tools.r8.graph.DexItemFactory dexItemFactory():75:76 -> a
-    5:6:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):80:81 -> a
-    7:14:boolean com.android.tools.r8.graph.DexType.isD8R8SynthesizedClassType():238:245 -> a
-    7:14:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):81 -> a
-    15:17:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):81:83 -> a
-    18:24:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):126:132 -> a
-    25:30:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):143:148 -> a
-    31:32:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):155:156 -> a
-    33:37:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):241:245 -> a
-    38:40:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):327:329 -> a
-    41:61:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):328:348 -> a
-    62:85:com.android.tools.r8.graph.DexEncodedMethod resolveMethodStep3Helper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfo$MultiResultBuilder):385:408 -> a
-    86:105:com.android.tools.r8.graph.DexEncodedField resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):496:515 -> a
-    106:110:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):557:561 -> a
-    111:111:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():754:754 -> a
-    111:111:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):95 -> a
-    112:112:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):95:95 -> a
-    1:2:com.android.tools.r8.graph.DexApplication app():69:70 -> b
-    3:6:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod):228:231 -> b
-    7:8:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):259:260 -> b
-    9:14:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):280:285 -> b
-    9:14:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):261 -> b
-    15:19:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):263:267 -> b
-    20:45:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):426:451 -> b
-    20:45:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):268 -> b
-    46:46:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):432:432 -> b
-    46:46:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):268 -> b
-    47:47:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):269:269 -> b
-    48:56:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):364:372 -> b
-    57:58:com.android.tools.r8.graph.DexEncodedField resolveField(com.android.tools.r8.graph.DexField):485:486 -> b
-    59:60:boolean isInMainDexList(com.android.tools.r8.graph.DexType):593:594 -> b
-    1:1:boolean checkIfObsolete():64:64 -> c
-    2:4:com.android.tools.r8.origin.Origin originFor(com.android.tools.r8.graph.DexType):136:138 -> c
-    5:8:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod):180:183 -> c
-    9:21:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):301:313 -> c
-    22:22:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):305:305 -> c
-    1:5:java.util.Map computeDefinitions(com.android.tools.r8.graph.DexType):92:96 -> d
-    6:10:void com.android.tools.r8.graph.DexClass.forEachField(java.util.function.Consumer):346:350 -> d
-    6:10:java.util.Map computeDefinitions(com.android.tools.r8.graph.DexType):96 -> d
-    11:11:java.util.Map computeDefinitions(com.android.tools.r8.graph.DexType):98:98 -> d
-    12:13:java.lang.Iterable classes():102:103 -> d
-    1:7:java.util.Map getDefinitions(com.android.tools.r8.graph.DexType):160:166 -> e
-    8:8:boolean hasLiveness():578:578 -> e
-    1:1:boolean hasSubtyping():568:568 -> f
-    1:1:boolean isObsolete():52:52 -> g
-    1:1:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):589:589 -> h
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():583:583 -> i
+    1:2:com.android.tools.r8.graph.DexItemFactory dexItemFactory():71:72 -> a
+    3:3:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getKey():72:72 -> a
+    3:3:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):92 -> a
+    4:4:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):92:92 -> a
+    5:6:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):76:77 -> a
+    7:14:boolean com.android.tools.r8.graph.DexType.isD8R8SynthesizedClassType():480:487 -> a
+    7:14:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):77 -> a
+    15:17:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):77:79 -> a
+    18:24:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):122:128 -> a
+    25:30:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):139:144 -> a
+    31:32:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):151:152 -> a
+    33:37:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):237:241 -> a
+    38:40:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):323:325 -> a
+    41:61:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):324:344 -> a
+    62:85:com.android.tools.r8.graph.DexEncodedMethod resolveMethodStep3Helper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfo$MultiResultBuilder):381:404 -> a
+    86:105:com.android.tools.r8.graph.DexEncodedField resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):492:511 -> a
+    106:110:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):553:557 -> a
+    111:111:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):585:585 -> a
+    112:112:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():725:725 -> a
+    112:112:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):91 -> a
+    113:113:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):91:91 -> a
+    1:2:com.android.tools.r8.graph.DexApplication app():65:66 -> b
+    3:6:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod):224:227 -> b
+    7:8:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):255:256 -> b
+    9:14:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):276:281 -> b
+    9:14:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):257 -> b
+    15:19:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):259:263 -> b
+    20:45:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):422:447 -> b
+    20:45:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):264 -> b
+    46:46:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):428:428 -> b
+    46:46:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):264 -> b
+    47:47:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):265:265 -> b
+    48:56:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):360:368 -> b
+    57:58:com.android.tools.r8.graph.DexEncodedField resolveField(com.android.tools.r8.graph.DexField):481:482 -> b
+    59:60:boolean isInMainDexList(com.android.tools.r8.graph.DexType):589:590 -> b
+    1:1:boolean checkIfObsolete():60:60 -> c
+    2:4:com.android.tools.r8.origin.Origin originFor(com.android.tools.r8.graph.DexType):132:134 -> c
+    5:8:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod):176:179 -> c
+    9:21:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):297:309 -> c
+    22:22:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):301:301 -> c
+    1:5:java.util.Map computeDefinitions(com.android.tools.r8.graph.DexType):88:92 -> d
+    6:10:void com.android.tools.r8.graph.DexClass.forEachField(java.util.function.Consumer):344:348 -> d
+    6:10:java.util.Map computeDefinitions(com.android.tools.r8.graph.DexType):92 -> d
+    11:11:java.util.Map computeDefinitions(com.android.tools.r8.graph.DexType):94:94 -> d
+    12:13:java.lang.Iterable classes():98:99 -> d
+    1:7:java.util.Map getDefinitions(com.android.tools.r8.graph.DexType):156:162 -> e
+    8:8:boolean hasLiveness():574:574 -> e
+    1:1:boolean isObsolete():48:48 -> f
+    1:1:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness withLiveness():579:579 -> g
 com.android.tools.r8.graph.AppInfo$1 -> a.a.a.a.f.b:
 com.android.tools.r8.graph.AppInfo$EmptyResult -> a.a.a.a.f.c:
     com.android.tools.r8.graph.AppInfo$EmptyResult SINGLETON -> a
-    1:1:void <clinit>():675:675 -> <clinit>
-    1:1:void <init>():677:677 -> <init>
-    boolean hasSingleTarget() -> a
-    com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> b
-    1:1:java.util.List asListOfTargets():702:702 -> c
-    1:1:com.android.tools.r8.graph.AppInfo$EmptyResult get():682:682 -> d
-    1:1:com.android.tools.r8.graph.AppInfo$EmptyResult access$000():673 -> d
+    1:1:void <clinit>():671:671 -> <clinit>
+    1:1:void <init>():673:673 -> <init>
+    com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> a
+    boolean hasSingleTarget() -> b
+    1:1:com.android.tools.r8.graph.AppInfo$EmptyResult get():678:678 -> c
+    1:1:com.android.tools.r8.graph.AppInfo$EmptyResult access$000():669 -> c
 com.android.tools.r8.graph.AppInfo$MultiResult -> a.a.a.a.f.d:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList methods -> a
-    1:1:void <clinit>():636:636 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):640:642 -> <init>
-    1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.graph.AppInfo$1):636 -> <init>
-    boolean hasSingleTarget() -> a
-    com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> b
-    1:1:java.util.List asListOfTargets():664:664 -> c
+    1:1:void <clinit>():632:632 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):636:638 -> <init>
+    1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.graph.AppInfo$1):632 -> <init>
+    com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> a
+    boolean hasSingleTarget() -> b
 com.android.tools.r8.graph.AppInfo$MultiResultBuilder -> a.a.a.a.f.e:
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder builder -> a
     com.android.tools.r8.graph.DexEncodedMethod singleResult -> b
-    1:1:void <init>():610:610 -> <init>
-    1:1:void <init>(com.android.tools.r8.graph.AppInfo$1):610 -> <init>
-    1:8:void add(com.android.tools.r8.graph.DexEncodedMethod):616:623 -> a
-    9:12:com.android.tools.r8.graph.AppInfo$ResolutionResult build():628:631 -> a
+    1:1:void <init>():606:606 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppInfo$1):606 -> <init>
+    1:8:void add(com.android.tools.r8.graph.DexEncodedMethod):612:619 -> a
+    9:12:com.android.tools.r8.graph.AppInfo$ResolutionResult build():624:627 -> a
 com.android.tools.r8.graph.AppInfo$ResolutionResult -> a.a.a.a.f.f:
-    boolean hasSingleTarget() -> a
-    com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> b
-    java.util.List asListOfTargets() -> c
+    com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> a
+    boolean hasSingleTarget() -> b
 com.android.tools.r8.graph.AppInfoWithSubtyping -> a.a.a.a.f.h:
-    1:8:void <clinit>():25:32 -> <clinit>
+    1:1:void <clinit>():21:21 -> <clinit>
 com.android.tools.r8.graph.AppView -> a.a.a.a.f.j:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView$WholeProgramOptimizations wholeProgramOptimizations -> c
@@ -10638,50 +10468,38 @@
     boolean $assertionsDisabled -> f
     com.android.tools.r8.utils.InternalOptions options -> e
     com.android.tools.r8.graph.AppInfo appInfo -> a
-    1:1:void <clinit>():13:13 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):30:35 -> <init>
-    1:1:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):39:39 -> a
-    2:2:com.android.tools.r8.graph.AppInfo appInfo():47:47 -> a
-    2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):87 -> a
-    3:3:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):87:87 -> a
-    4:4:com.android.tools.r8.graph.AppInfo appInfo():47:47 -> a
-    4:4:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):77 -> a
-    5:5:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):77:77 -> a
-    6:6:com.android.tools.r8.graph.AppInfo appInfo():47:47 -> a
-    6:6:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):82 -> a
-    7:7:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):82:82 -> a
-    8:8:com.android.tools.r8.graph.AppInfo appInfo():47:47 -> a
-    8:8:com.android.tools.r8.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):164 -> a
-    9:11:com.android.tools.r8.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):164:166 -> a
-    12:12:com.android.tools.r8.graph.DexItemFactory dexItemFactory():107:107 -> a
-    13:14:boolean setGraphLense(com.android.tools.r8.graph.GraphLense):120:121 -> a
-    1:1:com.android.tools.r8.graph.AppInfo appInfo():47:47 -> b
-    2:3:com.android.tools.r8.OptionalBool isInterface(com.android.tools.r8.graph.DexType):93:94 -> b
-    4:4:com.android.tools.r8.graph.AppInfo appInfo():47:47 -> b
-    4:4:com.android.tools.r8.OptionalBool isInterface(com.android.tools.r8.graph.DexType):94 -> b
-    5:5:com.android.tools.r8.OptionalBool isInterface(com.android.tools.r8.graph.DexType):94:94 -> b
-    6:6:com.android.tools.r8.graph.AppInfo appInfo():47:47 -> b
-    6:6:com.android.tools.r8.OptionalBool isInterface(com.android.tools.r8.graph.DexType):95 -> b
-    7:14:com.android.tools.r8.OptionalBool isInterface(com.android.tools.r8.graph.DexType):95:102 -> b
-    1:1:boolean enableWholeProgramOptimizations():111:111 -> c
-    1:1:com.android.tools.r8.graph.GraphLense graphLense():115:115 -> d
-    1:1:com.android.tools.r8.utils.InternalOptions options():128:128 -> e
-    com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet() -> f
-    com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses verticallyMergedClasses() -> g
-    com.android.tools.r8.graph.AppView withLiveness() -> h
-    1:1:com.android.tools.r8.graph.AppView withSubtyping():152:152 -> i
+    1:1:void <clinit>():11:11 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):27:32 -> <init>
+    1:1:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):36:36 -> a
+    2:2:com.android.tools.r8.graph.AppInfo appInfo():44:44 -> a
+    2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):81 -> a
+    3:3:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):81:81 -> a
+    4:4:com.android.tools.r8.graph.AppInfo appInfo():44:44 -> a
+    4:4:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):71 -> a
+    5:5:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):71:71 -> a
+    6:6:com.android.tools.r8.graph.AppInfo appInfo():44:44 -> a
+    6:6:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):76 -> a
+    7:7:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):76:76 -> a
+    8:8:com.android.tools.r8.graph.DexItemFactory dexItemFactory():86:86 -> a
+    9:9:void setGraphLense(com.android.tools.r8.graph.GraphLense):98:98 -> a
+    1:1:com.android.tools.r8.graph.AppInfo appInfo():44:44 -> b
+    1:1:boolean enableWholeProgramOptimizations():90:90 -> c
+    1:1:com.android.tools.r8.graph.GraphLense graphLense():94:94 -> d
+    1:1:com.android.tools.r8.utils.InternalOptions options():102:102 -> e
+    com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses verticallyMergedClasses() -> f
+    com.android.tools.r8.graph.AppView withLiveness() -> g
 com.android.tools.r8.graph.AppView$WholeProgramOptimizations -> a.a.a.a.f.i:
     com.android.tools.r8.graph.AppView$WholeProgramOptimizations ON -> a
     com.android.tools.r8.graph.AppView$WholeProgramOptimizations OFF -> b
-    1:2:void <clinit>():16:17 -> <clinit>
-    3:3:void <clinit>():15:15 -> <clinit>
-    1:1:void <init>(java.lang.String,int):15:15 -> <init>
+    1:2:void <clinit>():14:15 -> <clinit>
+    3:3:void <clinit>():13:13 -> <clinit>
+    1:1:void <init>(java.lang.String,int):13:13 -> <init>
 com.android.tools.r8.graph.CachedHashValueDexItem -> a.a.a.a.f.k:
     int hash -> a
     1:5:void <init>():9:13 -> <init>
     boolean computeEquals(java.lang.Object) -> b
+    int computeHashCode() -> e
     1:1:boolean equals(java.lang.Object):40:40 -> equals
-    int computeHashCode() -> f
     1:7:int hashCode():21:27 -> hashCode
 com.android.tools.r8.graph.CfCode -> a.a.a.a.f.m:
     boolean $assertionsDisabled -> i
@@ -10696,17 +10514,17 @@
     1:2:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):219:220 -> a
     3:15:com.android.tools.r8.ir.code.IRCode internalBuild(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):246:258 -> a
     1:1:boolean computeEquals(java.lang.Object):201:201 -> b
-    1:1:int computeHashCode():196:196 -> f
-    com.android.tools.r8.graph.CfCode asCfCode() -> g
-    boolean isCfCode() -> l
-    1:2:boolean isEmptyVoidMethod():206:207 -> n
-    1:1:java.util.List getInstructions():114:114 -> p
-    1:1:java.util.List getLocalVariables():118:118 -> q
-    1:1:int getMaxLocals():106:106 -> r
-    1:1:int getMaxStack():102:102 -> s
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():98:98 -> t
+    1:1:int computeHashCode():196:196 -> e
+    com.android.tools.r8.graph.CfCode asCfCode() -> f
+    boolean isCfCode() -> k
+    1:2:boolean isEmptyVoidMethod():206:207 -> m
+    1:1:java.util.List getInstructions():114:114 -> o
+    1:1:java.util.List getLocalVariables():118:118 -> p
+    1:1:int getMaxLocals():106:106 -> q
+    1:1:int getMaxStack():102:102 -> r
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():98:98 -> s
+    1:1:java.util.List getTryCatchRanges():110:110 -> t
     1:1:java.lang.String toString():275:275 -> toString
-    1:1:java.util.List getTryCatchRanges():110:110 -> u
 com.android.tools.r8.graph.CfCode$LocalVariableInfo -> a.a.a.a.f.l:
     com.android.tools.r8.graph.DebugLocalInfo local -> b
     boolean $assertionsDisabled -> e
@@ -10745,8 +10563,7 @@
     1:1:void unsetAbstract():145:145 -> w
     1:1:void unsetAnnotation():157:157 -> x
     1:1:void unsetInterface():133:133 -> y
-com.android.tools.r8.graph.ClassHierarchy -> a.a.a.a.f.o:
-com.android.tools.r8.graph.ClassKind -> a.a.a.a.f.q:
+com.android.tools.r8.graph.ClassKind -> a.a.a.a.f.p:
     com.android.tools.r8.graph.ClassKind CLASSPATH -> d
     com.android.tools.r8.graph.ClassKind LIBRARY -> e
     java.util.function.Predicate check -> b
@@ -10760,25 +10577,25 @@
     2:2:boolean isOfKind(com.android.tools.r8.graph.DexClass):81:81 -> a
     3:3:java.util.function.Consumer bridgeConsumer(java.util.function.Consumer):85:85 -> a
     4:6:void lambda$bridgeConsumer$0(java.util.function.Consumer,com.android.tools.r8.graph.DexClass):86:88 -> a
-com.android.tools.r8.graph.ClassKind$Factory -> a.a.a.a.f.p:
+com.android.tools.r8.graph.ClassKind$Factory -> a.a.a.a.f.o:
     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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean) -> a
-com.android.tools.r8.graph.Code -> a.a.a.a.f.r:
+com.android.tools.r8.graph.Code -> a.a.a.a.f.q:
     com.android.tools.r8.graph.DexEncodedMethod owner -> b
     1:1:void <init>():16:16 -> <init>
     com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin) -> a
     1:1:void setOwner(com.android.tools.r8.graph.DexEncodedMethod):22:22 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):104:104 -> a
     3:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):109:109 -> a
-    1:1:com.android.tools.r8.graph.CfCode asCfCode():82:82 -> g
-    1:1:com.android.tools.r8.graph.DexCode asDexCode():90:90 -> h
-    1:1:com.android.tools.r8.graph.JarCode asJarCode():94:94 -> i
-    1:1:com.android.tools.r8.graph.LazyCfCode asLazyCfCode():86:86 -> j
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getOwner():27:27 -> k
-    boolean isCfCode() -> l
-    boolean isDexCode() -> m
-    boolean isEmptyVoidMethod() -> n
-    boolean isJarCode() -> o
-com.android.tools.r8.graph.DebugLocalInfo -> a.a.a.a.f.t:
+    1:1:com.android.tools.r8.graph.CfCode asCfCode():82:82 -> f
+    1:1:com.android.tools.r8.graph.DexCode asDexCode():90:90 -> g
+    1:1:com.android.tools.r8.graph.JarCode asJarCode():94:94 -> h
+    1:1:com.android.tools.r8.graph.LazyCfCode asLazyCfCode():86:86 -> i
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getOwner():27:27 -> j
+    boolean isCfCode() -> k
+    boolean isDexCode() -> l
+    boolean isEmptyVoidMethod() -> m
+    boolean isJarCode() -> n
+com.android.tools.r8.graph.DebugLocalInfo -> a.a.a.a.f.s:
     com.android.tools.r8.graph.DexString name -> a
     com.android.tools.r8.graph.DexString signature -> c
     com.android.tools.r8.graph.DexType type -> b
@@ -10792,7 +10609,7 @@
     1:3:int hashCode():94:96 -> hashCode
     1:11:java.lang.String toString():103:113 -> toString
     12:12:java.lang.String toString():107:107 -> toString
-com.android.tools.r8.graph.DebugLocalInfo$PrintLevel -> a.a.a.a.f.s:
+com.android.tools.r8.graph.DebugLocalInfo$PrintLevel -> a.a.a.a.f.r:
     com.android.tools.r8.graph.DebugLocalInfo$PrintLevel[] $VALUES -> d
     com.android.tools.r8.graph.DebugLocalInfo$PrintLevel NAME -> b
     com.android.tools.r8.graph.DebugLocalInfo$PrintLevel NONE -> a
@@ -10800,10 +10617,10 @@
     1:3:void <clinit>():16:18 -> <clinit>
     4:4:void <clinit>():15:15 -> <clinit>
     1:1:void <init>(java.lang.String,int):15:15 -> <init>
-com.android.tools.r8.graph.Descriptor -> a.a.a.a.f.u:
+com.android.tools.r8.graph.Descriptor -> a.a.a.a.f.t:
     1:1:void <init>():6:6 -> <init>
     boolean match(com.android.tools.r8.graph.DexItem) -> a
-com.android.tools.r8.graph.DexAnnotation -> a.a.a.a.f.v:
+com.android.tools.r8.graph.DexAnnotation -> a.a.a.a.f.u:
     com.android.tools.r8.graph.DexEncodedAnnotation annotation -> b
     com.android.tools.r8.graph.DexAnnotation[] EMPTY_ARRAY -> c
     boolean $assertionsDisabled -> d
@@ -10833,7 +10650,7 @@
     57:59:com.android.tools.r8.graph.DexAnnotation createSystemValueAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexValue):228:230 -> a
     60:64:com.android.tools.r8.graph.DexValue getSystemValueAnnotationValue(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotation):235:239 -> a
     65:65:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):320:320 -> a
-    66:67:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotationSet.getFirstMatching(com.android.tools.r8.graph.DexType):90:91 -> a
+    66:67:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotationSet.getFirstMatching(com.android.tools.r8.graph.DexType):73:74 -> a
     66:67:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):320 -> a
     68:73:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):323:328 -> a
     74:74:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
@@ -10847,7 +10664,7 @@
     96:97:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):329:330 -> a
     98:121:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):324:347 -> a
     122:122:java.lang.String getInvalidSynthesizedClassMapMessage(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):353:353 -> a
-    123:123:java.lang.String com.android.tools.r8.graph.DexType.toString():118:118 -> a
+    123:123:java.lang.String com.android.tools.r8.graph.DexType.toString():360:360 -> a
     123:123:java.lang.String getInvalidSynthesizedClassMapMessage(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):355 -> a
     124:124:java.lang.String getInvalidSynthesizedClassMapMessage(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):355:355 -> a
     125:125:java.lang.String toString():56:56 -> a
@@ -10855,6 +10672,7 @@
     126:126:java.lang.String getInvalidSynthesizedClassMapMessage(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):356:356 -> a
     127:133:com.android.tools.r8.graph.DexAnnotation createAnnotationSynthesizedClassMap(java.util.TreeSet,com.android.tools.r8.graph.DexItemFactory):362:368 -> a
     1:4:com.android.tools.r8.graph.DexMethod getEnclosingMethodFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):91:94 -> b
+    5:5:com.android.tools.r8.graph.DexValue$DexValueType[] lambda$createAnnotationSynthesizedClassMap$0(int):364:364 -> b
     1:1:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):133:133 -> c
     2:2:boolean isInnerClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):108:108 -> c
     2:2:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):133 -> c
@@ -10869,7 +10687,6 @@
     17:17:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():443:443 -> c
     17:17:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):143 -> c
     18:18:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):143:143 -> c
-    19:19:com.android.tools.r8.graph.DexValue$DexValueType[] lambda$createAnnotationSynthesizedClassMap$0(int):364:364 -> c
     1:6:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):161:166 -> d
     7:7:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():908:908 -> d
     7:7:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):166 -> d
@@ -10880,7 +10697,7 @@
     1:3:boolean equals(java.lang.Object):47:49 -> equals
     1:1:int hashCode():39:39 -> hashCode
     1:1:java.lang.String toString():56:56 -> toString
-com.android.tools.r8.graph.DexAnnotationDirectory -> a.a.a.a.f.w:
+com.android.tools.r8.graph.DexAnnotationDirectory -> a.a.a.a.f.v:
     java.util.List methodAnnotations -> b
     java.util.List fieldAnnotations -> d
     com.android.tools.r8.graph.DexProgramClass clazz -> a
@@ -10894,13 +10711,13 @@
     3:3:boolean isSorted(java.util.List):112:112 -> a
     4:6:boolean isSorted(java.util.List,java.util.function.Function):118:120 -> a
     4:6:boolean isSorted(java.util.List):112 -> a
+    1:1:com.android.tools.r8.graph.DexAnnotationSet getClazzAnnotations():54:54 -> e
     1:11:boolean equals(java.lang.Object):78:88 -> equals
-    1:1:com.android.tools.r8.graph.DexAnnotationSet getClazzAnnotations():54:54 -> f
-    1:1:java.util.List getFieldAnnotations():66:66 -> g
-    1:1:java.util.List getMethodAnnotations():58:58 -> h
+    1:1:java.util.List getFieldAnnotations():66:66 -> f
+    1:1:java.util.List getMethodAnnotations():58:58 -> g
+    1:1:java.util.List getParameterAnnotations():62:62 -> h
     1:4:int hashCode():93:96 -> hashCode
-    1:1:java.util.List getParameterAnnotations():62:62 -> i
-com.android.tools.r8.graph.DexAnnotationElement -> a.a.a.a.f.x:
+com.android.tools.r8.graph.DexAnnotationElement -> a.a.a.a.f.w:
     com.android.tools.r8.graph.DexAnnotationElement[] EMPTY_ARRAY -> c
     com.android.tools.r8.graph.DexString name -> a
     com.android.tools.r8.graph.DexValue value -> b
@@ -10912,46 +10729,43 @@
     1:3:boolean equals(java.lang.Object):30:32 -> equals
     1:1:int hashCode():22:22 -> hashCode
     1:1:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.graph.DexAnnotationSet -> a.a.a.a.f.y:
+com.android.tools.r8.graph.DexAnnotationSet -> a.a.a.a.f.x:
     com.android.tools.r8.graph.DexAnnotationSet THE_EMPTY_ANNOTATIONS_SET -> d
     boolean $assertionsDisabled -> e
     int sorted -> c
     com.android.tools.r8.graph.DexAnnotation[] annotations -> b
-    1:4:void <clinit>():16:19 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexAnnotation[]):25:25 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.DexAnnotation[]):23:26 -> <init>
-    1:1:com.android.tools.r8.graph.DexType findDuplicateEntryType(com.android.tools.r8.graph.DexAnnotation[]):30:30 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):64:64 -> a
-    3:4:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):69:70 -> a
-    5:5:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):82:82 -> a
-    6:6:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):140:140 -> a
-    7:10:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):144:147 -> a
-    7:10:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):140 -> a
-    11:34:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.map(java.lang.Class,java.lang.Object[],java.util.function.Function):83:106 -> a
-    11:34:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):147 -> a
-    11:34:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):140 -> a
-    35:35:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.map(java.lang.Class,java.lang.Object[],java.util.function.Function):105:105 -> a
-    35:35:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):147 -> a
-    35:35:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):140 -> a
-    36:40:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):147:151 -> a
-    36:40:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):140 -> a
-    41:41:com.android.tools.r8.graph.DexAnnotationSet empty():44:44 -> a
-    41:41:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):152 -> a
-    41:41:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):140 -> a
-    42:42:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):154:154 -> a
-    42:42:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):140 -> a
-    43:43:com.android.tools.r8.graph.DexAnnotation lambda$keepIf$1(java.util.function.Predicate,com.android.tools.r8.graph.DexAnnotation):140:140 -> a
-    1:4:com.android.tools.r8.graph.DexType findDuplicateEntryType(java.util.List):34:37 -> b
-    5:7:boolean computeEquals(java.lang.Object):54:56 -> b
-    1:1:int computeHashCode():49:49 -> f
-    1:1:com.android.tools.r8.graph.DexAnnotationSet empty():44:44 -> g
-    1:1:boolean isEmpty():74:74 -> h
-    1:2:void sort():78:79 -> i
-    3:3:int sortedHashCode():115:115 -> i
-    3:3:void sort():79 -> i
-    4:11:void sort():79:86 -> i
-    1:1:java.lang.String toString():159:159 -> toString
-com.android.tools.r8.graph.DexApplication -> a.a.a.a.f.B:
+    1:4:void <clinit>():13:16 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexAnnotation[]):22:22 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.DexAnnotation[]):20:23 -> <init>
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):47:47 -> a
+    2:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):52:53 -> a
+    4:4:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):65:65 -> a
+    5:5:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):123:123 -> a
+    6:9:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):127:130 -> a
+    6:9:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):123 -> a
+    10:33:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.map(java.lang.Class,java.lang.Object[],java.util.function.Function):83:106 -> a
+    10:33:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):130 -> a
+    10:33:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):123 -> a
+    34:34:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.map(java.lang.Class,java.lang.Object[],java.util.function.Function):105:105 -> a
+    34:34:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):130 -> a
+    34:34:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):123 -> a
+    35:39:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):130:134 -> a
+    35:39:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):123 -> a
+    40:40:com.android.tools.r8.graph.DexAnnotationSet empty():27:27 -> a
+    40:40:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):135 -> a
+    40:40:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):123 -> a
+    41:41:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):137:137 -> a
+    41:41:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):123 -> a
+    42:42:com.android.tools.r8.graph.DexAnnotation lambda$keepIf$1(java.util.function.Predicate,com.android.tools.r8.graph.DexAnnotation):123:123 -> a
+    1:3:boolean computeEquals(java.lang.Object):37:39 -> b
+    1:1:int computeHashCode():32:32 -> e
+    1:1:com.android.tools.r8.graph.DexAnnotationSet empty():27:27 -> f
+    1:2:void sort():61:62 -> g
+    3:3:int sortedHashCode():98:98 -> g
+    3:3:void sort():62 -> g
+    4:11:void sort():62:69 -> g
+    1:1:boolean isEmpty():57:57 -> isEmpty
+com.android.tools.r8.graph.DexApplication -> a.a.a.a.f.A:
     com.android.tools.r8.utils.Timing timing -> e
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> f
     com.android.tools.r8.naming.ClassNameMapper proguardMap -> d
@@ -10969,7 +10783,7 @@
     1:3:java.util.List classes():92:94 -> b
     1:1:com.android.tools.r8.naming.ClassNameMapper getProguardMap():112:112 -> c
     java.util.List programClasses() -> d
-com.android.tools.r8.graph.DexApplication$Builder -> a.a.a.a.f.z:
+com.android.tools.r8.graph.DexApplication$Builder -> a.a.a.a.f.y:
     java.util.List dataResourceProviders -> b
     java.lang.String deadCode -> g
     java.util.List programClasses -> a
@@ -10994,12 +10808,12 @@
     18:18:com.android.tools.r8.graph.DexApplication$Builder addToMainDexList(java.util.Collection):222:222 -> a
     1:1:java.util.Collection getProgramClasses():210:210 -> b
     1:1:java.util.Collection getSynthesizedClasses():214:214 -> c
-com.android.tools.r8.graph.DexApplication$ReorderBox -> a.a.a.a.f.A:
+com.android.tools.r8.graph.DexApplication$ReorderBox -> a.a.a.a.f.z:
     java.util.List classes -> a
     1:2:void <init>(java.util.List):71:72 -> <init>
     1:1:java.util.List getClasses():85:85 -> a
     1:3:boolean reorderClasses():77:79 -> b
-com.android.tools.r8.graph.DexCallSite -> a.a.a.a.f.E:
+com.android.tools.r8.graph.DexCallSite -> a.a.a.a.f.D:
     com.android.tools.r8.graph.DexString methodName -> d
     int instructionOffset -> j
     boolean $assertionsDisabled -> k
@@ -11021,16 +10835,16 @@
     31:31:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):140:140 -> a
     32:32:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):145:145 -> a
     boolean computeEquals(java.lang.Object) -> b
+    1:1:java.lang.String toSmaliString():151:151 -> c
     1:1:int compareTo(java.lang.Object):24:24 -> compareTo
     2:8:int compareTo(com.android.tools.r8.graph.DexCallSite):160:166 -> compareTo
     2:8:int compareTo(java.lang.Object):24 -> compareTo
-    1:1:java.lang.String toSmaliString():151:151 -> d
-    1:1:int computeHashCode():91:91 -> f
-    1:14:com.android.tools.r8.graph.DexEncodedArray getEncodedArray():289:302 -> h
-    1:1:java.lang.String getHash():155:155 -> i
+    1:1:int computeHashCode():91:91 -> e
+    1:14:com.android.tools.r8.graph.DexEncodedArray getEncodedArray():289:302 -> g
+    1:1:java.lang.String getHash():155:155 -> h
     1:11:java.lang.String toString():104:114 -> toString
-com.android.tools.r8.graph.DexCallSite$1 -> a.a.a.a.f.C:
-com.android.tools.r8.graph.DexCallSite$HashBuilder -> a.a.a.a.f.D:
+com.android.tools.r8.graph.DexCallSite$1 -> a.a.a.a.f.B:
+com.android.tools.r8.graph.DexCallSite$HashBuilder -> a.a.a.a.f.C:
     java.io.ByteArrayOutputStream bytes -> a
     com.android.tools.r8.graph.DexCallSite this$0 -> c
     java.io.ObjectOutputStream out -> b
@@ -11049,7 +10863,7 @@
     14:19:void write(com.android.tools.r8.graph.DexProto):192:197 -> a
     20:67:void write(java.util.List):214:261 -> a
     68:84:java.lang.String build():267:283 -> a
-com.android.tools.r8.graph.DexClass -> a.a.a.a.f.F:
+com.android.tools.r8.graph.DexClass -> a.a.a.a.f.E:
     com.android.tools.r8.graph.DexEncodedField[] instanceFields -> i
     boolean $assertionsDisabled -> o
     com.android.tools.r8.graph.DexTypeList interfaces -> f
@@ -11065,111 +10879,108 @@
     java.util.List innerClasses -> m
     com.android.tools.r8.graph.ClassAccessFlags accessFlags -> d
     com.android.tools.r8.graph.DexType superType -> e
-    1:1:void <clinit>():27:27 -> <clinit>
-    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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):81:81 -> <init>
-    2:52: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):38:88 -> <init>
-    53:55:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):398:400 -> <init>
-    53:55: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):89 -> <init>
-    56:58:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):457:459 -> <init>
-    56:58: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):90 -> <init>
-    59:69: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):91:101 -> <init>
-    70:70:java.lang.String com.android.tools.r8.graph.DexType.toString():118:118 -> <init>
-    70:70: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):101 -> <init>
-    71:77: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):101:107 -> <init>
-    78:78: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):97:97 -> <init>
-    79:79:java.lang.String com.android.tools.r8.graph.DexType.toString():118:118 -> <init>
-    79:79: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):97 -> <init>
-    80:80: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):97:97 -> <init>
-    1:1:boolean isInterface():554:554 -> A
-    boolean isLibraryClass() -> B
-    1:3:boolean isLocalClass():784:786 -> C
-    4:4:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():753:753 -> C
-    4:4:boolean isLocalClass():787 -> C
-    1:4:boolean isMemberClass():791:794 -> D
-    5:5:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():753:753 -> D
-    5:5:boolean isMemberClass():795 -> D
-    boolean isNotProgramClass() -> E
-    boolean isProgramClass() -> F
-    1:1:java.lang.Iterable methods():123:123 -> G
-    1:5:java.util.List staticFields():355:359 -> H
-    1:5:java.util.List virtualMethods():192:196 -> I
-    1:4:boolean verifyNoDuplicateFields():480:483 -> J
-    1:4:boolean verifyNoDuplicateMethods():259:262 -> K
-    1:3:java.lang.Iterable fields(java.util.function.Predicate):117:119 -> a
+    1:1:void <clinit>():25:25 -> <clinit>
+    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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):79:79 -> <init>
+    2:52: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):36:86 -> <init>
+    53:55:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):396:398 -> <init>
+    53:55: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):87 -> <init>
+    56:58:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):455:457 -> <init>
+    56:58: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):88 -> <init>
+    59:69: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):89:99 -> <init>
+    70:70:java.lang.String com.android.tools.r8.graph.DexType.toString():360:360 -> <init>
+    70:70: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):99 -> <init>
+    71:77: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):99:105 -> <init>
+    78:78: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):95:95 -> <init>
+    79:79:java.lang.String com.android.tools.r8.graph.DexType.toString():360:360 -> <init>
+    79:79: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):95 -> <init>
+    80:80: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):95:95 -> <init>
+    1:5:java.util.List virtualMethods():190:194 -> A
+    1:4:boolean verifyNoDuplicateFields():478:481 -> B
+    1:4:boolean verifyNoDuplicateMethods():257:260 -> C
+    1:3:java.lang.Iterable fields(java.util.function.Predicate):115:117 -> a
     4:4:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    4:4:java.lang.Iterable fields(java.util.function.Predicate):117 -> a
-    5:5:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):134:134 -> a
-    6:12:void appendDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):146:152 -> a
-    13:16:void setDirectMethod(int,com.android.tools.r8.graph.DexEncodedMethod):178:181 -> a
-    17:20:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):185:188 -> a
-    21:30:void appendVirtualMethods(java.util.Collection):209:218 -> a
-    31:35:void forEachMethod(java.util.function.Consumer):268:272 -> a
-    36:37:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):473:474 -> a
-    38:42:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):463:467 -> a
-    38:42:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):474 -> a
-    43:43:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):510:510 -> a
-    43:43:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):517 -> a
-    44:44:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):503:503 -> a
-    44:44:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):518 -> a
-    45:45:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):525:525 -> a
-    46:47:com.android.tools.r8.graph.DexItem lookupTarget(com.android.tools.r8.graph.DexItem[],com.android.tools.r8.graph.Descriptor):544:545 -> a
-    48:49:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Predicate):704:705 -> a
-    50:58:boolean hasNonTrivialClassInitializer():649:657 -> a
-    50:58:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Predicate):708 -> a
-    59:62:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Predicate):711:714 -> a
-    63:63:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$3(com.android.tools.r8.graph.DexEncodedField):745:745 -> a
+    4:4:java.lang.Iterable fields(java.util.function.Predicate):115 -> a
+    5:5:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):132:132 -> a
+    6:12:void appendDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):144:150 -> a
+    13:16:void setDirectMethod(int,com.android.tools.r8.graph.DexEncodedMethod):176:179 -> a
+    17:20:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):183:186 -> a
+    21:30:void appendVirtualMethods(java.util.Collection):207:216 -> a
+    31:35:void forEachMethod(java.util.function.Consumer):266:270 -> a
+    36:37:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):471:472 -> a
+    38:42:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):461:465 -> a
+    38:42:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):472 -> a
+    43:43:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):508:508 -> a
+    43:43:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):515 -> a
+    44:44:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):501:501 -> a
+    44:44:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):516 -> a
+    45:45:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):523:523 -> a
+    46:47:com.android.tools.r8.graph.DexItem lookupTarget(com.android.tools.r8.graph.DexItem[],com.android.tools.r8.graph.Descriptor):542:543 -> a
+    48:52:boolean hasMissingSuperType(com.android.tools.r8.graph.DexDefinitionSupplier):670:674 -> a
+    53:54:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Predicate):695:696 -> a
+    55:63:boolean hasNonTrivialClassInitializer():645:653 -> a
+    55:63:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Predicate):699 -> a
+    64:67:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Predicate):702:705 -> a
+    68:68:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$2(com.android.tools.r8.graph.DexEncodedField):727:727 -> a
     void addDependencies(com.android.tools.r8.dex.MixedSectionCollection) -> b
-    1:3:java.lang.Iterable methods(java.util.function.Predicate):127:129 -> b
+    1:3:java.lang.Iterable methods(java.util.function.Predicate):125:127 -> b
     4:4:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> b
-    4:4:java.lang.Iterable methods(java.util.function.Predicate):127 -> b
-    5:10:void appendVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):200:205 -> b
-    11:13:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):236:238 -> b
-    14:15:boolean verifyCorrectnessOfMethodHolders(java.lang.Iterable):252:253 -> b
-    16:16:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):510:510 -> b
-    17:17:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):525:525 -> b
-    17:17:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):539 -> b
-    18:18:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):532:532 -> b
-    18:18:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):540 -> b
-    19:24:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Predicate):732:737 -> b
-    1:5:void removeDirectMethod(int):170:174 -> c
-    6:10:boolean verifyCorrectnessOfMethodHolder(com.android.tools.r8.graph.DexEncodedMethod):242:246 -> c
-    11:11:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):503:503 -> c
-    12:12:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):532:532 -> c
-    com.android.tools.r8.graph.DexClass asDexClass() -> f
-    boolean isDexClass() -> i
-    com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> l
-    com.android.tools.r8.graph.DexProgramClass asProgramClass() -> m
-    1:1:void clearEnclosingMethod():757:757 -> n
-    1:1:void clearInnerClasses():767:767 -> o
-    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():744:745 -> p
-    1:5:java.util.List directMethods():138:142 -> q
-    1:1:java.lang.Iterable fields():113:113 -> r
-    1:10:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():615:624 -> s
-    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():753:753 -> t
-    1:1:java.util.List getInnerClasses():749:749 -> u
-    1:1:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():775 -> u
-    2:3:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():775:776 -> u
-    1:1:java.util.List getInnerClasses():749:749 -> v
-    com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> w
-    1:5:java.util.List instanceFields():413:417 -> x
-    1:3:boolean isAnonymousClass():799:801 -> y
-    4:4:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():753:753 -> y
-    4:4:boolean isAnonymousClass():802 -> y
-    boolean isClasspathClass() -> z
-com.android.tools.r8.graph.DexClasspathClass -> a.a.a.a.f.G:
+    4:4:java.lang.Iterable methods(java.util.function.Predicate):125 -> b
+    5:9:void removeDirectMethod(int):168:172 -> b
+    10:15:void appendVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):198:203 -> b
+    16:18:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):234:236 -> b
+    19:20:boolean verifyCorrectnessOfMethodHolders(java.lang.Iterable):250:251 -> b
+    21:21:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):508:508 -> b
+    22:22:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):523:523 -> b
+    22:22:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):537 -> b
+    23:23:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):530:530 -> b
+    23:23:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):538 -> b
+    24:29:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Predicate):714:719 -> b
+    1:5:boolean verifyCorrectnessOfMethodHolder(com.android.tools.r8.graph.DexEncodedMethod):240:244 -> c
+    6:6:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):501:501 -> c
+    7:7:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):530:530 -> c
+    com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> e
+    com.android.tools.r8.graph.DexProgramClass asProgramClass() -> f
+    1:1:void clearEnclosingMethod():739:739 -> g
+    1:1:void clearInnerClasses():749:749 -> h
+    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():726:727 -> i
+    1:5:java.util.List directMethods():136:140 -> j
+    1:1:java.lang.Iterable fields():111:111 -> k
+    1:10:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():611:620 -> l
+    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():735:735 -> m
+    1:1:java.util.List getInnerClasses():731:731 -> n
+    1:1:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():757 -> n
+    2:3:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():757:758 -> n
+    1:1:java.util.List getInnerClasses():731:731 -> o
+    com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> p
+    1:5:java.util.List instanceFields():411:415 -> q
+    1:3:boolean isAnonymousClass():781:783 -> r
+    4:4:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():735:735 -> r
+    4:4:boolean isAnonymousClass():784 -> r
+    boolean isClasspathClass() -> s
+    1:1:boolean isInterface():552:552 -> t
+    boolean isLibraryClass() -> u
+    1:3:boolean isLocalClass():766:768 -> v
+    4:4:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():735:735 -> v
+    4:4:boolean isLocalClass():769 -> v
+    1:4:boolean isMemberClass():773:776 -> w
+    5:5:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():735:735 -> w
+    5:5:boolean isMemberClass():777 -> w
+    boolean isProgramClass() -> x
+    1:1:java.lang.Iterable methods():121:121 -> y
+    1:5:java.util.List staticFields():353:357 -> z
+com.android.tools.r8.graph.DexClasspathClass -> a.a.a.a.f.F:
     boolean $assertionsDisabled -> p
     1:1:void <clinit>():16:16 -> <clinit>
     1:16:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):34:49 -> <init>
-    boolean isNotProgramClass() -> E
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):55:55 -> a
     1:1:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):66:66 -> b
+    1:1:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo():81:81 -> p
+    boolean isClasspathClass() -> s
     1:1:java.lang.String toString():60:60 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():118:118 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():360:360 -> toString
     2:2:java.lang.String toString():60 -> toString
     3:3:java.lang.String toString():60:60 -> toString
-    1:1:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo():86:86 -> w
-    boolean isClasspathClass() -> z
-com.android.tools.r8.graph.DexCode -> a.a.a.a.f.K:
+com.android.tools.r8.graph.DexCode -> a.a.a.a.f.J:
     com.android.tools.r8.graph.DexDebugInfoForWriting debugInfoForWriting -> k
     boolean $assertionsDisabled -> l
     com.android.tools.r8.code.Instruction[] instructions -> h
@@ -11204,12 +11015,12 @@
     65:67:void updateHighestSortingString(com.android.tools.r8.graph.DexString):431:433 -> a
     68:70:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):443:445 -> a
     1:28:boolean computeEquals(java.lang.Object):178:205 -> b
-    1:7:int computeHashCode():167:173 -> f
-    com.android.tools.r8.graph.DexCode asDexCode() -> h
-    boolean isDexCode() -> m
-    1:1:boolean isEmptyVoidMethod():212:212 -> n
-    1:1:com.android.tools.r8.graph.DexDebugInfo getDebugInfo():100:100 -> p
-    1:8:com.android.tools.r8.graph.DexDebugInfoForWriting getDebugInfoForWriting():420:427 -> q
+    1:7:int computeHashCode():167:173 -> e
+    com.android.tools.r8.graph.DexCode asDexCode() -> g
+    boolean isDexCode() -> l
+    1:1:boolean isEmptyVoidMethod():212:212 -> m
+    1:1:com.android.tools.r8.graph.DexDebugInfo getDebugInfo():100:100 -> o
+    1:8:com.android.tools.r8.graph.DexDebugInfoForWriting getDebugInfoForWriting():420:427 -> p
     1:15:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):270:284 -> toString
     1:15:java.lang.String toString():265 -> toString
     16:16:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> toString
@@ -11229,7 +11040,7 @@
     33:60:java.lang.String toString():265 -> toString
     61:61:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):312:312 -> toString
     61:61:java.lang.String toString():265 -> toString
-com.android.tools.r8.graph.DexCode$Try -> a.a.a.a.f.H:
+com.android.tools.r8.graph.DexCode$Try -> a.a.a.a.f.G:
     boolean $assertionsDisabled -> e
     int handlerIndex -> d
     int startAddress -> b
@@ -11242,7 +11053,7 @@
     1:9:boolean equals(java.lang.Object):480:488 -> equals
     1:1:int hashCode():472:472 -> hashCode
     1:4:java.lang.String toString():495:498 -> toString
-com.android.tools.r8.graph.DexCode$TryHandler -> a.a.a.a.f.J:
+com.android.tools.r8.graph.DexCode$TryHandler -> a.a.a.a.f.I:
     com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair[] pairs -> a
     int catchAllAddr -> b
     boolean $assertionsDisabled -> c
@@ -11253,7 +11064,7 @@
     1:6:boolean equals(java.lang.Object):539:544 -> equals
     1:1:int hashCode():531:531 -> hashCode
     1:16:java.lang.String toString():563:578 -> toString
-com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair -> a.a.a.a.f.I:
+com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair -> a.a.a.a.f.H:
     com.android.tools.r8.graph.DexType type -> a
     int addr -> b
     boolean $assertionsDisabled -> c
@@ -11263,7 +11074,7 @@
     2:2:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):600:600 -> a
     1:3:boolean equals(java.lang.Object):613:615 -> equals
     1:1:int hashCode():605:605 -> hashCode
-com.android.tools.r8.graph.DexDebugEntry -> a.a.a.a.f.L:
+com.android.tools.r8.graph.DexDebugEntry -> a.a.a.a.f.K:
     com.android.tools.r8.ir.code.Position callerPosition -> i
     com.android.tools.r8.graph.DexString sourceFile -> d
     boolean $assertionsDisabled -> j
@@ -11278,7 +11089,7 @@
     1:11:void <init>(boolean,int,int,com.android.tools.r8.graph.DexString,boolean,boolean,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):34:44 -> <init>
     1:38:java.lang.String toString(boolean):53:90 -> a
     1:1:java.lang.String toString():49:49 -> toString
-com.android.tools.r8.graph.DexDebugEntryBuilder -> a.a.a.a.f.O:
+com.android.tools.r8.graph.DexDebugEntryBuilder -> a.a.a.a.f.N:
     com.android.tools.r8.graph.DexDebugPositionState positionState -> h
     java.util.Map locals -> c
     boolean $assertionsDisabled -> i
@@ -11316,13 +11127,13 @@
     32:56:void entryEventReceived(boolean):161:185 -> a
     57:62:java.util.List build():190:195 -> a
     63:66:com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry getEntry(int):206:209 -> a
-com.android.tools.r8.graph.DexDebugEntryBuilder$1 -> a.a.a.a.f.M:
-com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry -> a.a.a.a.f.N:
+com.android.tools.r8.graph.DexDebugEntryBuilder$1 -> a.a.a.a.f.L:
+com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry -> a.a.a.a.f.M:
     com.android.tools.r8.graph.DebugLocalInfo current -> a
     com.android.tools.r8.graph.DebugLocalInfo last -> b
     1:1:void <init>():24:24 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexDebugEntryBuilder$1):24 -> <init>
-com.android.tools.r8.graph.DexDebugEvent -> a.a.a.a.f.aa:
+com.android.tools.r8.graph.DexDebugEvent -> a.a.a.a.f.Z:
     com.android.tools.r8.graph.DexDebugEvent[] EMPTY_ARRAY -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -11330,7 +11141,7 @@
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
     void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection) -> a
     void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping) -> a
-com.android.tools.r8.graph.DexDebugEvent$AdvanceLine -> a.a.a.a.f.P:
+com.android.tools.r8.graph.DexDebugEvent$AdvanceLine -> a.a.a.a.f.O:
     int delta -> b
     1:2:void <init>(int):148:149 -> <init>
     1:2:void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping):154:155 -> a
@@ -11338,7 +11149,7 @@
     1:1:boolean equals(java.lang.Object):176:176 -> equals
     1:1:int hashCode():170:170 -> hashCode
     1:1:java.lang.String toString():165:165 -> toString
-com.android.tools.r8.graph.DexDebugEvent$AdvancePC -> a.a.a.a.f.Q:
+com.android.tools.r8.graph.DexDebugEvent$AdvancePC -> a.a.a.a.f.P:
     int delta -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():41:41 -> <clinit>
@@ -11348,19 +11159,19 @@
     1:1:boolean equals(java.lang.Object):75:75 -> equals
     1:1:int hashCode():69:69 -> hashCode
     1:1:java.lang.String toString():64:64 -> toString
-com.android.tools.r8.graph.DexDebugEvent$Default -> a.a.a.a.f.S:
+com.android.tools.r8.graph.DexDebugEvent$Default -> a.a.a.a.f.Q:
     int value -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():426:426 -> <clinit>
     1:3:void <init>(int):430:432 -> <init>
     1:1:void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping):437:437 -> a
     2:2:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):442:442 -> a
+    1:2:int getLineDelta():451:452 -> e
     1:1:boolean equals(java.lang.Object):468:468 -> equals
-    1:2:int getLineDelta():451:452 -> f
-    1:2:int getPCDelta():446:447 -> g
+    1:2:int getPCDelta():446:447 -> f
     1:1:int hashCode():462:462 -> hashCode
     1:1:java.lang.String toString():457:457 -> toString
-com.android.tools.r8.graph.DexDebugEvent$EndLocal -> a.a.a.a.f.T:
+com.android.tools.r8.graph.DexDebugEvent$EndLocal -> a.a.a.a.f.S:
     int registerNum -> b
     1:2:void <init>(int):272:273 -> <init>
     1:2:void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping):278:279 -> a
@@ -11368,7 +11179,7 @@
     1:1:boolean equals(java.lang.Object):300:300 -> equals
     1:1:int hashCode():294:294 -> hashCode
     1:1:java.lang.String toString():289:289 -> toString
-com.android.tools.r8.graph.DexDebugEvent$RestartLocal -> a.a.a.a.f.U:
+com.android.tools.r8.graph.DexDebugEvent$RestartLocal -> a.a.a.a.f.T:
     int registerNum -> b
     1:2:void <init>(int):309:310 -> <init>
     1:2:void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping):315:316 -> a
@@ -11376,12 +11187,12 @@
     1:1:boolean equals(java.lang.Object):337:337 -> equals
     1:1:int hashCode():331:331 -> hashCode
     1:1:java.lang.String toString():326:326 -> toString
-com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin -> a.a.a.a.f.V:
+com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin -> a.a.a.a.f.U:
     1:1:void <init>():115:115 -> <init>
     1:1:void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping):120:120 -> a
     2:2:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):125:125 -> a
     1:1:boolean equals(java.lang.Object):140:140 -> equals
-com.android.tools.r8.graph.DexDebugEvent$SetFile -> a.a.a.a.f.W:
+com.android.tools.r8.graph.DexDebugEvent$SetFile -> a.a.a.a.f.V:
     com.android.tools.r8.graph.DexString fileName -> b
     1:2:void <init>(com.android.tools.r8.graph.DexString):346:347 -> <init>
     1:2:void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping):352:353 -> a
@@ -11390,7 +11201,7 @@
     1:2:boolean equals(java.lang.Object):380:381 -> equals
     1:2:int hashCode():374:375 -> hashCode
     1:1:java.lang.String toString():369:369 -> toString
-com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame -> a.a.a.a.f.X:
+com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame -> a.a.a.a.f.W:
     com.android.tools.r8.graph.DexMethod callee -> b
     com.android.tools.r8.ir.code.Position caller -> c
     boolean $assertionsDisabled -> d
@@ -11401,12 +11212,12 @@
     1:5:boolean equals(java.lang.Object):418:422 -> equals
     1:1:int hashCode():413:413 -> hashCode
     1:1:java.lang.String toString():408:408 -> toString
-com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd -> a.a.a.a.f.Y:
+com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd -> a.a.a.a.f.X:
     1:1:void <init>():82:82 -> <init>
     1:1:void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping):87:87 -> a
     2:2:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):92:92 -> a
     1:1:boolean equals(java.lang.Object):108:108 -> equals
-com.android.tools.r8.graph.DexDebugEvent$StartLocal -> a.a.a.a.f.Z:
+com.android.tools.r8.graph.DexDebugEvent$StartLocal -> a.a.a.a.f.Y:
     com.android.tools.r8.graph.DexString name -> c
     com.android.tools.r8.graph.DexString signature -> e
     com.android.tools.r8.graph.DexType type -> d
@@ -11418,7 +11229,7 @@
     1:14:boolean equals(java.lang.Object):251:264 -> equals
     1:5:int hashCode():242:246 -> hashCode
     1:1:java.lang.String toString():237:237 -> toString
-com.android.tools.r8.graph.DexDebugEventBuilder -> a.a.a.a.f.ba:
+com.android.tools.r8.graph.DexDebugEventBuilder -> a.a.a.a.f.aa:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexItemFactory factory -> b
     int startLine -> l
@@ -11478,7 +11289,7 @@
     148:148:void emitLocalChangeEvents(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,java.util.List,com.android.tools.r8.graph.DexItemFactory):290 -> a
     149:150:void emitLocalChangeEvents(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,java.util.List,com.android.tools.r8.graph.DexItemFactory):290:291 -> a
     1:5:boolean localsChanged():174:178 -> b
-com.android.tools.r8.graph.DexDebugEventVisitor -> a.a.a.a.f.ca:
+com.android.tools.r8.graph.DexDebugEventVisitor -> a.a.a.a.f.ba:
     void visit(com.android.tools.r8.graph.DexDebugEvent$AdvanceLine) -> a
     void visit(com.android.tools.r8.graph.DexDebugEvent$AdvancePC) -> a
     void visit(com.android.tools.r8.graph.DexDebugEvent$Default) -> a
@@ -11489,7 +11300,7 @@
     void visit(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
     void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd) -> a
     void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal) -> a
-com.android.tools.r8.graph.DexDebugInfo -> a.a.a.a.f.da:
+com.android.tools.r8.graph.DexDebugInfo -> a.a.a.a.f.ca:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexDebugEvent[] events -> d
     int startLine -> b
@@ -11499,14 +11310,14 @@
     1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):60:61 -> a
     3:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):66:66 -> a
     1:9:boolean computeEquals(java.lang.Object):44:52 -> b
-    1:3:int computeHashCode():37:39 -> f
+    1:3:int computeHashCode():37:39 -> e
     1:8:java.lang.String toString():71:78 -> toString
-com.android.tools.r8.graph.DexDebugInfoForWriting -> a.a.a.a.f.ea:
+com.android.tools.r8.graph.DexDebugInfoForWriting -> a.a.a.a.f.da:
     1:4:void <init>(com.android.tools.r8.graph.DexDebugInfo):17:20 -> <init>
     5:5:void <init>(com.android.tools.r8.graph.DexDebugInfo):17:17 -> <init>
     1:1:boolean lambda$new$0(com.android.tools.r8.graph.DexDebugEvent):19:19 -> a
-    1:1:com.android.tools.r8.graph.DexDebugEvent[] lambda$new$1(int):20:20 -> c
-com.android.tools.r8.graph.DexDebugPositionState -> a.a.a.a.f.fa:
+    1:1:com.android.tools.r8.graph.DexDebugEvent[] lambda$new$1(int):20:20 -> b
+com.android.tools.r8.graph.DexDebugPositionState -> a.a.a.a.f.ea:
     com.android.tools.r8.graph.DexString currentFile -> c
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexMethod currentMethod -> d
@@ -11531,18 +11342,12 @@
     1:1:int getCurrentLine():94:94 -> c
     1:1:com.android.tools.r8.graph.DexMethod getCurrentMethod():102:102 -> d
     1:1:int getCurrentPc():90:90 -> e
-com.android.tools.r8.graph.DexDefinition -> a.a.a.a.f.ga:
+com.android.tools.r8.graph.DexDefinition -> a.a.a.a.f.fa:
     1:1:void <init>():13:13 -> <init>
-    com.android.tools.r8.graph.DexClass asDexClass() -> f
-    com.android.tools.r8.graph.DexEncodedField asDexEncodedField() -> g
-    com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod() -> h
-    boolean isDexClass() -> i
-    boolean isDexEncodedField() -> j
-    boolean isDexEncodedMethod() -> k
-com.android.tools.r8.graph.DexDefinitionSupplier -> a.a.a.a.f.ha:
+com.android.tools.r8.graph.DexDefinitionSupplier -> a.a.a.a.f.ga:
     com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexItemFactory dexItemFactory() -> a
-com.android.tools.r8.graph.DexEncodedAnnotation -> a.a.a.a.f.ia:
+com.android.tools.r8.graph.DexEncodedAnnotation -> a.a.a.a.f.ha:
     com.android.tools.r8.graph.DexAnnotationElement[] elements -> b
     com.android.tools.r8.graph.DexType type -> a
     int sorted -> c
@@ -11553,17 +11358,17 @@
     1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):29:30 -> a
     3:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):36:36 -> a
     4:4:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexAnnotationElement):66:66 -> a
+    1:2:void sort():62:63 -> e
+    3:3:int sortedHashCode():74:74 -> e
+    3:3:void sort():63 -> e
+    4:9:void sort():63:68 -> e
+    10:10:int sortedHashCode():74:74 -> e
+    10:10:void sort():70 -> e
+    11:11:void sort():70:70 -> e
     1:3:boolean equals(java.lang.Object):54:56 -> equals
-    1:2:void sort():62:63 -> f
-    3:3:int sortedHashCode():74:74 -> f
-    3:3:void sort():63 -> f
-    4:9:void sort():63:68 -> f
-    10:10:int sortedHashCode():74:74 -> f
-    10:10:void sort():70 -> f
-    11:11:void sort():70:70 -> f
     1:1:int hashCode():46:46 -> hashCode
     1:1:java.lang.String toString():41:41 -> toString
-com.android.tools.r8.graph.DexEncodedArray -> a.a.a.a.f.ja:
+com.android.tools.r8.graph.DexEncodedArray -> a.a.a.a.f.ia:
     com.android.tools.r8.graph.DexValue[] values -> a
     1:2:void <init>(com.android.tools.r8.graph.DexValue[]):14:15 -> <init>
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):21:21 -> a
@@ -11571,7 +11376,7 @@
     1:1:boolean equals(java.lang.Object):39:39 -> equals
     1:1:int hashCode():31:31 -> hashCode
     1:1:java.lang.String toString():44:44 -> toString
-com.android.tools.r8.graph.DexEncodedField -> a.a.a.a.f.ka:
+com.android.tools.r8.graph.DexEncodedField -> a.a.a.a.f.ja:
     com.android.tools.r8.graph.DexAnnotationSet annotations -> c
     com.android.tools.r8.graph.DexEncodedField[] EMPTY_ARRAY -> e
     boolean $assertionsDisabled -> f
@@ -11581,137 +11386,128 @@
     1:2:void <clinit>():13:14 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):25:29 -> <init>
     1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):43:44 -> a
-    3:3:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):64:64 -> a
+    3:3:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):47:47 -> a
     3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):44 -> a
     4:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):45:46 -> a
     6:6:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):52:52 -> a
-    7:9:void setStaticValue(com.android.tools.r8.graph.DexValue):114:116 -> a
-    1:1:java.lang.String toSourceString():67:67 -> e
-    com.android.tools.r8.graph.DexEncodedField asDexEncodedField() -> g
-    boolean isDexEncodedField() -> j
-    1:1:com.android.tools.r8.graph.DexField getKey():72:72 -> l
-    1:1:com.android.tools.r8.graph.PresortedComparable getKey():13 -> l
-    1:2:com.android.tools.r8.graph.DexValue getStaticValue():120:121 -> m
-    1:1:boolean hasAnnotation():105:105 -> n
-    1:2:boolean hasExplicitStaticValue():109:110 -> o
+    7:9:void setStaticValue(com.android.tools.r8.graph.DexValue):110:112 -> a
+    1:1:java.lang.String toSourceString():67:67 -> d
+    1:1:com.android.tools.r8.graph.DexField getKey():72:72 -> e
+    1:1:com.android.tools.r8.graph.PresortedComparable getKey():13 -> e
+    1:2:com.android.tools.r8.graph.DexValue getStaticValue():116:117 -> f
+    1:1:boolean hasAnnotation():101:101 -> g
     1:1:java.lang.String toString():57:57 -> toString
-com.android.tools.r8.graph.DexEncodedMethod -> a.a.a.a.f.ta:
-    com.android.tools.r8.graph.DexEncodedMethod[] EMPTY_ARRAY -> k
+com.android.tools.r8.graph.DexEncodedMethod -> a.a.a.a.f.sa:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> f
+    com.android.tools.r8.graph.DexEncodedMethod[] EMPTY_ARRAY -> j
     com.android.tools.r8.graph.DexAnnotationSet annotations -> c
     com.android.tools.r8.graph.Code code -> e
+    boolean obsolete -> i
     com.android.tools.r8.graph.ParameterAnnotationsList parameterAnnotationsList -> d
-    boolean obsolete -> j
+    boolean $assertionsDisabled -> k
     int classFileVersion -> h
-    boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.MethodAccessFlags accessFlags -> b
     com.android.tools.r8.graph.OptimizationInfo optimizationInfo -> g
-    com.android.tools.r8.graph.DexEncodedMethod defaultInterfaceMethodImplementation -> i
     com.android.tools.r8.graph.DexMethod method -> a
-    1:40:void <clinit>():58:97 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):170:170 -> <init>
-    2:72:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):107:177 -> <init>
-    73:74:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,int):187:188 -> <init>
-    1:2:boolean isPublicized():243:244 -> A
-    3:3:boolean com.android.tools.r8.graph.AccessFlags.wasSet(int):202:202 -> A
-    3:3:boolean com.android.tools.r8.graph.AccessFlags.isPromoted(int):220 -> A
-    3:3:boolean com.android.tools.r8.graph.AccessFlags.isPromotedToPublic():189 -> A
-    3:3:boolean isPublicized():244 -> A
-    4:4:boolean com.android.tools.r8.graph.AccessFlags.isPromoted(int):220:220 -> A
-    4:4:boolean com.android.tools.r8.graph.AccessFlags.isPromotedToPublic():189 -> A
-    4:4:boolean isPublicized():244 -> A
-    1:2:boolean isStatic():267:268 -> B
-    1:2:boolean isVirtualMethod():229:230 -> C
-    1:2:java.lang.String qualifiedName():462:463 -> D
-    1:1:void removeCode():426:426 -> E
-    2:3:void voidCodeOwnership():438:439 -> E
-    2:3:void removeCode():427 -> E
-    4:4:void removeCode():428:428 -> E
-    1:1:boolean shouldNotHaveCode():413:413 -> F
-    1:1:void checkIfObsolete():120:120 -> G
-    1:2:void setCodeOwnership():432:433 -> H
-    1:2:boolean isInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):287:288 -> a
-    3:26:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):293:316 -> a
-    27:27:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):314:314 -> a
-    28:28:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):312:312 -> a
-    29:45:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):323:339 -> a
-    46:46:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):336:336 -> a
-    47:47:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):333:333 -> a
-    48:48:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):330:330 -> a
-    49:64:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):327:342 -> a
-    65:66:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):351:352 -> a
-    67:67:void setCode(com.android.tools.r8.graph.Code):367:367 -> a
-    68:69:void voidCodeOwnership():438:439 -> a
-    68:69:void setCode(com.android.tools.r8.graph.Code):368 -> a
-    70:71:void setCode(com.android.tools.r8.graph.Code):369:370 -> a
-    72:74:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions):374:376 -> a
-    75:76:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):388:389 -> a
-    77:77:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
-    77:77:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):389 -> a
-    78:79:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):390:391 -> a
-    80:80:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod):50:50 -> a
-    80:80:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):391 -> a
-    81:81:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):393:393 -> a
-    82:82:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
-    82:82:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):393 -> a
-    83:83:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):394:394 -> a
-    84:84:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
-    84:84:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):394 -> a
-    85:85:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):399:399 -> a
-    86:91:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):404:409 -> a
-    92:103:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):720:731 -> a
-    104:114:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):730:740 -> a
-    115:121:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1306:1312 -> a
-    122:124:void upgradeClassFileVersion(int):455:457 -> a
-    122:124:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1312 -> a
-    125:126:boolean hasClassFileVersion():450:451 -> a
-    125:126:void upgradeClassFileVersion(int):457 -> a
-    125:126:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1312 -> a
-    127:128:void upgradeClassFileVersion(int):457:458 -> a
-    127:128:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1312 -> a
-    129:129:boolean hasSingleTarget():1399:1399 -> a
-    1:6:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):140:145 -> b
-    7:7:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> b
-    7:7:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):145 -> b
-    8:11:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):146:149 -> b
-    12:12:com.android.tools.r8.graph.DexEncodedMethod asSingleTarget():1393:1393 -> b
-    1:2:java.util.List asListOfTargets():1405:1406 -> c
-    1:2:java.lang.String toSourceString():505:506 -> e
-    1:1:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():771:771 -> h
-    1:1:boolean isDexEncodedMethod():765:765 -> k
-    1:1:com.android.tools.r8.graph.DexMethod getKey():754:754 -> l
-    1:1:com.android.tools.r8.graph.PresortedComparable getKey():58 -> l
-    1:1:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():550:550 -> m
-    2:3:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):530:531 -> m
-    2:3:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():551 -> m
-    4:4:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> m
-    4:4:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):532 -> m
-    4:4:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():551 -> m
-    5:12:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):533:540 -> m
-    5:12:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():551 -> m
-    1:3:int getClassFileVersion():444:446 -> n
-    1:2:com.android.tools.r8.graph.Code getCode():421:422 -> o
-    1:5:com.android.tools.r8.graph.UpdatableOptimizationInfo getMutableOptimizationInfo():1293:1297 -> p
-    1:2:com.android.tools.r8.graph.OptimizationInfo getOptimizationInfo():1288:1289 -> q
-    1:2:boolean hasAnnotation():776:777 -> r
-    1:1:boolean hasCode():417:417 -> s
-    1:2:boolean isClassInitializer():220:221 -> t
-    1:2:java.lang.String toString():381:382 -> toString
-    1:2:boolean isDirectMethod():261:262 -> u
-    1:2:boolean isInstanceInitializer():210:211 -> v
-    1:2:boolean isNonAbstractVirtualMethod():238:239 -> w
-    1:1:boolean isObsolete():126:126 -> x
-    1:2:boolean isPrivateMethod():253:254 -> y
-    1:2:boolean isProcessed():200:201 -> z
-com.android.tools.r8.graph.DexEncodedMethod$1 -> a.a.a.a.f.la:
+    1:40:void <clinit>():56:95 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):149:149 -> <init>
+    2:52:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):105:155 -> <init>
+    53:54:void setCodeOwnership():403:404 -> <init>
+    53:54:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):156 -> <init>
+    55:56:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,int):166:167 -> <init>
+    1:2:boolean isInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):258:259 -> a
+    3:26:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):264:287 -> a
+    27:27:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):285:285 -> a
+    28:28:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):283:283 -> a
+    29:45:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):294:310 -> a
+    46:46:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):307:307 -> a
+    47:47:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):304:304 -> a
+    48:48:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):301:301 -> a
+    49:64:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):298:313 -> a
+    65:66:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):322:323 -> a
+    67:67:void setCode(com.android.tools.r8.graph.Code):338:338 -> a
+    68:69:void voidCodeOwnership():409:410 -> a
+    68:69:void setCode(com.android.tools.r8.graph.Code):339 -> a
+    70:70:void setCode(com.android.tools.r8.graph.Code):340:340 -> a
+    71:72:void setCodeOwnership():403:404 -> a
+    71:72:void setCode(com.android.tools.r8.graph.Code):341 -> a
+    73:75:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions):345:347 -> a
+    76:77:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):359:360 -> a
+    78:78:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
+    78:78:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):360 -> a
+    79:80:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):361:362 -> a
+    81:81:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod):50:50 -> a
+    81:81:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):362 -> a
+    82:82:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):364:364 -> a
+    83:83:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
+    83:83:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):364 -> a
+    84:84:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):365:365 -> a
+    85:85:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
+    85:85:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):365 -> a
+    86:86:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):370:370 -> a
+    87:92:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):375:380 -> a
+    93:104:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):691:702 -> a
+    105:115:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):701:711 -> a
+    116:122:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1259:1265 -> a
+    123:125:void upgradeClassFileVersion(int):426:428 -> a
+    123:125:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1265 -> a
+    126:127:boolean hasClassFileVersion():421:422 -> a
+    126:127:void upgradeClassFileVersion(int):428 -> a
+    126:127:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1265 -> a
+    128:129:void upgradeClassFileVersion(int):428:429 -> a
+    128:129:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1265 -> a
+    130:130:com.android.tools.r8.graph.DexEncodedMethod asSingleTarget():1346:1346 -> a
+    1:1:boolean hasSingleTarget():1352:1352 -> b
+    1:2:java.lang.String toSourceString():476:477 -> d
+    1:1:com.android.tools.r8.graph.DexMethod getKey():725:725 -> e
+    1:1:com.android.tools.r8.graph.PresortedComparable getKey():56 -> e
+    1:1:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():521:521 -> f
+    2:3:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):501:502 -> f
+    2:3:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():522 -> f
+    4:4:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> f
+    4:4:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):503 -> f
+    4:4:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():522 -> f
+    5:12:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):504:511 -> f
+    5:12:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():522 -> f
+    1:3:int getClassFileVersion():415:417 -> g
+    1:2:com.android.tools.r8.graph.Code getCode():392:393 -> h
+    1:5:com.android.tools.r8.graph.UpdatableOptimizationInfo getMutableOptimizationInfo():1246:1250 -> i
+    1:2:com.android.tools.r8.graph.OptimizationInfo getOptimizationInfo():1241:1242 -> j
+    1:2:boolean hasAnnotation():747:748 -> k
+    1:2:boolean isClassInitializer():191:192 -> l
+    1:2:boolean isDirectMethod():232:233 -> m
+    1:2:boolean isInstanceInitializer():181:182 -> n
+    1:2:boolean isNonAbstractVirtualMethod():209:210 -> o
+    1:1:boolean isObsolete():122:122 -> p
+    1:2:boolean isPrivateMethod():224:225 -> q
+    1:2:boolean isProcessed():171:172 -> r
+    1:2:boolean isPublicized():214:215 -> s
+    3:3:boolean com.android.tools.r8.graph.AccessFlags.wasSet(int):202:202 -> s
+    3:3:boolean com.android.tools.r8.graph.AccessFlags.isPromoted(int):220 -> s
+    3:3:boolean com.android.tools.r8.graph.AccessFlags.isPromotedToPublic():189 -> s
+    3:3:boolean isPublicized():215 -> s
+    4:4:boolean com.android.tools.r8.graph.AccessFlags.isPromoted(int):220:220 -> s
+    4:4:boolean com.android.tools.r8.graph.AccessFlags.isPromotedToPublic():189 -> s
+    4:4:boolean isPublicized():215 -> s
+    1:2:boolean isStatic():238:239 -> t
+    1:2:java.lang.String toString():352:353 -> toString
+    1:2:boolean isVirtualMethod():200:201 -> u
+    1:2:java.lang.String qualifiedName():433:434 -> v
+    1:1:void removeCode():397:397 -> w
+    2:3:void voidCodeOwnership():409:410 -> w
+    2:3:void removeCode():398 -> w
+    4:4:void removeCode():399:399 -> w
+    1:1:boolean shouldNotHaveCode():384:384 -> x
+    1:1:void checkIfObsolete():116:116 -> y
+com.android.tools.r8.graph.DexEncodedMethod$1 -> a.a.a.a.f.ka:
     int[] $SwitchMap$com$android$tools$r8$ir$optimize$Inliner$Constraint -> b
     int[] $SwitchMap$com$android$tools$r8$graph$DexEncodedMethod$CompilationState -> a
-    1:1:void <clinit>():325:325 -> <clinit>
-    2:2:void <clinit>():308:308 -> <clinit>
-com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility -> a.a.a.a.f.ma:
+    1:1:void <clinit>():296:296 -> <clinit>
+    2:2:void <clinit>():279:279 -> <clinit>
+com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility -> a.a.a.a.f.la:
     boolean returnsReceiver -> a
-    1:2:void <init>(boolean):797:798 -> <init>
-com.android.tools.r8.graph.DexEncodedMethod$CompilationState -> a.a.a.a.f.na:
+    1:2:void <init>(boolean):768:769 -> <init>
+com.android.tools.r8.graph.DexEncodedMethod$CompilationState -> a.a.a.a.f.ma:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_CLASS -> f
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_NOT_INLINING_CANDIDATE -> b
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_ANY -> c
@@ -11719,111 +11515,107 @@
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_PACKAGE -> e
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] $VALUES -> g
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState NOT_PROCESSED -> a
-    1:24:void <clinit>():70:93 -> <clinit>
-    25:25:void <clinit>():66:66 -> <clinit>
-    1:1:void <init>(java.lang.String,int):66:66 -> <init>
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] values():66:66 -> a
-com.android.tools.r8.graph.DexEncodedMethod$DefaultOptimizationInfoImpl -> a.a.a.a.f.oa:
-    boolean UNKNOWN_INITIALIZER_ENABLING_JAVA_ASSERTIONS -> n
-    boolean UNKNOWN_MAY_HAVE_SIDE_EFFECTS -> p
-    boolean DOES_NOT_USE_IDNETIFIER_NAME_STRING -> i
-    boolean UNKNOWN_CHECKS_NULL_RECEIVER_BEFORE_ANY_SIDE_EFFECT -> j
-    boolean UNKNOWN_TRIGGERS_CLASS_INIT_BEFORE_ANY_SIDE_EFFECT -> k
-    long UNKNOWN_RETURNED_CONSTANT_NUMBER -> g
-    com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer UNKNOWN_TRIVIAL_INITIALIZER -> m
-    java.util.BitSet NO_NULL_PARAMETER_OR_THROW_FACTS -> q
-    java.util.Set UNKNOWN_INITIALIZED_CLASSES_ON_NORMAL_EXIT -> b
-    int UNKNOWN_RETURNED_ARGUMENT -> c
-    java.util.BitSet NO_NULL_PARAMETER_ON_NORMAL_EXITS_FACTS -> r
-    com.android.tools.r8.graph.ParameterUsagesInfo UNKNOWN_PARAMETER_USAGE_INFO -> o
-    boolean $assertionsDisabled -> s
+    1:24:void <clinit>():68:91 -> <clinit>
+    25:25:void <clinit>():64:64 -> <clinit>
+    1:1:void <init>(java.lang.String,int):64:64 -> <init>
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] values():64:64 -> a
+com.android.tools.r8.graph.DexEncodedMethod$DefaultOptimizationInfoImpl -> a.a.a.a.f.na:
+    boolean UNKNOWN_INITIALIZER_ENABLING_JAVA_ASSERTIONS -> m
+    boolean UNKNOWN_MAY_HAVE_SIDE_EFFECTS -> o
+    long UNKNOWN_RETURNED_CONSTANT_NUMBER -> f
+    boolean UNKNOWN_CHECKS_NULL_RECEIVER_BEFORE_ANY_SIDE_EFFECT -> i
+    boolean UNKNOWN_TRIGGERS_CLASS_INIT_BEFORE_ANY_SIDE_EFFECT -> j
+    java.util.BitSet NO_NULL_PARAMETER_ON_NORMAL_EXITS_FACTS -> q
+    java.util.BitSet NO_NULL_PARAMETER_OR_THROW_FACTS -> p
+    int UNKNOWN_RETURNED_ARGUMENT -> b
+    com.android.tools.r8.graph.ParameterUsagesInfo UNKNOWN_PARAMETER_USAGE_INFO -> n
+    boolean $assertionsDisabled -> r
     com.android.tools.r8.graph.OptimizationInfo DEFAULT_INSTANCE -> a
-    boolean UNKNOWN_NEVER_RETURNS_NORMALLY -> e
-    com.android.tools.r8.graph.DexString UNKNOWN_RETURNED_CONSTANT_STRING -> h
-    boolean UNKNOWN_RETURNS_CONSTANT -> f
-    boolean UNKNOWN_NEVER_RETURNS_NULL -> d
-    com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility UNKNOWN_CLASS_INLINER_ELIGIBILITY -> l
-    1:20:void <clinit>():824:843 -> <clinit>
-    1:1:void <init>():845:845 -> <init>
-    1:1:com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):859:859 -> a
-    2:2:boolean useIdentifierNameString():938:938 -> a
-    1:1:com.android.tools.r8.graph.UpdatableOptimizationInfo mutableCopy():968:968 -> b
-    1:1:java.util.BitSet getNonNullParamOnNormalExits():870:870 -> c
-    boolean isReachabilitySensitive() -> d
+    com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer UNKNOWN_TRIVIAL_INITIALIZER -> l
+    com.android.tools.r8.graph.DexString UNKNOWN_RETURNED_CONSTANT_STRING -> g
+    boolean UNKNOWN_RETURNS_CONSTANT -> e
+    boolean DOES_NOT_USE_IDNETIFIER_NAME_STRING -> h
+    com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility UNKNOWN_CLASS_INLINER_ELIGIBILITY -> k
+    boolean UNKNOWN_NEVER_RETURNS_NULL -> c
+    boolean UNKNOWN_NEVER_RETURNS_NORMALLY -> d
+    1:19:void <clinit>():795:813 -> <clinit>
+    1:1:void <init>():815:815 -> <init>
+    1:1:com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):824:824 -> a
+    2:2:com.android.tools.r8.graph.UpdatableOptimizationInfo mutableCopy():933:933 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo():819:819 -> b
+    1:1:java.util.BitSet getNonNullParamOrThrow():830:830 -> c
+    1:1:boolean isInitializerEnablingJavaAssertions():898:898 -> d
     boolean neverInline() -> e
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility():916:916 -> f
-    1:1:java.util.Set getInitializedClassesOnNormalExit():849:849 -> g
-    1:1:boolean isInitializerEnablingJavaAssertions():933:933 -> h
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo():854:854 -> i
-    1:1:java.util.BitSet getNonNullParamOrThrow():865:865 -> j
-com.android.tools.r8.graph.DexEncodedMethod$OptimizationInfoImpl -> a.a.a.a.f.pa:
-    boolean triggersClassInitBeforeAnySideEffect -> m
-    boolean initializerEnablingJavaAssertions -> p
-    boolean useIdentifierNameString -> k
-    long returnedConstantNumber -> g
-    boolean checksNullReceiverBeforeAnySideEffect -> l
-    boolean $assertionsDisabled -> u
-    com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer trivialInitializerInfo -> o
-    java.util.Set initializedClassesOnNormalExit -> a
-    int returnedArgument -> b
-    com.android.tools.r8.graph.OptimizationInfo$InlinePreference inlining -> j
-    java.util.BitSet nonNullParamOnNormalExits -> s
-    java.util.BitSet nonNullParamOrThrow -> r
-    boolean reachabilitySensitive -> t
-    com.android.tools.r8.graph.ParameterUsagesInfo parametersUsages -> q
-    boolean neverReturnsNormally -> e
-    boolean returnsConstantNumber -> f
-    com.android.tools.r8.graph.DexString returnedConstantString -> i
-    com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility classInlinerEligibility -> n
-    boolean returnsConstantString -> h
-    boolean mayHaveSideEffects -> c
-    boolean neverReturnsNull -> d
-    1:1:void <clinit>():972:972 -> <clinit>
-    1:1:void <init>():1022:1022 -> <init>
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):972 -> <init>
-    2:48:void <init>():974:1020 -> <init>
-    2:48:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):972 -> <init>
-    49:49:void <init>(com.android.tools.r8.graph.DexEncodedMethod$OptimizationInfoImpl):1026:1026 -> <init>
-    50:120:void <init>(com.android.tools.r8.graph.DexEncodedMethod$OptimizationInfoImpl):974:1044 -> <init>
-    1:1:com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):1059:1059 -> a
-    2:2:boolean useIdentifierNameString():1138:1138 -> a
-    3:3:void setParameterUsages(com.android.tools.r8.graph.ParameterUsagesInfo):1168:1168 -> a
-    4:4:void setNonNullParamOnNormalExits(java.util.BitSet):1178:1178 -> a
-    5:5:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):1188:1188 -> a
-    6:6:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):1193:1193 -> a
-    7:10:void markReturnsConstantNumber(long):1230:1233 -> a
-    11:14:void markReturnsConstantString(com.android.tools.r8.graph.DexString):1238:1241 -> a
-    15:15:void markCheckNullReceiverBeforeAnySideEffect(boolean):1272:1272 -> a
-    1:1:void setNonNullParamOrThrow(java.util.BitSet):1173:1173 -> b
-    2:4:void markReturnsArgument(int):1208:1210 -> b
-    5:5:void markTriggerClassInitBeforeAnySideEffect(boolean):1277:1277 -> b
-    6:7:com.android.tools.r8.graph.UpdatableOptimizationInfo mutableCopy():1282:1283 -> b
-    1:1:java.util.BitSet getNonNullParamOnNormalExits():1069:1069 -> c
-    2:2:void setReachabilitySensitive(boolean):1183:1183 -> c
-    1:1:boolean isReachabilitySensitive():1074:1074 -> d
-    1:1:boolean neverInline():1148:1148 -> e
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility():1116:1116 -> f
-    1:1:java.util.Set getInitializedClassesOnNormalExit():1049:1049 -> g
-    1:1:boolean isInitializerEnablingJavaAssertions():1133:1133 -> h
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo():1054:1054 -> i
-    1:1:java.util.BitSet getNonNullParamOrThrow():1064:1064 -> j
-    1:1:void markMayNotHaveSideEffects():1215:1215 -> k
-    1:2:void markNeverInline():1261:1262 -> l
-    1:1:void markNeverReturnsNormally():1225:1225 -> m
-    1:1:void markNeverReturnsNull():1220:1220 -> n
-    1:1:void markUseIdentifierNameString():1267:1267 -> o
-    1:1:void setInitializerEnablingJavaAssertions():1198:1198 -> p
-com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer -> a.a.a.a.f.sa:
-    1:1:void <init>():803:803 -> <init>
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):802 -> <init>
-com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer -> a.a.a.a.f.qa:
+    1:1:boolean useIdentifierNameString():903:903 -> f
+    boolean isReachabilitySensitive() -> g
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility():881:881 -> h
+    1:1:java.util.BitSet getNonNullParamOnNormalExits():835:835 -> i
+com.android.tools.r8.graph.DexEncodedMethod$OptimizationInfoImpl -> a.a.a.a.f.oa:
+    boolean initializerEnablingJavaAssertions -> o
+    long returnedConstantNumber -> f
+    boolean useIdentifierNameString -> j
+    boolean checksNullReceiverBeforeAnySideEffect -> k
+    boolean triggersClassInitBeforeAnySideEffect -> l
+    java.util.BitSet nonNullParamOrThrow -> q
+    com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer trivialInitializerInfo -> n
+    com.android.tools.r8.graph.OptimizationInfo$InlinePreference inlining -> i
+    java.util.BitSet nonNullParamOnNormalExits -> r
+    boolean reachabilitySensitive -> s
+    boolean $assertionsDisabled -> t
+    int returnedArgument -> a
+    com.android.tools.r8.graph.ParameterUsagesInfo parametersUsages -> p
+    boolean returnsConstantNumber -> e
+    com.android.tools.r8.graph.DexString returnedConstantString -> h
+    boolean returnsConstantString -> g
+    boolean mayHaveSideEffects -> b
+    boolean neverReturnsNull -> c
+    com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility classInlinerEligibility -> m
+    boolean neverReturnsNormally -> d
+    1:1:void <clinit>():937:937 -> <clinit>
+    1:1:void <init>():985:985 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):937 -> <init>
+    2:46:void <init>():939:983 -> <init>
+    2:46:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):937 -> <init>
+    47:47:void <init>(com.android.tools.r8.graph.DexEncodedMethod$OptimizationInfoImpl):989:989 -> <init>
+    48:116:void <init>(com.android.tools.r8.graph.DexEncodedMethod$OptimizationInfoImpl):939:1007 -> <init>
+    1:1:com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):1017:1017 -> a
+    2:2:void setParameterUsages(com.android.tools.r8.graph.ParameterUsagesInfo):1126:1126 -> a
+    3:3:void setNonNullParamOnNormalExits(java.util.BitSet):1136:1136 -> a
+    4:4:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):1146:1146 -> a
+    5:5:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):1151:1151 -> a
+    6:9:void markReturnsConstantNumber(long):1183:1186 -> a
+    10:13:void markReturnsConstantString(com.android.tools.r8.graph.DexString):1191:1194 -> a
+    14:14:void markCheckNullReceiverBeforeAnySideEffect(boolean):1225:1225 -> a
+    15:16:com.android.tools.r8.graph.UpdatableOptimizationInfo mutableCopy():1235:1236 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo():1012:1012 -> b
+    2:2:void setNonNullParamOrThrow(java.util.BitSet):1131:1131 -> b
+    3:5:void markReturnsArgument(int):1161:1163 -> b
+    6:6:void markTriggerClassInitBeforeAnySideEffect(boolean):1230:1230 -> b
+    1:1:java.util.BitSet getNonNullParamOrThrow():1022:1022 -> c
+    2:2:void setReachabilitySensitive(boolean):1141:1141 -> c
+    1:1:boolean isInitializerEnablingJavaAssertions():1091:1091 -> d
+    1:1:boolean neverInline():1106:1106 -> e
+    1:1:boolean useIdentifierNameString():1096:1096 -> f
+    1:1:boolean isReachabilitySensitive():1032:1032 -> g
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility():1074:1074 -> h
+    1:1:java.util.BitSet getNonNullParamOnNormalExits():1027:1027 -> i
+    1:1:void markMayNotHaveSideEffects():1168:1168 -> j
+    1:2:void markNeverInline():1214:1215 -> k
+    1:1:void markNeverReturnsNormally():1178:1178 -> l
+    1:1:void markNeverReturnsNull():1173:1173 -> m
+    1:1:void markUseIdentifierNameString():1220:1220 -> n
+    1:1:void setInitializerEnablingJavaAssertions():1156:1156 -> o
+com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer -> a.a.a.a.f.ra:
+    1:1:void <init>():774:774 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):773 -> <init>
+com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer -> a.a.a.a.f.pa:
     com.android.tools.r8.graph.DexField field -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexField):818:819 -> <init>
-com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer -> a.a.a.a.f.ra:
+    1:2:void <init>(com.android.tools.r8.graph.DexField):789:790 -> <init>
+com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer -> a.a.a.a.f.qa:
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer INSTANCE -> a
-    1:1:void <clinit>():809:809 -> <clinit>
-    1:1:void <init>():808:808 -> <init>
-com.android.tools.r8.graph.DexField -> a.a.a.a.f.ua:
+    1:1:void <clinit>():780:780 -> <clinit>
+    1:1:void <init>():779:779 -> <init>
+com.android.tools.r8.graph.DexField -> a.a.a.a.f.ta:
     com.android.tools.r8.graph.DexString name -> f
     com.android.tools.r8.graph.DexType holder -> d
     com.android.tools.r8.graph.DexType type -> e
@@ -11838,23 +11630,23 @@
     10:18:int slowCompareTo(com.android.tools.r8.graph.DexField):83:91 -> a
     19:27:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):109:117 -> a
     1:5:boolean computeEquals(java.lang.Object):36:40 -> b
+    1:1:java.lang.String toSmaliString():131:131 -> c
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():355:355 -> c
+    2:2:java.lang.String toSmaliString():131 -> c
+    3:3:java.lang.String toSmaliString():131:131 -> c
+    4:4:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():355:355 -> c
+    4:4:java.lang.String toSmaliString():131 -> c
+    5:5:java.lang.String toSmaliString():131:131 -> c
     1:1:int compareTo(java.lang.Object):10:10 -> compareTo
     2:2:int compareTo(com.android.tools.r8.graph.DexField):78:78 -> compareTo
     2:2:int compareTo(java.lang.Object):10 -> compareTo
-    1:1:java.lang.String toSmaliString():131:131 -> d
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():113:113 -> d
-    2:2:java.lang.String toSmaliString():131 -> d
-    3:3:java.lang.String toSmaliString():131:131 -> d
-    4:4:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():113:113 -> d
-    4:4:java.lang.String toSmaliString():131 -> d
-    5:5:java.lang.String toSmaliString():131:131 -> d
-    1:1:java.lang.String toSourceString():136:136 -> e
-    2:2:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> e
-    2:2:java.lang.String toSourceString():136 -> e
-    3:3:java.lang.String toSourceString():136:136 -> e
-    1:3:int computeHashCode():29:31 -> f
+    1:1:java.lang.String toSourceString():136:136 -> d
+    2:2:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> d
+    2:2:java.lang.String toSourceString():136 -> d
+    3:3:java.lang.String toSourceString():136:136 -> d
+    1:3:int computeHashCode():29:31 -> e
     1:1:java.lang.String toString():47:47 -> toString
-com.android.tools.r8.graph.DexItem -> a.a.a.a.f.va:
+com.android.tools.r8.graph.DexItem -> a.a.a.a.f.ua:
     1:1:void <init>():12:12 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
     void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection) -> a
@@ -11867,408 +11659,385 @@
     9:9:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
     9:9:void lambda$collectAll$0(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexItem):15 -> a
     1:1:void lambda$collectAll$2(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexItem):24:24 -> b
-    1:1:java.lang.String toSmaliString():60:60 -> d
-    1:1:java.lang.String toSourceString():64:64 -> e
-com.android.tools.r8.graph.DexItemFactory -> a.a.a.a.f.Ja:
-    com.android.tools.r8.graph.DexString unboxFloatMethodName -> Q
-    com.android.tools.r8.graph.DexType boxedCharType -> vb
+    1:1:java.lang.String toSmaliString():60:60 -> c
+    1:1:java.lang.String toSourceString():64:64 -> d
+com.android.tools.r8.graph.DexItemFactory -> a.a.a.a.f.Ga:
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> Rb
+    com.android.tools.r8.graph.DexString unboxLongMethodName -> Q
+    com.android.tools.r8.utils.LRUCacheTable leastUpperBoundOfInterfacesTable -> q
+    com.android.tools.r8.graph.DexString npeDescriptor -> Ua
+    com.android.tools.r8.graph.DexType boxedShortType -> vb
+    com.android.tools.r8.graph.DexItemFactory$LongMethods longMethods -> Vb
     com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd setPrologueEnd -> m
-    com.android.tools.r8.graph.DexString proxyDescriptor -> Ya
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> Zb
-    com.android.tools.r8.graph.DexType doubleType -> nb
-    com.android.tools.r8.kotlin.Kotlin kotlin -> ic
-    com.android.tools.r8.graph.DexString indexOfMethodName -> aa
+    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> Zb
+    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> zc
+    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> Ya
+    com.android.tools.r8.graph.DexType boxedDoubleType -> rb
+    com.android.tools.r8.graph.DexString equalsMethodName -> Y
+    com.android.tools.r8.graph.DexString shortDescriptor -> z
+    com.android.tools.r8.graph.DexType voidType -> nb
+    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> Ub
+    com.android.tools.r8.graph.DexString contentEqualsMethodName -> aa
+    com.android.tools.r8.graph.DexType floatType -> jb
+    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> bc
     com.android.tools.r8.graph.DexString voidDescriptor -> A
-    com.android.tools.r8.graph.DexMethod metafactoryMethod -> Ic
-    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> jb
-    com.android.tools.r8.graph.DexType serializableType -> Fc
+    com.android.tools.r8.graph.DexString unknownTypeName -> Fc
+    com.android.tools.r8.graph.DexType booleanType -> fb
+    com.android.tools.r8.graph.DexString classDescriptor -> Ea
     java.util.concurrent.ConcurrentHashMap strings -> a
-    com.android.tools.r8.graph.DexString classArrayDescriptor -> Ia
-    com.android.tools.r8.graph.DexString objectsDescriptor -> Qa
-    java.util.Set libraryMethodsReturningNonNull -> Mc
-    com.android.tools.r8.graph.DexString unboxDoubleMethodName -> R
-    com.android.tools.r8.graph.DexType proxyType -> Vb
-    com.android.tools.r8.graph.DexType annotationThrows -> wc
+    com.android.tools.r8.graph.DexString fieldDescriptor -> Ia
+    com.android.tools.r8.graph.DexString boxedShortDescriptor -> I
+    com.android.tools.r8.graph.DexString throwableDescriptor -> Ma
+    com.android.tools.r8.graph.DexString stringBufferDescriptor -> Qa
+    java.util.IdentityHashMap internalSentinels -> Gc
+    com.android.tools.r8.graph.DexString unboxFloatMethodName -> R
+    com.android.tools.r8.graph.DexString getMethodName -> ua
+    com.android.tools.r8.graph.DexType serializableType -> wc
     com.android.tools.r8.graph.DexString booleanDescriptor -> s
-    com.android.tools.r8.graph.DexString invokeMethodName -> ya
-    com.android.tools.r8.graph.DexType autoCloseableType -> Nb
-    com.android.tools.r8.graph.DexType annotationDefault -> oc
+    com.android.tools.r8.graph.DexString invokeExactMethodName -> ya
+    com.android.tools.r8.graph.DexType metafactoryType -> sc
+    com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> Z
+    com.android.tools.r8.graph.DexType methodTypeType -> Nb
+    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> oc
     boolean sorted -> r
-    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> ab
-    com.android.tools.r8.graph.DexType objectType -> Fb
+    com.android.tools.r8.graph.DexType stringBuilderType -> Jb
+    com.android.tools.r8.graph.DexType annotationMethodParameters -> kc
+    com.android.tools.r8.graph.DexString classConstructorMethodName -> ab
+    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> Fb
     com.android.tools.r8.graph.DexString boxedBooleanDescriptor -> B
-    com.android.tools.r8.graph.DexString getClassMethodName -> ia
-    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> fc
+    com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> ea
+    com.android.tools.r8.graph.DexType annotationEnclosingClass -> gc
+    com.android.tools.r8.graph.DexType objectArrayType -> Bb
+    com.android.tools.r8.graph.DexString toStringMethodName -> ia
     java.util.concurrent.ConcurrentHashMap referenceTypeLatticeElements -> p
-    com.android.tools.r8.graph.DexString getTypeNameName -> qa
-    com.android.tools.r8.graph.DexString isEmptyMethodName -> S
+    com.android.tools.r8.graph.DexString boxedNumberDescriptor -> J
+    com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> ma
+    com.android.tools.r8.graph.DexString getSimpleNameName -> qa
+    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> Dc
+    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> cc
+    com.android.tools.r8.graph.DexType stringType -> yb
+    com.android.tools.r8.graph.DexString unboxDoubleMethodName -> S
+    com.android.tools.r8.graph.DexString methodTypeDescriptor -> Ta
     com.android.tools.r8.graph.DexString byteDescriptor -> t
-    com.android.tools.r8.graph.DexType boxedByteType -> ub
-    com.android.tools.r8.graph.DexString npeDescriptor -> Xa
-    com.android.tools.r8.graph.DexType charType -> mb
+    com.android.tools.r8.graph.DexType boxedLongType -> ub
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advanceLines -> g
+    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> Xa
+    com.android.tools.r8.graph.DexMethod metafactoryMethod -> yc
+    com.android.tools.r8.graph.DexType boxedCharType -> qb
+    com.android.tools.r8.graph.DexType shortType -> mb
+    com.android.tools.r8.graph.DexType doubleType -> ib
+    com.android.tools.r8.graph.DexString objectArrayDescriptor -> Da
     com.android.tools.r8.graph.DexString boxedByteDescriptor -> C
-    com.android.tools.r8.graph.DexString autoCloseableDescriptor -> Ha
-    com.android.tools.r8.graph.DexType iteratorType -> Ec
-    com.android.tools.r8.graph.DexString exceptionInInitializerErrorDescriptor -> Pa
-    com.android.tools.r8.graph.DexString lengthMethodName -> T
+    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> eb
+    com.android.tools.r8.graph.DexString classArrayDescriptor -> Ha
+    com.android.tools.r8.graph.DexType nullValueType -> Ec
+    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> Tb
+    com.android.tools.r8.graph.DexString initMethodName -> K
+    com.android.tools.r8.graph.DexString annotationDescriptor -> La
+    com.android.tools.r8.graph.DexType stringConcatFactoryType -> Ac
+    com.android.tools.r8.graph.DexString stringBuilderDescriptor -> Pa
+    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> Sb
+    com.android.tools.r8.graph.DexString getDeclaredFieldName -> ta
+    com.android.tools.r8.kotlin.Kotlin kotlin -> _b
+    com.android.tools.r8.graph.DexString isEmptyMethodName -> T
+    java.util.Map setFiles -> n
     com.android.tools.r8.graph.DexString charDescriptor -> u
-    com.android.tools.r8.graph.DexType npeType -> Ub
-    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> vc
-    java.util.Set libraryMethodsReturningReceiver -> Lc
-    com.android.tools.r8.graph.DexString assertionsDisabled -> xa
-    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> ac
-    com.android.tools.r8.graph.DexType classLoaderType -> Mb
+    com.android.tools.r8.graph.DexType iteratorType -> vc
+    com.android.tools.r8.graph.DexString invokeMethodName -> xa
+    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> Yb
+    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> rc
+    com.android.tools.r8.graph.DexType methodHandleType -> Mb
+    com.android.tools.r8.graph.DexType annotationThrows -> nc
+    com.android.tools.r8.graph.DexType annotationMemberClasses -> jc
+    java.util.concurrent.ConcurrentHashMap methodHandles -> f
+    com.android.tools.r8.graph.DexType autoCloseableType -> Ib
+    com.android.tools.r8.graph.DexString compareToMethodName -> da
     com.android.tools.r8.graph.DexString boxedCharDescriptor -> D
-    com.android.tools.r8.graph.DexType stringArrayType -> Eb
-    com.android.tools.r8.graph.DexString toStringMethodName -> ha
-    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> hc
-    com.android.tools.r8.graph.DexString getSimpleNameName -> pa
-    com.android.tools.r8.graph.DexString stringBufferDescriptor -> Sa
-    com.android.tools.r8.graph.DexString unknownTypeName -> Tc
-    com.android.tools.r8.graph.DexType boxedBooleanType -> tb
+    boolean skipNameValidationForTesting -> Cc
+    com.android.tools.r8.graph.DexType annotationDefault -> fc
+    com.android.tools.r8.graph.DexType throwableType -> Eb
+    com.android.tools.r8.graph.DexString valueOfMethodName -> ha
+    com.android.tools.r8.graph.DexType objectType -> Ab
+    com.android.tools.r8.graph.DexString ordinalMethodName -> la
+    com.android.tools.r8.graph.DexString unboxBooleanMethodName -> L
+    com.android.tools.r8.graph.DexType stringArrayType -> zb
+    com.android.tools.r8.graph.DexString getCanonicalNameName -> pa
+    com.android.tools.r8.graph.DexString methodHandleDescriptor -> Sa
+    com.android.tools.r8.graph.DexType charSequenceType -> xb
+    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> Wa
+    com.android.tools.r8.graph.DexType boxedIntType -> tb
+    com.android.tools.r8.graph.DexString lengthMethodName -> U
     java.util.Map setInlineFrames -> o
+    com.android.tools.r8.graph.DexString doubleDescriptor -> v
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap defaults -> i
-    com.android.tools.r8.graph.DexType byteType -> lb
-    com.android.tools.r8.graph.DexString newUpdaterName -> db
-    com.android.tools.r8.graph.DexString stringArrayDescriptor -> Ca
+    com.android.tools.r8.graph.DexType boxedByteType -> pb
+    com.android.tools.r8.graph.DexString constructorMethodName -> _a
+    com.android.tools.r8.graph.DexType longType -> lb
+    com.android.tools.r8.graph.DexType charType -> hb
+    com.android.tools.r8.graph.DexString objectDescriptor -> Ca
     com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin setEpilogueBegin -> l
     java.util.concurrent.ConcurrentHashMap methods -> e
-    com.android.tools.r8.graph.DexType lookupType -> Dc
-    java.util.IdentityHashMap internalSentinels -> Uc
-    com.android.tools.r8.graph.DexString fieldDescriptor -> Ka
-    com.android.tools.r8.graph.DexString unboxCharMethodName -> M
-    com.android.tools.r8.graph.DexString getFieldName -> sa
-    java.util.Set libraryTypesAssumedToBePresent -> Oc
-    com.android.tools.r8.graph.DexType invocationHandlerType -> Tb
-    com.android.tools.r8.graph.DexType annotationSignature -> uc
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advancePCs -> h
-    com.android.tools.r8.graph.DexType classType -> Lb
-    com.android.tools.r8.graph.DexString compareToMethodName -> ca
-    java.util.concurrent.ConcurrentHashMap protos -> d
-    com.android.tools.r8.graph.DexType stringType -> Db
-    com.android.tools.r8.graph.DexString ordinalMethodName -> ka
-    com.android.tools.r8.graph.DexString unboxShortMethodName -> N
-    com.android.tools.r8.graph.DexString stringBuilderDescriptor -> Ra
-    com.android.tools.r8.graph.DexType nullValueType -> Sc
-    com.android.tools.r8.graph.DexType voidType -> sb
-    com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> Za
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap restartLocals -> k
-    com.android.tools.r8.graph.DexType stringConcatFactoryType -> Kc
-    com.android.tools.r8.graph.DexType booleanType -> kb
-    com.android.tools.r8.graph.DexString stringDescriptor -> Ba
-    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> cb
-    java.util.concurrent.ConcurrentHashMap fields -> c
-    com.android.tools.r8.graph.DexType callSiteType -> Cc
-    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> Jc
-    com.android.tools.r8.graph.DexString constructorDescriptor -> Ja
-    com.android.tools.r8.graph.DexString unboxIntMethodName -> O
-    com.android.tools.r8.graph.DexString unboxLongMethodName -> P
-    java.util.Set libraryMethodsWithoutSideEffects -> Nc
-    com.android.tools.r8.graph.DexString getDeclaredConstructorName -> ra
-    com.android.tools.r8.graph.DexType methodTypeType -> Sb
-    com.android.tools.r8.graph.DexType annotationMethodParameters -> tc
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap endLocals -> j
-    com.android.tools.r8.graph.DexString invokeExactMethodName -> za
-    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> bb
-    com.android.tools.r8.graph.DexString charSequenceDescriptor -> Aa
-    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> Kb
-    com.android.tools.r8.graph.DexString lastIndexOfMethodName -> ba
-    com.android.tools.r8.graph.DexType charSequenceType -> Cb
-    java.util.concurrent.ConcurrentHashMap types -> b
-    com.android.tools.r8.graph.DexItemFactory$LongMethods longMethods -> cc
-    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> kc
-    com.android.tools.r8.graph.DexString finalizeMethodName -> ja
-    com.android.tools.r8.utils.LRUCacheTable leastUpperBoundOfInterfacesTable -> q
-    com.android.tools.r8.graph.DexString methodHandleDescriptor -> Ua
-    com.android.tools.r8.graph.DexType shortType -> rb
-    com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> Y
-    com.android.tools.r8.graph.DexString shortDescriptor -> z
-    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> bc
-    com.android.tools.r8.graph.DexString classConstructorMethodName -> fb
-    com.android.tools.r8.graph.DexString objectArrayDescriptor -> Ea
-    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> Hc
-    com.android.tools.r8.graph.DexString boxedShortDescriptor -> I
-    com.android.tools.r8.graph.DexString enumDescriptor -> Ma
-    com.android.tools.r8.graph.DexType metafactoryType -> Bc
-    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> jc
-    com.android.tools.r8.graph.DexString getMethodName -> ua
-    com.android.tools.r8.graph.DexType methodHandleType -> Rb
-    com.android.tools.r8.graph.DexType annotationMemberClasses -> sc
-    boolean $assertionsDisabled -> Vc
-    com.android.tools.r8.graph.DexString contentEqualsMethodName -> Z
-    com.android.tools.r8.graph.DexType throwableType -> Jb
-    com.android.tools.r8.graph.DexString cloneMethodName -> ea
-    com.android.tools.r8.graph.DexType boxedNumberType -> Bb
-    com.android.tools.r8.graph.DexString boxedNumberDescriptor -> J
-    com.android.tools.r8.graph.DexString forNameMethodName -> ma
-    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> gc
-    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> nc
-    com.android.tools.r8.graph.DexType boxedIntType -> yb
-    com.android.tools.r8.graph.DexString varHandleDescriptor -> Ta
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advanceLines -> g
-    com.android.tools.r8.graph.DexType longType -> qb
-    com.android.tools.r8.graph.DexType charArrayType -> ib
-    com.android.tools.r8.graph.DexString objectDescriptor -> Da
-    com.android.tools.r8.graph.DexString constructorMethodName -> eb
-    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> ec
-    com.android.tools.r8.graph.DexString unboxBooleanMethodName -> K
-    com.android.tools.r8.graph.DexString methodDescriptor -> La
-    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> Ac
-    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> zc
-    java.util.Set libraryTypesWithoutStaticInitialization -> Pc
-    com.android.tools.r8.graph.DexString getDeclaredFieldName -> ta
-    java.util.Map setFiles -> n
-    com.android.tools.r8.graph.DexType varHandleType -> Qb
-    com.android.tools.r8.graph.DexType annotationInnerClass -> rc
-    java.util.concurrent.ConcurrentHashMap methodHandles -> f
-    com.android.tools.r8.graph.DexType enumType -> Ib
-    com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> da
-    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> mc
-    com.android.tools.r8.graph.DexType boxedShortType -> Ab
-    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> _b
-    com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> la
-    com.android.tools.r8.graph.DexString unboxByteMethodName -> L
-    com.android.tools.r8.graph.DexType boxedLongType -> zb
-    com.android.tools.r8.graph.DexType boxedFloatType -> xb
-    com.android.tools.r8.graph.DexString invocationHandlerDescriptor -> Wa
-    com.android.tools.r8.graph.DexString containsMethodName -> U
-    com.android.tools.r8.graph.DexString doubleDescriptor -> v
-    com.android.tools.r8.graph.DexType intType -> pb
-    com.android.tools.r8.graph.DexString listDescriptor -> _a
-    com.android.tools.r8.graph.DexString charArrayDescriptor -> hb
+    com.android.tools.r8.graph.DexType charArrayType -> db
     com.android.tools.r8.graph.DexString boxedDoubleDescriptor -> E
-    com.android.tools.r8.graph.DexString classLoaderDescriptor -> Ga
-    com.android.tools.r8.graph.DexString throwableDescriptor -> Oa
-    com.android.tools.r8.graph.DexType listType -> Xb
-    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> yc
-    com.android.tools.r8.graph.DexString newInstanceName -> wa
-    com.android.tools.r8.graph.DexString startsWithMethodName -> V
+    com.android.tools.r8.graph.DexString autoCloseableDescriptor -> Ga
+    com.android.tools.r8.graph.DexString enumDescriptor -> Ka
+    com.android.tools.r8.graph.DexString objectsDescriptor -> Oa
+    com.android.tools.r8.graph.DexString unboxByteMethodName -> M
+    com.android.tools.r8.graph.DexString getFieldName -> sa
+    com.android.tools.r8.graph.DexString assertionsDisabled -> wa
+    com.android.tools.r8.graph.DexType lookupType -> uc
+    com.android.tools.r8.graph.DexString containsMethodName -> V
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advancePCs -> h
     com.android.tools.r8.graph.DexString floatDescriptor -> w
-    com.android.tools.r8.graph.DexType stringBufferType -> Pb
-    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> qc
-    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> Rc
-    com.android.tools.r8.graph.DexType classArrayType -> Hb
-    com.android.tools.r8.graph.DexString valueOfMethodName -> ga
+    com.android.tools.r8.graph.DexType serviceLoaderType -> Pb
+    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> qc
+    com.android.tools.r8.graph.DexType varHandleType -> Lb
+    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> mc
+    com.android.tools.r8.graph.DexString lastIndexOfMethodName -> ca
+    com.android.tools.r8.graph.DexType annotationInnerClass -> ic
+    boolean $assertionsDisabled -> Hc
+    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> dc
+    com.android.tools.r8.graph.DexType classLoaderType -> Hb
+    java.util.concurrent.ConcurrentHashMap protos -> d
+    com.android.tools.r8.graph.DexString substringName -> ga
     com.android.tools.r8.graph.DexString boxedFloatDescriptor -> F
-    com.android.tools.r8.graph.DexString getCanonicalNameName -> oa
-    com.android.tools.r8.graph.DexType boxedDoubleType -> wb
-    com.android.tools.r8.graph.DexString methodTypeDescriptor -> Va
-    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> lc
-    com.android.tools.r8.graph.DexString endsWithMethodName -> W
+    com.android.tools.r8.graph.DexType enumType -> Db
+    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> Wb
+    com.android.tools.r8.graph.DexString finalizeMethodName -> ka
+    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> ec
+    com.android.tools.r8.graph.DexString getNameName -> oa
+    com.android.tools.r8.graph.DexString unboxCharMethodName -> N
+    com.android.tools.r8.graph.DexString varHandleDescriptor -> Ra
+    com.android.tools.r8.graph.DexType boxedNumberType -> wb
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> Qb
+    com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> Va
+    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> Xb
+    com.android.tools.r8.graph.DexString startsWithMethodName -> W
+    com.android.tools.r8.graph.DexType boxedFloatType -> sb
     com.android.tools.r8.graph.DexString intDescriptor -> x
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods utilArraysMethods -> dc
-    com.android.tools.r8.graph.DexType floatType -> ob
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> Yb
-    com.android.tools.r8.graph.DexType comparableType -> Gc
-    com.android.tools.r8.graph.DexString classDescriptor -> Fa
-    com.android.tools.r8.graph.DexString thisName -> gb
+    com.android.tools.r8.graph.DexString newUpdaterName -> Za
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap restartLocals -> k
+    com.android.tools.r8.graph.DexType boxedBooleanType -> ob
+    com.android.tools.r8.graph.DexType intType -> kb
+    com.android.tools.r8.graph.DexString stringArrayDescriptor -> Ba
+    com.android.tools.r8.graph.DexString charArrayDescriptor -> cb
+    com.android.tools.r8.graph.DexType byteType -> gb
+    com.android.tools.r8.graph.DexString classLoaderDescriptor -> Fa
+    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> ac
+    java.util.concurrent.ConcurrentHashMap fields -> c
     com.android.tools.r8.graph.DexString boxedIntDescriptor -> G
-    com.android.tools.r8.graph.DexString annotationDescriptor -> Na
-    com.android.tools.r8.graph.DexType serviceLoaderType -> Wb
-    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> xc
+    com.android.tools.r8.graph.DexString methodDescriptor -> Ja
+    com.android.tools.r8.graph.DexString exceptionInInitializerErrorDescriptor -> Na
+    com.android.tools.r8.graph.DexString unboxShortMethodName -> O
+    com.android.tools.r8.graph.DexString unboxIntMethodName -> P
+    com.android.tools.r8.graph.DexString getTypeNameName -> ra
+    com.android.tools.r8.graph.DexType comparableType -> xc
     com.android.tools.r8.graph.DexString getDeclaredMethodName -> va
-    com.android.tools.r8.graph.DexString equalsMethodName -> X
+    com.android.tools.r8.graph.DexType callSiteType -> tc
+    com.android.tools.r8.graph.DexString endsWithMethodName -> X
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap endLocals -> j
     com.android.tools.r8.graph.DexString longDescriptor -> y
-    boolean skipNameValidationForTesting -> Qc
-    com.android.tools.r8.graph.DexType stringBuilderType -> Ob
-    com.android.tools.r8.graph.DexType annotationEnclosingClass -> pc
-    com.android.tools.r8.graph.DexType objectArrayType -> Gb
-    com.android.tools.r8.graph.DexString substringName -> fa
+    com.android.tools.r8.graph.DexString charSequenceDescriptor -> za
+    com.android.tools.r8.graph.DexType npeType -> Ob
+    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> pc
+    java.util.Set libraryTypesWithoutStaticInitialization -> Bc
+    com.android.tools.r8.graph.DexString thisName -> bb
+    com.android.tools.r8.graph.DexString stringDescriptor -> Aa
+    com.android.tools.r8.graph.DexType stringBufferType -> Kb
+    com.android.tools.r8.graph.DexType annotationSignature -> lc
+    com.android.tools.r8.graph.DexType classType -> Gb
+    com.android.tools.r8.graph.DexString indexOfMethodName -> ba
+    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> hc
+    com.android.tools.r8.graph.DexType classArrayType -> Cb
+    com.android.tools.r8.graph.DexString cloneMethodName -> fa
+    java.util.concurrent.ConcurrentHashMap types -> b
     com.android.tools.r8.graph.DexString boxedLongDescriptor -> H
-    com.android.tools.r8.graph.DexString getNameName -> na
-    1:39:void <clinit>():49:87 -> <clinit>
-    1:1:void <init>():91:91 -> <init>
-    2:221:void <init>():53:272 -> <init>
-    222:223:void com.android.tools.r8.graph.DexItemFactory$ConstructorMethods.<init>(com.android.tools.r8.graph.DexItemFactory):560:561 -> <init>
-    222:223:void com.android.tools.r8.graph.DexItemFactory$ConstructorMethods.<init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):555 -> <init>
-    222:223:void <init>():273 -> <init>
-    224:225:void com.android.tools.r8.graph.DexItemFactory$EnumMethods.<init>(com.android.tools.r8.graph.DexItemFactory):574:575 -> <init>
-    224:225:void com.android.tools.r8.graph.DexItemFactory$EnumMethods.<init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):569 -> <init>
-    224:225:void <init>():274 -> <init>
-    226:227:void <init>():275:276 -> <init>
-    228:246:void com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods.<init>(com.android.tools.r8.graph.DexItemFactory):654:672 -> <init>
-    228:246:void com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods.<init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):647 -> <init>
-    228:246:void <init>():278 -> <init>
-    247:247:void <init>():281:281 -> <init>
-    248:252:void com.android.tools.r8.graph.DexItemFactory$ProxyMethods.<init>(com.android.tools.r8.graph.DexItemFactory):896:900 -> <init>
-    248:252:void com.android.tools.r8.graph.DexItemFactory$ProxyMethods.<init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):891 -> <init>
-    248:252:void <init>():282 -> <init>
-    253:253:void com.android.tools.r8.graph.DexItemFactory$ProxyMethods.<init>(com.android.tools.r8.graph.DexItemFactory):897:897 -> <init>
-    253:253:void com.android.tools.r8.graph.DexItemFactory$ProxyMethods.<init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):891 -> <init>
-    253:253:void <init>():282 -> <init>
-    254:259:void <init>():284:289 -> <init>
-    260:260:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    260:260:void <init>():290 -> <init>
-    261:261:void <init>():290:290 -> <init>
-    262:262:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    262:262:void <init>():294 -> <init>
-    263:263:void <init>():294:294 -> <init>
-    264:264:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    264:264:void <init>():295 -> <init>
-    265:265:void <init>():295:295 -> <init>
-    266:266:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    266:266:void <init>():296 -> <init>
-    267:267:void <init>():296:296 -> <init>
-    268:268:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    268:268:void <init>():298 -> <init>
-    269:269:void <init>():298:298 -> <init>
-    270:270:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    270:270:void <init>():299 -> <init>
-    271:271:void <init>():299:299 -> <init>
-    272:272:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    272:272:void <init>():300 -> <init>
-    273:273:void <init>():300:300 -> <init>
-    274:274:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    274:274:void <init>():302 -> <init>
-    275:275:void <init>():302:302 -> <init>
-    276:276:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    276:276:void <init>():303 -> <init>
-    277:277:void <init>():303:303 -> <init>
-    278:278:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    278:278:void <init>():305 -> <init>
-    279:279:void <init>():305:305 -> <init>
-    280:280:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    280:280:void <init>():307 -> <init>
-    281:281:void <init>():307:307 -> <init>
-    282:282:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    282:282:void <init>():309 -> <init>
-    283:283:void <init>():309:309 -> <init>
-    284:284:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    284:284:void <init>():311 -> <init>
-    285:285:void <init>():311:311 -> <init>
-    286:286:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    286:286:void <init>():313 -> <init>
-    287:287:void <init>():313:313 -> <init>
-    288:288:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    288:288:void <init>():318 -> <init>
-    289:289:void <init>():318:318 -> <init>
-    290:290:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    290:290:void <init>():319 -> <init>
-    291:291:void <init>():319:319 -> <init>
-    292:292:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    292:292:void <init>():320 -> <init>
-    293:293:void <init>():320:320 -> <init>
-    294:294:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    294:294:void <init>():321 -> <init>
-    295:295:void <init>():321:321 -> <init>
-    296:296:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    296:296:void <init>():322 -> <init>
-    297:297:void <init>():322:322 -> <init>
-    298:298:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    298:298:void <init>():323 -> <init>
-    299:299:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    299:299:void <init>():324 -> <init>
-    300:315:void <init>():324:339 -> <init>
-    316:332:void <init>():329:345 -> <init>
-    333:333:void <init>():342:342 -> <init>
-    334:334:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    334:334:void <init>():348 -> <init>
-    335:347:void <init>():348:360 -> <init>
-    348:368:void <init>():351:371 -> <init>
-    369:428:void <init>():364:423 -> <init>
-    429:429:void <init>():413:413 -> <init>
-    430:430:void <init>():92:92 -> <init>
+    com.android.tools.r8.graph.DexString getClassMethodName -> ja
+    com.android.tools.r8.graph.DexString forNameMethodName -> na
+    1:39:void <clinit>():51:89 -> <clinit>
+    1:1:void <init>():93:93 -> <init>
+    2:212:void <init>():55:265 -> <init>
+    213:214:void com.android.tools.r8.graph.DexItemFactory$EnumMethods.<init>(com.android.tools.r8.graph.DexItemFactory):508:509 -> <init>
+    213:214:void com.android.tools.r8.graph.DexItemFactory$EnumMethods.<init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):503 -> <init>
+    213:214:void <init>():266 -> <init>
+    215:216:void <init>():267:268 -> <init>
+    217:235:void com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods.<init>(com.android.tools.r8.graph.DexItemFactory):583:601 -> <init>
+    217:235:void com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods.<init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):576 -> <init>
+    217:235:void <init>():270 -> <init>
+    236:236:void <init>():273:273 -> <init>
+    237:242:void com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods.<init>(com.android.tools.r8.graph.DexItemFactory):813:818 -> <init>
+    237:242:void com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods.<init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):806 -> <init>
+    237:242:void <init>():274 -> <init>
+    243:251:void com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods.<init>(com.android.tools.r8.graph.DexItemFactory):816:824 -> <init>
+    243:251:void com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods.<init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):806 -> <init>
+    243:251:void <init>():274 -> <init>
+    252:252:void com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods.<init>(com.android.tools.r8.graph.DexItemFactory):821:821 -> <init>
+    252:252:void com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods.<init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):806 -> <init>
+    252:252:void <init>():274 -> <init>
+    253:258:void <init>():276:281 -> <init>
+    259:259:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    259:259:void <init>():282 -> <init>
+    260:260:void <init>():282:282 -> <init>
+    261:261:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    261:261:void <init>():286 -> <init>
+    262:262:void <init>():286:286 -> <init>
+    263:263:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    263:263:void <init>():287 -> <init>
+    264:264:void <init>():287:287 -> <init>
+    265:265:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    265:265:void <init>():288 -> <init>
+    266:266:void <init>():288:288 -> <init>
+    267:267:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    267:267:void <init>():290 -> <init>
+    268:268:void <init>():290:290 -> <init>
+    269:269:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    269:269:void <init>():291 -> <init>
+    270:270:void <init>():291:291 -> <init>
+    271:271:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    271:271:void <init>():292 -> <init>
+    272:272:void <init>():292:292 -> <init>
+    273:273:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    273:273:void <init>():294 -> <init>
+    274:274:void <init>():294:294 -> <init>
+    275:275:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    275:275:void <init>():295 -> <init>
+    276:276:void <init>():295:295 -> <init>
+    277:277:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    277:277:void <init>():297 -> <init>
+    278:278:void <init>():297:297 -> <init>
+    279:279:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    279:279:void <init>():299 -> <init>
+    280:280:void <init>():299:299 -> <init>
+    281:281:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    281:281:void <init>():301 -> <init>
+    282:282:void <init>():301:301 -> <init>
+    283:283:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    283:283:void <init>():303 -> <init>
+    284:284:void <init>():303:303 -> <init>
+    285:285:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    285:285:void <init>():305 -> <init>
+    286:286:void <init>():305:305 -> <init>
+    287:287:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    287:287:void <init>():310 -> <init>
+    288:288:void <init>():310:310 -> <init>
+    289:289:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    289:289:void <init>():311 -> <init>
+    290:290:void <init>():311:311 -> <init>
+    291:291:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    291:291:void <init>():312 -> <init>
+    292:292:void <init>():312:312 -> <init>
+    293:293:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    293:293:void <init>():313 -> <init>
+    294:294:void <init>():313:313 -> <init>
+    295:295:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    295:295:void <init>():314 -> <init>
+    296:296:void <init>():314:314 -> <init>
+    297:297:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    297:297:void <init>():315 -> <init>
+    298:298:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    298:298:void <init>():316 -> <init>
+    299:312:void <init>():316:329 -> <init>
+    313:329:void <init>():319:335 -> <init>
+    330:330:void <init>():332:332 -> <init>
+    331:331:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    331:331:void <init>():338 -> <init>
+    332:344:void <init>():338:350 -> <init>
+    345:365:void <init>():341:361 -> <init>
+    366:407:void <init>():354:395 -> <init>
+    408:408:void <init>():385:385 -> <init>
+    409:409:void <init>():94:94 -> <init>
     com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame lambda$createSetInlineFrame$0(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
-    1:1:com.android.tools.r8.graph.DexType access$1700(com.android.tools.r8.graph.DexItemFactory):49:49 -> a
-    2:2:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):96:96 -> a
-    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):426:427 -> a
-    5:7:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):934:936 -> a
-    8:9:com.android.tools.r8.graph.DexString createString(int,byte[]):941:942 -> a
-    10:11:com.android.tools.r8.graph.DexString createString(java.lang.String):946:947 -> a
-    12:13:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1004:1005 -> a
-    14:16: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):1009:1011 -> a
-    17:17:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1015:1015 -> a
-    18:20:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList):1019:1021 -> a
-    21:21:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1025:1025 -> a
-    22:27:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1066:1071 -> a
-    22:27:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1026 -> a
-    28:28:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1027:1027 -> a
-    29:29:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1026:1026 -> a
-    30:34:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1032:1036 -> a
-    35:42:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1053:1060 -> a
-    35:42:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1036 -> a
+    1:1:com.android.tools.r8.graph.DexType access$1200(com.android.tools.r8.graph.DexItemFactory):51:51 -> a
+    2:2:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):98:98 -> a
+    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):398:399 -> a
+    5:7:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):833:835 -> a
+    8:9:com.android.tools.r8.graph.DexString createString(int,byte[]):840:841 -> a
+    10:11:com.android.tools.r8.graph.DexString createString(java.lang.String):845:846 -> a
+    12:13:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):903:904 -> a
+    14:16: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):908:910 -> a
+    17:17:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):914:914 -> a
+    18:20:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList):918:920 -> a
+    21:21:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):924:924 -> a
+    22:27:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):965:970 -> a
+    22:27:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):925 -> a
+    28:28:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):926:926 -> a
+    29:29:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):925:925 -> a
+    30:34:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):931:935 -> a
+    35:42:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):952:959 -> a
+    35:42:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):935 -> a
     43:52:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.copyWithSparseChanges(java.lang.Class,java.lang.Object[],java.util.Map):25:34 -> a
-    43:52:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1062 -> a
-    43:52:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1036 -> a
-    53:53:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1062:1062 -> a
-    53:53:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1036 -> a
-    54:60:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1037:1043 -> a
-    61:65:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1042:1046 -> a
-    66:68: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):1075:1077 -> a
-    69:69:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1081:1081 -> a
-    70:72:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):1088:1090 -> a
-    73:74: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):1099:1100 -> a
-    75:84: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[]):1106:1115 -> a
-    85:87:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1119:1121 -> a
-    88:88:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1149:1149 -> a
-    89:91:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1157:1159 -> a
-    92:94:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1164:1166 -> a
-    95:95:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1174:1174 -> a
-    96:103:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1203:1210 -> a
-    104:132:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1209:1237 -> a
-    133:141:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1217:1225 -> a
-    142:153:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1224:1235 -> a
-    154:158:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1242:1246 -> a
-    159:159:int lambda$assignSortedIndices$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1243:1243 -> a
-    160:166:void sort(com.android.tools.r8.naming.NamingLens):1251:1257 -> a
-    1:7:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):982:988 -> b
-    8:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):987:990 -> b
-    12:12:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> b
-    13:15:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1125:1127 -> b
-    16:16:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1153:1153 -> b
-    17:17:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1170:1170 -> b
-    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):410:410 -> c
-    2:6:java.util.Collection extractMarker():957:961 -> c
-    7:9:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1131:1133 -> c
-    1:5:java.util.List extractMarkers():971:975 -> d
-    6:8:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1137:1139 -> d
-    1:1:boolean getSkipNameValidationForTesting():406:406 -> e
-    2:4:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1143:1145 -> e
-com.android.tools.r8.graph.DexItemFactory$1 -> a.a.a.a.f.wa:
-com.android.tools.r8.graph.DexItemFactory$ClassMethods -> a.a.a.a.f.xa:
-    com.android.tools.r8.graph.DexMethod getDeclaredMethod -> j
-    com.android.tools.r8.graph.DexMethod getMethod -> i
-    com.android.tools.r8.graph.DexMethod getDeclaredField -> h
-    com.android.tools.r8.graph.DexMethod getField -> g
-    com.android.tools.r8.graph.DexMethod getTypeName -> f
-    com.android.tools.r8.graph.DexMethod getSimpleName -> e
-    com.android.tools.r8.graph.DexMethod getCanonicalName -> d
-    com.android.tools.r8.graph.DexMethod getName -> c
-    java.util.Set getNames -> k
-    com.android.tools.r8.graph.DexMethod forName -> b
+    43:52:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):961 -> a
+    43:52:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):935 -> a
+    53:53:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):961:961 -> a
+    53:53:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):935 -> a
+    54:60:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):936:942 -> a
+    61:65:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):941:945 -> a
+    66:68: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):974:976 -> a
+    69:69:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):980:980 -> a
+    70:72:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor):986:988 -> a
+    73:74: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):997:998 -> a
+    75:84: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[]):1004:1013 -> a
+    85:87:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1017:1019 -> a
+    88:88:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1047:1047 -> a
+    89:91:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1055:1057 -> a
+    92:94:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1062:1064 -> a
+    95:95:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1072:1072 -> a
+    96:131:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier):1077:1112 -> a
+    132:132:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier):1107:1107 -> a
+    133:137:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1117:1121 -> a
+    138:138:int lambda$assignSortedIndices$1(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1118:1118 -> a
+    139:145:void sort(com.android.tools.r8.naming.NamingLens):1126:1132 -> a
+    1:7:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):881:887 -> b
+    8:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):886:889 -> b
+    12:12:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> b
+    13:15:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1023:1025 -> b
+    16:16:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1051:1051 -> b
+    17:17:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1068:1068 -> b
+    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):378:378 -> c
+    2:6:java.util.Collection extractMarker():856:860 -> c
+    7:9:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1029:1031 -> c
+    1:5:java.util.List extractMarkers():870:874 -> d
+    6:8:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1035:1037 -> d
+    1:1:boolean getSkipNameValidationForTesting():374:374 -> e
+    2:4:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1041:1043 -> e
+com.android.tools.r8.graph.DexItemFactory$1 -> a.a.a.a.f.va:
+com.android.tools.r8.graph.DexItemFactory$ClassMethods -> a.a.a.a.f.wa:
+    java.util.Set getNames -> j
+    com.android.tools.r8.graph.DexMethod getDeclaredMethod -> i
+    com.android.tools.r8.graph.DexMethod getMethod -> h
+    com.android.tools.r8.graph.DexMethod getDeclaredField -> g
+    com.android.tools.r8.graph.DexMethod getField -> f
+    com.android.tools.r8.graph.DexMethod getTypeName -> e
+    com.android.tools.r8.graph.DexMethod getSimpleName -> d
+    com.android.tools.r8.graph.DexMethod getCanonicalName -> c
+    com.android.tools.r8.graph.DexMethod getName -> b
     com.android.tools.r8.graph.DexMethod desiredAssertionStatus -> a
-    1:30:void <init>(com.android.tools.r8.graph.DexItemFactory):514:543 -> <init>
-    1:30:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):497 -> <init>
-    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):551:551 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> a.a.a.a.f.ya:
-    com.android.tools.r8.graph.DexMethod asList -> a
-    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):448:452 -> <init>
-    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):444 -> <init>
-    6:6:void <init>(com.android.tools.r8.graph.DexItemFactory):450:450 -> <init>
-    6:6:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):444 -> <init>
-com.android.tools.r8.graph.DexItemFactory$LongMethods -> a.a.a.a.f.za:
+    1:22:void <init>(com.android.tools.r8.graph.DexItemFactory):470:491 -> <init>
+    1:22:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):455 -> <init>
+    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):499:499 -> a
+com.android.tools.r8.graph.DexItemFactory$LongMethods -> a.a.a.a.f.xa:
     com.android.tools.r8.graph.DexMethod compare -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):438:440 -> <init>
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):434 -> <init>
-    4:4:void <init>(com.android.tools.r8.graph.DexItemFactory):439:439 -> <init>
-    4:4:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):434 -> <init>
-com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> a.a.a.a.f.Aa:
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):410:412 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):406 -> <init>
+    4:4:void <init>(com.android.tools.r8.graph.DexItemFactory):411:411 -> <init>
+    4:4:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):406 -> <init>
+com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> a.a.a.a.f.ya:
     com.android.tools.r8.graph.DexMethod init -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):587:589 -> <init>
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):583 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ObjectMethods -> a.a.a.a.f.Ba:
+    1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):521:522 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):517 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ObjectMethods -> a.a.a.a.f.za:
     com.android.tools.r8.graph.DexMethod finalize -> c
     com.android.tools.r8.graph.DexMethod constructor -> b
     com.android.tools.r8.graph.DexMethod getClass -> a
-    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):477:482 -> <init>
-    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):471 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> a.a.a.a.f.Ca:
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):435:440 -> <init>
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):429 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> a.a.a.a.f.Aa:
     com.android.tools.r8.graph.DexMethod requireNonNull -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):491:493 -> <init>
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):487 -> <init>
-    4:4:void <init>(com.android.tools.r8.graph.DexItemFactory):492:492 -> <init>
-    4:4:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):487 -> <init>
-com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> a.a.a.a.f.Da:
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):449:451 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):445 -> <init>
+    4:4:void <init>(com.android.tools.r8.graph.DexItemFactory):450:450 -> <init>
+    4:4:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):445 -> <init>
+com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> a.a.a.a.f.Ba:
     com.android.tools.r8.graph.DexProto compareAndSetSignature -> c
     java.util.Set varHandleMethods -> d
     com.android.tools.r8.graph.DexItemFactory this$0 -> g
@@ -12276,10 +12045,10 @@
     java.util.Set varHandleCompareAndSetMethods -> f
     com.android.tools.r8.graph.DexProto signature -> a
     com.android.tools.r8.graph.DexProto setSignature -> b
-    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):822:857 -> <init>
-    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):865:875 -> a
-    12:17:java.util.Set createStrings(java.lang.String[]):882:887 -> a
-com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> a.a.a.a.f.Ea:
+    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):737:772 -> <init>
+    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):780:790 -> a
+    12:17:java.util.Set createStrings(java.lang.String[]):797:802 -> a
+com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> a.a.a.a.f.Ca:
     com.android.tools.r8.graph.DexField longTYPE -> f
     com.android.tools.r8.graph.DexField intTYPE -> e
     com.android.tools.r8.graph.DexField doubleTYPE -> h
@@ -12289,24 +12058,12 @@
     com.android.tools.r8.graph.DexField booleanTYPE -> a
     com.android.tools.r8.graph.DexField shortTYPE -> d
     com.android.tools.r8.graph.DexField charTYPE -> c
-    1:21:void <init>(com.android.tools.r8.graph.DexItemFactory):615:635 -> <init>
-    1:21:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):603 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> a.a.a.a.f.Fa:
-    com.android.tools.r8.graph.DexMethod iterator -> b
-    com.android.tools.r8.graph.DexMethod loadWithClassLoader -> a
-    1:7:void <init>(com.android.tools.r8.graph.DexItemFactory):911:917 -> <init>
-    1:7:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):904 -> <init>
-    8:16:void <init>(com.android.tools.r8.graph.DexItemFactory):915:923 -> <init>
-    8:16:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):904 -> <init>
-    17:22:void <init>(com.android.tools.r8.graph.DexItemFactory):920:925 -> <init>
-    17:22:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):904 -> <init>
-com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> a.a.a.a.f.Ga:
-    com.android.tools.r8.graph.DexMethod defaultConstructor -> o
-    com.android.tools.r8.graph.DexMethod charSequenceConstructor -> n
+    1:21:void <init>(com.android.tools.r8.graph.DexItemFactory):544:564 -> <init>
+    1:21:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):532 -> <init>
+com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> a.a.a.a.f.Da:
     com.android.tools.r8.graph.DexMethod appendStringBuffer -> m
     com.android.tools.r8.graph.DexMethod appendString -> l
     com.android.tools.r8.graph.DexMethod appendObject -> k
-    java.util.Set constructorMethods -> s
     com.android.tools.r8.graph.DexMethod appendLong -> j
     com.android.tools.r8.graph.DexMethod appendFloat -> i
     com.android.tools.r8.graph.DexMethod appendDouble -> h
@@ -12317,14 +12074,11 @@
     com.android.tools.r8.graph.DexMethod appendCharArray -> c
     com.android.tools.r8.graph.DexMethod appendChar -> b
     com.android.tools.r8.graph.DexMethod appendBoolean -> a
-    java.util.Set appendMethods -> r
-    com.android.tools.r8.graph.DexMethod stringConstructor -> q
-    com.android.tools.r8.graph.DexMethod intConstructor -> p
-    1:45:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):769:813 -> <init>
-    1:45:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):746 -> <init>
-    1:1:java.util.Set access$1500(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):746:746 -> a
-    1:1:java.util.Set access$1600(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):746:746 -> b
-com.android.tools.r8.graph.DexItemFactory$StringMethods -> a.a.a.a.f.Ha:
+    java.util.Set appenders -> n
+    1:34:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):692:725 -> <init>
+    1:34:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):675 -> <init>
+    1:1:void forEachAppendMethod(java.util.function.Consumer):733:733 -> a
+com.android.tools.r8.graph.DexItemFactory$StringMethods -> a.a.a.a.f.Ea:
     com.android.tools.r8.graph.DexMethod valueOf -> o
     com.android.tools.r8.graph.DexMethod compareToIgnoreCase -> n
     com.android.tools.r8.graph.DexMethod compareTo -> m
@@ -12341,41 +12095,32 @@
     com.android.tools.r8.graph.DexMethod length -> b
     com.android.tools.r8.graph.DexMethod isEmpty -> a
     com.android.tools.r8.graph.DexMethod toString -> p
-    1:41:void <init>(com.android.tools.r8.graph.DexItemFactory):701:741 -> <init>
-    1:41:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):680 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> a.a.a.a.f.Ia:
+    1:41:void <init>(com.android.tools.r8.graph.DexItemFactory):630:670 -> <init>
+    1:41:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):609 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> a.a.a.a.f.Fa:
     com.android.tools.r8.graph.DexMethod getSuppressed -> b
     com.android.tools.r8.graph.DexMethod addSuppressed -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):463:465 -> <init>
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):458 -> <init>
-    4:7:void <init>(com.android.tools.r8.graph.DexItemFactory):464:467 -> <init>
-    4:7:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):458 -> <init>
-    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):466:466 -> <init>
-    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):458 -> <init>
-com.android.tools.r8.graph.DexLibraryClass -> a.a.a.a.f.Ka:
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):421:423 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):416 -> <init>
+    4:7:void <init>(com.android.tools.r8.graph.DexItemFactory):422:425 -> <init>
+    4:7:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):416 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):424:424 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):416 -> <init>
+com.android.tools.r8.graph.DexLibraryClass -> a.a.a.a.f.Ha:
     boolean $assertionsDisabled -> p
-    1:1:void <clinit>():17:17 -> <clinit>
-    1:25:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):35:59 -> <init>
-    boolean isLibraryClass() -> B
-    boolean isNotProgramClass() -> E
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):78:78 -> a
-    1:1:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):70:70 -> b
-    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():96:96 -> b
-    2:2:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):70 -> b
-    3:4:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):70:71 -> b
-    5:5:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():92:92 -> b
-    5:5:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):71 -> b
-    6:6:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):71:71 -> b
-    7:7:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):94:94 -> b
-    1:3:boolean verifyLibraryMethod(com.android.tools.r8.graph.DexEncodedMethod):63:65 -> d
-    1:1:java.lang.String toSourceString():88:88 -> e
-    com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> l
-    1:1:java.lang.String toString():83:83 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():118:118 -> toString
-    2:2:java.lang.String toString():83 -> toString
-    3:3:java.lang.String toString():83:83 -> toString
-    com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> w
-com.android.tools.r8.graph.DexMemberAnnotation -> a.a.a.a.f.Oa:
+    1:1:void <clinit>():16:16 -> <clinit>
+    1:21:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):34:54 -> <init>
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):60:60 -> a
+    1:1:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):76:76 -> b
+    1:1:java.lang.String toSourceString():70:70 -> d
+    com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> e
+    com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> p
+    1:1:java.lang.String toString():65:65 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():360:360 -> toString
+    2:2:java.lang.String toString():65 -> toString
+    3:3:java.lang.String toString():65:65 -> toString
+    boolean isLibraryClass() -> u
+com.android.tools.r8.graph.DexMemberAnnotation -> a.a.a.a.f.La:
     com.android.tools.r8.graph.Descriptor item -> a
     com.android.tools.r8.graph.DexItem annotations -> b
     1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexItem):14:16 -> <init>
@@ -12383,13 +12128,13 @@
     3:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):28:28 -> a
     1:3:boolean equals(java.lang.Object):41:43 -> equals
     1:1:int hashCode():33:33 -> hashCode
-com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation -> a.a.a.a.f.La:
+com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation -> a.a.a.a.f.Ia:
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexAnnotationSet):51:51 -> <init>
-com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation -> a.a.a.a.f.Ma:
+com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation -> a.a.a.a.f.Ja:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexAnnotationSet):58:58 -> <init>
-com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation -> a.a.a.a.f.Na:
+com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation -> a.a.a.a.f.Ka:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ParameterAnnotationsList):66:66 -> <init>
-com.android.tools.r8.graph.DexMethod -> a.a.a.a.f.Pa:
+com.android.tools.r8.graph.DexMethod -> a.a.a.a.f.Ma:
     com.android.tools.r8.graph.DexProto proto -> e
     com.android.tools.r8.graph.DexString name -> f
     com.android.tools.r8.graph.DexType holder -> d
@@ -12411,54 +12156,53 @@
     1:3:boolean collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):52:54 -> b
     4:8:boolean computeEquals(java.lang.Object):89:93 -> b
     1:1:void collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):62:62 -> c
+    2:2:java.lang.String toSmaliString():161:161 -> c
+    3:3:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():355:355 -> c
+    3:3:java.lang.String toSmaliString():161 -> c
+    4:4:java.lang.String toSmaliString():161:161 -> c
+    5:5:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():95:95 -> c
+    5:5:java.lang.String toSmaliString():161 -> c
+    6:6:java.lang.String toSmaliString():161:161 -> c
     1:1:int compareTo(java.lang.Object):12:12 -> compareTo
     2:2:int compareTo(com.android.tools.r8.graph.DexMethod):108:108 -> compareTo
     2:2:int compareTo(java.lang.Object):12 -> compareTo
-    1:1:java.lang.String toSmaliString():161:161 -> d
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():113:113 -> d
-    2:2:java.lang.String toSmaliString():161 -> d
-    3:3:java.lang.String toSmaliString():161:161 -> d
-    4:4:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():95:95 -> d
-    4:4:java.lang.String toSmaliString():161 -> d
-    5:5:java.lang.String toSmaliString():161:161 -> d
-    1:15:java.lang.String toSourceString():166:180 -> e
-    1:3:int computeHashCode():82:84 -> f
-    com.android.tools.r8.graph.DexMethod asDexMethod() -> h
-    boolean isDexMethod() -> j
-    1:1:int getArity():39:39 -> k
-    1:1:java.lang.String qualifiedName():156:156 -> l
+    1:15:java.lang.String toSourceString():166:180 -> d
+    1:3:int computeHashCode():82:84 -> e
+    com.android.tools.r8.graph.DexMethod asDexMethod() -> g
+    boolean isDexMethod() -> i
+    1:1:int getArity():39:39 -> j
+    1:1:java.lang.String qualifiedName():156:156 -> k
     1:1:java.lang.String toString():35:35 -> toString
-com.android.tools.r8.graph.DexMethodHandle -> a.a.a.a.f.Ra:
+com.android.tools.r8.graph.DexMethodHandle -> a.a.a.a.f.Oa:
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType type -> d
     com.android.tools.r8.graph.Descriptor fieldOrMethod -> e
-    com.android.tools.r8.graph.DexMethod rewrittenTarget -> g
-    boolean isInterface -> f
-    boolean $assertionsDisabled -> h
+    com.android.tools.r8.graph.DexMethod rewrittenTarget -> f
+    boolean $assertionsDisabled -> g
     1:1:void <clinit>():15:15 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):208:212 -> <init>
-    6:10:void <init>(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean,com.android.tools.r8.graph.DexMethod):219:223 -> <init>
+    1:4:void <init>(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor):205:208 -> <init>
+    5:8:void <init>(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexMethod):214:217 -> <init>
     1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):15:15 -> a
-    2:8:int layeredCompareTo(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.naming.NamingLens):344:350 -> a
+    2:8:int layeredCompareTo(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.naming.NamingLens):339:345 -> a
     2:8:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):15 -> a
-    9:14: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):228:233 -> a
-    15:15: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.Descriptor,boolean):109:109 -> a
-    15:15: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):233 -> a
-    16:26:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):266:276 -> a
-    27:27:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):283:283 -> a
-    1:6:boolean computeEquals(java.lang.Object):243:248 -> b
+    9:13: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):222:226 -> a
+    14:14: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.Descriptor):108:108 -> a
+    14:14: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):227 -> a
+    15:25:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):261:271 -> a
+    26:26:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):278:278 -> a
+    1:5:boolean computeEquals(java.lang.Object):239:243 -> b
+    1:1:java.lang.String toSmaliString():284:284 -> c
     1:1:int compareTo(java.lang.Object):15:15 -> compareTo
-    2:8:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):316:322 -> compareTo
-    2:8:int compareTo(com.android.tools.r8.graph.DexMethodHandle):358 -> compareTo
+    2:8:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):311:317 -> compareTo
+    2:8:int compareTo(com.android.tools.r8.graph.DexMethodHandle):353 -> compareTo
     2:8:int compareTo(java.lang.Object):15 -> compareTo
-    1:1:java.lang.String toSmaliString():289:289 -> d
-    1:1:int computeHashCode():238:238 -> f
-    1:2:com.android.tools.r8.graph.DexField asField():310:311 -> h
-    1:2:com.android.tools.r8.graph.DexMethod asMethod():305:306 -> i
-    1:1:boolean isFieldHandle():293:293 -> j
-    1:1:boolean isMethodHandle():297:297 -> k
-    1:1:boolean isStaticHandle():301:301 -> l
-    1:6:java.lang.String toString():255:260 -> toString
-com.android.tools.r8.graph.DexMethodHandle$MethodHandleType -> a.a.a.a.f.Qa:
+    1:3:int computeHashCode():232:234 -> e
+    1:2:com.android.tools.r8.graph.DexField asField():305:306 -> g
+    1:2:com.android.tools.r8.graph.DexMethod asMethod():300:301 -> h
+    1:1:boolean isFieldHandle():288:288 -> i
+    1:1:boolean isMethodHandle():292:292 -> j
+    1:1:boolean isStaticHandle():296:296 -> k
+    1:6:java.lang.String toString():250:255 -> toString
+com.android.tools.r8.graph.DexMethodHandle$MethodHandleType -> a.a.a.a.f.Na:
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType INVOKE_CONSTRUCTOR -> h
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType INVOKE_INSTANCE -> g
@@ -12475,54 +12219,54 @@
     1:12:void <clinit>():18:29 -> <clinit>
     13:13:void <clinit>():18:18 -> <clinit>
     1:2:void <init>(java.lang.String,int,short):33:34 -> <init>
-    1:1:short getValue():38:38 -> a
-    2:29:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):85:112 -> a
-    30:34:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):106:110 -> a
-    35:48:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):95:108 -> a
-    49:49:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):104:104 -> a
-    50:50:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):93:93 -> a
-    51:51:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):91:91 -> a
-    52:52:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):89:89 -> a
-    53:53:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):87:87 -> a
-    1:1:boolean isFieldType():117:117 -> b
-    2:2:boolean isInstancePut():134:134 -> b
-    2:2:boolean isFieldType():117 -> b
-    3:3:boolean isInstanceGet():138:138 -> b
-    3:3:boolean isFieldType():117 -> b
-    1:1:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):76:76 -> c
-    2:2:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):73:73 -> c
-    3:3:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):70:70 -> c
-    4:4:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):67:67 -> c
-    5:5:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):64:64 -> c
-    6:6:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):61:61 -> c
-    7:7:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):58:58 -> c
-    8:8:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):55:55 -> c
-    9:9:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):52:52 -> c
-    10:10:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):49:49 -> c
-    11:44:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):46:79 -> c
-    45:45:short getValue():38:38 -> c
-    45:45:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):79 -> c
-    46:46:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):79:79 -> c
-    47:47:boolean isInvokeConstructor():162:162 -> c
-    1:1:boolean isInvokeDirect():146:146 -> d
-    1:1:boolean isInvokeInstance():150:150 -> e
-    1:1:boolean isInvokeInterface():154:154 -> f
-    1:1:boolean isInvokeStatic():142:142 -> g
-    1:1:boolean isMethodType():121:121 -> h
-    2:2:boolean isInvokeSuper():158:158 -> h
-    2:2:boolean isMethodType():121 -> h
-    3:3:boolean isMethodType():122:122 -> h
-    1:1:boolean isStaticGet():130:130 -> i
-    1:1:boolean isStaticPut():126:126 -> j
-    1:16:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():166:181 -> k
-    17:17:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():179:179 -> k
-    18:18:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():177:177 -> k
-    19:19:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():175:175 -> k
-    20:20:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():173:173 -> k
-    21:21:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():171:171 -> k
-    22:22:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():169:169 -> k
-    1:1:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType[] values():18:18 -> l
-com.android.tools.r8.graph.DexProgramClass -> a.a.a.a.f.Sa:
+    1:28:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):85:112 -> a
+    29:33:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):106:110 -> a
+    34:47:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):95:108 -> a
+    48:48:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):104:104 -> a
+    49:49:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):93:93 -> a
+    50:50:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):91:91 -> a
+    51:51:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):89:89 -> a
+    52:52:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):87:87 -> a
+    53:53:boolean isFieldType():117:117 -> a
+    54:54:boolean isInstancePut():134:134 -> a
+    54:54:boolean isFieldType():117 -> a
+    55:55:boolean isInstanceGet():138:138 -> a
+    55:55:boolean isFieldType():117 -> a
+    1:1:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):76:76 -> b
+    2:2:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):73:73 -> b
+    3:3:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):70:70 -> b
+    4:4:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):67:67 -> b
+    5:5:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):64:64 -> b
+    6:6:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):61:61 -> b
+    7:7:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):58:58 -> b
+    8:8:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):55:55 -> b
+    9:9:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):52:52 -> b
+    10:10:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):49:49 -> b
+    11:44:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):46:79 -> b
+    45:45:short getValue():38:38 -> b
+    45:45:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):79 -> b
+    46:46:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):79:79 -> b
+    47:47:boolean isInvokeConstructor():162:162 -> b
+    1:1:boolean isInvokeDirect():146:146 -> c
+    1:1:boolean isInvokeInstance():150:150 -> d
+    1:1:boolean isInvokeInterface():154:154 -> e
+    1:1:boolean isInvokeStatic():142:142 -> f
+    1:1:boolean isMethodType():121:121 -> g
+    2:2:boolean isInvokeSuper():158:158 -> g
+    2:2:boolean isMethodType():121 -> g
+    3:3:boolean isMethodType():122:122 -> g
+    1:1:short getValue():38:38 -> getValue
+    1:1:boolean isStaticGet():130:130 -> h
+    1:1:boolean isStaticPut():126:126 -> i
+    1:16:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():166:181 -> j
+    17:17:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():179:179 -> j
+    18:18:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():177:177 -> j
+    19:19:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():175:175 -> j
+    20:20:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():173:173 -> j
+    21:21:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():171:171 -> j
+    22:22:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():169:169 -> j
+    1:1:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType[] values():18:18 -> k
+com.android.tools.r8.graph.DexProgramClass -> a.a.a.a.f.Pa:
     com.android.tools.r8.graph.DexEncodedArray SENTINEL_NOT_YET_COMPUTED -> u
     java.util.Collection synthesizedFrom -> r
     com.android.tools.r8.graph.DexProgramClass[] EMPTY_ARRAY -> t
@@ -12535,52 +12279,51 @@
     2:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):49:49 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,java.util.Collection):85:85 -> <init>
     4:79:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,java.util.Collection):28:103 -> <init>
-    boolean isNotProgramClass() -> E
-    boolean isProgramClass() -> F
-    1:20:void computeStaticValues():276:295 -> J
-    1:2:int getInitialClassFileVersion():386:387 -> K
-    1:2:com.android.tools.r8.graph.DexEncodedArray getStaticValues():316:317 -> L
-    1:1:java.util.Collection getSynthesizedFrom():154:154 -> M
-    1:5:boolean hasAnnotations():240:244 -> N
-    1:2:boolean hasMethodsOrFields():234:235 -> O
-    1:4:boolean hasOnlyInternalizableAnnotations():248:251 -> P
-    1:4:boolean isSorted():300:303 -> Q
-    1:1:boolean originatesFromClassResource():111:111 -> R
-    1:1:boolean originatesFromDexResource():107:107 -> S
+    1:20:void computeStaticValues():271:290 -> B
+    1:2:int getInitialClassFileVersion():381:382 -> C
+    1:2:com.android.tools.r8.graph.DexEncodedArray getStaticValues():311:312 -> D
+    1:1:java.util.Collection getSynthesizedFrom():154:154 -> E
+    1:5:boolean hasAnnotations():235:239 -> F
+    1:2:boolean hasMethodsOrFields():229:230 -> G
+    1:4:boolean hasOnlyInternalizableAnnotations():243:246 -> H
+    1:4:boolean isSorted():295:298 -> I
+    1:1:boolean originatesFromClassResource():111:111 -> J
+    1:1:boolean originatesFromDexResource():107:107 -> K
     1:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):117:119 -> a
-    4:5:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):124:125 -> a
+    4:5:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):366:367 -> a
     4:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):120 -> a
     6:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):122:124 -> a
     9:9:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):144:144 -> a
     9:9:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):125 -> a
     10:10:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):127:127 -> a
-    11:11:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):64:64 -> a
+    11:11:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):47:47 -> a
     11:11:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):128 -> a
     12:24:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):130:142 -> a
     25:28:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):159:162 -> a
-    29:31:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedField[]):255:257 -> a
-    32:35:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):267:270 -> a
-    36:40:boolean isSorted(com.android.tools.r8.graph.KeyedDexItem[]):308:312 -> a
-    41:64:boolean hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):399:422 -> a
+    29:31:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedField[]):250:252 -> a
+    32:35:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):262:265 -> a
+    36:40:boolean isSorted(com.android.tools.r8.graph.KeyedDexItem[]):303:307 -> a
+    41:64:boolean hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):394:417 -> a
     1:3:void synchronizedCollectAll(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexItem[]):148:150 -> b
     4:8:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):168:172 -> b
-    9:12:void sortMembers():353:356 -> b
+    9:12:void sortMembers():348:351 -> b
     9:12:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):176 -> b
     13:24:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):177:188 -> b
     25:27:void synchronizedCollectAll(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexItem[]):193:195 -> b
-    28:30:void sortEncodedFields(com.android.tools.r8.graph.DexEncodedField[]):360:362 -> b
-    31:31:com.android.tools.r8.graph.DexField lambda$sortEncodedFields$0(com.android.tools.r8.graph.DexEncodedField):361:361 -> b
-    1:3:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedMethod[]):261:263 -> c
-    1:3:void sortEncodedMethods(com.android.tools.r8.graph.DexEncodedMethod[]):366:368 -> d
-    4:4:com.android.tools.r8.graph.DexMethod lambda$sortEncodedMethods$1(com.android.tools.r8.graph.DexEncodedMethod):367:367 -> d
-    5:6:void setInitialClassFileVersion(int):377:378 -> d
-    1:1:java.lang.String toSourceString():205:205 -> e
-    com.android.tools.r8.graph.DexProgramClass asProgramClass() -> m
+    28:30:void sortEncodedFields(com.android.tools.r8.graph.DexEncodedField[]):355:357 -> b
+    31:31:com.android.tools.r8.graph.DexField lambda$sortEncodedFields$0(com.android.tools.r8.graph.DexEncodedField):356:356 -> b
+    1:3:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedMethod[]):256:258 -> c
+    4:5:void setInitialClassFileVersion(int):372:373 -> c
+    1:1:java.lang.String toSourceString():205:205 -> d
+    2:4:void sortEncodedMethods(com.android.tools.r8.graph.DexEncodedMethod[]):361:363 -> d
+    5:5:com.android.tools.r8.graph.DexMethod lambda$sortEncodedMethods$1(com.android.tools.r8.graph.DexEncodedMethod):362:362 -> d
+    com.android.tools.r8.graph.DexProgramClass asProgramClass() -> f
+    com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> p
     1:1:java.lang.String toString():200:200 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():118:118 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():360:360 -> toString
     2:2:java.lang.String toString():200 -> toString
-    com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> w
-com.android.tools.r8.graph.DexProto -> a.a.a.a.f.Ta:
+    boolean isProgramClass() -> x
+com.android.tools.r8.graph.DexProto -> a.a.a.a.f.Qa:
     com.android.tools.r8.graph.DexTypeList parameters -> f
     com.android.tools.r8.graph.DexString shorty -> d
     com.android.tools.r8.graph.DexType returnType -> e
@@ -12593,22 +12336,22 @@
     9:9:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):58:58 -> a
     10:10:int compareTo(com.android.tools.r8.graph.DexProto):63:63 -> a
     1:5:boolean computeEquals(java.lang.Object):32:36 -> b
+    1:1:java.lang.String toSmaliString():95:95 -> c
     1:1:int compareTo(java.lang.Object):9:9 -> compareTo
-    1:1:java.lang.String toSmaliString():95:95 -> d
-    1:2:int computeHashCode():25:26 -> f
-    3:3:int com.android.tools.r8.graph.DexTypeList.hashCode():33:33 -> f
-    3:3:int computeHashCode():27 -> f
-    1:1:java.lang.String toDescriptorString():99:99 -> h
-    2:9:java.lang.String toDescriptorString(com.android.tools.r8.naming.NamingLens):103:110 -> h
-    2:9:java.lang.String toDescriptorString():99 -> h
+    1:2:int computeHashCode():25:26 -> e
+    3:3:int com.android.tools.r8.graph.DexTypeList.hashCode():33:33 -> e
+    3:3:int computeHashCode():27 -> e
+    1:1:java.lang.String toDescriptorString():99:99 -> g
+    2:9:java.lang.String toDescriptorString(com.android.tools.r8.naming.NamingLens):103:110 -> g
+    2:9:java.lang.String toDescriptorString():99 -> g
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.graph.DexReference -> a.a.a.a.f.Ua:
+com.android.tools.r8.graph.DexReference -> a.a.a.a.f.Ra:
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():14:14 -> <init>
-    com.android.tools.r8.graph.DexMethod asDexMethod() -> h
-    com.android.tools.r8.graph.DexReference asDexReference() -> i
-    boolean isDexMethod() -> j
-com.android.tools.r8.graph.DexString -> a.a.a.a.f.Va:
+    com.android.tools.r8.graph.DexMethod asDexMethod() -> g
+    com.android.tools.r8.graph.DexReference asDexReference() -> h
+    boolean isDexMethod() -> i
+com.android.tools.r8.graph.DexString -> a.a.a.a.f.Sa:
     com.android.tools.r8.graph.DexString[] EMPTY_ARRAY -> f
     boolean $assertionsDisabled -> g
     int size -> d
@@ -12631,72 +12374,91 @@
     1:3:boolean computeEquals(java.lang.Object):38:40 -> b
     4:16:int slowCompareTo(com.android.tools.r8.graph.DexString):167:179 -> b
     1:1:int compareTo(java.lang.Object):14:14 -> compareTo
-    1:1:int computeHashCode():33:33 -> f
-    1:1:boolean isValidClassDescriptor():285:285 -> h
-    2:13:boolean isValidClassDescriptor(java.lang.String):203:214 -> h
-    2:13:boolean isValidClassDescriptor():285 -> h
-    14:14:boolean isValidClassDescriptor(java.lang.String):212:212 -> h
-    14:14:boolean isValidClassDescriptor():285 -> h
-    1:1:boolean isValidFieldName():277:277 -> i
-    2:18:boolean isValidFieldName(java.lang.String):244:260 -> i
-    2:18:boolean isValidFieldName():277 -> i
-    19:19:boolean isValidFieldName(java.lang.String):258:258 -> i
-    19:19:boolean isValidFieldName():277 -> i
-    1:1:boolean isValidMethodName():269:269 -> j
-    2:16:boolean isValidMethodName(java.lang.String):222:236 -> j
-    2:16:boolean isValidMethodName():269 -> j
-    17:17:boolean isValidMethodName(java.lang.String):234:234 -> j
-    17:17:boolean isValidMethodName():269 -> j
-    1:3:java.lang.String toASCIIString():56:58 -> k
-    1:15:java.lang.String decode():74:88 -> l
-    16:25:java.lang.String decode():86:95 -> l
-    26:30:java.lang.String decode():93:97 -> l
+    1:1:int computeHashCode():33:33 -> e
+    1:1:boolean isValidClassDescriptor():285:285 -> g
+    2:13:boolean isValidClassDescriptor(java.lang.String):203:214 -> g
+    2:13:boolean isValidClassDescriptor():285 -> g
+    14:14:boolean isValidClassDescriptor(java.lang.String):212:212 -> g
+    14:14:boolean isValidClassDescriptor():285 -> g
+    1:1:boolean isValidFieldName():277:277 -> h
+    2:18:boolean isValidFieldName(java.lang.String):244:260 -> h
+    2:18:boolean isValidFieldName():277 -> h
+    19:19:boolean isValidFieldName(java.lang.String):258:258 -> h
+    19:19:boolean isValidFieldName():277 -> h
+    1:1:boolean isValidMethodName():269:269 -> i
+    2:16:boolean isValidMethodName(java.lang.String):222:236 -> i
+    2:16:boolean isValidMethodName():269 -> i
+    17:17:boolean isValidMethodName(java.lang.String):234:234 -> i
+    17:17:boolean isValidMethodName():269 -> i
+    1:3:java.lang.String toASCIIString():56:58 -> j
+    1:15:java.lang.String decode():74:88 -> k
+    16:25:java.lang.String decode():86:95 -> k
+    26:30:java.lang.String decode():93:97 -> k
     1:3:java.lang.String toString():48:50 -> toString
-com.android.tools.r8.graph.DexType -> a.a.a.a.f.Wa:
+com.android.tools.r8.graph.DexType -> a.a.a.a.f.Ta:
+    java.util.Set directSubtypes -> g
+    java.util.Set implementedInterfaces -> h
+    java.util.Set NO_DIRECT_SUBTYPE -> j
     com.android.tools.r8.graph.DexString descriptor -> d
-    boolean $assertionsDisabled -> g
-    com.android.tools.r8.graph.DexType[] EMPTY_ARRAY -> f
+    boolean $assertionsDisabled -> k
+    int hierarchyLevel -> f
+    com.android.tools.r8.graph.DexType[] EMPTY_ARRAY -> i
     java.lang.String toStringCache -> e
-    1:2:void <clinit>():23:24 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexString):29:29 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexString):27:31 -> <init>
+    1:9:void <clinit>():32:40 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexString):54:54 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.DexString):43:56 -> <init>
     boolean isPrimitiveType(char) -> a
-    1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):23:23 -> a
-    2:4:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):170:172 -> a
-    2:4:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):23 -> a
-    5:6:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Predicate):53:54 -> a
-    7:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):124:125 -> a
-    9:9:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):138:138 -> a
-    10:10:int compareTo(com.android.tools.r8.graph.DexType):153:153 -> a
-    11:20:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):292:301 -> a
-    21:23:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):305:307 -> a
-    24:26:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):306:308 -> a
-    27:34:java.lang.String getPackageOrName(boolean):312:319 -> a
-    1:2:boolean computeEquals(java.lang.Object):41:42 -> b
-    3:3:boolean isSamePackage(com.android.tools.r8.graph.DexType):78:78 -> b
-    4:9:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):282:287 -> b
-    10:12:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):286:288 -> b
-    1:1:int slowCompareTo(com.android.tools.r8.graph.DexType):158:158 -> c
-    1:1:int compareTo(java.lang.Object):23:23 -> compareTo
-    1:1:java.lang.String toSmaliString():113:113 -> d
-    1:9:java.lang.String toSourceString():95:103 -> e
-    1:1:int computeHashCode():36:36 -> f
-    1:16:int elementSizeForPrimitiveArrayType():254:269 -> k
-    1:2:java.lang.String getInternalName():336:337 -> l
-    1:4:java.lang.String getName():328:331 -> m
-    1:1:int getNumberOfLeadingSquareBrackets():275:275 -> n
-    1:1:java.lang.String getPackageDescriptor():324:324 -> o
-    1:1:boolean isArrayType():221:221 -> p
-    1:1:boolean isBooleanType():189:189 -> q
-    1:1:boolean isClassType():226:226 -> r
-    1:1:boolean isFloatType():209:209 -> s
-    1:4:boolean isPrimitiveArrayType():231:234 -> t
-    1:1:java.lang.String toString():118:118 -> toString
-    1:1:boolean isPrimitiveType():176:176 -> u
-    1:1:boolean isVoidType():185:185 -> v
-    1:1:java.lang.String toDescriptorString():82:82 -> w
-    1:1:char toShorty():107:107 -> x
-com.android.tools.r8.graph.DexTypeList -> a.a.a.a.f.Xa:
+    1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):32:32 -> a
+    2:4:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):412:414 -> a
+    2:4:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):32 -> a
+    5:6:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Predicate):135:136 -> a
+    7:7:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):176:176 -> a
+    8:18:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):188:198 -> a
+    19:22:boolean isSubtypeOfClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):228:231 -> a
+    19:22:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):200 -> a
+    23:32:boolean isInterfaceSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):205:214 -> a
+    33:43:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexDefinitionSupplier):297:307 -> a
+    44:44:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexDefinitionSupplier):306:306 -> a
+    45:57:void implementedInterfaces(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Set):311:323 -> a
+    58:59:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):366:367 -> a
+    60:60:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):380:380 -> a
+    61:61:int compareTo(com.android.tools.r8.graph.DexType):395:395 -> a
+    62:71:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):529:538 -> a
+    72:74:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):542:544 -> a
+    75:77:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):543:545 -> a
+    78:85:java.lang.String getPackageOrName(boolean):588:595 -> a
+    86:130:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):634:678 -> a
+    1:2:boolean computeEquals(java.lang.Object):66:67 -> b
+    3:4:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexDefinitionSupplier):109:110 -> b
+    5:5:boolean isSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):167:167 -> b
+    6:6:boolean lambda$isStrictSubtypeOf$0(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):198:198 -> b
+    7:7:boolean isSamePackage(com.android.tools.r8.graph.DexType):328:328 -> b
+    8:13:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):519:524 -> b
+    14:16:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):523:525 -> b
+    1:1:java.lang.String toSmaliString():355:355 -> c
+    2:2:int slowCompareTo(com.android.tools.r8.graph.DexType):400:400 -> c
+    1:1:int compareTo(java.lang.Object):32:32 -> compareTo
+    1:9:java.lang.String toSourceString():337:345 -> d
+    1:1:int computeHashCode():61:61 -> e
+    1:16:int elementSizeForPrimitiveArrayType():491:506 -> j
+    1:2:java.lang.String getInternalName():621:622 -> k
+    1:4:java.lang.String getName():613:616 -> l
+    1:1:int getNumberOfLeadingSquareBrackets():512:512 -> m
+    1:1:java.lang.String getPackageDescriptor():609:609 -> n
+    1:1:boolean hasSubtypes():171:171 -> o
+    1:1:boolean isArrayType():463:463 -> p
+    1:1:boolean isBooleanType():431:431 -> q
+    1:1:boolean isClassType():468:468 -> r
+    1:1:boolean isFloatType():451:451 -> s
+    1:3:boolean isInterface():114:116 -> t
+    1:1:java.lang.String toString():360:360 -> toString
+    1:4:boolean isPrimitiveArrayType():473:476 -> u
+    1:1:boolean isPrimitiveType():418:418 -> v
+    1:1:boolean isUnknown():150:150 -> w
+    1:1:boolean isVoidType():427:427 -> x
+    1:1:java.lang.String toDescriptorString():332:332 -> y
+    1:1:char toShorty():349:349 -> z
+com.android.tools.r8.graph.DexTypeList -> a.a.a.a.f.Ua:
     com.android.tools.r8.graph.DexType[] values -> a
     com.android.tools.r8.graph.DexTypeList theEmptyTypeList -> b
     boolean $assertionsDisabled -> c
@@ -12707,13 +12469,13 @@
     3:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):46:46 -> a
     4:16:int compareTo(com.android.tools.r8.graph.DexTypeList):80:92 -> a
     1:1:int compareTo(java.lang.Object):12:12 -> compareTo
+    1:1:com.android.tools.r8.graph.DexTypeList empty():19:19 -> e
     1:2:boolean equals(java.lang.Object):54:55 -> equals
-    1:1:com.android.tools.r8.graph.DexTypeList empty():19:19 -> f
-    1:1:boolean isEmpty():59:59 -> g
-    1:1:int size():63:63 -> h
     1:1:int hashCode():33:33 -> hashCode
+    1:1:boolean isEmpty():59:59 -> isEmpty
+    1:1:int size():63:63 -> size
     1:8:java.lang.String toString():68:75 -> toString
-com.android.tools.r8.graph.DexValue -> a.a.a.a.f.ub:
+com.android.tools.r8.graph.DexValue -> a.a.a.a.f.rb:
     com.android.tools.r8.graph.DexValue$UnknownDexValue UNKNOWN -> b
     com.android.tools.r8.graph.DexValue[] EMPTY_ARRAY -> a
     1:3:void <clinit>():25:27 -> <clinit>
@@ -12729,12 +12491,12 @@
     84:84:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):120:120 -> a
     85:85:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):118:118 -> a
     1:1:boolean isDefault(com.android.tools.r8.graph.DexType):147:147 -> b
-    com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> f
-    com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> g
-    boolean mayHaveSideEffects() -> h
-    void sort() -> i
-com.android.tools.r8.graph.DexValue$1 -> a.a.a.a.f.Ya:
-com.android.tools.r8.graph.DexValue$DexItemBasedValueString -> a.a.a.a.f.Za:
+    com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> e
+    com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> f
+    boolean mayHaveSideEffects() -> g
+    void sort() -> h
+com.android.tools.r8.graph.DexValue$1 -> a.a.a.a.f.Va:
+com.android.tools.r8.graph.DexValue$DexItemBasedValueString -> a.a.a.a.f.Wa:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo classNameComputationInfo -> d
     1:1:void <clinit>():759:759 -> <clinit>
@@ -12743,11 +12505,11 @@
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):759 -> a
     2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):799:799 -> a
     1:1:boolean equals(java.lang.Object):759:759 -> equals
+    void sort() -> h
     1:1:int hashCode():759:759 -> hashCode
-    void sort() -> i
-    byte getValueKind() -> j
+    byte getValueKind() -> i
     1:1:java.lang.String toString():759:759 -> toString
-com.android.tools.r8.graph.DexValue$DexValueAnnotation -> a.a.a.a.f._a:
+com.android.tools.r8.graph.DexValue$DexValueAnnotation -> a.a.a.a.f.Xa:
     com.android.tools.r8.graph.DexEncodedAnnotation value -> c
     1:2:void <init>(com.android.tools.r8.graph.DexEncodedAnnotation):970:971 -> <init>
     1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):91:91 -> a
@@ -12758,10 +12520,10 @@
     4:5:void com.android.tools.r8.graph.DexEncodedAnnotation.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):29:30 -> a
     4:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):977 -> a
     1:3:boolean equals(java.lang.Object):1011:1013 -> equals
+    1:1:void sort():998:998 -> h
     1:1:int hashCode():1003:1003 -> hashCode
-    1:1:void sort():998:998 -> i
     1:1:java.lang.String toString():1020:1020 -> toString
-com.android.tools.r8.graph.DexValue$DexValueArray -> a.a.a.a.f.ab:
+com.android.tools.r8.graph.DexValue$DexValueArray -> a.a.a.a.f.Ya:
     com.android.tools.r8.graph.DexValue[] values -> c
     1:2:void <init>(com.android.tools.r8.graph.DexValue[]):903:904 -> <init>
     1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):91:91 -> a
@@ -12773,11 +12535,11 @@
     4:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):921:922 -> a
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):914:914 -> a
     1:3:boolean equals(java.lang.Object):953:955 -> equals
+    1:2:void sort():938:939 -> h
     1:1:int hashCode():945:945 -> hashCode
-    1:2:void sort():938:939 -> i
-    1:1:com.android.tools.r8.graph.DexValue[] getValues():908:908 -> j
+    1:1:com.android.tools.r8.graph.DexValue[] getValues():908:908 -> i
     1:1:java.lang.String toString():962:962 -> toString
-com.android.tools.r8.graph.DexValue$DexValueBoolean -> a.a.a.a.f.bb:
+com.android.tools.r8.graph.DexValue$DexValueBoolean -> a.a.a.a.f.Za:
     com.android.tools.r8.graph.DexValue$DexValueBoolean TRUE -> d
     com.android.tools.r8.graph.DexValue$DexValueBoolean FALSE -> e
     com.android.tools.r8.graph.DexValue$DexValueBoolean DEFAULT -> f
@@ -12791,12 +12553,12 @@
     3:3:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):24 -> a
     3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1098 -> a
     1:1:boolean equals(java.lang.Object):1116:1116 -> equals
-    boolean mayHaveSideEffects() -> h
+    boolean mayHaveSideEffects() -> g
+    void sort() -> h
     1:1:int hashCode():1108:1108 -> hashCode
-    void sort() -> i
-    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean access$000():1070:1070 -> j
+    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean access$000():1070:1070 -> i
     1:1:java.lang.String toString():1121:1121 -> toString
-com.android.tools.r8.graph.DexValue$DexValueByte -> a.a.a.a.f.cb:
+com.android.tools.r8.graph.DexValue$DexValueByte -> a.a.a.a.f._a:
     byte value -> c
     com.android.tools.r8.graph.DexValue$DexValueByte DEFAULT -> d
     1:1:void <clinit>():254:254 -> <clinit>
@@ -12810,11 +12572,11 @@
     3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):278 -> a
     4:4:com.android.tools.r8.graph.DexValue$DexValueByte create(byte):263:263 -> a
     1:1:boolean equals(java.lang.Object):296:296 -> equals
-    boolean mayHaveSideEffects() -> h
+    boolean mayHaveSideEffects() -> g
+    void sort() -> h
     1:1:int hashCode():288:288 -> hashCode
-    void sort() -> i
     1:1:java.lang.String toString():301:301 -> toString
-com.android.tools.r8.graph.DexValue$DexValueChar -> a.a.a.a.f.db:
+com.android.tools.r8.graph.DexValue$DexValueChar -> a.a.a.a.f.ab:
     com.android.tools.r8.graph.DexValue$DexValueChar DEFAULT -> d
     char value -> c
     1:1:void <clinit>():370:370 -> <clinit>
@@ -12830,11 +12592,11 @@
     6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):395 -> a
     7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):396:396 -> a
     1:1:boolean equals(java.lang.Object):414:414 -> equals
-    boolean mayHaveSideEffects() -> h
+    boolean mayHaveSideEffects() -> g
+    void sort() -> h
     1:1:int hashCode():406:406 -> hashCode
-    void sort() -> i
     1:1:java.lang.String toString():419:419 -> toString
-com.android.tools.r8.graph.DexValue$DexValueDouble -> a.a.a.a.f.eb:
+com.android.tools.r8.graph.DexValue$DexValueDouble -> a.a.a.a.f.bb:
     com.android.tools.r8.graph.DexValue$DexValueDouble DEFAULT -> d
     double value -> c
     1:1:void <clinit>():602:602 -> <clinit>
@@ -12847,29 +12609,29 @@
     5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):628 -> a
     6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):629:629 -> a
     1:2:boolean equals(java.lang.Object):647:648 -> equals
-    boolean mayHaveSideEffects() -> h
+    boolean mayHaveSideEffects() -> g
+    void sort() -> h
     1:1:int hashCode():639:639 -> hashCode
-    void sort() -> i
     1:1:java.lang.String toString():653:653 -> toString
-com.android.tools.r8.graph.DexValue$DexValueEnum -> a.a.a.a.f.fb:
+com.android.tools.r8.graph.DexValue$DexValueEnum -> a.a.a.a.f.cb:
     1:1:void <init>(com.android.tools.r8.graph.DexField):861:861 -> <init>
     1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):858:858 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):872:872 -> a
     1:1:boolean equals(java.lang.Object):858:858 -> equals
+    void sort() -> h
     1:1:int hashCode():858:858 -> hashCode
-    void sort() -> i
-    byte getValueKind() -> j
+    byte getValueKind() -> i
     1:1:java.lang.String toString():858:858 -> toString
-com.android.tools.r8.graph.DexValue$DexValueField -> a.a.a.a.f.gb:
+com.android.tools.r8.graph.DexValue$DexValueField -> a.a.a.a.f.db:
     1:1:void <init>(com.android.tools.r8.graph.DexField):825:825 -> <init>
     1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):822:822 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):836:836 -> a
     1:1:boolean equals(java.lang.Object):822:822 -> equals
+    void sort() -> h
     1:1:int hashCode():822:822 -> hashCode
-    void sort() -> i
-    byte getValueKind() -> j
+    byte getValueKind() -> i
     1:1:java.lang.String toString():822:822 -> toString
-com.android.tools.r8.graph.DexValue$DexValueFloat -> a.a.a.a.f.hb:
+com.android.tools.r8.graph.DexValue$DexValueFloat -> a.a.a.a.f.eb:
     float value -> c
     com.android.tools.r8.graph.DexValue$DexValueFloat DEFAULT -> d
     1:1:void <clinit>():545:545 -> <clinit>
@@ -12882,24 +12644,24 @@
     5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):570 -> a
     6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):571:571 -> a
     1:2:boolean equals(java.lang.Object):589:590 -> equals
-    boolean mayHaveSideEffects() -> h
+    boolean mayHaveSideEffects() -> g
+    void sort() -> h
     1:1:int hashCode():581:581 -> hashCode
-    void sort() -> i
     1:1:java.lang.String toString():595:595 -> toString
-com.android.tools.r8.graph.DexValue$DexValueInt -> a.a.a.a.f.ib:
+com.android.tools.r8.graph.DexValue$DexValueInt -> a.a.a.a.f.fb:
     int value -> c
     com.android.tools.r8.graph.DexValue$DexValueInt DEFAULT -> d
     1:1:void <clinit>():431:431 -> <clinit>
     1:2:void <init>(int):434:435 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
     1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):453:453 -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueInt create(int):439:439 -> c
+    1:1:com.android.tools.r8.graph.DexValue$DexValueInt create(int):439:439 -> b
     1:1:boolean equals(java.lang.Object):471:471 -> equals
-    boolean mayHaveSideEffects() -> h
+    boolean mayHaveSideEffects() -> g
+    void sort() -> h
     1:1:int hashCode():463:463 -> hashCode
-    void sort() -> i
     1:1:java.lang.String toString():476:476 -> toString
-com.android.tools.r8.graph.DexValue$DexValueLong -> a.a.a.a.f.jb:
+com.android.tools.r8.graph.DexValue$DexValueLong -> a.a.a.a.f.gb:
     com.android.tools.r8.graph.DexValue$DexValueLong DEFAULT -> d
     long value -> c
     1:1:void <clinit>():488:488 -> <clinit>
@@ -12908,42 +12670,42 @@
     1:1:com.android.tools.r8.graph.DexValue$DexValueLong create(long):496:496 -> a
     2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):510:510 -> a
     1:1:boolean equals(java.lang.Object):528:528 -> equals
-    boolean mayHaveSideEffects() -> h
+    boolean mayHaveSideEffects() -> g
+    void sort() -> h
     1:1:int hashCode():520:520 -> hashCode
-    void sort() -> i
     1:1:java.lang.String toString():533:533 -> toString
-com.android.tools.r8.graph.DexValue$DexValueMethod -> a.a.a.a.f.kb:
+com.android.tools.r8.graph.DexValue$DexValueMethod -> a.a.a.a.f.hb:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod):843:843 -> <init>
     1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):840:840 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):854:854 -> a
     3:4:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):45:46 -> a
     3:4:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):854 -> a
     1:1:boolean equals(java.lang.Object):840:840 -> equals
+    void sort() -> h
     1:1:int hashCode():840:840 -> hashCode
-    void sort() -> i
-    byte getValueKind() -> j
+    byte getValueKind() -> i
     1:1:java.lang.String toString():840:840 -> toString
-com.android.tools.r8.graph.DexValue$DexValueMethodHandle -> a.a.a.a.f.lb:
+com.android.tools.r8.graph.DexValue$DexValueMethodHandle -> a.a.a.a.f.ib:
     1:1:void <init>(com.android.tools.r8.graph.DexMethodHandle):1134:1134 -> <init>
     1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1131:1131 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1150:1150 -> a
+    com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> e
     1:1:boolean equals(java.lang.Object):1131:1131 -> equals
-    com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> f
+    void sort() -> h
     1:1:int hashCode():1131:1131 -> hashCode
-    void sort() -> i
-    byte getValueKind() -> j
+    byte getValueKind() -> i
     1:1:java.lang.String toString():1131:1131 -> toString
-com.android.tools.r8.graph.DexValue$DexValueMethodType -> a.a.a.a.f.mb:
+com.android.tools.r8.graph.DexValue$DexValueMethodType -> a.a.a.a.f.jb:
     1:1:void <init>(com.android.tools.r8.graph.DexProto):879:879 -> <init>
     1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):876:876 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):895:895 -> a
     1:1:boolean equals(java.lang.Object):876:876 -> equals
-    com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> g
+    com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> f
+    void sort() -> h
     1:1:int hashCode():876:876 -> hashCode
-    void sort() -> i
-    byte getValueKind() -> j
+    byte getValueKind() -> i
     1:1:java.lang.String toString():876:876 -> toString
-com.android.tools.r8.graph.DexValue$DexValueNull -> a.a.a.a.f.nb:
+com.android.tools.r8.graph.DexValue$DexValueNull -> a.a.a.a.f.kb:
     com.android.tools.r8.graph.DexValue NULL -> c
     1:1:void <clinit>():1026:1026 -> <clinit>
     1:1:void <init>():1029:1029 -> <init>
@@ -12952,9 +12714,9 @@
     1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):24 -> a
     1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1038 -> a
     1:1:boolean equals(java.lang.Object):1061:1061 -> equals
-    boolean mayHaveSideEffects() -> h
-    void sort() -> i
-com.android.tools.r8.graph.DexValue$DexValueShort -> a.a.a.a.f.ob:
+    boolean mayHaveSideEffects() -> g
+    void sort() -> h
+com.android.tools.r8.graph.DexValue$DexValueShort -> a.a.a.a.f.lb:
     com.android.tools.r8.graph.DexValue$DexValueShort DEFAULT -> d
     short value -> c
     1:1:void <clinit>():313:313 -> <clinit>
@@ -12963,33 +12725,33 @@
     1:1:com.android.tools.r8.graph.DexValue$DexValueShort create(short):321:321 -> a
     2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):335:335 -> a
     1:1:boolean equals(java.lang.Object):353:353 -> equals
-    boolean mayHaveSideEffects() -> h
+    boolean mayHaveSideEffects() -> g
+    void sort() -> h
     1:1:int hashCode():345:345 -> hashCode
-    void sort() -> i
     1:1:java.lang.String toString():358:358 -> toString
-com.android.tools.r8.graph.DexValue$DexValueString -> a.a.a.a.f.pb:
+com.android.tools.r8.graph.DexValue$DexValueString -> a.a.a.a.f.mb:
     1:1:void <init>(com.android.tools.r8.graph.DexString):728:728 -> <init>
     1:1:void com.android.tools.r8.graph.DexValue$NestedDexValue.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):694:694 -> a
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):725 -> a
     2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):725:725 -> a
     1:1:boolean equals(java.lang.Object):725:725 -> equals
-    boolean mayHaveSideEffects() -> h
+    boolean mayHaveSideEffects() -> g
+    void sort() -> h
     1:1:int hashCode():725:725 -> hashCode
-    void sort() -> i
-    byte getValueKind() -> j
-    1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():668:668 -> k
-    1:1:com.android.tools.r8.graph.IndexedDexItem getValue():0 -> k
+    byte getValueKind() -> i
+    1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():668:668 -> j
+    1:1:com.android.tools.r8.graph.IndexedDexItem getValue():0 -> j
     1:1:java.lang.String toString():725:725 -> toString
-com.android.tools.r8.graph.DexValue$DexValueType -> a.a.a.a.f.qb:
+com.android.tools.r8.graph.DexValue$DexValueType -> a.a.a.a.f.nb:
     1:1:void <init>(com.android.tools.r8.graph.DexType):807:807 -> <init>
     1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):804:804 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):818:818 -> a
     1:1:boolean equals(java.lang.Object):804:804 -> equals
+    void sort() -> h
     1:1:int hashCode():804:804 -> hashCode
-    void sort() -> i
-    byte getValueKind() -> j
+    byte getValueKind() -> i
     1:1:java.lang.String toString():804:804 -> toString
-com.android.tools.r8.graph.DexValue$NestedDexValue -> a.a.a.a.f.rb:
+com.android.tools.r8.graph.DexValue$NestedDexValue -> a.a.a.a.f.ob:
     com.android.tools.r8.graph.IndexedDexItem value -> c
     1:2:void <init>(com.android.tools.r8.graph.IndexedDexItem):661:662 -> <init>
     1:2:void <init>(com.android.tools.r8.graph.IndexedDexItem,com.android.tools.r8.graph.DexValue$1):657 -> <init>
@@ -13003,9 +12765,9 @@
     7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):678:678 -> a
     1:3:boolean equals(java.lang.Object):712:714 -> equals
     1:1:int hashCode():704:704 -> hashCode
-    byte getValueKind() -> j
+    byte getValueKind() -> i
     1:1:java.lang.String toString():721:721 -> toString
-com.android.tools.r8.graph.DexValue$SimpleDexValue -> a.a.a.a.f.sb:
+com.android.tools.r8.graph.DexValue$SimpleDexValue -> a.a.a.a.f.pb:
     1:1:void <init>():223:223 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexValue$1):223 -> <init>
     1:1:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):244:244 -> a
@@ -13016,16 +12778,16 @@
     4:4:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):24 -> a
     4:4:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):247 -> a
     5:5:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):248:248 -> a
-com.android.tools.r8.graph.DexValue$UnknownDexValue -> a.a.a.a.f.tb:
+com.android.tools.r8.graph.DexValue$UnknownDexValue -> a.a.a.a.f.qb:
     com.android.tools.r8.graph.DexValue$UnknownDexValue UNKNOWN -> c
     1:1:void <clinit>():165:165 -> <clinit>
     1:1:void <init>():167:167 -> <init>
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):173:173 -> a
     2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):188:188 -> a
-    boolean mayHaveSideEffects() -> h
+    boolean mayHaveSideEffects() -> g
+    1:1:void sort():178:178 -> h
     1:1:int hashCode():203:203 -> hashCode
-    1:1:void sort():178:178 -> i
-com.android.tools.r8.graph.EnclosingMethodAttribute -> a.a.a.a.f.vb:
+com.android.tools.r8.graph.EnclosingMethodAttribute -> a.a.a.a.f.sb:
     com.android.tools.r8.graph.DexType enclosingClass -> a
     com.android.tools.r8.graph.DexMethod enclosingMethod -> b
     boolean $assertionsDisabled -> c
@@ -13042,7 +12804,7 @@
     1:1:com.android.tools.r8.graph.DexMethod getEnclosingMethod():47:47 -> b
     1:1:boolean equals(java.lang.Object):62:62 -> equals
     1:2:int hashCode():56:57 -> hashCode
-com.android.tools.r8.graph.FieldAccessFlags -> a.a.a.a.f.wb:
+com.android.tools.r8.graph.FieldAccessFlags -> a.a.a.a.f.tb:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(int,int):44:44 -> <init>
@@ -13057,7 +12819,7 @@
     1:1:boolean isEnum():97:97 -> q
     1:1:boolean isTransient():89:89 -> r
     1:1:boolean isVolatile():81:81 -> s
-com.android.tools.r8.graph.GraphLense -> a.a.a.a.f.Eb:
+com.android.tools.r8.graph.GraphLense -> a.a.a.a.f.Bb:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():48:48 -> <clinit>
     1:1:void <init>():48:48 -> <init>
@@ -13073,7 +12835,7 @@
     com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod) -> d
     1:1:com.android.tools.r8.graph.GraphLense getIdentityLense():458:458 -> d
     1:1:boolean isIdentityLense():462 -> d
-com.android.tools.r8.graph.GraphLense$Builder -> a.a.a.a.f.xb:
+com.android.tools.r8.graph.GraphLense$Builder -> a.a.a.a.f.ub:
     java.util.Map typeMap -> a
     java.util.Map methodMap -> b
     java.util.Map fieldMap -> c
@@ -13084,13 +12846,13 @@
     1:1:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):345 -> a
     2:2:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):346:346 -> a
     3:6:com.android.tools.r8.graph.GraphLense build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLense):362:365 -> a
-com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult -> a.a.a.a.f.yb:
+com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult -> a.a.a.a.f.vb:
     com.android.tools.r8.ir.code.Invoke$Type type -> b
     com.android.tools.r8.graph.DexMethod method -> a
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):60:62 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod getMethod():66:66 -> a
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():70:70 -> b
-com.android.tools.r8.graph.GraphLense$IdentityGraphLense -> a.a.a.a.f.zb:
+com.android.tools.r8.graph.GraphLense$IdentityGraphLense -> a.a.a.a.f.wb:
     com.android.tools.r8.graph.GraphLense$IdentityGraphLense INSTANCE -> b
     1:1:void <clinit>():733:733 -> <clinit>
     1:1:void <init>():735:735 -> <init>
@@ -13102,7 +12864,7 @@
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):778:778 -> d
     1:1:com.android.tools.r8.graph.GraphLense$IdentityGraphLense getInstance():738:738 -> e
     1:1:com.android.tools.r8.graph.GraphLense$IdentityGraphLense access$100():731 -> e
-com.android.tools.r8.graph.GraphLense$NestedGraphLense -> a.a.a.a.f.Ab:
+com.android.tools.r8.graph.GraphLense$NestedGraphLense -> a.a.a.a.f.xb:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     java.util.Map typeMap -> d
     boolean $assertionsDisabled -> i
@@ -13123,7 +12885,7 @@
     1:1:boolean isContextFreeForMethods():981:981 -> c
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):923:923 -> d
     1:17:java.lang.String toString():991:1007 -> toString
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription -> a.a.a.a.f.Db:
+com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription -> a.a.a.a.f.Ab:
     boolean hasBeenChangedToReturnVoid -> a
     com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription none -> c
     com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo removedArgumentsInfo -> b
@@ -13136,8 +12898,8 @@
     2:4:com.android.tools.r8.ir.code.ConstInstruction getConstantReturn(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position):264:266 -> a
     1:1:boolean hasBeenChangedToReturnVoid():247:247 -> b
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription none():239:239 -> c
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo -> a.a.a.a.f.Bb:
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo -> a.a.a.a.f.Cb:
+com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo -> a.a.a.a.f.yb:
+com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo -> a.a.a.a.f.zb:
     java.util.List removedArguments -> a
     com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo empty -> b
     boolean $assertionsDisabled -> c
@@ -13151,7 +12913,7 @@
     1:1:boolean hasRemovedArguments():178:178 -> b
     1:3:java.util.ListIterator iterator():172:174 -> c
     1:1:int numberOfRemovedArguments():193:193 -> d
-com.android.tools.r8.graph.IndexedDexItem -> a.a.a.a.f.Fb:
+com.android.tools.r8.graph.IndexedDexItem -> a.a.a.a.f.Cb:
     int sortedIndex -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():12:12 -> <clinit>
@@ -13159,33 +12921,33 @@
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
     int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping) -> a
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):24:24 -> a
-    1:3:void setSortedIndex(int):33:35 -> c
-    1:3:int sortedCompareTo(int):45:47 -> d
-    1:1:int getSortedIndex():40:40 -> g
-com.android.tools.r8.graph.InnerClassAttribute -> a.a.a.a.f.Gb:
+    1:3:void setSortedIndex(int):33:35 -> b
+    1:3:int sortedCompareTo(int):45:47 -> c
+    1:1:int getSortedIndex():40:40 -> f
+com.android.tools.r8.graph.InnerClassAttribute -> a.a.a.a.f.Db:
     com.android.tools.r8.graph.DexString innerName -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType outer -> c
     com.android.tools.r8.graph.DexType inner -> b
     int access -> a
-    1:1:void <clinit>():13:13 -> <clinit>
-    1:6:void <init>(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):33:38 -> <init>
-    1:1:int getAccess():50:50 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):75:75 -> a
+    1:1:void <clinit>():12:12 -> <clinit>
+    1:6:void <init>(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):32:37 -> <init>
+    1:1:int getAccess():49:49 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):74:74 -> a
     3:3:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
-    3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):75 -> a
-    4:4:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):76:76 -> a
+    3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):74 -> a
+    4:4:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):75:75 -> a
     5:5:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
-    5:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):77 -> a
-    6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):79:79 -> a
+    5:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):76 -> a
+    6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):78:78 -> a
     7:7:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
-    7:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):80 -> a
-    1:1:com.android.tools.r8.graph.DexType getInner():54:54 -> b
-    1:1:com.android.tools.r8.graph.DexString getInnerName():62:62 -> c
-    1:1:com.android.tools.r8.graph.DexType getOuter():58:58 -> d
-    1:1:boolean isAnonymous():46:46 -> e
-    1:1:boolean isNamed():42:42 -> f
-com.android.tools.r8.graph.JarApplicationReader -> a.a.a.a.f.Hb:
+    7:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):79 -> a
+    1:1:com.android.tools.r8.graph.DexType getInner():53:53 -> b
+    1:1:com.android.tools.r8.graph.DexString getInnerName():61:61 -> c
+    1:1:com.android.tools.r8.graph.DexType getOuter():57:57 -> d
+    1:1:boolean isAnonymous():45:45 -> e
+    1:1:boolean isNamed():41:41 -> f
+com.android.tools.r8.graph.JarApplicationReader -> a.a.a.a.f.Eb:
     java.util.concurrent.ConcurrentHashMap stringCache -> d
     com.android.tools.r8.utils.InternalOptions options -> a
     java.util.concurrent.ConcurrentHashMap asmTypeCache -> c
@@ -13199,104 +12961,102 @@
     3:10:com.android.tools.r8.graph.DexTypeList getTypeListFromNames(java.lang.String[]):62:69 -> a
     11:11:com.android.tools.r8.graph.DexField getField(java.lang.String,java.lang.String,java.lang.String):84:84 -> a
     12:12:com.android.tools.r8.graph.DexField getField(com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String):88:88 -> a
-    13:15:int getArgumentCount(java.lang.String):157:159 -> a
+    13:15:int getArgumentCount(java.lang.String):156:158 -> a
     1:1:com.android.tools.r8.graph.DexMethod getMethod(java.lang.String,java.lang.String,java.lang.String):92:92 -> b
     2:2:com.android.tools.r8.graph.DexMethod getMethod(com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String):96:96 -> b
-    3:7:com.android.tools.r8.org.objectweb.asm.Type[] getArgumentTypes(java.lang.String):169:173 -> b
+    3:7:com.android.tools.r8.org.objectweb.asm.Type[] getArgumentTypes(java.lang.String):168:172 -> b
     1:1:com.android.tools.r8.org.objectweb.asm.Type getAsmObjectType(java.lang.String):32:32 -> c
     1:1:com.android.tools.r8.org.objectweb.asm.Type getAsmType(java.lang.String):36:36 -> d
-    1:1:com.android.tools.r8.graph.DexProto getProto(java.lang.String):113:113 -> e
-    2:2:boolean isValidDescriptor(java.lang.String):137:137 -> e
-    2:2:com.android.tools.r8.graph.DexProto getProto(java.lang.String):113 -> e
-    3:13:com.android.tools.r8.graph.DexProto getProto(java.lang.String):113:123 -> e
+    1:1:com.android.tools.r8.graph.DexProto getProto(java.lang.String):112:112 -> e
+    2:2:boolean isValidDescriptor(java.lang.String):136:136 -> e
+    2:2:com.android.tools.r8.graph.DexProto getProto(java.lang.String):112 -> e
+    3:13:com.android.tools.r8.graph.DexProto getProto(java.lang.String):112:122 -> e
     14:21:com.android.tools.r8.graph.DexTypeList getTypeListFromDescriptors(java.lang.String[]):73:80 -> e
-    14:21:com.android.tools.r8.graph.DexProto getProto(java.lang.String):124 -> e
-    22:22:com.android.tools.r8.graph.DexProto getProto(java.lang.String):121:121 -> e
-    1:1:com.android.tools.r8.org.objectweb.asm.Type getReturnType(java.lang.String):145:145 -> f
+    14:21:com.android.tools.r8.graph.DexProto getProto(java.lang.String):123 -> e
+    22:22:com.android.tools.r8.graph.DexProto getProto(java.lang.String):120:120 -> e
+    1:1:com.android.tools.r8.org.objectweb.asm.Type getReturnType(java.lang.String):144:144 -> f
     1:1:com.android.tools.r8.graph.DexString getString(java.lang.String):44:44 -> g
     1:1:com.android.tools.r8.graph.DexType getTypeFromDescriptor(java.lang.String):57:57 -> h
-    2:2:boolean isValidDescriptor(java.lang.String):137:137 -> h
+    2:2:boolean isValidDescriptor(java.lang.String):136:136 -> h
     2:2:com.android.tools.r8.graph.DexType getTypeFromDescriptor(java.lang.String):57 -> h
     3:4:com.android.tools.r8.graph.DexType getTypeFromDescriptor(java.lang.String):57:58 -> h
     1:1:com.android.tools.r8.graph.DexType getTypeFromName(java.lang.String):52:52 -> i
-    2:2:boolean isValidInternalName(java.lang.String):141:141 -> i
+    2:2:boolean isValidInternalName(java.lang.String):140:140 -> i
     2:2:com.android.tools.r8.graph.DexType getTypeFromName(java.lang.String):52 -> i
     3:4:com.android.tools.r8.graph.DexType getTypeFromName(java.lang.String):52:53 -> i
-    1:35:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):179:213 -> j
-    36:41:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):200:205 -> j
-    42:65:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):187:210 -> j
-    66:66:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):196:196 -> j
-    1:2:java.lang.String getReturnTypeDescriptor(java.lang.String):149:150 -> k
-    1:4:java.lang.String getShortyDescriptor(java.lang.String):129:132 -> l
+    1:35:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):178:212 -> j
+    36:41:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):199:204 -> j
+    42:65:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):186:209 -> j
+    66:66:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):195:195 -> j
+    1:2:java.lang.String getReturnTypeDescriptor(java.lang.String):148:149 -> k
+    1:4:java.lang.String getShortyDescriptor(java.lang.String):128:131 -> l
     1:1:com.android.tools.r8.org.objectweb.asm.Type lambda$getAsmObjectType$0(java.lang.String):32:32 -> m
     1:1:com.android.tools.r8.org.objectweb.asm.Type lambda$getAsmType$1(java.lang.String):36:36 -> n
-com.android.tools.r8.graph.JarClassFileReader -> a.a.a.a.f.Nb:
+com.android.tools.r8.graph.JarClassFileReader -> a.a.a.a.f.Kb:
     java.util.function.Consumer classConsumer -> b
     com.android.tools.r8.graph.JarApplicationReader application -> a
     byte[] CLASSFILE_HEADER -> c
     boolean $assertionsDisabled -> d
     1:3:void <clinit>():63:65 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):74:76 -> <init>
-    1:1:int access$000(int):63:63 -> a
-    2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor access$100(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):63:63 -> a
-    3:3:com.android.tools.r8.graph.DexEncodedAnnotation access$1700(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):63:63 -> a
-    4:13:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):80:89 -> a
-    14:14:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):29:29 -> a
-    14:14:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):89 -> a
-    15:24:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):89:98 -> a
-    25:33:byte[] com.android.tools.r8.org.objectweb.asm.ClassReader.readStream(java.io.InputStream,boolean):312:320 -> a
-    25:33:void com.android.tools.r8.org.objectweb.asm.ClassReader.<init>(java.io.InputStream):283 -> a
-    25:33:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):98 -> a
-    34:34:void com.android.tools.r8.org.objectweb.asm.ClassReader.<init>(java.io.InputStream):283:283 -> a
-    34:34:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):98 -> a
-    35:53:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):104:122 -> a
-    54:58:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):120:124 -> a
-    59:71:byte[] com.android.tools.r8.org.objectweb.asm.ClassReader.readStream(java.io.InputStream,boolean):312:324 -> a
-    59:71:void com.android.tools.r8.org.objectweb.asm.ClassReader.<init>(java.io.InputStream):283 -> a
-    59:71:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):98 -> a
-    72:72:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):94:94 -> a
-    73:73:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):29:29 -> a
-    73:73:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):94 -> a
-    74:74:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):94:94 -> a
-    75:77:com.android.tools.r8.graph.MethodAccessFlags createMethodAccessFlags(java.lang.String,int):143:145 -> a
-    78:79:void lambda$createAnnotationVisitor$0(java.util.List,int,java.lang.String,com.android.tools.r8.graph.JarApplicationReader,java.util.List,java.util.List):154:155 -> a
-    80:80:void lambda$createAnnotationVisitor$0(java.util.List,int,java.lang.String,com.android.tools.r8.graph.JarApplicationReader,java.util.List,java.util.List):154:154 -> a
-    81:91:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):435:445 -> a
-    81:91:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):63 -> a
-    92:92:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):436:436 -> a
-    92:92:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):63 -> a
-    1:1:com.android.tools.r8.graph.FieldAccessFlags createFieldAccessFlags(int):138:138 -> b
-    2:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):151:153 -> b
-    5:6:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):160:161 -> b
-    7:13:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):160:166 -> b
-    int cleanAccessFlags(int) -> c
-com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> a.a.a.a.f.Ib:
+    int access$000(int) -> a
+    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor access$100(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):63:63 -> a
+    2:2:com.android.tools.r8.graph.DexEncodedAnnotation access$1700(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):63:63 -> a
+    3:12:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):80:89 -> a
+    13:13:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):29:29 -> a
+    13:13:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):89 -> a
+    14:23:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):89:98 -> a
+    24:31:byte[] com.android.tools.r8.org.objectweb.asm.ClassReader.readStream(java.io.InputStream,boolean):303:310 -> a
+    24:31:void com.android.tools.r8.org.objectweb.asm.ClassReader.<init>(java.io.InputStream):273 -> a
+    24:31:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):98 -> a
+    32:32:void com.android.tools.r8.org.objectweb.asm.ClassReader.<init>(java.io.InputStream):273:273 -> a
+    32:32:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):98 -> a
+    33:51:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):104:122 -> a
+    52:56:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):120:124 -> a
+    57:57:byte[] com.android.tools.r8.org.objectweb.asm.ClassReader.readStream(java.io.InputStream,boolean):315:315 -> a
+    57:57:void com.android.tools.r8.org.objectweb.asm.ClassReader.<init>(java.io.InputStream):273 -> a
+    57:57:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):98 -> a
+    58:58:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):94:94 -> a
+    59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):29:29 -> a
+    59:59:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):94 -> a
+    60:60:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):94:94 -> a
+    61:63:com.android.tools.r8.graph.MethodAccessFlags createMethodAccessFlags(java.lang.String,int):139:141 -> a
+    64:65:void lambda$createAnnotationVisitor$0(java.util.List,int,java.lang.String,com.android.tools.r8.graph.JarApplicationReader,java.util.List,java.util.List):150:151 -> a
+    66:66:void lambda$createAnnotationVisitor$0(java.util.List,int,java.lang.String,com.android.tools.r8.graph.JarApplicationReader,java.util.List,java.util.List):150:150 -> a
+    67:69:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List):417:419 -> a
+    67:69:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List):63 -> a
+    70:70:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List):418:418 -> a
+    70:70:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List):63 -> a
+    1:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):147:149 -> b
+    4:5:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):156:157 -> b
+    6:12:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):156:162 -> b
+com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> a.a.a.a.f.Fb:
     java.util.List values -> e
     java.util.List names -> d
     com.android.tools.r8.graph.JarApplicationReader application -> b
     boolean $assertionsDisabled -> f
     java.util.function.BiConsumer onVisitEnd -> c
-    1:1:void <clinit>():760:760 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):769:769 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):764:771 -> <init>
-    1:2:void visitEnum(java.lang.String,java.lang.String,java.lang.String):781:782 -> a
-    3:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):787:787 -> a
-    4:5:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):788:789 -> a
-    6:6:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):788:788 -> a
-    7:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):794:794 -> a
-    8:9:void lambda$visitArray$1(java.lang.String,java.util.List,java.util.List):795:796 -> a
-    10:10:void visitEnd():802:802 -> a
-    11:16:void addElement(java.lang.String,com.android.tools.r8.graph.DexValue):807:812 -> a
-    17:38:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):878:899 -> a
-    17:38:void visit(java.lang.String,java.lang.Object):776 -> a
-    39:94:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):816:871 -> a
-    39:94:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):901 -> a
-    39:94:void visit(java.lang.String,java.lang.Object):776 -> a
-    95:95:void visit(java.lang.String,java.lang.Object):776:776 -> a
-    96:96:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):873:873 -> a
-    96:96:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):901 -> a
-    96:96:void visit(java.lang.String,java.lang.Object):776 -> a
-com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> a.a.a.a.f.Jb:
+    1:1:void <clinit>():732:732 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):741:741 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):736:743 -> <init>
+    1:2:void visitEnum(java.lang.String,java.lang.String,java.lang.String):753:754 -> a
+    3:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):759:759 -> a
+    4:5:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):760:761 -> a
+    6:6:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):760:760 -> a
+    7:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):766:766 -> a
+    8:9:void lambda$visitArray$1(java.lang.String,java.util.List,java.util.List):767:768 -> a
+    10:10:void visitEnd():774:774 -> a
+    11:16:void addElement(java.lang.String,com.android.tools.r8.graph.DexValue):779:784 -> a
+    17:38:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):850:871 -> a
+    17:38:void visit(java.lang.String,java.lang.Object):748 -> a
+    39:94:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):788:843 -> a
+    39:94:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):873 -> a
+    39:94:void visit(java.lang.String,java.lang.Object):748 -> a
+    95:95:void visit(java.lang.String,java.lang.Object):748:748 -> a
+    96:96:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):845:845 -> a
+    96:96:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):873 -> a
+    96:96:void visit(java.lang.String,java.lang.Object):748 -> a
+com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> a.a.a.a.f.Gb:
     com.android.tools.r8.graph.ClassKind classKind -> d
     java.util.List staticFields -> r
     java.util.Set methodSignatures -> w
@@ -13320,70 +13080,70 @@
     java.util.function.Consumer classConsumer -> f
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> g
     com.android.tools.r8.graph.DexString sourceFile -> m
-    1:1:void <clinit>():169:169 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[],com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):202:202 -> <init>
-    2:34:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[],com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):175:207 -> <init>
+    1:1:void <clinit>():165:165 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[],com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):198:198 -> <init>
+    2:34:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[],com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):171:203 -> <init>
     void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute) -> a
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
-    1:1:com.android.tools.r8.graph.JarClassFileReader$ReparseContext access$1000(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> a
-    2:2:boolean access$1376(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int):169:169 -> a
-    3:8:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):212:217 -> a
-    9:9:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):212:212 -> a
-    10:15:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):223:228 -> a
-    16:16:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):244:244 -> a
-    17:18:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):232:233 -> a
-    17:18:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):244 -> a
-    19:19:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):244:244 -> a
-    20:20:java.lang.String illegalClassFilePostfix(int):239:239 -> a
-    20:20:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):246 -> a
-    21:21:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):246:246 -> a
-    22:27:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):252:257 -> a
-    28:28:int getMajorVersion():425:425 -> a
-    28:28:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):257 -> a
-    29:30:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):257:258 -> a
+    1:1:com.android.tools.r8.graph.JarClassFileReader$ReparseContext access$1000(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> a
+    2:2:boolean access$1376(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int):165:165 -> a
+    3:8:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):208:213 -> a
+    9:9:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):208:208 -> a
+    10:15:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):219:224 -> a
+    16:16:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):240:240 -> a
+    17:18:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):228:229 -> a
+    17:18:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):240 -> a
+    19:19:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):240:240 -> a
+    20:20:java.lang.String illegalClassFilePostfix(int):235:235 -> a
+    20:20:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):242 -> a
+    21:21:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):242:242 -> a
+    22:27:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):248:253 -> a
+    28:28:int getMajorVersion():408:408 -> a
+    28:28:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):253 -> a
+    29:30:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):253:254 -> a
     31:44:java.lang.String com.android.tools.r8.graph.AccessFlags.toStringInternal(boolean):241:254 -> a
     31:44:java.lang.String com.android.tools.r8.graph.AccessFlags.toString():237 -> a
-    31:44:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):260 -> a
-    45:45:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):260:260 -> a
-    46:58:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):259:271 -> a
-    59:67:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):270:278 -> a
-    68:68:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):414:414 -> a
-    68:68:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):278 -> a
-    69:74:void visitSource(java.lang.String,java.lang.String):285:290 -> a
+    31:44:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):256 -> a
+    45:45:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):256:256 -> a
+    46:58:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):255:267 -> a
+    59:67:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):266:274 -> a
+    68:68:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):397:397 -> a
+    68:68:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):274 -> a
+    69:74:void visitSource(java.lang.String,java.lang.String):281:286 -> a
     75:78:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createSourceDebugExtensionAnnotation(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexItemFactory):175:178 -> a
-    75:78:void visitSource(java.lang.String,java.lang.String):289 -> a
-    79:79:void visitSource(java.lang.String,java.lang.String):288:288 -> a
-    80:87:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):297:304 -> a
-    88:94:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):310:316 -> a
-    95:95:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):321:321 -> a
-    96:98:void visitEnd():338:340 -> a
-    99:99:void visitEnd():339:339 -> a
-    100:100:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):414:414 -> a
-    100:100:void visitEnd():339 -> a
-    101:101:void checkReachabilitySensitivity():371:371 -> a
-    101:101:void visitEnd():342 -> a
-    102:112:boolean hasReachabilitySensitiveField():388:398 -> a
-    102:112:void checkReachabilitySensitivity():371 -> a
-    102:112:void visitEnd():342 -> a
-    113:122:void checkReachabilitySensitivity():372:381 -> a
-    113:122:void visitEnd():342 -> a
-    123:139:void visitEnd():343:359 -> a
-    140:160:void visitEnd():344:364 -> a
-    161:164:void addDefaultAnnotation(java.lang.String,com.android.tools.r8.graph.DexValue):407:410 -> a
-    161:164:void access$1600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):169 -> a
-    1:1:int access$1100(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> b
-    2:5:java.util.List getAnnotations():418:421 -> b
-    1:1:java.util.Set access$1200(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> c
-    1:1:java.util.List access$1400(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> d
-    1:1:java.util.List access$1500(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> e
-    1:1:com.android.tools.r8.graph.JarApplicationReader access$300(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> f
-    1:1:com.android.tools.r8.graph.DexType access$400(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> g
-    1:1:java.util.Set access$500(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> h
-    1:1:java.util.List access$600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> i
-    1:1:java.util.List access$700(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> j
-    1:1:com.android.tools.r8.graph.ClassKind access$800(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> k
-    1:1:com.android.tools.r8.origin.Origin access$900(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> l
-com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> a.a.a.a.f.Kb:
+    75:78:void visitSource(java.lang.String,java.lang.String):285 -> a
+    79:79:void visitSource(java.lang.String,java.lang.String):284:284 -> a
+    80:80:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):293:293 -> a
+    81:81:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):299:299 -> a
+    82:82:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):304:304 -> a
+    83:85:void visitEnd():321:323 -> a
+    86:86:void visitEnd():322:322 -> a
+    87:87:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):397:397 -> a
+    87:87:void visitEnd():322 -> a
+    88:88:void checkReachabilitySensitivity():354:354 -> a
+    88:88:void visitEnd():325 -> a
+    89:99:boolean hasReachabilitySensitiveField():371:381 -> a
+    89:99:void checkReachabilitySensitivity():354 -> a
+    89:99:void visitEnd():325 -> a
+    100:109:void checkReachabilitySensitivity():355:364 -> a
+    100:109:void visitEnd():325 -> a
+    110:126:void visitEnd():326:342 -> a
+    127:147:void visitEnd():327:347 -> a
+    148:151:void addDefaultAnnotation(java.lang.String,com.android.tools.r8.graph.DexValue):390:393 -> a
+    148:151:void access$1600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):165 -> a
+    1:1:int access$1100(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> b
+    2:5:java.util.List getAnnotations():401:404 -> b
+    1:1:java.util.Set access$1200(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> c
+    1:1:java.util.List access$1400(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> d
+    1:1:java.util.List access$1500(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> e
+    1:1:com.android.tools.r8.graph.JarApplicationReader access$300(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> f
+    1:1:com.android.tools.r8.graph.DexType access$400(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> g
+    1:1:java.util.Set access$500(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> h
+    1:1:java.util.List access$600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> i
+    1:1:java.util.List access$700(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> j
+    1:1:com.android.tools.r8.graph.ClassKind access$800(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> k
+    1:1:com.android.tools.r8.origin.Origin access$900(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> l
+com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> a.a.a.a.f.Hb:
     com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor parent -> b
     java.lang.Object value -> f
     boolean $assertionsDisabled -> h
@@ -13391,79 +13151,79 @@
     int access -> c
     java.lang.String desc -> e
     java.lang.String name -> d
-    1:1:void <clinit>():448:448 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):459:459 -> <init>
-    2:14:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):455:467 -> <init>
-    15:15:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):466:466 -> <init>
-    16:16:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):543:543 -> <init>
-    16:16:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):466 -> <init>
+    1:1:void <clinit>():422:422 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):433:433 -> <init>
+    2:14:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):429:441 -> <init>
+    15:15:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):440:440 -> <init>
+    16:16:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):516:516 -> <init>
+    16:16:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):440 -> <init>
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
-    1:7:void visitEnd():485:491 -> a
-    8:38:com.android.tools.r8.graph.DexValue getStaticValue(java.lang.Object,com.android.tools.r8.graph.DexType):509:539 -> a
-    8:38:void visitEnd():491 -> a
-    39:48:void visitEnd():492:501 -> a
-    49:49:void visitEnd():499:499 -> a
-    50:53:java.util.List getAnnotations():547:550 -> a
-    50:53:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):473 -> a
-    54:54:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):473:473 -> a
-    1:4:java.util.List getAnnotations():547:550 -> b
-com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> a.a.a.a.f.Lb:
-    java.util.List parameterFlags -> r
-    int annotableParameterCount -> o
-    java.util.List parameterNames -> q
-    com.android.tools.r8.graph.Code code -> u
-    int parameterCount -> l
-    java.util.List parameterAnnotationsLists -> p
-    com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor parent -> k
-    java.lang.String name -> j
-    com.android.tools.r8.graph.DexValue defaultAnnotation -> n
-    boolean $assertionsDisabled -> v
-    com.android.tools.r8.graph.MethodAccessFlags flags -> t
-    com.android.tools.r8.graph.DexMethod method -> s
-    java.util.List annotations -> m
-    1:1:void <clinit>():554:554 -> <clinit>
-    1:1:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):571:571 -> <init>
-    2:26:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):559:583 -> <init>
-    27:27:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):582:582 -> <init>
-    28:28:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):756:756 -> <init>
-    28:28:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):582 -> <init>
-    29:31:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):585:587 -> <init>
-    32:32:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):586:586 -> <init>
-    33:33:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):756:756 -> <init>
-    33:33:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):586 -> <init>
+    1:6:void visitEnd():459:464 -> a
+    7:37:com.android.tools.r8.graph.DexValue getStaticValue(java.lang.Object,com.android.tools.r8.graph.DexType):482:512 -> a
+    7:37:void visitEnd():464 -> a
+    38:47:void visitEnd():465:474 -> a
+    48:48:void visitEnd():472:472 -> a
+    49:52:java.util.List getAnnotations():520:523 -> a
+    49:52:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):447 -> a
+    53:53:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):447:447 -> a
+    1:4:java.util.List getAnnotations():520:523 -> b
+com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> a.a.a.a.f.Ib:
+    boolean $assertionsDisabled -> o
+    com.android.tools.r8.graph.DexMethod method -> l
+    com.android.tools.r8.graph.MethodAccessFlags flags -> m
+    int annotableParameterCount -> h
+    com.android.tools.r8.graph.Code code -> n
+    int parameterCount -> e
+    com.android.tools.r8.graph.DexValue defaultAnnotation -> g
+    com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor parent -> d
+    java.util.List annotations -> f
+    java.util.List parameterNames -> j
+    java.util.List parameterAnnotationsLists -> i
+    java.lang.String name -> c
+    java.util.List parameterFlags -> k
+    1:1:void <clinit>():527:527 -> <clinit>
+    1:1:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):544:544 -> <init>
+    2:26:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):532:556 -> <init>
+    27:27:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):555:555 -> <init>
+    28:28:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):728:728 -> <init>
+    28:28:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):555 -> <init>
+    29:31:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):558:560 -> <init>
+    32:32:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):559:559 -> <init>
+    33:33:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):728:728 -> <init>
+    33:33:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):559 -> <init>
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean) -> a
-    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):593:593 -> a
-    2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():598:598 -> a
-    3:4:void lambda$visitAnnotationDefault$0(java.util.List,java.util.List):599:600 -> a
-    5:11:void visitAnnotableParameterCount(int,boolean):613:619 -> a
-    12:23:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):624:635 -> a
-    24:24:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):634:634 -> a
+    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):566:566 -> a
+    2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():571:571 -> a
+    3:4:void lambda$visitAnnotationDefault$0(java.util.List,java.util.List):572:573 -> a
+    5:11:void visitAnnotableParameterCount(int,boolean):586:592 -> a
+    12:23:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):597:608 -> a
+    24:24:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):607:607 -> a
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> b
-    1:8:void visitParameter(java.lang.String,int):661:668 -> b
-    9:9:void visitCode():673:673 -> b
+    1:8:void visitParameter(java.lang.String,int):634:641 -> b
+    9:9:void visitCode():646:646 -> b
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> c
-    1:17:void visitEnd():678:694 -> c
-    18:18:void com.android.tools.r8.graph.ParameterAnnotationsList.<init>(com.android.tools.r8.graph.DexAnnotationSet[]):54:54 -> c
-    18:18:void visitEnd():694 -> c
-    19:24:void visitEnd():696:701 -> c
-    25:31:void visitEnd():700:706 -> c
-    32:40:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createMethodParametersAnnotation(com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexItemFactory):184:192 -> c
-    32:40:void visitEnd():703 -> c
-    41:56:void visitEnd():703:718 -> c
-    57:59:boolean isReachabilitySensitive():739:741 -> c
-    57:59:void visitEnd():718 -> c
-    60:64:void visitEnd():718:722 -> c
-    65:75:void visitEnd():720:730 -> c
-    76:76:void visitEnd():727:727 -> c
-    77:85:void visitEnd():725:733 -> c
-    1:4:java.util.List getAnnotations():749:752 -> d
-com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> a.a.a.a.f.Mb:
+    1:16:void visitEnd():651:666 -> c
+    17:17:void com.android.tools.r8.graph.ParameterAnnotationsList.<init>(com.android.tools.r8.graph.DexAnnotationSet[]):54:54 -> c
+    17:17:void visitEnd():666 -> c
+    18:23:void visitEnd():668:673 -> c
+    24:30:void visitEnd():672:678 -> c
+    31:39:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createMethodParametersAnnotation(com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexItemFactory):184:192 -> c
+    31:39:void visitEnd():675 -> c
+    40:55:void visitEnd():675:690 -> c
+    56:58:boolean isReachabilitySensitive():711:713 -> c
+    56:58:void visitEnd():690 -> c
+    59:63:void visitEnd():690:694 -> c
+    64:74:void visitEnd():692:702 -> c
+    75:75:void visitEnd():699:699 -> c
+    76:84:void visitEnd():697:705 -> c
+    1:4:java.util.List getAnnotations():721:724 -> d
+com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> a.a.a.a.f.Jb:
     byte[] classCache -> a
     com.android.tools.r8.graph.DexProgramClass owner -> b
     java.util.List codeList -> c
-    1:8:void <init>():905:912 -> <init>
-com.android.tools.r8.graph.JarCode -> a.a.a.a.f.Rb:
+    1:8:void <init>():877:884 -> <init>
+com.android.tools.r8.graph.JarCode -> a.a.a.a.f.Ob:
     com.android.tools.r8.org.objectweb.asm.tree.MethodNode node -> e
     com.android.tools.r8.graph.JarApplicationReader application -> g
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> f
@@ -13479,52 +13239,52 @@
     3:3:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):128:128 -> a
     4:7:boolean keepLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.InternalOptions):177:180 -> a
     8:17:com.android.tools.r8.ir.code.IRCode internalBuild(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position):192:201 -> a
-    18:33:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):298:313 -> a
-    34:34:java.util.function.BiFunction createCodeLocator(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):318:318 -> a
+    18:33:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):296:311 -> a
+    34:34:java.util.function.BiFunction createCodeLocator(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):316:316 -> a
     1:9:boolean computeEquals(java.lang.Object):95:103 -> b
     10:15:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position):150:155 -> b
     16:20:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position):168:172 -> b
     16:20:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position):157 -> b
-    21:22:boolean hasJsr(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):322:323 -> b
-    23:25:boolean hasJsr(com.android.tools.r8.org.objectweb.asm.tree.MethodNode):331:333 -> b
-    23:25:boolean hasJsr(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):323 -> b
-    1:2:int computeHashCode():89:90 -> f
-    com.android.tools.r8.graph.JarCode asJarCode() -> i
-    1:2:com.android.tools.r8.org.objectweb.asm.tree.MethodNode getNode():73:74 -> n
-    1:2:boolean isEmptyVoidMethod():110 -> n
-    3:5:boolean isEmptyVoidMethod():110:112 -> n
-    boolean isJarCode() -> o
-    1:2:void markReachabilitySensitive():68:69 -> p
-    1:9:void triggerDelayedParsingIfNeccessary():278:286 -> q
-    10:22:boolean verifyNoReparseContext(com.android.tools.r8.graph.DexProgramClass):394:406 -> q
-    10:22:void triggerDelayedParsingIfNeccessary():286 -> q
-    23:23:void triggerDelayedParsingIfNeccessary():286:286 -> q
-    1:6:java.lang.String toString():264:269 -> toString
-com.android.tools.r8.graph.JarCode$1 -> a.a.a.a.f.Ob:
-com.android.tools.r8.graph.JarCode$DefaultCodeLocator -> a.a.a.a.f.Pb:
+    21:22:boolean hasJsr(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):320:321 -> b
+    23:25:boolean hasJsr(com.android.tools.r8.org.objectweb.asm.tree.MethodNode):329:331 -> b
+    23:25:boolean hasJsr(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):321 -> b
+    1:2:int computeHashCode():89:90 -> e
+    com.android.tools.r8.graph.JarCode asJarCode() -> h
+    1:2:com.android.tools.r8.org.objectweb.asm.tree.MethodNode getNode():73:74 -> m
+    1:2:boolean isEmptyVoidMethod():110 -> m
+    3:5:boolean isEmptyVoidMethod():110:112 -> m
+    boolean isJarCode() -> n
+    1:2:void markReachabilitySensitive():68:69 -> o
+    1:9:void triggerDelayedParsingIfNeccessary():276:284 -> p
+    10:22:boolean verifyNoReparseContext(com.android.tools.r8.graph.DexProgramClass):392:404 -> p
+    10:22:void triggerDelayedParsingIfNeccessary():284 -> p
+    23:23:void triggerDelayedParsingIfNeccessary():284:284 -> p
+    1:6:java.lang.String toString():262:267 -> toString
+com.android.tools.r8.graph.JarCode$1 -> a.a.a.a.f.Lb:
+com.android.tools.r8.graph.JarCode$DefaultCodeLocator -> a.a.a.a.f.Mb:
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> a
     com.android.tools.r8.graph.JarApplicationReader application -> b
     int methodIndex -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():341:341 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):346:346 -> <init>
-    1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.JarCode$1):341 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):344:348 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.JarCode$1):341 -> <init>
-    1:1:java.lang.Object apply(java.lang.Object,java.lang.Object):341:341 -> apply
-    2:3:com.android.tools.r8.graph.JarCode apply(java.lang.String,java.lang.String):353:354 -> apply
-    2:3:java.lang.Object apply(java.lang.Object,java.lang.Object):341 -> apply
-com.android.tools.r8.graph.JarCode$SecondVisitor -> a.a.a.a.f.Qb:
+    1:1:void <clinit>():339:339 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):344:344 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.JarCode$1):339 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):342:346 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.JarCode$1):339 -> <init>
+    1:1:java.lang.Object apply(java.lang.Object,java.lang.Object):339:339 -> apply
+    2:3:com.android.tools.r8.graph.JarCode apply(java.lang.String,java.lang.String):351:352 -> apply
+    2:3:java.lang.Object apply(java.lang.Object,java.lang.Object):339 -> apply
+com.android.tools.r8.graph.JarCode$SecondVisitor -> a.a.a.a.f.Nb:
     java.util.function.BiFunction codeLocator -> c
     boolean useJsrInliner -> d
-    1:3:void <init>(java.util.function.BiFunction,boolean):367:369 -> <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[]):376:386 -> a
-com.android.tools.r8.graph.KeyedDexItem -> a.a.a.a.f.Sb:
+    1:3:void <init>(java.util.function.BiFunction,boolean):365:367 -> <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[]):374:384 -> a
+com.android.tools.r8.graph.KeyedDexItem -> a.a.a.a.f.Pb:
     1:1:void <init>():6:6 -> <init>
+    com.android.tools.r8.graph.PresortedComparable getKey() -> e
     1:1:boolean equals(java.lang.Object):15:15 -> equals
     1:1:int hashCode():20:20 -> hashCode
-    com.android.tools.r8.graph.PresortedComparable getKey() -> l
-com.android.tools.r8.graph.LazyCfCode -> a.a.a.a.f.Wb:
+com.android.tools.r8.graph.LazyCfCode -> a.a.a.a.f.Tb:
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> f
     com.android.tools.r8.graph.JarApplicationReader application -> d
     com.android.tools.r8.graph.CfCode code -> e
@@ -13538,18 +13298,18 @@
     5:10:void setCode(com.android.tools.r8.graph.CfCode):143:148 -> a
     11:12:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):179:180 -> a
     1:1:boolean computeEquals(java.lang.Object):158:158 -> b
-    1:1:int computeHashCode():153:153 -> f
-    1:19:com.android.tools.r8.graph.CfCode asCfCode():113:131 -> g
-    20:26:boolean verifyNoReparseContext(com.android.tools.r8.graph.DexProgramClass):840:846 -> g
-    20:26:com.android.tools.r8.graph.CfCode asCfCode():131 -> g
-    27:33:com.android.tools.r8.graph.CfCode asCfCode():128:134 -> g
-    com.android.tools.r8.graph.LazyCfCode asLazyCfCode() -> j
-    boolean isCfCode() -> l
-    1:1:boolean isEmptyVoidMethod():163:163 -> n
-    2:3:boolean com.android.tools.r8.graph.CfCode.isEmptyVoidMethod():206:207 -> n
-    2:3:boolean isEmptyVoidMethod():163 -> n
+    1:1:int computeHashCode():153:153 -> e
+    1:19:com.android.tools.r8.graph.CfCode asCfCode():113:131 -> f
+    20:26:boolean verifyNoReparseContext(com.android.tools.r8.graph.DexProgramClass):840:846 -> f
+    20:26:com.android.tools.r8.graph.CfCode asCfCode():131 -> f
+    27:33:com.android.tools.r8.graph.CfCode asCfCode():128:134 -> f
+    com.android.tools.r8.graph.LazyCfCode asLazyCfCode() -> i
+    boolean isCfCode() -> k
+    1:1:boolean isEmptyVoidMethod():163:163 -> m
+    2:3:boolean com.android.tools.r8.graph.CfCode.isEmptyVoidMethod():206:207 -> m
+    2:3:boolean isEmptyVoidMethod():163 -> m
     1:1:java.lang.String toString():204:204 -> toString
-com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> a.a.a.a.f.Tb:
+com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> a.a.a.a.f.Qb:
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> c
     com.android.tools.r8.graph.JarApplicationReader application -> d
     boolean usrJsrInliner -> f
@@ -13559,21 +13319,21 @@
     1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader,boolean):221:221 -> <init>
     2:10:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader,boolean):216:224 -> <init>
     1:10:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):230:239 -> a
-com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> a.a.a.a.f.Ub:
+com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> a.a.a.a.f.Rb:
     1:1:void <init>(java.lang.String):82:82 -> <init>
-com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> a.a.a.a.f.Vb:
-    java.util.Map canonicalDebugLocalInfo -> q
-    java.util.Map labelMap -> r
-    int maxStack -> l
-    java.util.List localVariables -> p
-    int maxLocals -> m
-    java.util.List tryCatchRanges -> o
-    com.android.tools.r8.graph.LazyCfCode code -> s
-    boolean $assertionsDisabled -> u
-    com.android.tools.r8.graph.DexItemFactory factory -> k
-    com.android.tools.r8.graph.DexMethod method -> t
-    java.util.List instructions -> n
-    com.android.tools.r8.graph.JarApplicationReader application -> j
+com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> a.a.a.a.f.Sb:
+    boolean $assertionsDisabled -> n
+    com.android.tools.r8.graph.DexItemFactory factory -> d
+    com.android.tools.r8.graph.DexMethod method -> m
+    com.android.tools.r8.graph.JarApplicationReader application -> c
+    int maxLocals -> f
+    java.util.List localVariables -> i
+    java.util.Map canonicalDebugLocalInfo -> j
+    java.util.List tryCatchRanges -> h
+    java.util.Map labelMap -> k
+    int maxStack -> e
+    java.util.List instructions -> g
+    com.android.tools.r8.graph.LazyCfCode code -> l
     1:1:void <clinit>():245:245 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.LazyCfCode):259:259 -> <init>
     2:12:void <init>(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.LazyCfCode):253:263 -> <init>
@@ -13623,7 +13383,7 @@
     295:295:void visitTypeInsn(int,java.lang.String):635:635 -> a
     296:296:void visitTypeInsn(int,java.lang.String):632:632 -> a
     297:298:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):650:651 -> a
-    299:299:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> a
+    299:299:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> a
     299:299:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):651 -> a
     300:303:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):651:654 -> a
     304:304:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):659:659 -> a
@@ -13641,13 +13401,13 @@
     378:383:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):777:782 -> a
     384:388:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):787:791 -> a
     389:389:void visitMultiANewArrayInsn(java.lang.String,int):796:796 -> a
-    390:390:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> a
+    390:390:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> a
     390:390:void visitMultiANewArrayInsn(java.lang.String,int):796 -> a
     391:391:void visitMultiANewArrayInsn(java.lang.String,int):796:796 -> a
     392:392: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):803:803 -> a
     393:396: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):802:805 -> a
     397:400: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):811:814 -> a
-    401:401:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> a
+    401:401:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> a
     401:401: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):815 -> a
     402:402: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):816:816 -> a
     403:409: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):812:818 -> a
@@ -13711,7 +13471,7 @@
     4:8:void visitVarInsn(int,int):601:605 -> d
     9:35:void visitVarInsn(int,int):597:623 -> d
     36:36:void visitVarInsn(int,int):616:616 -> d
-com.android.tools.r8.graph.LazyLoadedDexApplication -> a.a.a.a.f.Zb:
+com.android.tools.r8.graph.LazyLoadedDexApplication -> a.a.a.a.f.Wb:
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> k
     boolean $assertionsDisabled -> l
     com.android.tools.r8.utils.ClasspathClassCollection classpathClasses -> j
@@ -13728,8 +13488,8 @@
     boolean lambda$programClasses$0(com.android.tools.r8.graph.DexType) -> c
     1:2:java.util.List programClasses():56:57 -> d
     1:1:java.lang.String toString():237:237 -> toString
-com.android.tools.r8.graph.LazyLoadedDexApplication$1 -> a.a.a.a.f.Xb:
-com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> a.a.a.a.f.Yb:
+com.android.tools.r8.graph.LazyLoadedDexApplication$1 -> a.a.a.a.f.Ub:
+com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> a.a.a.a.f.Vb:
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> l
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver resolver -> m
     com.android.tools.r8.utils.ClasspathClassCollection classpathClasses -> k
@@ -13739,12 +13499,13 @@
     1:1:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder setClasspathClassCollection(com.android.tools.r8.utils.ClasspathClassCollection):200:200 -> a
     2:2:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder setLibraryClassCollection(com.android.tools.r8.utils.LibraryClassCollection):205:205 -> a
     1:7:com.android.tools.r8.graph.LazyLoadedDexApplication build():211:217 -> d
-com.android.tools.r8.graph.MethodAccessFlags -> a.a.a.a.f._b:
+com.android.tools.r8.graph.MethodAccessFlags -> a.a.a.a.f.Xb:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(int,int):61:61 -> <init>
     1:1:void <init>(int):57 -> <init>
     2:2:void <init>(int,int):61:61 -> <init>
+    1:1:void unsetBridge():130:130 -> A
     1:9:java.util.List getNames():32:40 -> a
     10:11:com.android.tools.r8.graph.MethodAccessFlags fromCfAccessFlags(int,boolean):81:82 -> a
     1:9:java.util.List getPredicates():45:53 -> b
@@ -13771,9 +13532,9 @@
     1:1:boolean isStrict():162:162 -> v
     1:1:boolean isSynchronized():110:110 -> w
     1:1:boolean isVarargs():134:134 -> x
-    1:1:void setBridge():126:126 -> y
-    1:1:void unsetBridge():130:130 -> z
-com.android.tools.r8.graph.ObjectToOffsetMapping -> a.a.a.a.f.bc:
+    1:1:void setAbstract():154:154 -> y
+    1:1:void setBridge():126:126 -> z
+com.android.tools.r8.graph.ObjectToOffsetMapping -> a.a.a.a.f.Zb:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap types -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap methods -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap fields -> e
@@ -13814,13 +13575,13 @@
     1:1:java.util.Collection getStrings():179:179 -> i
     1:1:java.util.Collection getTypes():167:167 -> j
     1:1:boolean hasJumboStrings():191:191 -> k
-com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> a.a.a.a.f.ac:
+com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> a.a.a.a.f.Yb:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap depthOfClasses -> b
     1:1:void <init>(com.android.tools.r8.graph.DexApplication):103:103 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.DexApplication):101:105 -> <init>
     1:22:int getDepth(com.android.tools.r8.graph.DexProgramClass):109:130 -> a
-com.android.tools.r8.graph.OffsetToObjectMapping -> a.a.a.a.f.cc:
+com.android.tools.r8.graph.OffsetToObjectMapping -> a.a.a.a.f._b:
     com.android.tools.r8.graph.DexProto[] protos -> c
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethodHandle[] methodHandles -> h
@@ -13860,26 +13621,25 @@
     1:2:void initializeProtos(int):28:29 -> l
     1:2:void initializeStrings(int):43:44 -> m
     1:2:void initializeTypes(int):38:39 -> n
-com.android.tools.r8.graph.OptimizationInfo -> a.a.a.a.f.ec:
+com.android.tools.r8.graph.OptimizationInfo -> a.a.a.a.f.bc:
     com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage getParameterUsages(int) -> a
-    boolean useIdentifierNameString() -> a
-    com.android.tools.r8.graph.UpdatableOptimizationInfo mutableCopy() -> b
-    java.util.BitSet getNonNullParamOnNormalExits() -> c
-    boolean isReachabilitySensitive() -> d
+    com.android.tools.r8.graph.UpdatableOptimizationInfo mutableCopy() -> a
+    com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo() -> b
+    java.util.BitSet getNonNullParamOrThrow() -> c
+    boolean isInitializerEnablingJavaAssertions() -> d
     boolean neverInline() -> e
-    com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility() -> f
-    java.util.Set getInitializedClassesOnNormalExit() -> g
-    boolean isInitializerEnablingJavaAssertions() -> h
-    com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo() -> i
-    java.util.BitSet getNonNullParamOrThrow() -> j
-com.android.tools.r8.graph.OptimizationInfo$InlinePreference -> a.a.a.a.f.dc:
+    boolean useIdentifierNameString() -> f
+    boolean isReachabilitySensitive() -> g
+    com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility() -> h
+    java.util.BitSet getNonNullParamOnNormalExits() -> i
+com.android.tools.r8.graph.OptimizationInfo$InlinePreference -> a.a.a.a.f.ac:
     com.android.tools.r8.graph.OptimizationInfo$InlinePreference ForceInline -> b
     com.android.tools.r8.graph.OptimizationInfo$InlinePreference NeverInline -> a
     com.android.tools.r8.graph.OptimizationInfo$InlinePreference Default -> c
-    1:3:void <clinit>():16:18 -> <clinit>
-    4:4:void <clinit>():15:15 -> <clinit>
-    1:1:void <init>(java.lang.String,int):15:15 -> <init>
-com.android.tools.r8.graph.ParameterAnnotationsList -> a.a.a.a.f.fc:
+    1:3:void <clinit>():15:17 -> <clinit>
+    4:4:void <clinit>():14:14 -> <clinit>
+    1:1:void <init>(java.lang.String,int):14:14 -> <init>
+com.android.tools.r8.graph.ParameterAnnotationsList -> a.a.a.a.f.cc:
     com.android.tools.r8.graph.ParameterAnnotationsList EMPTY_PARAMETER_ANNOTATIONS_LIST -> c
     com.android.tools.r8.graph.DexAnnotationSet[] values -> a
     int missingParameterAnnotations -> b
@@ -13893,16 +13653,16 @@
     13:13:com.android.tools.r8.graph.ParameterAnnotationsList empty():45:45 -> a
     13:13:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):192 -> a
     14:14:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):194:194 -> a
-    1:5:com.android.tools.r8.graph.DexAnnotationSet get(int):145:149 -> c
-    1:2:boolean isMissing(int):132:133 -> d
-    1:13:com.android.tools.r8.graph.ParameterAnnotationsList withParameterCount(int):154:166 -> e
+    1:2:boolean isMissing(int):132:133 -> b
+    1:13:com.android.tools.r8.graph.ParameterAnnotationsList withParameterCount(int):154:166 -> c
+    1:1:int countNonMissing():122:122 -> e
     1:2:boolean equals(java.lang.Object):77:78 -> equals
-    1:1:int countNonMissing():122:122 -> f
-    1:1:com.android.tools.r8.graph.ParameterAnnotationsList empty():45:45 -> g
-    1:1:boolean isEmpty():97:97 -> h
+    1:1:com.android.tools.r8.graph.ParameterAnnotationsList empty():45:45 -> f
+    1:5:com.android.tools.r8.graph.DexAnnotationSet get(int):145:149 -> get
     1:1:int hashCode():69:69 -> hashCode
-    1:1:int size():114:114 -> i
-com.android.tools.r8.graph.ParameterUsagesInfo -> a.a.a.a.f.ic:
+    1:1:boolean isEmpty():97:97 -> isEmpty
+    1:1:int size():114:114 -> size
+com.android.tools.r8.graph.ParameterUsagesInfo -> a.a.a.a.f.fc:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList parametersUsages -> a
     1:1:void <clinit>():26:26 -> <clinit>
@@ -13910,7 +13670,7 @@
     6:6:void <init>(java.util.List):32:32 -> <init>
     1:1:java.lang.Integer lambda$new$0(com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage):33:33 -> a
     2:3:com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage getParameterUsage(int):37:38 -> a
-com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage -> a.a.a.a.f.gc:
+com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage -> a.a.a.a.f.dc:
     java.util.List callsReceiver -> c
     boolean hasFieldRead -> e
     boolean isAssignedToField -> f
@@ -13920,7 +13680,7 @@
     boolean hasFieldAssignment -> d
     1:10:void <init>(int,java.util.Set,java.util.List,boolean,boolean,boolean,boolean):70:79 -> <init>
     1:1:boolean notUsed():83:83 -> a
-com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsageBuilder -> a.a.a.a.f.hc:
+com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsageBuilder -> a.a.a.a.f.ec:
     boolean $assertionsDisabled -> i
     java.util.Set ifZeroTestTypes -> c
     java.util.List callsOnReceiver -> d
@@ -13951,14 +13711,14 @@
     31:32:boolean note(com.android.tools.r8.ir.code.Return):184:185 -> a
     31:32:boolean note(com.android.tools.r8.ir.code.Instruction):124 -> a
     33:33:com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage build():130:130 -> a
-com.android.tools.r8.graph.Presorted -> a.a.a.a.f.jc:
-com.android.tools.r8.graph.PresortedComparable -> a.a.a.a.f.kc:
+com.android.tools.r8.graph.Presorted -> a.a.a.a.f.gc:
+com.android.tools.r8.graph.PresortedComparable -> a.a.a.a.f.hc:
     int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens) -> a
     int slowCompareTo(java.lang.Object) -> a
     1:1:boolean isSorted(java.util.List):15:15 -> a
     2:2:boolean isSorted(java.lang.Object[],java.util.function.Function):19:19 -> a
     3:5:boolean isSorted(java.util.List,java.util.function.Function):25:27 -> a
-com.android.tools.r8.graph.ProgramClassVisitor -> a.a.a.a.f.lc:
+com.android.tools.r8.graph.ProgramClassVisitor -> a.a.a.a.f.ic:
     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>
@@ -13971,8 +13731,8 @@
     16:17:void accept(com.android.tools.r8.graph.DexTypeList):50:51 -> b
     16:17:void accept(com.android.tools.r8.graph.DexClass):60 -> b
     18:19:void accept(com.android.tools.r8.graph.DexClass):61:62 -> b
-com.android.tools.r8.graph.UpdatableOptimizationInfo -> a.a.a.a.f.mc:
-com.android.tools.r8.graph.UseRegistry -> a.a.a.a.f.oc:
+com.android.tools.r8.graph.UpdatableOptimizationInfo -> a.a.a.a.f.jc:
+com.android.tools.r8.graph.UseRegistry -> a.a.a.a.f.lc:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexItemFactory factory -> a
     1:1:void <clinit>():15:15 -> <clinit>
@@ -14001,7 +13761,7 @@
     boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod) -> d
     boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> d
     boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> e
-com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> a.a.a.a.f.nc:
+com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> a.a.a.a.f.kc:
     com.android.tools.r8.graph.UseRegistry$MethodHandleUse ARGUMENT_TO_LAMBDA_METAFACTORY -> a
     com.android.tools.r8.graph.UseRegistry$MethodHandleUse NOT_ARGUMENT_TO_LAMBDA_METAFACTORY -> b
     1:2:void <clinit>():20:21 -> <clinit>
@@ -14015,49 +13775,45 @@
     boolean $assertionsDisabled -> g
     com.android.tools.r8.ir.code.IRCode code -> b
     int markingColor -> e
-    1:13:void <clinit>():49:61 -> <clinit>
-    1:1:void <init>():78:78 -> <init>
-    1:1:void <init>(com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1):49 -> <init>
-    2:8:void <init>():75:81 -> <init>
-    2:8:void <init>(com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1):49 -> <init>
-    9:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):84:84 -> <init>
-    10:22:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):75:87 -> <init>
-    1:3:void returnMarkingColor():248:250 -> a
-    1:3:void finish():244 -> a
-    1:1:com.android.tools.r8.ir.analysis.ClassInitializationAnalysis trivial():92:92 -> b
+    1:13:void <clinit>():40:52 -> <clinit>
+    1:1:void <init>():69:69 -> <init>
+    1:1:void <init>(com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1):40 -> <init>
+    2:8:void <init>():66:72 -> <init>
+    2:8:void <init>(com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1):40 -> <init>
+    9:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):75:75 -> <init>
+    10:22:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):66:78 -> <init>
+    1:3:void returnMarkingColor():236:238 -> a
+    1:3:void finish():232 -> a
+    1:1:com.android.tools.r8.ir.analysis.ClassInitializationAnalysis trivial():83:83 -> b
 com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1 -> a.a.a.a.g.a.a:
-    1:1:void <init>():62:62 -> <init>
+    1:1:void <init>():53:53 -> <init>
 com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption -> a.a.a.a.g.a.b:
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption NONE -> b
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption INSTRUCTION_DOES_NOT_THROW -> a
-    1:2:void <clinit>():52:53 -> <clinit>
-    3:3:void <clinit>():51:51 -> <clinit>
-    1:1:void <init>(java.lang.String,int):51:51 -> <init>
+    1:2:void <clinit>():43:44 -> <clinit>
+    3:3:void <clinit>():42:42 -> <clinit>
+    1:1:void <init>(java.lang.String,int):42:42 -> <init>
 com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils -> a.a.a.a.g.a.c:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():254:254 -> <clinit>
-    1:1:boolean forInstanceGet(com.android.tools.r8.ir.code.InstanceGet,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):262:262 -> a
-    2:2:boolean forInstancePut(com.android.tools.r8.ir.code.InstancePut,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):271:271 -> a
-    3:15:boolean forInstanceGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):280:292 -> a
-    16:23:boolean forInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,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):301:308 -> a
-    24:50:boolean forInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):318:344 -> a
-    51:56:boolean forInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,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):353:358 -> a
-    57:91:boolean forInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):368:402 -> a
-    92:118:boolean forInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):412:438 -> a
-    119:124:boolean forNewInstance(com.android.tools.r8.ir.code.NewInstance,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):447:452 -> a
-    125:125:boolean forStaticGet(com.android.tools.r8.ir.code.StaticGet,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):461:461 -> a
-    126:126:boolean forStaticPut(com.android.tools.r8.ir.code.StaticPut,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):470:470 -> a
-    127:170:boolean isTypeInitializedBy(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):493:536 -> a
-    171:171:boolean isTypeInitializedBy(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
-    172:173:void enqueue(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Deque):545:546 -> a
-    174:175:void enqueueInitializedClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set,java.util.Deque):552:553 -> a
-    1:7:boolean forStaticGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):479:485 -> b
+    1:1:void <clinit>():242:242 -> <clinit>
+    1:1:boolean forInstanceGet(com.android.tools.r8.ir.code.InstanceGet,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):250:250 -> a
+    2:2:boolean forInstancePut(com.android.tools.r8.ir.code.InstancePut,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):259:259 -> a
+    3:14:boolean forInstanceGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):268:279 -> a
+    15:21:boolean forInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,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):288:294 -> a
+    22:26:boolean forInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,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):303:307 -> a
+    27:53:boolean forInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,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):316:342 -> a
+    54:72:boolean forInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,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):351:369 -> a
+    73:73:boolean forNewInstance(com.android.tools.r8.ir.code.NewInstance,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):378:378 -> a
+    74:74:boolean forStaticGet(com.android.tools.r8.ir.code.StaticGet,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):387:387 -> a
+    75:75:boolean forStaticPut(com.android.tools.r8.ir.code.StaticPut,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):396:396 -> a
+    76:79:boolean isTypeInitializedBy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):418:421 -> a
+    1:6:boolean forStaticGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):405:410 -> b
 com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> a.a.a.a.g.a.d:
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query DIRECTLY_OR_INDIRECTLY -> b
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query DIRECTLY -> a
-    1:2:void <clinit>():57:58 -> <clinit>
-    3:3:void <clinit>():56:56 -> <clinit>
-    1:1:void <init>(java.lang.String,int):56:56 -> <init>
+    1:2:void <clinit>():48:49 -> <clinit>
+    3:3:void <clinit>():47:47 -> <clinit>
+    1:1:void <init>(java.lang.String,int):47:47 -> <init>
 com.android.tools.r8.ir.analysis.EscapeAnalysis -> a.a.a.a.g.a.f:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():26:26 -> <clinit>
@@ -14071,25 +13827,25 @@
 com.android.tools.r8.ir.analysis.TypeChecker -> a.a.a.a.g.a.g:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():32:32 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.AppView):36:37 -> <init>
-    1:5:boolean check(com.android.tools.r8.ir.code.IRCode):41:45 -> a
-    6:6:boolean check(com.android.tools.r8.ir.code.InstancePut):62:62 -> a
-    6:6:boolean check(com.android.tools.r8.ir.code.IRCode):45 -> a
-    7:8:boolean check(com.android.tools.r8.ir.code.IRCode):48:49 -> a
-    9:9:boolean check(com.android.tools.r8.ir.code.StaticPut):66:66 -> a
-    9:9:boolean check(com.android.tools.r8.ir.code.IRCode):49 -> a
-    10:11:boolean check(com.android.tools.r8.ir.code.IRCode):52:53 -> a
-    12:15:boolean check(com.android.tools.r8.ir.code.Throw):94:97 -> a
-    12:15:boolean check(com.android.tools.r8.ir.code.IRCode):53 -> a
-    16:18:boolean check(com.android.tools.r8.ir.code.Throw):96:98 -> a
-    16:18:boolean check(com.android.tools.r8.ir.code.IRCode):53 -> a
-    19:19:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):70:70 -> a
-    20:20:boolean com.android.tools.r8.ir.code.Instruction.isFieldPut():768:768 -> a
-    20:20:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):70 -> a
-    21:29:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):70:78 -> a
-    30:40:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):77:87 -> a
-    41:43:boolean isSubtypeOf(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):103:105 -> a
+    1:1:void <clinit>():31:31 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AppView):35:36 -> <init>
+    1:5:boolean check(com.android.tools.r8.ir.code.IRCode):40:44 -> a
+    6:6:boolean check(com.android.tools.r8.ir.code.InstancePut):61:61 -> a
+    6:6:boolean check(com.android.tools.r8.ir.code.IRCode):44 -> a
+    7:8:boolean check(com.android.tools.r8.ir.code.IRCode):47:48 -> a
+    9:9:boolean check(com.android.tools.r8.ir.code.StaticPut):65:65 -> a
+    9:9:boolean check(com.android.tools.r8.ir.code.IRCode):48 -> a
+    10:11:boolean check(com.android.tools.r8.ir.code.IRCode):51:52 -> a
+    12:15:boolean check(com.android.tools.r8.ir.code.Throw):93:96 -> a
+    12:15:boolean check(com.android.tools.r8.ir.code.IRCode):52 -> a
+    16:18:boolean check(com.android.tools.r8.ir.code.Throw):95:97 -> a
+    16:18:boolean check(com.android.tools.r8.ir.code.IRCode):52 -> a
+    19:19:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):69:69 -> a
+    20:20:boolean com.android.tools.r8.ir.code.Instruction.isFieldPut():766:766 -> a
+    20:20:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):69 -> a
+    21:29:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):69:77 -> a
+    30:40:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):76:86 -> a
+    41:43:boolean isSubtypeOf(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):102:104 -> a
 com.android.tools.r8.ir.analysis.constant.Bottom -> a.a.a.a.g.a.a.a:
     com.android.tools.r8.ir.analysis.constant.Bottom INSTANCE -> a
     1:1:void <clinit>():7:7 -> <clinit>
@@ -14174,254 +13930,272 @@
     boolean isTop() -> e
     1:1:com.android.tools.r8.ir.analysis.constant.Top getInstance():13:13 -> g
 com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement -> a.a.a.a.g.a.b.a:
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement memberTypeLattice -> r
-    com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> s
-    boolean $assertionsDisabled -> t
-    1:1:void <clinit>():14:14 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):32:35 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsValueType():65:65 -> F
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement memberTypeLattice -> u
+    boolean $assertionsDisabled -> v
+    1:1:void <clinit>():13:13 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.Nullability):19:20 -> <init>
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsValueType():50:50 -> E
     com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement asArrayTypeLatticeElement() -> a
-    1:1:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement create(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.Nullability):23:23 -> a
-    2:2:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement lambda$create$0(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):25:25 -> a
-    3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():61:61 -> a
-    3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayBaseTypeLattice():69 -> a
-    3:3:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):39 -> a
-    4:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayBaseTypeLattice():70:71 -> a
-    4:5:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):39 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():61:61 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayBaseTypeLattice():71 -> a
-    6:6:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):39 -> a
-    7:8:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):41:42 -> a
-    9:33:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.toDexType(com.android.tools.r8.graph.DexItemFactory):38:62 -> a
-    9:33:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):42 -> a
-    34:35:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):44:45 -> a
-    36:36:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():61:61 -> a
-    36:36:int getNesting():52 -> a
-    36:36:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):47 -> a
-    37:39:int getNesting():53:55 -> a
-    37:39:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):47 -> a
-    40:40:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():61:61 -> a
-    40:40:int getNesting():55 -> a
-    40:40:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):47 -> a
-    41:41:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):47:47 -> a
-    42:42:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> a
-    42:42:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.AppView):132 -> a
-    43:43:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> a
-    43:43:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.AppView):132 -> a
-    44:55:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.AppView):132:143 -> a
-    56:57:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):78:79 -> a
-    58:62:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):84:88 -> a
-    63:63:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):93:93 -> a
-    64:74:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):153:163 -> a
-    75:87:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):159:171 -> a
-    88:90:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.objectArrayType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):306:308 -> a
-    88:90:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):174 -> a
-    91:93:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.objectArrayType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):307:309 -> a
-    91:93:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):174 -> a
-    94:95:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):301:302 -> a
-    94:95:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):172 -> a
-    boolean isArrayType() -> e
-    1:4:boolean equals(java.lang.Object):116:119 -> equals
-    5:5:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> equals
-    5:5:boolean equals(java.lang.Object):120 -> equals
-    6:6:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> equals
-    6:6:boolean equals(java.lang.Object):120 -> equals
-    7:7:boolean equals(java.lang.Object):123:123 -> equals
-    1:1:int hashCode():128:128 -> hashCode
-    1:1:java.lang.String toString():108:108 -> toString
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():46:46 -> a
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayBaseTypeLattice():54 -> a
+    1:1:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):24 -> a
+    2:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayBaseTypeLattice():55:56 -> a
+    2:3:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):24 -> a
+    4:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():46:46 -> a
+    4:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayBaseTypeLattice():56 -> a
+    4:4:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):24 -> a
+    5:6:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):26:27 -> a
+    7:31:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.toDexType(com.android.tools.r8.graph.DexItemFactory):38:62 -> a
+    7:31:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):27 -> a
+    32:33:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):29:30 -> a
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement.getClassType():48:48 -> a
+    34:34:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):30 -> a
+    35:35:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():46:46 -> a
+    35:35:int getNesting():37 -> a
+    35:35:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):32 -> a
+    36:38:int getNesting():38:40 -> a
+    36:38:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):32 -> a
+    39:39:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():46:46 -> a
+    39:39:int getNesting():40 -> a
+    39:39:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):32 -> a
+    40:40:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):32:32 -> a
+    41:41:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():46:46 -> a
+    41:41:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):124 -> a
+    42:42:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():46:46 -> a
+    42:42:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):125 -> a
+    43:43:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):126:126 -> a
+    44:44:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():82:82 -> a
+    44:44:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):130 -> a
+    45:45:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():82:82 -> a
+    45:45:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):130 -> a
+    46:61:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):130:145 -> a
+    62:64:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.objectArrayType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.analysis.type.Nullability):294:296 -> a
+    62:64:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):148 -> a
+    65:67:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.objectArrayType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.analysis.type.Nullability):295:297 -> a
+    65:67:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):148 -> a
+    68:69:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.objectClassType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.analysis.type.Nullability):288:289 -> a
+    68:69:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):146 -> a
+    70:73:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability):63:66 -> a
+    74:74:boolean isBasedOnMissingClass(com.android.tools.r8.graph.DexDefinitionSupplier):81:81 -> a
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNonNullable():76:76 -> c
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNullable():71:71 -> d
+    1:4:boolean equals(java.lang.Object):104:107 -> equals
+    5:5:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():82:82 -> equals
+    5:5:boolean equals(java.lang.Object):108 -> equals
+    6:6:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():82:82 -> equals
+    6:6:boolean equals(java.lang.Object):108 -> equals
+    7:10:boolean equals(java.lang.Object):111:114 -> equals
+    boolean isArrayType() -> f
+    1:1:int hashCode():119:119 -> hashCode
+    1:1:java.lang.String toString():96:96 -> toString
 com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement -> a.a.a.a.g.a.b.b:
     com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement INSTANCE -> p
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement getInstance():10:10 -> B
-    boolean isBoolean() -> f
+    1:1:com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement getInstance():10:10 -> C
+    boolean isBoolean() -> g
     1:1:int hashCode():30:30 -> hashCode
 com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement -> a.a.a.a.g.a.b.c:
     com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement INSTANCE -> o
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>():9:9 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement getInstance():18:18 -> B
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkCast(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> a
-    boolean isBottom() -> g
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():14:14 -> A
+    1:1:com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement getInstance():18:18 -> C
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkCast(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType) -> a
+    boolean isBottom() -> h
     1:1:int hashCode():43:43 -> hashCode
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():14:14 -> z
 com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement -> a.a.a.a.g.a.b.d:
     com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement INSTANCE -> p
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement getInstance():10:10 -> B
-    boolean isByte() -> h
+    1:1:com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement getInstance():10:10 -> C
     1:1:int hashCode():30:30 -> hashCode
+    boolean isByte() -> i
 com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement -> a.a.a.a.g.a.b.e:
     com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement INSTANCE -> p
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement getInstance():10:10 -> B
+    1:1:com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement getInstance():10:10 -> C
     1:1:int hashCode():30:30 -> hashCode
-    boolean isChar() -> i
-com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement -> a.a.a.a.g.a.b.f:
-    com.android.tools.r8.graph.AppView appViewForLazyInterfacesComputation -> s
-    boolean $assertionsDisabled -> v
-    com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> t
-    java.util.Set lazyInterfaces -> r
-    com.android.tools.r8.graph.DexType type -> u
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set,com.android.tools.r8.ir.analysis.type.NullabilityVariants,com.android.tools.r8.graph.AppView):53:58 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getClassType():62:62 -> F
-    1:13:java.util.Set getInterfaces():66:78 -> G
-    14:20:java.util.Set getInterfaces():71:77 -> G
-    1:2:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set):32:33 -> a
-    3:3:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement lambda$create$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set,com.android.tools.r8.ir.analysis.type.NullabilityVariants):36:36 -> a
-    4:4:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement lambda$create$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.NullabilityVariants):44:44 -> a
-    5:5:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> a
-    5:5:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.AppView):137 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.AppView):137 -> a
-    7:10:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.AppView):137:140 -> a
-    11:11:com.android.tools.r8.graph.DexType getClassType():62:62 -> a
-    11:11:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.AppView):142 -> a
-    12:12:com.android.tools.r8.graph.DexType getClassType():62:62 -> a
-    12:12:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.AppView):142 -> a
-    13:15:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.AppView):144:146 -> a
-    16:16:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.AppView):141:141 -> a
-    17:18:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):83:84 -> a
-    19:23:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):90:94 -> a
-    24:24:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):100:100 -> a
+    boolean isChar() -> j
+com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement -> a.a.a.a.g.a.b.h:
+    com.android.tools.r8.graph.DexDefinitionSupplier definitionsForLazyInterfacesComputation -> v
+    java.util.Set lazyInterfaces -> u
+    boolean $assertionsDisabled -> w
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set):28:28 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier):33:33 -> <init>
+    3:6:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set,com.android.tools.r8.graph.DexDefinitionSupplier):41:44 -> <init>
+    1:12:java.util.Set getInterfaces():53:64 -> C
+    13:13:java.util.Set getInterfaces():63:63 -> C
+    1:1:com.android.tools.r8.graph.DexType getClassType():48:48 -> E
+    1:1:com.android.tools.r8.graph.DexType getClassType():48:48 -> a
+    1:1:boolean isBasedOnMissingClass(com.android.tools.r8.graph.DexDefinitionSupplier):88 -> a
+    2:4:boolean isBasedOnMissingClass(com.android.tools.r8.graph.DexDefinitionSupplier):88:90 -> a
+    5:5:com.android.tools.r8.graph.DexType getClassType():48:48 -> a
+    5:5:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):122 -> a
+    6:6:com.android.tools.r8.graph.DexType getClassType():48:48 -> a
+    6:6:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):122 -> a
+    7:15:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):122:130 -> a
+    16:16:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():82:82 -> a
+    16:16:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):132 -> a
+    17:17:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():82:82 -> a
+    17:17:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):132 -> a
+    18:19:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):132:133 -> a
+    20:23:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability):69:72 -> a
+    24:98:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Set,java.util.Set):153:227 -> a
+    99:99:java.util.Set lambda$computeLeastUpperBoundOfInterfaces$1(com.android.tools.r8.graph.DexType):173:173 -> a
     com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement asClassTypeLatticeElement() -> b
-    1:2:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):41:42 -> b
-    1:4:boolean equals(java.lang.Object):269:272 -> equals
-    5:5:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> equals
-    5:5:boolean equals(java.lang.Object):273 -> equals
-    6:6:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> equals
-    6:6:boolean equals(java.lang.Object):273 -> equals
-    7:18:boolean equals(java.lang.Object):276:287 -> equals
-    1:1:int hashCode():133:133 -> hashCode
-    boolean isClassType() -> j
-    1:11:java.lang.String toString():117:127 -> toString
-com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement -> a.a.a.a.g.a.b.g:
+    1:1:boolean lambda$isBasedOnMissingClass$0(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):90:90 -> b
+    2:2:java.util.Set lambda$computeLeastUpperBoundOfInterfaces$2(com.android.tools.r8.graph.DexType):189:189 -> b
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNonNullable():83:83 -> c
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNullable():78:78 -> d
+    1:1:int hashCode():117:117 -> hashCode
+    boolean isClassType() -> k
+    1:1:java.lang.String toString():105:105 -> toString
+    2:2:java.lang.String com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.toString():111:111 -> toString
+    2:2:java.lang.String toString():106 -> toString
+    3:3:java.lang.String com.android.tools.r8.graph.DexType.toString():360:360 -> toString
+    3:3:java.lang.String com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.toString():111 -> toString
+    3:3:java.lang.String toString():106 -> toString
+    4:4:java.lang.String com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.toString():111:111 -> toString
+    4:4:java.lang.String toString():106 -> toString
+    5:8:java.lang.String toString():106:109 -> toString
+    9:12:java.lang.String toString():108:111 -> toString
+com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker -> a.a.a.a.g.a.b.f:
+    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker RIGHT -> b
+    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker LEFT -> a
+    1:2:void <clinit>():137:138 -> <clinit>
+    3:3:void <clinit>():136:136 -> <clinit>
+    1:1:void <init>(java.lang.String,int):136:136 -> <init>
+com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceWithMarker -> a.a.a.a.g.a.b.g:
+    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker marker -> b
+    com.android.tools.r8.graph.DexType itf -> a
+    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker):145:147 -> <init>
+com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement -> a.a.a.a.g.a.b.i:
     com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement getInstance():10:10 -> B
+    1:1:com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement getInstance():10:10 -> C
     1:1:int hashCode():25:25 -> hashCode
-    boolean isDouble() -> l
-com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement -> a.a.a.a.g.a.b.h:
+    boolean isDouble() -> m
+com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement -> a.a.a.a.g.a.b.j:
     com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement getInstance():10:10 -> B
+    1:1:com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement getInstance():10:10 -> C
     1:1:int hashCode():25:25 -> hashCode
-    boolean isFloat() -> n
-com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement -> a.a.a.a.g.a.b.i:
+    boolean isFloat() -> o
+com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement -> a.a.a.a.g.a.b.k:
     com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement getInstance():10:10 -> B
+    1:1:com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement getInstance():10:10 -> C
     1:1:int hashCode():25:25 -> hashCode
-    boolean isInt() -> o
-com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement -> a.a.a.a.g.a.b.j:
+    boolean isInt() -> p
+com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement -> a.a.a.a.g.a.b.l:
     com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement getInstance():10:10 -> B
+    1:1:com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement getInstance():10:10 -> C
     1:1:int hashCode():25:25 -> hashCode
-    boolean isLong() -> p
-com.android.tools.r8.ir.analysis.type.Nullability -> a.a.a.a.g.a.b.k:
+    boolean isLong() -> q
+com.android.tools.r8.ir.analysis.type.Nullability -> a.a.a.a.g.a.b.m:
     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
     com.android.tools.r8.ir.analysis.type.Nullability DEFINITELY_NOT_NULL -> b
-    1:4:void <clinit>():25:28 -> <clinit>
-    1:1:void <init>():30:30 -> <init>
-    1:10:com.android.tools.r8.ir.analysis.type.Nullability join(com.android.tools.r8.ir.analysis.type.Nullability):49:58 -> a
-    11:11:com.android.tools.r8.ir.analysis.type.Nullability bottom():78:78 -> a
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability definitelyNotNull():70:70 -> b
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability definitelyNull():66:66 -> c
-    1:1:boolean isDefinitelyNotNull():37:37 -> d
-    1:1:boolean isDefinitelyNull():33:33 -> e
-    1:1:boolean isMaybeNull():41:41 -> f
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability maybeNull():74:74 -> g
-    1:13:java.lang.String toString():83:95 -> toString
-com.android.tools.r8.ir.analysis.type.NullabilityVariants -> a.a.a.a.g.a.b.l:
-    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement definitelyNotNullVariant -> c
-    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement definitelyNullVariant -> b
-    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement maybeNullVariant -> a
-    boolean $assertionsDisabled -> d
-    1:1:void <clinit>():10:10 -> <clinit>
-    1:1:void <init>():10:10 -> <init>
-    1:3:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement create(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.Function):18:20 -> a
-    4:10:void set(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement):25:31 -> a
-    11:17:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement get(com.android.tools.r8.ir.analysis.type.Nullability):36:42 -> a
-    18:31:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateElement(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.BiFunction):48:61 -> a
-com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement -> a.a.a.a.g.a.b.m:
+    1:3:void <clinit>():21:23 -> <clinit>
+    1:1:void <init>():25:25 -> <init>
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability join(com.android.tools.r8.ir.analysis.type.Nullability):43:43 -> a
+    2:2:com.android.tools.r8.ir.analysis.type.Nullability definitelyNotNull():59:59 -> a
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability definitelyNull():55:55 -> b
+    1:1:boolean isDefinitelyNotNull():32:32 -> c
+    1:1:boolean isDefinitelyNull():28:28 -> d
+    1:1:boolean isMaybeNull():36:36 -> e
+    1:1:boolean isNullable():51:51 -> f
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability maybeNull():63:63 -> g
+    1:10:java.lang.String toString():68:77 -> toString
+com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement -> a.a.a.a.g.a.b.n:
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():15:15 -> <init>
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():19:19 -> A
     1:14:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):104:117 -> a
     15:15:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):115:115 -> a
     16:16:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):113:113 -> a
     17:17:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):111:111 -> a
     18:18:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):109:109 -> a
     19:31:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement):125:137 -> a
-    com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement asPrimitiveTypeLatticeElement() -> c
-    boolean isPrimitive() -> t
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():19:19 -> z
+    com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement asPrimitiveTypeLatticeElement() -> e
+    boolean isPrimitive() -> u
 com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement -> a.a.a.a.g.a.b.o:
-    com.android.tools.r8.ir.analysis.type.Nullability nullability -> o
-    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement NULL_BOTTOM_INSTANCE -> q
-    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement NULL_INSTANCE -> p
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement.create():23:23 -> <clinit>
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement.access$200():11 -> <clinit>
-    1:1:void <clinit>():57 -> <clinit>
-    2:2:void <clinit>():57:57 -> <clinit>
-    3:3:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement.createBottom():27:27 -> <clinit>
-    3:3:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement.access$300():11 -> <clinit>
-    3:3:void <clinit>():59 -> <clinit>
-    4:4:void <clinit>():59:59 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.analysis.type.Nullability):63:64 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement access$000():9:9 -> B
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement access$100():9:9 -> C
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNotNull():79:79 -> D
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getNullTypeLatticeElement():73:73 -> E
-    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability) -> a
-    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement asReferenceTypeLatticeElement() -> d
-    boolean isReference() -> u
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():69:69 -> z
-com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement -> a.a.a.a.g.a.b.n:
-    1:1:void <init>(com.android.tools.r8.ir.analysis.type.Nullability):14:14 -> <init>
-    1:1:boolean com.android.tools.r8.ir.analysis.type.Nullability.isNullable():45:45 -> a
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):19 -> a
-    2:2:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):19:19 -> a
-    1:1:boolean equals(java.lang.Object):50:50 -> equals
-    1:1:int hashCode():42:42 -> hashCode
-    boolean isNullType() -> q
-    1:1:java.lang.String toString():37:37 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():118:118 -> toString
-    2:2:java.lang.String toString():37 -> toString
-    3:3:java.lang.String toString():37:37 -> toString
+    com.android.tools.r8.graph.DexType type -> o
+    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement NULL_INSTANCE -> s
+    com.android.tools.r8.ir.analysis.type.Nullability nullability -> p
+    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement nonNullVariant -> r
+    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement primaryOrNullVariant -> q
+    boolean $assertionsDisabled -> t
+    1:4:void <clinit>():12:15 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):27:29 -> <init>
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():82:82 -> A
+    1:1:java.util.Set getInterfaces():90:90 -> C
+    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getNullTypeLatticeElement():86:86 -> D
+    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability):62:62 -> a
+    2:2:void linkVariant(com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement,com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement):67:67 -> a
+    3:3:com.android.tools.r8.ir.analysis.type.Nullability nullability():82:82 -> a
+    3:3:void linkVariant(com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement,com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement):67 -> a
+    4:6:void linkVariant(com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement,com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement):67:69 -> a
+    7:7:com.android.tools.r8.ir.analysis.type.Nullability nullability():82:82 -> a
+    7:7:void linkVariant(com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement,com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement):70 -> a
+    8:12:void linkVariant(com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement,com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement):70:74 -> a
+    13:13:com.android.tools.r8.ir.analysis.type.Nullability nullability():82:82 -> a
+    13:13:void linkVariant(com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement,com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement):74 -> a
+    14:16:void linkVariant(com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement,com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement):74:76 -> a
+    1:26:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):33:58 -> b
+    27:27:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):44:44 -> b
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNullable():100:100 -> d
+    2:2:boolean isNullType():95:95 -> d
+    2:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNullable():100 -> d
+    3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNullable():100:100 -> d
+    1:4:boolean equals(java.lang.Object):119:122 -> equals
+    5:5:com.android.tools.r8.ir.analysis.type.Nullability nullability():82:82 -> equals
+    5:5:boolean equals(java.lang.Object):123 -> equals
+    6:6:com.android.tools.r8.ir.analysis.type.Nullability nullability():82:82 -> equals
+    6:6:boolean equals(java.lang.Object):123 -> equals
+    7:15:boolean equals(java.lang.Object):126:134 -> equals
+    1:1:int hashCode():139:139 -> hashCode
+    2:2:boolean isNullType():95:95 -> hashCode
+    2:2:int hashCode():139 -> hashCode
+    3:4:int hashCode():139:140 -> hashCode
+    1:1:boolean isNullType():95:95 -> r
+    1:1:java.lang.String toString():111:111 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():360:360 -> toString
+    2:2:java.lang.String toString():111 -> toString
+    3:3:java.lang.String toString():111:111 -> toString
+    boolean isReference() -> v
 com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement -> a.a.a.a.g.a.b.p:
     com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement INSTANCE -> p
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement getInstance():10:10 -> B
+    1:1:com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement getInstance():10:10 -> C
     1:1:int hashCode():30:30 -> hashCode
-    boolean isShort() -> v
+    boolean isShort() -> w
 com.android.tools.r8.ir.analysis.type.SingleTypeLatticeElement -> a.a.a.a.g.a.b.q:
     com.android.tools.r8.ir.analysis.type.SingleTypeLatticeElement SINGLE_INSTANCE -> p
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>():13:13 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.SingleTypeLatticeElement getInstance():17:17 -> B
+    1:1:com.android.tools.r8.ir.analysis.type.SingleTypeLatticeElement getInstance():17:17 -> C
     1:1:int hashCode():37:37 -> hashCode
-    boolean isSingle() -> w
+    boolean isSingle() -> x
 com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement -> a.a.a.a.g.a.b.r:
     com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement INSTANCE -> o
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>():9:9 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement getInstance():18:18 -> B
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkCast(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> a
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():14:14 -> A
+    1:1:com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement getInstance():18:18 -> C
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkCast(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType) -> a
     1:1:int hashCode():43:43 -> hashCode
-    boolean isTop() -> x
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():14:14 -> z
+    boolean isTop() -> y
 com.android.tools.r8.ir.analysis.type.TypeAnalysis -> a.a.a.a.g.a.b.t:
     com.android.tools.r8.graph.AppView appView -> c
     java.util.Deque worklist -> e
@@ -14444,7 +14218,10 @@
     38:58:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):108:128 -> a
     38:58:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):66 -> a
     59:85:void updateTypeOfValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):142:168 -> a
-    86:90:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):174:178 -> a
+    86:89:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):174:177 -> a
+    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement.getClassType():48:48 -> a
+    90:90:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):177 -> a
+    91:91:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):178:178 -> a
     1:4:void widening(java.lang.Iterable):71:74 -> b
 com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode -> a.a.a.a.g.a.b.s:
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode UNSET -> a
@@ -14468,77 +14245,75 @@
     com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement BOOLEAN -> c
     com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement SHORT -> e
     com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement LONG -> j
-    1:15:void <clinit>():17:31 -> <clinit>
-    1:1:void <init>():17:17 -> <init>
-    1:2:int requiredRegisters():295:296 -> A
+    1:15:void <clinit>():15:29 -> <clinit>
+    1:1:void <init>():15:15 -> <init>
+    com.android.tools.r8.ir.analysis.type.Nullability nullability() -> A
+    1:2:int requiredRegisters():282:283 -> B
     com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement asArrayTypeLatticeElement() -> a
-    boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView) -> a
-    1:29:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):50:78 -> a
-    30:31:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):301:302 -> a
-    30:31:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):79 -> a
-    32:40:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):82:90 -> a
-    41:41:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):57:57 -> a
-    42:50:boolean equalUpToNullability(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):140:148 -> a
-    51:52:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):314:315 -> a
-    53:53:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):326:326 -> a
-    54:58:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):331:335 -> a
-    59:60:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):33:34 -> a
-    59:60:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):336 -> a
-    61:61:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):99:99 -> a
-    61:61:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
-    61:61:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):336 -> a
-    62:89:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):70:97 -> a
-    62:89:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
-    62:89:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):336 -> a
-    90:90:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):93:93 -> a
-    90:90:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
-    90:90:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):336 -> a
-    91:95:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean) -> a
-    91:95:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
-    91:95:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):336 -> a
-    96:110:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):75:89 -> a
-    96:110:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
-    96:110:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):336 -> a
-    111:111:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):338:338 -> a
-    112:113:com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkCast(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):348:349 -> a
+    boolean isBasedOnMissingClass(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
+    1:29:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):66:94 -> a
+    30:31:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement objectClassType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.analysis.type.Nullability):288:289 -> a
+    30:31:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):94 -> a
+    32:42:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):97:107 -> a
+    43:43:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):73:73 -> a
+    44:45:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement classClassType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.analysis.type.Nullability):302:303 -> a
+    46:46:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier):314:314 -> a
+    47:51:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):322:326 -> a
+    52:53:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):33:34 -> a
+    52:53:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):327 -> a
+    54:54:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):99:99 -> a
+    54:54:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
+    54:54:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):327 -> a
+    55:82:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):70:97 -> a
+    55:82:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
+    55:82:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):327 -> a
+    83:83:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):93:93 -> a
+    83:83:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
+    83:83:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):327 -> a
+    84:88:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):91:95 -> a
+    84:88:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
+    84:88:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):327 -> a
+    89:103:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):75:89 -> a
+    89:103:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
+    89:103:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):327 -> a
+    104:105:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):330:331 -> a
+    106:107:com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkCast(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):341:342 -> a
     com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement asClassTypeLatticeElement() -> b
-    1:1:boolean lessThanOrEqual(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):127:127 -> b
-    2:3:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):301:302 -> b
-    com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement asPrimitiveTypeLatticeElement() -> c
-    1:5:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):111:115 -> c
-    6:7:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):320:321 -> c
-    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement asReferenceTypeLatticeElement() -> d
-    boolean isArrayType() -> e
-    boolean isBoolean() -> f
-    boolean isBottom() -> g
-    boolean isByte() -> h
-    boolean isChar() -> i
-    boolean isClassType() -> j
-    1:1:boolean isDefinitelyNull():287:287 -> k
-    boolean isDouble() -> l
-    1:4:boolean isFineGrainedType():263:266 -> m
-    boolean isFloat() -> n
-    boolean isInt() -> o
-    boolean isLong() -> p
-    boolean isNullType() -> q
-    1:1:boolean isNullable():34:34 -> r
-    2:2:boolean com.android.tools.r8.ir.analysis.type.Nullability.isNullable():45:45 -> r
-    2:2:boolean isNullable():34 -> r
-    1:8:boolean isPreciseType():252:259 -> s
-    boolean isPrimitive() -> t
-    boolean isReference() -> u
-    boolean isShort() -> v
-    boolean isSingle() -> w
-    boolean isTop() -> x
-    boolean isWide() -> y
-    com.android.tools.r8.ir.analysis.type.Nullability nullability() -> z
+    1:1:boolean lessThanOrEqual(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):144:144 -> b
+    2:3:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement objectClassType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.analysis.type.Nullability):288:289 -> b
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNonNullable():52:52 -> c
+    2:6:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):128:132 -> c
+    7:8:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement stringClassType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.analysis.type.Nullability):308:309 -> c
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNullable():43:43 -> d
+    com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement asPrimitiveTypeLatticeElement() -> e
+    boolean isArrayType() -> f
+    boolean isBoolean() -> g
+    boolean isBottom() -> h
+    boolean isByte() -> i
+    boolean isChar() -> j
+    boolean isClassType() -> k
+    1:1:boolean isDefinitelyNull():278:278 -> l
+    boolean isDouble() -> m
+    1:4:boolean isFineGrainedType():254:257 -> n
+    boolean isFloat() -> o
+    boolean isInt() -> p
+    boolean isLong() -> q
+    boolean isNullType() -> r
+    1:1:boolean isNullable():32:32 -> s
+    1:8:boolean isPreciseType():243:250 -> t
+    boolean isPrimitive() -> u
+    boolean isReference() -> v
+    boolean isShort() -> w
+    boolean isSingle() -> x
+    boolean isTop() -> y
+    boolean isWide() -> z
 com.android.tools.r8.ir.analysis.type.WideTypeLatticeElement -> a.a.a.a.g.a.b.v:
     com.android.tools.r8.ir.analysis.type.WideTypeLatticeElement WIDE_INSTANCE -> p
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>():13:13 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.WideTypeLatticeElement getInstance():17:17 -> B
+    1:1:com.android.tools.r8.ir.analysis.type.WideTypeLatticeElement getInstance():17:17 -> C
     1:1:int hashCode():37:37 -> hashCode
-    boolean isWide() -> y
+    boolean isWide() -> z
 com.android.tools.r8.ir.code.Add -> a.a.a.a.g.b.a:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
     boolean isAdd() -> Fa
@@ -14546,60 +14321,60 @@
     float foldFloat(float,float) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):52:52 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):47:47 -> a
     com.android.tools.r8.ir.code.Add asAdd() -> b
-    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):47:47 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):72:72 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):87:87 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):37:37 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):67:67 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):57:57 -> d
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):82:82 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):42:42 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):67:67 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):82:82 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):32:32 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):62:62 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):52:52 -> d
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):77:77 -> d
     boolean isCommutative() -> dc
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):62:62 -> e
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):77:77 -> e
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):42:42 -> f
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):57:57 -> e
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):72:72 -> e
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):37:37 -> f
 com.android.tools.r8.ir.code.AlwaysMaterializingDefinition -> a.a.a.a.g.b.b:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):19:19 -> <init>
-    1:1:int maxInValueRegister():52:52 -> Zb
+    1:1:int maxInValueRegister():47:47 -> Zb
     int maxOutValueRegister() -> _b
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):35:37 -> a
-    4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):36:36 -> a
+    1:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):30:32 -> a
+    4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):31:31 -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> b
 com.android.tools.r8.ir.code.AlwaysMaterializingNop -> a.a.a.a.g.b.c:
     1:1:void <init>():20:20 -> <init>
     boolean hasInvariantOutType() -> Aa
-    1:1:int maxInValueRegister():50:50 -> Zb
-    1:1:int maxOutValueRegister():55:55 -> _b
+    1:1:int maxInValueRegister():45:45 -> Zb
+    1:1:int maxOutValueRegister():50:50 -> _b
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):35:35 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):61:61 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):45:45 -> b
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):30:30 -> a
+    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):56:56 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):40:40 -> b
 com.android.tools.r8.ir.code.AlwaysMaterializingUser -> a.a.a.a.g.b.d:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):19:19 -> <init>
     boolean hasInvariantOutType() -> Aa
-    1:2:int maxInValueRegister():50:51 -> Zb
-    1:1:int maxOutValueRegister():56:56 -> _b
+    1:2:int maxInValueRegister():45:46 -> Zb
+    1:1:int maxOutValueRegister():51:51 -> _b
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):35:35 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):62:62 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):30:30 -> a
+    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):57:57 -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> b
 com.android.tools.r8.ir.code.And -> a.a.a.a.g.b.e:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
     boolean isAnd() -> Ga
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):43:43 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):53:53 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):68:68 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):73:73 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):38:38 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):48:48 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):63:63 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):68:68 -> b
     com.android.tools.r8.ir.code.And asAnd() -> c
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):58:58 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):63:63 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):48:48 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):53:53 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):58:58 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):43:43 -> d
     boolean isCommutative() -> dc
 com.android.tools.r8.ir.code.Argument -> a.a.a.a.g.b.f:
     boolean $assertionsDisabled -> h
@@ -14607,13 +14382,13 @@
     1:2:void <init>(com.android.tools.r8.ir.code.Value):25:26 -> <init>
     boolean hasInvariantOutType() -> Aa
     boolean isArgument() -> Ha
-    1:1:int maxInValueRegister():44:44 -> Zb
+    1:1:int maxInValueRegister():39:39 -> Zb
     int maxOutValueRegister() -> _b
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:55 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):76:76 -> a
-    3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):97:97 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):60:60 -> b
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):50:50 -> a
+    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):71:71 -> a
+    3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):92:92 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):55:55 -> b
     com.android.tools.r8.ir.code.Argument asArgument() -> d
 com.android.tools.r8.ir.code.ArithmeticBinop -> a.a.a.a.g.b.g:
     boolean $assertionsDisabled -> i
@@ -14649,55 +14424,55 @@
     int maxInValueRegister() -> Zb
     int maxOutValueRegister() -> _b
     boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator) -> a
-    1:1:com.android.tools.r8.ir.code.Value dest():48:48 -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66 -> a
-    2:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:100 -> a
-    37:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):98:98 -> a
-    38:40:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:79 -> a
-    41:62:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):73:94 -> a
-    63:63:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):91:91 -> a
-    64:64:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):88:88 -> a
-    65:65:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):85:85 -> a
-    66:86:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:102 -> a
-    87:87:com.android.tools.r8.ir.code.MemberType getMemberType():61:61 -> a
-    88:88:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):147:147 -> a
-    89:90:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):181:182 -> a
-    91:91:com.android.tools.r8.ir.code.MemberType getMemberType():61:61 -> a
-    91:91:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):184 -> a
-    92:132:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):184:224 -> a
-    133:134:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):220:221 -> a
-    135:135:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):220:220 -> a
-    136:136:com.android.tools.r8.ir.code.Value dest():48:48 -> a
-    136:136:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):222 -> a
-    137:137:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):222:222 -> a
-    138:139:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):216:217 -> a
-    140:140:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):216:216 -> a
-    141:141:com.android.tools.r8.ir.code.Value dest():48:48 -> a
-    141:141:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):218 -> a
-    142:142:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):218:218 -> a
-    143:144:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):212:213 -> a
-    145:147:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):212:214 -> a
-    148:149:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):208:209 -> a
-    150:152:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):208:210 -> a
-    153:154:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):204:205 -> a
-    155:157:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):204:206 -> a
-    158:159:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):200:201 -> a
-    160:162:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):200:202 -> a
-    163:165:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):191:193 -> a
-    166:166:com.android.tools.r8.ir.code.MemberType getMemberType():61:61 -> a
-    166:166:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):224 -> a
-    167:167:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):224:224 -> a
-    168:172:com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkConstraint(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):229:233 -> a
-    173:173:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):239:239 -> a
-    174:174:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):244:244 -> a
-    175:175:com.android.tools.r8.ir.code.Value dest():48:48 -> a
-    175:175:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):244 -> a
-    176:176:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):244:244 -> a
-    177:177:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):244:244 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):115:115 -> b
-    1:1:com.android.tools.r8.ir.code.Value array():52:52 -> cc
-    1:1:com.android.tools.r8.ir.code.Value dest():48:48 -> dc
-    1:1:com.android.tools.r8.ir.code.Value index():56:56 -> ec
+    1:1:com.android.tools.r8.ir.code.Value dest():43:43 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61 -> a
+    2:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61:95 -> a
+    37:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):93:93 -> a
+    38:40:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:74 -> a
+    41:62:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:89 -> a
+    63:63:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86:86 -> a
+    64:64:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83:83 -> a
+    65:65:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):80:80 -> a
+    66:86:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:97 -> a
+    87:87:com.android.tools.r8.ir.code.MemberType getMemberType():56:56 -> a
+    88:88:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):142:142 -> a
+    89:90:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):176:177 -> a
+    91:91:com.android.tools.r8.ir.code.MemberType getMemberType():56:56 -> a
+    91:91:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):179 -> a
+    92:132:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):179:219 -> a
+    133:134:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):215:216 -> a
+    135:135:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):215:215 -> a
+    136:136:com.android.tools.r8.ir.code.Value dest():43:43 -> a
+    136:136:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):217 -> a
+    137:137:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):217:217 -> a
+    138:139:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):211:212 -> a
+    140:140:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):211:211 -> a
+    141:141:com.android.tools.r8.ir.code.Value dest():43:43 -> a
+    141:141:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):213 -> a
+    142:142:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):213:213 -> a
+    143:144:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):207:208 -> a
+    145:147:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):207:209 -> a
+    148:149:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):203:204 -> a
+    150:152:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):203:205 -> a
+    153:154:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):199:200 -> a
+    155:157:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):199:201 -> a
+    158:159:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):195:196 -> a
+    160:162:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):195:197 -> a
+    163:165:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):186:188 -> a
+    166:166:com.android.tools.r8.ir.code.MemberType getMemberType():56:56 -> a
+    166:166:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):219 -> a
+    167:167:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):219:219 -> a
+    168:172:com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkConstraint(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):224:228 -> a
+    173:173:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):234:234 -> a
+    174:174:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):239:239 -> a
+    175:175:com.android.tools.r8.ir.code.Value dest():43:43 -> a
+    175:175:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):239 -> a
+    176:176:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):239:239 -> a
+    177:177:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):239:239 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):110:110 -> b
+    1:1:com.android.tools.r8.ir.code.Value array():47:47 -> cc
+    1:1:com.android.tools.r8.ir.code.Value dest():43:43 -> dc
+    1:1:com.android.tools.r8.ir.code.Value index():51:51 -> ec
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> f
 com.android.tools.r8.ir.code.ArrayLength -> a.a.a.a.g.b.i:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
@@ -14706,15 +14481,15 @@
     boolean isArrayLength() -> Ka
     int maxInValueRegister() -> Zb
     int maxOutValueRegister() -> _b
-    1:1:com.android.tools.r8.ir.code.Value dest():33:33 -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52 -> a
-    2:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52:54 -> a
-    5:12:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):74:81 -> a
-    13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):94:94 -> a
-    14:14:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):110:110 -> a
-    15:15:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):120:120 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):88:88 -> b
-    1:1:com.android.tools.r8.ir.code.Value array():37:37 -> cc
+    1:1:com.android.tools.r8.ir.code.Value dest():28:28 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47 -> a
+    2:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47:49 -> a
+    5:12:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):69:76 -> a
+    13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):89:89 -> a
+    14:14:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):105:105 -> a
+    15:15:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):115:115 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> b
+    1:1:com.android.tools.r8.ir.code.Value array():32:32 -> cc
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> g
 com.android.tools.r8.ir.code.ArrayPut -> a.a.a.a.g.b.j:
     boolean $assertionsDisabled -> i
@@ -14722,30 +14497,30 @@
     1:1:void <clinit>():29:29 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):39:43 -> <init>
     boolean hasInvariantOutType() -> Aa
-    1:5:boolean instructionInstanceCanThrow():125:129 -> Da
+    1:5:boolean instructionInstanceCanThrow():120:124 -> Da
     boolean instructionTypeCanThrow() -> Ea
     boolean isArrayPut() -> La
     int maxInValueRegister() -> Zb
-    1:1:int maxOutValueRegister():114:114 -> _b
+    1:1:int maxOutValueRegister():109:109 -> _b
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator) -> a
-    1:1:com.android.tools.r8.ir.code.MemberType getMemberType():65:65 -> a
-    2:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:102 -> a
-    35:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):100:100 -> a
-    36:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81:81 -> a
-    37:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:96 -> a
-    57:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):93:93 -> a
-    58:58:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):90:90 -> a
-    59:59:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):87:87 -> a
-    60:80:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):84:104 -> a
-    81:81:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):168:168 -> a
-    82:82:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):188:188 -> a
-    83:83:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):193:193 -> a
-    84:84:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):193:193 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):152:152 -> b
-    1:1:com.android.tools.r8.ir.code.Value array():52:52 -> cc
-    1:1:com.android.tools.r8.ir.code.Value index():56:56 -> dc
-    1:1:com.android.tools.r8.ir.code.Value value():60:60 -> ec
+    1:1:com.android.tools.r8.ir.code.MemberType getMemberType():60:60 -> a
+    2:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:97 -> a
+    35:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):95:95 -> a
+    36:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:76 -> a
+    37:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:91 -> a
+    57:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):88:88 -> a
+    58:58:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):85:85 -> a
+    59:59:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:82 -> a
+    60:80:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79:99 -> a
+    81:81:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):163:163 -> a
+    82:82:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):183:183 -> a
+    83:83:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):188:188 -> a
+    84:84:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):188:188 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):147:147 -> b
+    1:1:com.android.tools.r8.ir.code.Value array():47:47 -> cc
+    1:1:com.android.tools.r8.ir.code.Value index():51:51 -> dc
+    1:1:com.android.tools.r8.ir.code.Value value():55:55 -> ec
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> h
 com.android.tools.r8.ir.code.BasicBlock -> a.a.a.a.g.b.p:
     int color -> n
@@ -14818,7 +14593,7 @@
     66:71:void close(com.android.tools.r8.ir.conversion.IRBuilder):625:630 -> a
     72:79:boolean verifyNoValuesAfterThrowingInstruction():1439:1446 -> a
     72:79:void close(com.android.tools.r8.ir.conversion.IRBuilder):630 -> a
-    80:80:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
+    80:80:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
     80:80:boolean verifyNoValuesAfterThrowingInstruction():1446 -> a
     80:80:void close(com.android.tools.r8.ir.conversion.IRBuilder):630 -> a
     81:81:boolean verifyNoValuesAfterThrowingInstruction():1446:1446 -> a
@@ -14858,7 +14633,7 @@
     258:275:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1538:1555 -> a
     276:284:int splitCriticalExceptionEdges(int,com.android.tools.r8.ir.code.ValueNumberGenerator,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1580:1588 -> a
     276:284:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1554 -> a
-    285:285:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
+    285:285:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
     285:285:int splitCriticalExceptionEdges(int,com.android.tools.r8.ir.code.ValueNumberGenerator,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1589 -> a
     285:285:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1554 -> a
     286:288:int splitCriticalExceptionEdges(int,com.android.tools.r8.ir.code.ValueNumberGenerator,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1589:1591 -> a
@@ -14870,7 +14645,7 @@
     290:321:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1554 -> a
     322:360:int splitCriticalExceptionEdges(int,com.android.tools.r8.ir.code.ValueNumberGenerator,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1599:1637 -> a
     322:360:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1554 -> a
-    361:361:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
+    361:361:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
     361:361:int splitCriticalExceptionEdges(int,com.android.tools.r8.ir.code.ValueNumberGenerator,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1638 -> a
     361:361:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1554 -> a
     362:362:int splitCriticalExceptionEdges(int,com.android.tools.r8.ir.code.ValueNumberGenerator,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1638:1638 -> a
@@ -14880,10 +14655,10 @@
     31:31:java.util.LinkedList getInstructions():529:529 -> b
     31:31:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):330 -> b
     32:32:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):330:330 -> b
-    33:33:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():81:81 -> b
+    33:33:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> b
     33:33:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):332 -> b
     34:34:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):332:332 -> b
-    35:35:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():81:81 -> b
+    35:35:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> b
     35:35:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):333 -> b
     36:39:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):333:336 -> b
     40:44:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):395:399 -> b
@@ -14908,12 +14683,12 @@
     128:128:java.util.LinkedList getInstructions():529:529 -> b
     128:128:java.util.Set cleanForRemoval():787 -> b
     129:129:java.util.Set cleanForRemoval():787:787 -> b
-    130:130:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> b
+    130:130:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
     130:130:java.util.Set cleanForRemoval():788 -> b
-    131:131:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> b
+    131:131:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
     131:131:java.util.Set cleanForRemoval():789 -> b
     132:132:java.util.Set cleanForRemoval():789:789 -> b
-    133:133:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> b
+    133:133:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
     133:133:java.util.Set cleanForRemoval():790 -> b
     134:144:java.util.Set cleanForRemoval():790:800 -> b
     145:146:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):890:891 -> b
@@ -15024,7 +14799,7 @@
     5:5:int doHash(java.lang.Object):1760:1760 -> a
     6:6:int doHash(com.android.tools.r8.ir.code.Phi):1775:1775 -> a
     6:6:int doHash(java.lang.Object):1760 -> a
-    7:7:int com.android.tools.r8.ir.code.Value.hashCode():705:705 -> a
+    7:7:int com.android.tools.r8.ir.code.Value.hashCode():686:686 -> a
     7:7:int doHash(com.android.tools.r8.ir.code.Phi):1776 -> a
     7:7:int doHash(java.lang.Object):1760 -> a
 com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo -> a.a.a.a.g.b.o:
@@ -15040,70 +14815,137 @@
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.code.Position position -> d
     com.android.tools.r8.ir.code.BasicBlock block -> a
-    1:1:void <clinit>():27:27 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.BasicBlock):34:34 -> <init>
-    2:6:void <init>(com.android.tools.r8.ir.code.BasicBlock):32:36 -> <init>
-    7:7:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):39:39 -> <init>
-    8:17:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):32:41 -> <init>
-    18:19:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):45:46 -> <init>
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.BasicBlock):33:33 -> <init>
+    2:6:void <init>(com.android.tools.r8.ir.code.BasicBlock):31:35 -> <init>
+    7:7:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):38:38 -> <init>
+    8:17:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):31:40 -> <init>
+    18:19:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):44:45 -> <init>
     boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    1:1:void setInsertionPosition(com.android.tools.r8.ir.code.Position):83:83 -> a
-    2:2:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):167:167 -> a
-    3:3:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():81:81 -> a
-    3:3:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):170 -> a
-    4:7:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):170:173 -> a
-    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    8:8:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):173 -> a
-    9:10:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):173:174 -> a
-    11:11:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    11:11:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):174 -> a
-    12:13:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):174:175 -> a
-    14:14:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    14:14:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):175 -> a
-    15:15:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    15:15:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):175 -> a
-    16:23:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):175:182 -> a
-    24:24:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):168:168 -> a
-    25:32:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):249:256 -> a
-    33:33:boolean hasNext():51:51 -> a
-    33:33:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):256 -> a
-    34:37:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):256:259 -> a
-    38:38:boolean hasPrevious():67:67 -> a
-    38:38:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):263 -> a
-    39:62:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):263:286 -> a
-    63:70:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):295:302 -> a
-    1:1:void add(java.lang.Object):27:27 -> add
-    1:6:void add(com.android.tools.r8.ir.code.Instruction):96:101 -> b
-    1:7:void removeOrReplaceByDebugLocalRead():155:161 -> c
-    8:8:void removeOrReplaceByDebugLocalRead():156:156 -> c
-    1:1:boolean hasNext():51:51 -> hasNext
-    1:1:boolean hasPrevious():67:67 -> hasPrevious
-    1:1:java.lang.Object next():27:27 -> next
-    2:3:com.android.tools.r8.ir.code.Instruction next():56:57 -> next
-    1:1:int nextIndex():62:62 -> nextIndex
-    1:1:java.lang.Object previous():27:27 -> previous
-    2:3:com.android.tools.r8.ir.code.Instruction previous():72:73 -> previous
-    1:1:int previousIndex():78:78 -> previousIndex
-    1:4:void remove():130:133 -> remove
-    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> remove
-    5:5:void remove():133 -> remove
-    6:8:void remove():133:135 -> remove
-    9:9:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():81:81 -> remove
-    9:9:void remove():135 -> remove
-    10:11:void remove():135:136 -> remove
-    12:12:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():81:81 -> remove
-    12:12:void remove():136 -> remove
-    13:22:void remove():136:145 -> remove
-    23:23:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> remove
-    23:23:void remove():145 -> remove
-    24:25:void remove():145:146 -> remove
-    26:26:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> remove
-    26:26:void remove():146 -> remove
-    27:31:void remove():146:150 -> remove
-    32:32:void remove():131:131 -> remove
-    1:1:void set(java.lang.Object):27:27 -> set
-    2:4:void set(com.android.tools.r8.ir.code.Instruction):114:116 -> set
-    2:4:void set(java.lang.Object):27 -> set
+    1:1:void setInsertionPosition(com.android.tools.r8.ir.code.Position):82:82 -> a
+    2:2:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):166:166 -> a
+    3:3:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> a
+    3:3:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):169 -> a
+    4:7:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):169:172 -> a
+    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    8:8:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):172 -> a
+    9:10:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):172:173 -> a
+    11:11:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    11:11:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):173 -> a
+    12:13:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):173:174 -> a
+    14:14:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    14:14:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):174 -> a
+    15:15:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    15:15:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):174 -> a
+    16:23:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):174:181 -> a
+    24:24:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):167:167 -> a
+    25:32:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):186:193 -> a
+    25:32:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> a
+    33:33:boolean hasNext():50:50 -> a
+    33:33:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):193 -> a
+    33:33:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> a
+    34:37:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):193:196 -> a
+    34:37:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> a
+    38:38:boolean hasPrevious():66:66 -> a
+    38:38:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):200 -> a
+    38:38:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> a
+    39:62:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):200:223 -> a
+    39:62:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> a
+    63:69:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):233:239 -> a
+    70:77:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):186:193 -> a
+    78:78:boolean hasNext():50:50 -> a
+    78:78:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):193 -> a
+    79:82:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):193:196 -> a
+    83:83:boolean hasPrevious():66:66 -> a
+    83:83:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):200 -> a
+    84:107:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):200:223 -> a
+    1:1:void add(java.lang.Object):26:26 -> add
+    2:7:void add(com.android.tools.r8.ir.code.Instruction):95:100 -> add
+    2:7:void add(java.lang.Object):26 -> add
+    1:4:void removeOrReplaceByDebugLocalRead():154:157 -> b
+    5:8:void remove():129:132 -> b
+    5:8:void removeOrReplaceByDebugLocalRead():158 -> b
+    9:9:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
+    9:9:void remove():132 -> b
+    9:9:void removeOrReplaceByDebugLocalRead():158 -> b
+    10:12:void remove():132:134 -> b
+    10:12:void removeOrReplaceByDebugLocalRead():158 -> b
+    13:13:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> b
+    13:13:void remove():134 -> b
+    13:13:void removeOrReplaceByDebugLocalRead():158 -> b
+    14:15:void remove():134:135 -> b
+    14:15:void removeOrReplaceByDebugLocalRead():158 -> b
+    16:16:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> b
+    16:16:void remove():135 -> b
+    16:16:void removeOrReplaceByDebugLocalRead():158 -> b
+    17:26:void remove():135:144 -> b
+    17:26:void removeOrReplaceByDebugLocalRead():158 -> b
+    27:27:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
+    27:27:void remove():144 -> b
+    27:27:void removeOrReplaceByDebugLocalRead():158 -> b
+    28:29:void remove():144:145 -> b
+    28:29:void removeOrReplaceByDebugLocalRead():158 -> b
+    30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
+    30:30:void remove():145 -> b
+    30:30:void removeOrReplaceByDebugLocalRead():158 -> b
+    31:35:void remove():145:149 -> b
+    31:35:void removeOrReplaceByDebugLocalRead():158 -> b
+    36:36:void remove():130:130 -> b
+    36:36:void removeOrReplaceByDebugLocalRead():158 -> b
+    37:37:void removeOrReplaceByDebugLocalRead():160:160 -> b
+    38:38:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):166:166 -> b
+    38:38:void removeOrReplaceByDebugLocalRead():160 -> b
+    39:39:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> b
+    39:39:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):169 -> b
+    39:39:void removeOrReplaceByDebugLocalRead():160 -> b
+    40:43:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):169:172 -> b
+    40:43:void removeOrReplaceByDebugLocalRead():160 -> b
+    44:44:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
+    44:44:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):172 -> b
+    44:44:void removeOrReplaceByDebugLocalRead():160 -> b
+    45:46:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):172:173 -> b
+    45:46:void removeOrReplaceByDebugLocalRead():160 -> b
+    47:47:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
+    47:47:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):173 -> b
+    47:47:void removeOrReplaceByDebugLocalRead():160 -> b
+    48:49:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):173:174 -> b
+    48:49:void removeOrReplaceByDebugLocalRead():160 -> b
+    50:50:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
+    50:50:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):174 -> b
+    50:50:void removeOrReplaceByDebugLocalRead():160 -> b
+    51:58:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):174:181 -> b
+    51:58:void removeOrReplaceByDebugLocalRead():160 -> b
+    59:59:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):167:167 -> b
+    59:59:void removeOrReplaceByDebugLocalRead():160 -> b
+    60:60:void removeOrReplaceByDebugLocalRead():155:155 -> b
+    1:1:boolean hasNext():50:50 -> hasNext
+    1:1:boolean hasPrevious():66:66 -> hasPrevious
+    1:2:com.android.tools.r8.ir.code.Instruction next():55:56 -> next
+    1:2:java.lang.Object next():26 -> next
+    1:1:int nextIndex():61:61 -> nextIndex
+    1:2:com.android.tools.r8.ir.code.Instruction previous():71:72 -> previous
+    1:2:java.lang.Object previous():26 -> previous
+    1:1:int previousIndex():77:77 -> previousIndex
+    1:4:void remove():129:132 -> remove
+    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> remove
+    5:5:void remove():132 -> remove
+    6:8:void remove():132:134 -> remove
+    9:9:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> remove
+    9:9:void remove():134 -> remove
+    10:11:void remove():134:135 -> remove
+    12:12:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> remove
+    12:12:void remove():135 -> remove
+    13:22:void remove():135:144 -> remove
+    23:23:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> remove
+    23:23:void remove():144 -> remove
+    24:25:void remove():144:145 -> remove
+    26:26:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> remove
+    26:26:void remove():145 -> remove
+    27:31:void remove():145:149 -> remove
+    32:32:void remove():130:130 -> remove
+    1:1:void set(java.lang.Object):26:26 -> set
+    2:4:void set(com.android.tools.r8.ir.code.Instruction):113:115 -> set
+    2:4:void set(java.lang.Object):26 -> set
 com.android.tools.r8.ir.code.BasicBlockIterator -> a.a.a.a.g.b.r:
     java.util.ListIterator listIterator -> a
     com.android.tools.r8.ir.code.BasicBlock current -> b
@@ -15127,20 +14969,20 @@
 com.android.tools.r8.ir.code.Binop -> a.a.a.a.g.b.s:
     com.android.tools.r8.ir.code.NumericType type -> h
     1:3: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):25:27 -> <init>
-    4:7:void com.android.tools.r8.ir.code.Instruction.addInValue(com.android.tools.r8.ir.code.Value):86:89 -> <init>
+    4:7:void com.android.tools.r8.ir.code.Instruction.addInValue(com.android.tools.r8.ir.code.Value):84:87 -> <init>
     4:7: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):28 -> <init>
-    8:11:void com.android.tools.r8.ir.code.Instruction.addInValue(com.android.tools.r8.ir.code.Value):86:89 -> <init>
+    8:11:void com.android.tools.r8.ir.code.Instruction.addInValue(com.android.tools.r8.ir.code.Value):84:87 -> <init>
     8:11: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):29 -> <init>
-    12:15:void com.android.tools.r8.ir.code.Instruction.addInValue(com.android.tools.r8.ir.code.Value):86:89 -> <init>
+    12:15:void com.android.tools.r8.ir.code.Instruction.addInValue(com.android.tools.r8.ir.code.Value):84:87 -> <init>
     12:15: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):31 -> <init>
-    16:19:void com.android.tools.r8.ir.code.Instruction.addInValue(com.android.tools.r8.ir.code.Value):86:89 -> <init>
+    16:19:void com.android.tools.r8.ir.code.Instruction.addInValue(com.android.tools.r8.ir.code.Value):84:87 -> <init>
     16:19: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):32 -> <init>
     boolean hasInvariantOutType() -> Aa
     boolean isBinop() -> Ma
     1:1:int maxInValueRegister():91:91 -> Zb
     1:1:int maxOutValueRegister():96:96 -> _b
     1:8:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):52:59 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():853:853 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():824:824 -> a
     9:9:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):59 -> a
     10:10:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):59:59 -> a
     11:11:int foldIntegers(int,int):100:100 -> a
@@ -15221,26 +15063,26 @@
     boolean isCheckCast() -> Na
     int maxInValueRegister() -> Zb
     int maxOutValueRegister() -> _b
-    1:14:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:66 -> a
-    15:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):110:110 -> a
-    16:16:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):115:115 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):74:74 -> b
-    2:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):120:124 -> b
-    7:7:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> b
-    7:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):126 -> b
-    8:8:boolean verifyTypes(com.android.tools.r8.graph.AppView):126:126 -> b
-    9:9:com.android.tools.r8.graph.DexType getType():41:41 -> b
-    9:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):128 -> b
-    10:27:boolean verifyTypes(com.android.tools.r8.graph.AppView):128:145 -> b
-    28:28:boolean com.android.tools.r8.ir.analysis.type.Nullability.lessThanOrEqual(com.android.tools.r8.ir.analysis.type.Nullability):62:62 -> b
-    28:28:boolean verifyTypes(com.android.tools.r8.graph.AppView):145 -> b
-    29:32:boolean verifyTypes(com.android.tools.r8.graph.AppView):145:148 -> b
-    1:1:com.android.tools.r8.graph.DexType getType():41:41 -> cc
-    1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():81:81 -> dc
-    1:1:com.android.tools.r8.ir.code.Value object():45 -> dc
-    2:2:com.android.tools.r8.ir.code.Value object():45:45 -> dc
+    1:14:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):48:61 -> a
+    15:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):105:105 -> a
+    16:16:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):110:110 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):69:69 -> b
+    2:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):115:119 -> b
+    7:7:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
+    7:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):121 -> b
+    8:8:boolean verifyTypes(com.android.tools.r8.graph.AppView):121:121 -> b
+    9:9:com.android.tools.r8.graph.DexType getType():36:36 -> b
+    9:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):123 -> b
+    10:27:boolean verifyTypes(com.android.tools.r8.graph.AppView):123:140 -> b
+    28:28:boolean com.android.tools.r8.ir.analysis.type.Nullability.lessThanOrEqual(com.android.tools.r8.ir.analysis.type.Nullability):47:47 -> b
+    28:28:boolean verifyTypes(com.android.tools.r8.graph.AppView):140 -> b
+    29:32:boolean verifyTypes(com.android.tools.r8.graph.AppView):140:143 -> b
+    1:1:com.android.tools.r8.graph.DexType getType():36:36 -> cc
+    1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> dc
+    1:1:com.android.tools.r8.ir.code.Value object():40 -> dc
+    2:2:com.android.tools.r8.ir.code.Value object():40:40 -> dc
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> j
-    1:1:java.lang.String toString():104:104 -> toString
+    1:1:java.lang.String toString():99:99 -> toString
 com.android.tools.r8.ir.code.Cmp -> a.a.a.a.g.b.z:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Cmp$Bias bias -> i
@@ -15249,28 +15091,28 @@
     boolean isCmp() -> Oa
     int maxInValueRegister() -> Zb
     int maxOutValueRegister() -> _b
-    1:28:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:80 -> a
-    29:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:82 -> a
-    54:62:java.lang.String biasToString(com.android.tools.r8.ir.code.Cmp$Bias):86:94 -> a
-    63:77:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):159:173 -> a
-    78:89:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):171:182 -> a
-    90:101:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):180:191 -> a
-    102:102:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    102:102:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):192 -> a
-    103:103:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):192:192 -> a
-    104:108:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):191:195 -> a
-    109:109:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    109:109:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):196 -> a
-    110:111:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):196:197 -> a
-    112:118:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):196:202 -> a
-    119:122:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):201:204 -> a
-    123:129:com.android.tools.r8.ir.analysis.constant.LatticeElement buildLatticeResult(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.LongInterval,com.android.tools.r8.utils.LongInterval):209:215 -> a
-    130:130:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):235:235 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):132:132 -> b
+    1:28:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):48:75 -> a
+    29:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:77 -> a
+    54:62:java.lang.String biasToString(com.android.tools.r8.ir.code.Cmp$Bias):81:89 -> a
+    63:77:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):154:168 -> a
+    78:89:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):166:177 -> a
+    90:101:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):175:186 -> a
+    102:102:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    102:102:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):187 -> a
+    103:103:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):187:187 -> a
+    104:108:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):186:190 -> a
+    109:109:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    109:109:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):191 -> a
+    110:111:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):191:192 -> a
+    112:118:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):191:197 -> a
+    119:122:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):196:199 -> a
+    123:129:com.android.tools.r8.ir.analysis.constant.LatticeElement buildLatticeResult(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.LongInterval,com.android.tools.r8.utils.LongInterval):204:210 -> a
+    130:130:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):230:230 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):127:127 -> b
     boolean isCommutative() -> dc
     com.android.tools.r8.ir.code.Cmp asCmp() -> k
-    1:17:java.lang.String toString():100:116 -> toString
-    18:40:java.lang.String toString():105:127 -> toString
+    1:17:java.lang.String toString():95:111 -> toString
+    18:40:java.lang.String toString():100:122 -> toString
 com.android.tools.r8.ir.code.Cmp$Bias -> a.a.a.a.g.b.y:
     com.android.tools.r8.ir.code.Cmp$Bias LT -> c
     com.android.tools.r8.ir.code.Cmp$Bias NONE -> a
@@ -15288,34 +15130,26 @@
     boolean instructionTypeCanThrow() -> Ea
     boolean isOutConstant() -> Lb
     boolean isConstClass() -> Pa
-    1:1:int maxInValueRegister():65:65 -> Zb
+    1:1:int maxInValueRegister():60:60 -> Zb
     int maxOutValueRegister() -> _b
-    1:3:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstClass):37:39 -> a
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    4:4:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstClass):40 -> a
-    5:7:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstClass):40:42 -> a
-    8:8:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstClass):46:46 -> a
-    9:9:com.android.tools.r8.graph.DexType getValue():54:54 -> a
-    9:9:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstClass):46 -> a
-    10:10:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstClass):46:46 -> a
-    11:11:com.android.tools.r8.ir.code.Value dest():50:50 -> a
-    11:11:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59 -> a
-    12:13:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:60 -> a
-    14:14:com.android.tools.r8.graph.DexType getValue():54:54 -> a
-    14:14:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93 -> a
-    15:22:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93:100 -> a
-    23:23:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):114:114 -> a
-    24:24:com.android.tools.r8.graph.DexType getValue():54:54 -> a
-    24:24:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93 -> a
-    24:24:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):114 -> a
-    25:32:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93:100 -> a
-    25:32:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):114 -> a
-    33:33:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):140:140 -> a
-    34:34:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):145:145 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):124:124 -> b
-    1:1:com.android.tools.r8.graph.DexType getValue():54:54 -> cc
+    1:1:com.android.tools.r8.ir.code.Value dest():45:45 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54 -> a
+    2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:55 -> a
+    4:4:com.android.tools.r8.graph.DexType getValue():49:49 -> a
+    4:4:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):88 -> a
+    5:12:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):88:95 -> a
+    13:13:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):109:109 -> a
+    14:14:com.android.tools.r8.graph.DexType getValue():49:49 -> a
+    14:14:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):88 -> a
+    14:14:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):109 -> a
+    15:22:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):88:95 -> a
+    15:22:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):109 -> a
+    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):135:135 -> a
+    24:24:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):140:140 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):119:119 -> b
+    1:1:com.android.tools.r8.graph.DexType getValue():49:49 -> cc
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> l
-    1:1:java.lang.String toString():76:76 -> toString
+    1:1:java.lang.String toString():71:71 -> toString
 com.android.tools.r8.ir.code.ConstInstruction -> a.a.a.a.g.b.B:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):32:32 -> <init>
     boolean hasInvariantOutType() -> Aa
@@ -15331,18 +15165,18 @@
     boolean instructionTypeCanThrow() -> Ea
     boolean isOutConstant() -> Lb
     boolean isConstMethodHandle() -> Ra
-    1:1:int maxInValueRegister():74:74 -> Zb
+    1:1:int maxInValueRegister():69:69 -> Zb
     int maxOutValueRegister() -> _b
-    1:1:com.android.tools.r8.ir.code.Value dest():49:49 -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58 -> a
-    2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:59 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):81:81 -> a
-    5:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):117:117 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):116:116 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):69:69 -> b
-    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():53:53 -> cc
+    1:1:com.android.tools.r8.ir.code.Value dest():44:44 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53 -> a
+    2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:54 -> a
+    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):76:76 -> a
+    5:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):112:112 -> a
+    6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):111:111 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):64:64 -> b
+    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():48:48 -> cc
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> n
-    1:1:java.lang.String toString():91:91 -> toString
+    1:1:java.lang.String toString():86:86 -> toString
 com.android.tools.r8.ir.code.ConstMethodType -> a.a.a.a.g.b.D:
     com.android.tools.r8.graph.DexProto methodType -> h
     boolean $assertionsDisabled -> i
@@ -15351,16 +15185,16 @@
     boolean instructionTypeCanThrow() -> Ea
     boolean isOutConstant() -> Lb
     boolean isConstMethodType() -> Sa
-    1:1:int maxInValueRegister():72:72 -> Zb
+    1:1:int maxInValueRegister():67:67 -> Zb
     int maxOutValueRegister() -> _b
-    1:1:com.android.tools.r8.ir.code.Value dest():47:47 -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56 -> a
-    2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56:57 -> a
-    4:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):109:109 -> a
-    5:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):108:108 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67:67 -> b
+    1:1:com.android.tools.r8.ir.code.Value dest():42:42 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):51 -> a
+    2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):51:52 -> a
+    4:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):104:104 -> a
+    5:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):103:103 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):62:62 -> b
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> o
-    1:1:java.lang.String toString():83:83 -> toString
+    1:1:java.lang.String toString():78:78 -> toString
 com.android.tools.r8.ir.code.ConstNumber -> a.a.a.a.g.b.E:
     boolean $assertionsDisabled -> i
     long value -> h
@@ -15368,104 +15202,104 @@
     1:6:void <init>(com.android.tools.r8.ir.code.Value,long):37:42 -> <init>
     boolean isOutConstant() -> Lb
     boolean isConstNumber() -> Ta
-    1:1:int maxInValueRegister():229:229 -> Zb
+    1:1:int maxInValueRegister():224:224 -> Zb
     int maxOutValueRegister() -> _b
-    1:2:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):51:52 -> a
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    3:3:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):53 -> a
-    4:6:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):53:55 -> a
-    7:7:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstNumber):59:59 -> a
-    8:8:long getRawValue():92:92 -> a
-    8:8:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstNumber):59 -> a
-    9:9:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstNumber):59:59 -> a
-    10:10:com.android.tools.r8.ir.code.Value dest():63:63 -> a
-    10:10:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):117 -> a
-    11:12:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):117:118 -> a
-    13:13:com.android.tools.r8.ir.code.Value dest():63:63 -> a
-    13:13:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):122 -> a
-    14:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):122:143 -> a
-    36:44:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):124:132 -> a
-    45:45:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    45:45:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):307 -> a
-    46:46:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):307:307 -> a
-    47:51:boolean isIntegerNegativeOne(com.android.tools.r8.ir.code.NumericType):108:112 -> a
-    52:52:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):164:164 -> a
-    53:70:int estimatedDexSize(com.android.tools.r8.ir.code.ValueType,long):202:219 -> a
-    53:70:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):164 -> a
-    71:101:int estimatedCfSize(com.android.tools.r8.ir.code.ValueType,long):168:198 -> a
-    71:101:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):164 -> a
-    102:102:int estimatedCfSize(com.android.tools.r8.ir.code.ValueType,long):191:191 -> a
-    102:102:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):164 -> a
-    103:103:int estimatedCfSize(com.android.tools.r8.ir.code.ValueType,long):185:185 -> a
-    103:103:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):164 -> a
-    104:107:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):299:302 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):252:256 -> b
-    6:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):312:313 -> b
-    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> b
-    8:8:boolean verifyTypes(com.android.tools.r8.graph.AppView):314 -> b
-    9:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):314:314 -> b
-    10:10:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> b
-    10:10:boolean verifyTypes(com.android.tools.r8.graph.AppView):315 -> b
-    11:11:boolean verifyTypes(com.android.tools.r8.graph.AppView):315:315 -> b
-    12:12:boolean verifyTypes(com.android.tools.r8.graph.AppView):313:313 -> b
-    1:1:com.android.tools.r8.ir.code.Value dest():63:63 -> cc
-    1:2:double getDoubleValue():87:88 -> dc
-    1:2:float getFloatValue():82:83 -> ec
-    1:2:int getIntValue():71:72 -> fc
-    3:5:int getIntValue():71:73 -> fc
-    1:2:long getLongValue():77:78 -> gc
-    1:1:long getRawValue():92:92 -> hc
-    1:1:boolean is16Bit():268:268 -> ic
-    1:1:boolean is8Bit():260:260 -> jc
-    1:1:boolean isIntegerOne():104:104 -> kc
-    1:1:boolean isIntegerZero():100:100 -> lc
-    1:1:boolean isZero():96:96 -> mc
-    1:1:boolean negativeIs16Bit():272:272 -> nc
-    1:1:boolean negativeIs8Bit():264:264 -> oc
+    1:2:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):46:47 -> a
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    3:3:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):48 -> a
+    4:6:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):48:50 -> a
+    7:7:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstNumber):54:54 -> a
+    8:8:long getRawValue():87:87 -> a
+    8:8:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstNumber):54 -> a
+    9:9:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstNumber):54:54 -> a
+    10:10:com.android.tools.r8.ir.code.Value dest():58:58 -> a
+    10:10:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):112 -> a
+    11:12:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):112:113 -> a
+    13:13:com.android.tools.r8.ir.code.Value dest():58:58 -> a
+    13:13:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):117 -> a
+    14:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):117:138 -> a
+    36:44:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):119:127 -> a
+    45:49:boolean isIntegerNegativeOne(com.android.tools.r8.ir.code.NumericType):103:107 -> a
+    50:50:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    50:50:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):298 -> a
+    51:51:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):298:298 -> a
+    52:52:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):159:159 -> a
+    53:70:int estimatedDexSize(com.android.tools.r8.ir.code.ValueType,long):197:214 -> a
+    53:70:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):159 -> a
+    71:101:int estimatedCfSize(com.android.tools.r8.ir.code.ValueType,long):163:193 -> a
+    71:101:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):159 -> a
+    102:102:int estimatedCfSize(com.android.tools.r8.ir.code.ValueType,long):186:186 -> a
+    102:102:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):159 -> a
+    103:103:int estimatedCfSize(com.android.tools.r8.ir.code.ValueType,long):180:180 -> a
+    103:103:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):159 -> a
+    104:107:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):290:293 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):243:247 -> b
+    6:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):303:304 -> b
+    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
+    8:8:boolean verifyTypes(com.android.tools.r8.graph.AppView):305 -> b
+    9:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):305:305 -> b
+    10:10:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
+    10:10:boolean verifyTypes(com.android.tools.r8.graph.AppView):306 -> b
+    11:11:boolean verifyTypes(com.android.tools.r8.graph.AppView):306:306 -> b
+    12:12:boolean verifyTypes(com.android.tools.r8.graph.AppView):304:304 -> b
+    1:1:com.android.tools.r8.ir.code.Value dest():58:58 -> cc
+    1:2:double getDoubleValue():82:83 -> dc
+    1:2:float getFloatValue():77:78 -> ec
+    1:2:int getIntValue():66:67 -> fc
+    3:5:int getIntValue():66:68 -> fc
+    1:2:long getLongValue():72:73 -> gc
+    1:1:long getRawValue():87:87 -> hc
+    1:1:boolean is16Bit():259:259 -> ic
+    1:1:boolean is8Bit():251:251 -> jc
+    1:1:boolean isIntegerOne():99:99 -> kc
+    1:1:boolean isIntegerZero():95:95 -> lc
+    1:1:boolean isZero():91:91 -> mc
+    1:1:boolean negativeIs16Bit():263:263 -> nc
+    1:1:boolean negativeIs8Bit():255:255 -> oc
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> p
-    1:2:java.lang.String toString():240:241 -> toString
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> toString
-    3:3:java.lang.String toString():241 -> toString
-    4:6:java.lang.String toString():241:243 -> toString
+    1:1:java.lang.String toString():235:235 -> toString
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> toString
+    2:2:java.lang.String toString():235 -> toString
+    3:3:java.lang.String toString():235:235 -> toString
 com.android.tools.r8.ir.code.ConstString -> a.a.a.a.g.b.F:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexString value -> h
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):27:29 -> <init>
-    1:11:boolean instructionInstanceCanThrow():106:116 -> Da
-    1:1:boolean instructionTypeCanThrow():86:86 -> Ea
+    1:11:boolean instructionInstanceCanThrow():101:111 -> Da
+    1:1:boolean instructionTypeCanThrow():81:81 -> Ea
     boolean isOutConstant() -> Lb
     boolean isConstString() -> Ua
-    1:1:int maxInValueRegister():70:70 -> Zb
+    1:1:int maxInValueRegister():65:65 -> Zb
     int maxOutValueRegister() -> _b
-    1:2:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):38:39 -> a
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    3:3:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):40 -> a
-    4:6:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):40:42 -> a
-    7:7:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):46:46 -> a
-    8:8:com.android.tools.r8.graph.DexString getValue():54:54 -> a
-    8:8:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):46 -> a
-    9:9:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):46:46 -> a
-    10:10:com.android.tools.r8.ir.code.Value dest():50:50 -> a
-    10:10:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59 -> a
-    11:12:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:60 -> a
-    13:13:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):125:125 -> a
-    14:14:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):146:146 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):65:65 -> b
-    1:1:com.android.tools.r8.graph.DexString getValue():54:54 -> cc
+    1:2:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):33:34 -> a
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    3:3:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):35 -> a
+    4:6:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):35:37 -> a
+    7:7:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):41:41 -> a
+    8:8:com.android.tools.r8.graph.DexString getValue():49:49 -> a
+    8:8:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):41 -> a
+    9:9:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):41:41 -> a
+    10:10:com.android.tools.r8.ir.code.Value dest():45:45 -> a
+    10:10:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54 -> a
+    11:12:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:55 -> a
+    13:13:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):120:120 -> a
+    14:14:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):141:141 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):60:60 -> b
+    1:1:com.android.tools.r8.graph.DexString getValue():49:49 -> cc
     com.android.tools.r8.ir.code.ConstString asConstString() -> q
-    1:1:java.lang.String toString():81:81 -> toString
+    1:1:java.lang.String toString():76:76 -> toString
 com.android.tools.r8.ir.code.DebugLocalRead -> a.a.a.a.g.b.G:
     1:1:void <init>():20:20 -> <init>
     boolean hasInvariantOutType() -> Aa
     boolean isDebugLocalRead() -> Xa
-    1:1:int maxInValueRegister():55:55 -> Zb
-    1:1:int maxOutValueRegister():60:60 -> _b
+    1:1:int maxInValueRegister():50:50 -> Zb
+    1:1:int maxOutValueRegister():55:55 -> _b
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):40:40 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):66:66 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):50:50 -> b
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):35:35 -> a
+    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):61:61 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):45:45 -> b
 com.android.tools.r8.ir.code.DebugLocalUninitialized -> a.a.a.a.g.b.H:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
     boolean isDebugLocalUninitialized() -> Ya
@@ -15475,7 +15309,7 @@
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):30:31 -> <init>
     boolean isOutConstant() -> Lb
     boolean isDebugLocalWrite() -> Za
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):56:56 -> b
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):51:51 -> b
     com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite() -> r
 com.android.tools.r8.ir.code.DebugLocalsChange -> a.a.a.a.g.b.J:
     boolean $assertionsDisabled -> j
@@ -15484,78 +15318,59 @@
     1:1:void <clinit>():20:20 -> <clinit>
     1:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):27:30 -> <init>
     boolean hasInvariantOutType() -> Aa
-    1:1:int maxInValueRegister():73:73 -> Zb
+    1:1:int maxInValueRegister():68:68 -> Zb
     boolean isDebugLocalsChange() -> _a
-    1:1:int maxOutValueRegister():78:78 -> _b
+    1:1:int maxOutValueRegister():73:73 -> _b
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:58 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):99:99 -> a
-    3:12:boolean apply(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):104:113 -> a
-    1:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):63:68 -> b
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():39:39 -> cc
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():43:43 -> dc
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:53 -> a
+    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):94:94 -> a
+    3:12:boolean apply(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):99:108 -> a
+    1:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):58:63 -> b
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():34:34 -> cc
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():38:38 -> dc
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> s
-    1:6:java.lang.String toString():88:93 -> toString
+    1:6:java.lang.String toString():83:88 -> toString
 com.android.tools.r8.ir.code.DebugPosition -> a.a.a.a.g.b.K:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():20:20 -> <init>
     boolean hasInvariantOutType() -> Aa
-    1:1:int maxInValueRegister():51:51 -> Zb
-    1:1:int maxOutValueRegister():56:56 -> _b
+    1:1:int maxInValueRegister():46:46 -> Zb
+    1:1:int maxOutValueRegister():51:51 -> _b
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):40:40 -> a
-    2:2:void com.android.tools.r8.ir.conversion.DexBuilder.addDebugPosition(com.android.tools.r8.ir.code.DebugPosition):609:609 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):41 -> a
-    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):62:62 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):35:35 -> a
+    2:2:void com.android.tools.r8.ir.conversion.DexBuilder.addDebugPosition(com.android.tools.r8.ir.code.DebugPosition):585:585 -> a
+    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):36 -> a
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):57:57 -> a
     boolean isDebugPosition() -> ab
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):46:46 -> b
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):41:41 -> b
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> t
 com.android.tools.r8.ir.code.DexItemBasedConstString -> a.a.a.a.g.b.L:
-    com.android.tools.r8.graph.DexReference item -> h
-    boolean $assertionsDisabled -> k
-    com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> j
-    com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo classNameComputationInfo -> i
+    boolean $assertionsDisabled -> h
     1:1:void <clinit>():21:21 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexReference,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):28:28 -> <init>
-    2:5:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexReference,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo):36:39 -> <init>
-    boolean instructionInstanceCanThrow() -> Da
-    1:1:boolean instructionTypeCanThrow():102:102 -> Ea
-    boolean isOutConstant() -> Lb
-    1:1:int maxInValueRegister():86:86 -> Zb
-    int maxOutValueRegister() -> _b
-    boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72 -> a
-    2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:73 -> a
-    4:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):141:141 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):81:81 -> b
-    boolean isDexItemBasedConstString() -> bb
-    1:1:com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo getClassNameComputationInfo():57:57 -> cc
-    1:1:com.android.tools.r8.graph.DexReference getItem():53:53 -> dc
-    1:1:java.lang.String toString():97:97 -> toString
-    com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> u
+    com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo getClassNameComputationInfo() -> cc
+    com.android.tools.r8.graph.DexReference getItem() -> dc
 com.android.tools.r8.ir.code.Div -> a.a.a.a.g.b.M:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    1:1:boolean instructionTypeCanThrow():129:129 -> Ea
+    1:1:boolean instructionTypeCanThrow():124:124 -> Ea
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
-    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):64:64 -> a
-    2:2:int foldIntegers(int,int):109:109 -> a
-    3:3:long foldLongs(long,long):114:114 -> a
-    4:8:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):134:138 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):59:59 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):84:84 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):99:99 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):49:49 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):79:79 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):59:59 -> a
+    2:2:int foldIntegers(int,int):104:104 -> a
+    3:3:long foldLongs(long,long):109:109 -> a
+    4:8:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):129:133 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):54:54 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):79:79 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:94 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):44:44 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):74:74 -> c
     boolean isDiv() -> cb
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):69:69 -> d
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):94:94 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):64:64 -> d
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):89:89 -> d
     boolean isCommutative() -> dc
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):74:74 -> e
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):89:89 -> e
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):54:54 -> f
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):69:69 -> e
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):84:84 -> e
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):49:49 -> f
     com.android.tools.r8.ir.code.Div asDiv() -> v
 com.android.tools.r8.ir.code.DominatorTree -> a.a.a.a.g.b.O:
     com.android.tools.r8.ir.code.BasicBlock[] sorted -> a
@@ -15568,29 +15383,29 @@
     1:1:void <init>(com.android.tools.r8.ir.code.IRCode):37:37 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):40:40 -> <init>
     3:50:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):30:77 -> <init>
-    51:52:void numberBlocks():220:221 -> <init>
+    51:52:void numberBlocks():222:223 -> <init>
     51:52:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):79 -> <init>
-    53:82:void build():236:265 -> <init>
+    53:82:void build():238:267 -> <init>
     53:82:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):80 -> <init>
     83:83:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):84:84 -> <init>
-    84:85:boolean recordChangesToControlFlowEdges(java.util.List):300:301 -> <init>
+    84:85:boolean recordChangesToControlFlowEdges(java.util.List):302:303 -> <init>
     84:85:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):84 -> <init>
     1:1:boolean dominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):103:103 -> a
     2:8:boolean strictlyDominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):118:124 -> a
     2:8:boolean dominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):107 -> a
     9:16:com.android.tools.r8.ir.code.BasicBlock closestDominator(java.util.Collection):141:148 -> a
     17:22:java.util.List dominatedBlocks(com.android.tools.r8.ir.code.BasicBlock):155:160 -> a
-    23:23:com.android.tools.r8.ir.code.BasicBlock[] getSortedBlocks():216:216 -> a
+    23:23:com.android.tools.r8.ir.code.BasicBlock[] getSortedBlocks():218:218 -> a
     1:2:com.android.tools.r8.ir.code.BasicBlock immediateDominator(com.android.tools.r8.ir.code.BasicBlock):91:92 -> b
-    3:3:boolean postorderCompareLess(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):227:227 -> b
-    3:3:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):276 -> b
-    4:4:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):277:277 -> b
-    5:5:boolean postorderCompareLess(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):227:227 -> b
-    5:5:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):279 -> b
-    6:6:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):280:280 -> b
-    1:1:void onPredecessorsMayChange(com.android.tools.r8.ir.code.BasicBlock):313:313 -> c
-    1:1:void onSuccessorsMayChange(com.android.tools.r8.ir.code.BasicBlock):308:308 -> d
-    1:9:java.lang.String toString():288:296 -> toString
+    3:3:boolean postorderCompareLess(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):229:229 -> b
+    3:3:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):278 -> b
+    4:4:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):279:279 -> b
+    5:5:boolean postorderCompareLess(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):229:229 -> b
+    5:5:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):281 -> b
+    6:6:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):282:282 -> b
+    1:1:void onPredecessorsMayChange(com.android.tools.r8.ir.code.BasicBlock):315:315 -> c
+    1:1:void onSuccessorsMayChange(com.android.tools.r8.ir.code.BasicBlock):310:310 -> d
+    1:9:java.lang.String toString():290:298 -> toString
 com.android.tools.r8.ir.code.DominatorTree$Assumption -> a.a.a.a.g.b.N:
     com.android.tools.r8.ir.code.DominatorTree$Assumption MAY_HAVE_UNREACHABLE_BLOCKS -> b
     com.android.tools.r8.ir.code.DominatorTree$Assumption NO_UNREACHABLE_BLOCKS -> a
@@ -15616,7 +15431,7 @@
     1:3:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,int):16:18 -> <init>
     boolean isConstant() -> A
     boolean isFixedRegisterValue() -> C
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():958:958 -> U
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():916:916 -> U
     1:1:com.android.tools.r8.ir.code.ValueType outType():23 -> U
     2:23:com.android.tools.r8.ir.code.ValueType outType():24:45 -> U
     24:25:com.android.tools.r8.ir.code.ValueType outType():42:43 -> U
@@ -15630,15 +15445,15 @@
     2:2:void <init>():17:17 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):21 -> <init>
     3:3:void <init>(com.android.tools.r8.ir.code.BasicBlock):22:22 -> <init>
-    1:1:int maxInValueRegister():54:54 -> Zb
-    1:1:int maxOutValueRegister():60:60 -> _b
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):49:49 -> a
-    2:3:void print(com.android.tools.r8.utils.CfgPrinter):74:75 -> a
-    4:9:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):99:104 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:80 -> b
-    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():31:34 -> dc
+    1:1:int maxInValueRegister():49:49 -> Zb
+    1:1:int maxOutValueRegister():55:55 -> _b
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):44:44 -> a
+    2:3:void print(com.android.tools.r8.utils.CfgPrinter):69:70 -> a
+    4:9:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):94:99 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> b
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():26:29 -> dc
     boolean isGoto() -> eb
-    1:4:java.lang.String toString():66:69 -> toString
+    1:4:java.lang.String toString():61:64 -> toString
     com.android.tools.r8.ir.code.Goto asGoto() -> x
 com.android.tools.r8.ir.code.IRCode -> a.a.a.a.g.b.V:
     boolean $assertionsDisabled -> m
@@ -15668,7 +15483,7 @@
     22:25:boolean lambda$verifyNoImpreciseOrBottomTypes$3(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):695:698 -> a
     26:31:java.util.List collectArguments(boolean):773:778 -> a
     26:31:java.util.List collectArguments():769 -> a
-    32:32:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
+    32:32:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
     32:32:java.util.List collectArguments(boolean):778 -> a
     32:32:java.util.List collectArguments():769 -> a
     33:38:java.util.List collectArguments(boolean):780:785 -> a
@@ -15682,10 +15497,10 @@
     48:59:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):944:955 -> a
     1:52:java.util.Map computeLiveAtEntrySets():146:197 -> b
     53:57:java.util.Map computeLiveAtEntrySets():196:200 -> b
-    58:58:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> b
+    58:58:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
     58:58:java.util.Map computeLiveAtEntrySets():201 -> b
     59:72:java.util.Map computeLiveAtEntrySets():203:216 -> b
-    73:73:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():81:81 -> b
+    73:73:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> b
     73:73:java.util.Map computeLiveAtEntrySets():220 -> b
     74:98:java.util.Map computeLiveAtEntrySets():220:244 -> b
     99:99:boolean com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets.equals(java.lang.Object):68:68 -> b
@@ -15699,7 +15514,7 @@
     113:113:boolean verifyValue(com.android.tools.r8.ir.code.Value):570 -> b
     114:114:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):580:580 -> b
     114:114:boolean verifyValue(com.android.tools.r8.ir.code.Value):570 -> b
-    115:115:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> b
+    115:115:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
     115:115:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):580 -> b
     115:115:boolean verifyValue(com.android.tools.r8.ir.code.Value):570 -> b
     116:118:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):581:583 -> b
@@ -15719,7 +15534,7 @@
     1:1:int getHighestBlockNumber():818:818 -> g
     1:1:int getNextInstructionNumber():765:765 -> h
     1:6:com.android.tools.r8.ir.code.Value getThis():790:795 -> i
-    7:7:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> i
+    7:7:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> i
     7:7:com.android.tools.r8.ir.code.Value getThis():795 -> i
     8:8:com.android.tools.r8.ir.code.Value getThis():796:796 -> i
     1:9:java.util.Set getUnreachableBlocks():914:922 -> j
@@ -15743,12 +15558,12 @@
     1:2:boolean isConsistentSSA():470:471 -> n
     3:19:boolean consistentDefUseChains():528:544 -> n
     3:19:boolean isConsistentSSA():471 -> n
-    20:20:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> n
+    20:20:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> n
     20:20:boolean consistentDefUseChains():545 -> n
     20:20:boolean isConsistentSSA():471 -> n
     21:22:boolean consistentDefUseChains():547:548 -> n
     21:22:boolean isConsistentSSA():471 -> n
-    23:23:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():81:81 -> n
+    23:23:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> n
     23:23:boolean consistentDefUseChains():550 -> n
     23:23:boolean isConsistentSSA():471 -> n
     24:37:boolean consistentDefUseChains():550:563 -> n
@@ -15756,7 +15571,7 @@
     38:39:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):588:589 -> n
     38:39:boolean consistentDefUseChains():563 -> n
     38:39:boolean isConsistentSSA():471 -> n
-    40:40:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():81:81 -> n
+    40:40:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> n
     40:40:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):589 -> n
     40:40:boolean consistentDefUseChains():563 -> n
     40:40:boolean isConsistentSSA():471 -> n
@@ -15796,7 +15611,7 @@
     1:12:boolean verifyNoImpreciseOrBottomTypes():680:691 -> x
     13:14:boolean verifySSATypeLattice(java.util.function.Predicate):704:705 -> x
     13:14:boolean verifyNoImpreciseOrBottomTypes():691 -> x
-    15:15:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> x
+    15:15:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> x
     15:15:boolean verifySSATypeLattice(java.util.function.Predicate):706 -> x
     15:15:boolean verifyNoImpreciseOrBottomTypes():691 -> x
     16:20:boolean verifySSATypeLattice(java.util.function.Predicate):708:712 -> x
@@ -15825,7 +15640,7 @@
     1:1:void add(java.lang.Object):10:10 -> add
     2:2:void add(com.android.tools.r8.ir.code.Instruction):69:69 -> add
     2:2:void add(java.lang.Object):10 -> add
-    1:1:void removeOrReplaceByDebugLocalRead():89:89 -> c
+    1:1:void removeOrReplaceByDebugLocalRead():89:89 -> b
     1:1:boolean hasNext():22:22 -> hasNext
     1:1:boolean hasPrevious():40:40 -> hasPrevious
     1:9:com.android.tools.r8.ir.code.Instruction next():27:35 -> next
@@ -15848,40 +15663,40 @@
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.Value):73:74 -> <init>
     3:4:void <init>(com.android.tools.r8.ir.code.If$Type,java.util.List):78:79 -> <init>
-    1:1:int maxInValueRegister():160:160 -> Zb
-    1:1:int maxOutValueRegister():165:165 -> _b
+    1:1:int maxInValueRegister():155:155 -> Zb
+    1:1:int maxOutValueRegister():160:160 -> _b
     1:3:boolean verifyTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.If$Type):65:67 -> a
-    4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):132:132 -> a
-    5:5:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode):137:137 -> a
-    6:7:void print(com.android.tools.r8.utils.CfgPrinter):171:172 -> a
-    8:9:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber):187:188 -> a
-    10:10:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    10:10:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber):188 -> a
-    11:12:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber):188:189 -> a
-    13:15:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.ConstNumber):193:195 -> a
-    16:16:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    16:16:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.ConstNumber):195 -> a
-    17:18:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.ConstNumber):195:196 -> a
-    1:2:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):126:127 -> b
-    3:8:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):177:182 -> b
-    9:24:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):206:221 -> b
-    25:33:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):211:219 -> b
-    34:34:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):217:217 -> b
-    35:35:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):215:215 -> b
-    36:36:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):213:213 -> b
-    37:37:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):209:209 -> b
-    1:4:void setTrueTarget(com.android.tools.r8.ir.code.BasicBlock):110:113 -> c
-    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():118:121 -> cc
-    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():103:106 -> dc
-    1:1:com.android.tools.r8.ir.code.If$Type getType():92:92 -> ec
+    4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):127:127 -> a
+    5:5:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode):132:132 -> a
+    6:7:void print(com.android.tools.r8.utils.CfgPrinter):166:167 -> a
+    8:9:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber):182:183 -> a
+    10:10:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    10:10:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber):183 -> a
+    11:12:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber):183:184 -> a
+    13:15:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.ConstNumber):188:190 -> a
+    16:16:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    16:16:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.ConstNumber):190 -> a
+    17:18:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.ConstNumber):190:191 -> a
+    1:2:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):121:122 -> b
+    3:8:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):172:177 -> b
+    9:24:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):201:216 -> b
+    25:33:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):206:214 -> b
+    34:34:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):212:212 -> b
+    35:35:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):210:210 -> b
+    36:36:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):208:208 -> b
+    37:37:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):204:204 -> b
+    1:4:void setTrueTarget(com.android.tools.r8.ir.code.BasicBlock):105:108 -> c
+    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():113:116 -> cc
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():98:101 -> dc
+    1:1:com.android.tools.r8.ir.code.If$Type getType():87:87 -> ec
     boolean isIf() -> fb
-    1:2:void invert():96:97 -> fc
-    3:4:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):126:127 -> fc
-    3:4:void invert():98 -> fc
-    5:5:void invert():99:99 -> fc
-    1:1:boolean isZeroTest():88:88 -> gc
-    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():200:202 -> hc
-    1:8:java.lang.String toString():147:154 -> toString
+    1:2:void invert():91:92 -> fc
+    3:4:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):121:122 -> fc
+    3:4:void invert():93 -> fc
+    5:5:void invert():94:94 -> fc
+    1:1:boolean isZeroTest():83:83 -> gc
+    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():195:197 -> hc
+    1:8:java.lang.String toString():142:149 -> toString
     com.android.tools.r8.ir.code.If asIf() -> y
 com.android.tools.r8.ir.code.If$Type -> a.a.a.a.g.b.X:
     com.android.tools.r8.ir.code.If$Type GT -> c
@@ -15911,26 +15726,26 @@
     boolean instructionTypeCanThrow() -> Ea
     int maxInValueRegister() -> Zb
     int maxOutValueRegister() -> _b
-    1:1:com.android.tools.r8.ir.code.Value dest():50:50 -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65 -> a
-    2:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:97 -> a
-    35:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):95:95 -> a
-    36:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:76 -> a
-    37:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:91 -> a
-    57:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):88:88 -> a
-    58:58:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):85:85 -> a
-    59:59:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:82 -> a
-    60:80:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79:99 -> a
-    81:102:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):110:131 -> a
-    103:103:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):156:156 -> a
-    104:104:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):176:176 -> a
-    105:105:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):199:199 -> a
-    106:106:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):209:209 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):146:150 -> b
-    1:2:com.android.tools.r8.ir.code.Value object():54:55 -> ec
+    1:1:com.android.tools.r8.ir.code.Value dest():45:45 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60 -> a
+    2:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60:92 -> a
+    35:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):90:90 -> a
+    36:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:71 -> a
+    37:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:86 -> a
+    57:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83:83 -> a
+    58:58:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):80:80 -> a
+    59:59:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:77 -> a
+    60:80:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74:94 -> a
+    81:102:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):105:126 -> a
+    103:103:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):151:151 -> a
+    104:104:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):171:171 -> a
+    105:105:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):194:194 -> a
+    106:106:boolean definitelyTriggersClassInitialization(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):203:203 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):141:145 -> b
+    1:2:com.android.tools.r8.ir.code.Value object():49:50 -> ec
     boolean isInstanceGet() -> gb
     boolean couldIntroduceAnAlias() -> oa
-    1:1:java.lang.String toString():171:171 -> toString
+    1:1:java.lang.String toString():166:166 -> toString
     com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> z
 com.android.tools.r8.ir.code.InstanceOf -> a.a.a.a.g.b.ba:
     com.android.tools.r8.graph.DexType type -> h
@@ -15940,40 +15755,39 @@
     boolean instructionTypeCanThrow() -> Ea
     int maxInValueRegister() -> Zb
     int maxOutValueRegister() -> _b
-    1:1:com.android.tools.r8.ir.code.Value dest():38:38 -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47 -> a
-    2:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47:49 -> a
-    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):85:85 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):90:90 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):69:69 -> b
-    1:1:com.android.tools.r8.graph.DexType type():34:34 -> cc
-    1:1:com.android.tools.r8.ir.code.Value value():42:42 -> dc
+    1:1:com.android.tools.r8.ir.code.Value dest():33:33 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):42 -> a
+    2:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):42:44 -> a
+    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):80:80 -> a
+    6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):85:85 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):64:64 -> b
+    1:1:com.android.tools.r8.graph.DexType type():29:29 -> cc
+    1:1:com.android.tools.r8.ir.code.Value value():37:37 -> dc
     boolean isInstanceOf() -> hb
 com.android.tools.r8.ir.code.InstancePut -> a.a.a.a.g.b.ca:
     boolean $assertionsDisabled -> k
-    1:1:void <clinit>():34:34 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):37:39 -> <init>
+    1:1:void <clinit>():33:33 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):36:38 -> <init>
     com.android.tools.r8.ir.code.InstancePut asInstancePut() -> B
     boolean instructionTypeCanThrow() -> Ea
     int maxInValueRegister() -> Zb
-    1:1:int maxOutValueRegister():135:135 -> _b
-    1:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:89 -> a
-    33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):87:87 -> a
-    34:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:68 -> a
-    35:54:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:83 -> a
-    55:55:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):80:80 -> a
-    56:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:77 -> a
-    57:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74:74 -> a
-    58:78:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:91 -> a
-    79:89:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):101:111 -> a
-    90:90:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):142:142 -> a
-    91:91:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):173:173 -> a
-    92:92:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):183:183 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):121:125 -> b
-    1:1:com.android.tools.r8.ir.code.Value object():48:48 -> ec
-    1:1:com.android.tools.r8.ir.code.Value value():52:52 -> fc
+    1:1:int maxOutValueRegister():109:109 -> _b
+    1:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52:83 -> a
+    33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81:81 -> a
+    34:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:62 -> a
+    35:54:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:77 -> a
+    55:55:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74:74 -> a
+    56:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:71 -> a
+    57:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:68 -> a
+    58:78:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:85 -> a
+    79:79:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):116:116 -> a
+    80:80:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):147:147 -> a
+    81:81:boolean definitelyTriggersClassInitialization(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):156:156 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):95:99 -> b
+    1:1:com.android.tools.r8.ir.code.Value object():42:42 -> ec
+    1:1:com.android.tools.r8.ir.code.Value value():46:46 -> fc
     boolean isInstancePut() -> ib
-    1:1:java.lang.String toString():157:157 -> toString
+    1:1:java.lang.String toString():131:131 -> toString
 com.android.tools.r8.ir.code.Instruction -> a.a.a.a.g.b.da:
     java.util.List inValues -> b
     java.util.Set debugValues -> e
@@ -15993,13 +15807,13 @@
     boolean hasInvariantOutType() -> Aa
     boolean isMove() -> Ab
     com.android.tools.r8.ir.code.InstancePut asInstancePut() -> B
-    1:1:boolean hasOutValue():104:104 -> Ba
+    1:1:boolean hasOutValue():102:102 -> Ba
     boolean isMoveException() -> Bb
     com.android.tools.r8.ir.code.Invoke asInvoke() -> C
-    1:1:java.util.List inValues():81:81 -> Ca
+    1:1:java.util.List inValues():79:79 -> Ca
     boolean isMul() -> Cb
     com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom() -> D
-    1:1:boolean instructionInstanceCanThrow():508:508 -> Da
+    1:1:boolean instructionInstanceCanThrow():506:506 -> Da
     boolean isNeg() -> Db
     com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> E
     boolean instructionTypeCanThrow() -> Ea
@@ -16053,10 +15867,10 @@
     boolean isConstString() -> Ua
     boolean isSwitch() -> Ub
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> V
-    1:5:boolean isCreatingInstanceOrArray():1187:1191 -> Va
+    1:5:boolean isCreatingInstanceOrArray():1185:1189 -> Va
     boolean isThrow() -> Vb
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> W
-    1:4:boolean isDebugInstruction():996:999 -> Wa
+    1:4:boolean isDebugInstruction():994:997 -> Wa
     boolean isUnop() -> Wb
     com.android.tools.r8.ir.code.NonNull asNonNull() -> X
     boolean isDebugLocalRead() -> Xa
@@ -16070,78 +15884,78 @@
     boolean isDebugLocalsChange() -> _a
     int maxOutValueRegister() -> _b
     void buildDex(com.android.tools.r8.ir.conversion.DexBuilder) -> a
-    boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption) -> a
+    boolean definitelyTriggersClassInitialization(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) -> a
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType) -> a
     boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator) -> a
     boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory) -> a
-    1:2:void setPosition(com.android.tools.r8.ir.code.Position):72:73 -> a
-    3:8:void addDebugValue(com.android.tools.r8.ir.code.Value):130:135 -> a
-    9:15:void clearUserInfo(com.android.tools.r8.ir.code.Instruction):140:146 -> a
-    16:19:void replaceValue(int,com.android.tools.r8.ir.code.Value):168:171 -> a
-    20:29:void replaceDebugValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):175:184 -> a
-    30:36:com.android.tools.r8.ir.code.Value removeDebugValue(com.android.tools.r8.graph.DebugLocalInfo):218:224 -> a
-    37:38:void setBlock(com.android.tools.r8.ir.code.BasicBlock):253:254 -> a
-    39:45:void print(com.android.tools.r8.utils.CfgPrinter):305:311 -> a
-    46:46:int com.android.tools.r8.ir.code.Value.getNumber():268:268 -> a
-    46:46:void print(com.android.tools.r8.utils.CfgPrinter):311 -> a
-    47:55:void print(com.android.tools.r8.utils.CfgPrinter):311:319 -> a
-    56:56:int com.android.tools.r8.ir.code.Value.getNumber():268:268 -> a
-    56:56:void print(com.android.tools.r8.utils.CfgPrinter):319 -> a
-    57:57:void print(com.android.tools.r8.utils.CfgPrinter):319:319 -> a
-    58:59:void setNumber(int):334:335 -> a
-    60:69:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):436:445 -> a
-    70:71:boolean identicalNonValueParts(com.android.tools.r8.ir.code.Instruction):344:345 -> a
-    70:71:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):442 -> a
-    72:72:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):448:448 -> a
-    73:76:boolean com.android.tools.r8.ir.code.InvokeDirect.sameConstructorReceiverValue(com.android.tools.r8.ir.code.Invoke):94:97 -> a
-    73:76:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):448 -> a
-    77:78:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):451:452 -> a
-    79:79:int getNumber():330:330 -> a
-    79:79:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):456 -> a
-    80:80:int getNumber():330:330 -> a
-    80:80:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):456 -> a
-    81:113:boolean identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):400:432 -> a
-    81:113:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):455 -> a
-    114:123:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):459:468 -> a
-    124:124:int getNumber():330:330 -> a
-    124:124:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):469 -> a
-    125:125:int getNumber():330:330 -> a
-    125:125:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):469 -> a
-    126:161:boolean identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):355:390 -> a
-    126:161:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):469 -> a
-    162:178:boolean identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):379:395 -> a
-    162:178:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):469 -> a
-    179:180:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):475:476 -> a
-    181:181:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):483:483 -> a
-    182:188:boolean identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):487:493 -> a
-    189:189:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):513:513 -> a
-    190:190:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):518:518 -> a
-    191:194:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):1213:1216 -> a
-    195:197:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):1221:1223 -> a
-    198:200:boolean verifyValidPositionInfo(boolean):1275:1277 -> a
+    1:2:void setPosition(com.android.tools.r8.ir.code.Position):70:71 -> a
+    3:8:void addDebugValue(com.android.tools.r8.ir.code.Value):128:133 -> a
+    9:15:void clearUserInfo(com.android.tools.r8.ir.code.Instruction):138:144 -> a
+    16:19:void replaceValue(int,com.android.tools.r8.ir.code.Value):166:169 -> a
+    20:29:void replaceDebugValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):173:182 -> a
+    30:36:com.android.tools.r8.ir.code.Value removeDebugValue(com.android.tools.r8.graph.DebugLocalInfo):216:222 -> a
+    37:38:void setBlock(com.android.tools.r8.ir.code.BasicBlock):251:252 -> a
+    39:45:void print(com.android.tools.r8.utils.CfgPrinter):303:309 -> a
+    46:46:int com.android.tools.r8.ir.code.Value.getNumber():266:266 -> a
+    46:46:void print(com.android.tools.r8.utils.CfgPrinter):309 -> a
+    47:55:void print(com.android.tools.r8.utils.CfgPrinter):309:317 -> a
+    56:56:int com.android.tools.r8.ir.code.Value.getNumber():266:266 -> a
+    56:56:void print(com.android.tools.r8.utils.CfgPrinter):317 -> a
+    57:57:void print(com.android.tools.r8.utils.CfgPrinter):317:317 -> a
+    58:59:void setNumber(int):332:333 -> a
+    60:69:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):434:443 -> a
+    70:71:boolean identicalNonValueParts(com.android.tools.r8.ir.code.Instruction):342:343 -> a
+    70:71:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):440 -> a
+    72:72:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):446:446 -> a
+    73:76:boolean com.android.tools.r8.ir.code.InvokeDirect.sameConstructorReceiverValue(com.android.tools.r8.ir.code.Invoke):84:87 -> a
+    73:76:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):446 -> a
+    77:78:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):449:450 -> a
+    79:79:int getNumber():328:328 -> a
+    79:79:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):454 -> a
+    80:80:int getNumber():328:328 -> a
+    80:80:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):454 -> a
+    81:113:boolean identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):398:430 -> a
+    81:113:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):453 -> a
+    114:123:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):457:466 -> a
+    124:124:int getNumber():328:328 -> a
+    124:124:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):467 -> a
+    125:125:int getNumber():328:328 -> a
+    125:125:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):467 -> a
+    126:161:boolean identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):353:388 -> a
+    126:161:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):467 -> a
+    162:178:boolean identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):377:393 -> a
+    162:178:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):467 -> a
+    179:180:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):473:474 -> a
+    181:181:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):481:481 -> a
+    182:188:boolean identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):485:491 -> a
+    189:189:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):511:511 -> a
+    190:190:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):516:516 -> a
+    191:194:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):1211:1214 -> a
+    195:197:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):1219:1221 -> a
+    198:200:boolean verifyValidPositionInfo(boolean):1272:1274 -> a
     com.android.tools.r8.ir.code.Or asOr() -> aa
     boolean isDebugPosition() -> ab
-    1:1:com.android.tools.r8.ir.code.ValueType outType():151:151 -> ac
+    1:1:com.android.tools.r8.ir.code.ValueType outType():149:149 -> ac
     com.android.tools.r8.ir.code.Add asAdd() -> b
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> b
-    1:4:void addInValue(com.android.tools.r8.ir.code.Value):86:89 -> b
-    5:8:void replaceValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):159:162 -> b
-    9:9:void printLIR(com.android.tools.r8.utils.CfgPrinter):326:326 -> b
-    10:21:boolean verifyTypes(com.android.tools.r8.graph.AppView):1228:1239 -> b
+    1:4:void addInValue(com.android.tools.r8.ir.code.Value):84:87 -> b
+    5:8:void replaceValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):157:160 -> b
+    9:9:void printLIR(com.android.tools.r8.utils.CfgPrinter):324:324 -> b
+    10:21:boolean verifyTypes(com.android.tools.r8.graph.AppView):1226:1237 -> b
     com.android.tools.r8.ir.code.Rem asRem() -> ba
     boolean isDexItemBasedConstString() -> bb
-    1:1:com.android.tools.r8.ir.code.Value outValue():108:108 -> bc
+    1:1:com.android.tools.r8.ir.code.Value outValue():106:106 -> bc
     com.android.tools.r8.ir.code.And asAnd() -> c
     boolean needsValueInRegister(com.android.tools.r8.ir.code.Value) -> c
-    1:7:void moveDebugValues(com.android.tools.r8.ir.code.Instruction):190:196 -> c
+    1:7:void moveDebugValues(com.android.tools.r8.ir.code.Instruction):188:194 -> c
     com.android.tools.r8.ir.code.Return asReturn() -> ca
     boolean isDiv() -> cb
     com.android.tools.r8.ir.code.Argument asArgument() -> d
-    1:9:void removeDebugValue(com.android.tools.r8.ir.code.Value):206:214 -> d
+    1:9:void removeDebugValue(com.android.tools.r8.ir.code.Value):204:212 -> d
     com.android.tools.r8.ir.code.Shl asShl() -> da
     boolean isFieldInstruction() -> db
     com.android.tools.r8.ir.code.ArithmeticBinop asArithmeticBinop() -> e
-    1:4:void setOutValue(com.android.tools.r8.ir.code.Value):112:115 -> e
+    1:4:void setOutValue(com.android.tools.r8.ir.code.Value):110:113 -> e
     com.android.tools.r8.ir.code.Shr asShr() -> ea
     boolean isGoto() -> eb
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> f
@@ -16166,61 +15980,61 @@
     com.android.tools.r8.ir.code.Xor asXor() -> la
     boolean isInvokeCustom() -> lb
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> m
-    1:2:void clearBlock():261:262 -> ma
+    1:2:void clearBlock():259:260 -> ma
     boolean isInvokeDirect() -> mb
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> n
-    1:5:void clearDebugValues():233:237 -> na
+    1:5:void clearDebugValues():231:235 -> na
     boolean isInvokeInterface() -> nb
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> o
     boolean couldIntroduceAnAlias() -> oa
     boolean isInvokeMethod() -> ob
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> p
-    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():1182:1182 -> pa
+    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():1180:1180 -> pa
     boolean isInvokeMethodWithReceiver() -> pb
     com.android.tools.r8.ir.code.ConstString asConstString() -> q
-    1:2:com.android.tools.r8.ir.code.BasicBlock getBlock():245:246 -> qa
+    1:2:com.android.tools.r8.ir.code.BasicBlock getBlock():243:244 -> qa
     boolean isInvokeMultiNewArray() -> qb
     com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite() -> r
-    1:1:java.util.Set getDebugValues():559:559 -> ra
+    1:1:java.util.Set getDebugValues():557:557 -> ra
     boolean isInvokeNewArray() -> rb
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> s
-    1:1:java.lang.String getInstructionName():281:281 -> sa
+    1:1:java.lang.String getInstructionName():279:279 -> sa
     boolean isInvokePolymorphic() -> sb
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> t
-    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():555:555 -> ta
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():553:553 -> ta
     boolean isInvokeStatic() -> tb
-    1:14:java.lang.String toString():286:299 -> toString
+    1:14:java.lang.String toString():284:297 -> toString
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> u
-    1:1:int getNumber():330:330 -> ua
+    1:1:int getNumber():328:328 -> ua
     boolean isInvokeSuper() -> ub
     com.android.tools.r8.ir.code.Div asDiv() -> v
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> va
     boolean isInvokeVirtual() -> vb
     com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> w
-    1:2:com.android.tools.r8.ir.code.Position getPosition():67:68 -> wa
+    1:2:com.android.tools.r8.ir.code.Position getPosition():65:66 -> wa
     boolean isJumpInstruction() -> wb
     com.android.tools.r8.ir.code.Goto asGoto() -> x
-    1:1:java.lang.String getPositionAsString():77:77 -> xa
+    1:1:java.lang.String getPositionAsString():75:75 -> xa
     boolean isLoad() -> xb
     com.android.tools.r8.ir.code.If asIf() -> y
-    1:1:boolean hasBlock():277:277 -> ya
+    1:1:boolean hasBlock():275:275 -> ya
     boolean isLogicalBinop() -> yb
     com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> z
-    1:1:java.util.List inValues():81:81 -> za
-    1:1:boolean hasInValueWithLocalInfo():95 -> za
-    2:3:boolean hasInValueWithLocalInfo():95:96 -> za
+    1:1:java.util.List inValues():79:79 -> za
+    1:1:boolean hasInValueWithLocalInfo():93 -> za
+    2:3:boolean hasInValueWithLocalInfo():93:94 -> za
     boolean isMonitor() -> zb
 com.android.tools.r8.ir.code.InstructionIterator -> a.a.a.a.g.b.ea:
     void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction) -> a
-    void removeOrReplaceByDebugLocalRead() -> c
+    void removeOrReplaceByDebugLocalRead() -> b
 com.android.tools.r8.ir.code.InstructionListIterator -> a.a.a.a.g.b.fa:
     void setInsertionPosition(com.android.tools.r8.ir.code.Position) -> a
     com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator) -> a
     com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator) -> a
-    1:3:com.android.tools.r8.ir.code.Instruction peekNext():42:44 -> a
-    4:4:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode):90:90 -> a
-    5:5:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int):117:117 -> a
-    1:3:com.android.tools.r8.ir.code.Instruction peekPrevious():27:29 -> b
+    1:3:com.android.tools.r8.ir.code.Instruction peekPrevious():25:27 -> a
+    4:4:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode):70:70 -> a
+    5:5:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int):97:97 -> a
+    1:3:com.android.tools.r8.ir.code.Instruction peekNext():40:42 -> peekNext
 com.android.tools.r8.ir.code.InstructionOrPhi -> a.a.a.a.g.b.ga:
 com.android.tools.r8.ir.code.Invoke -> a.a.a.a.g.b.ia:
     boolean $assertionsDisabled -> h
@@ -16292,7 +16106,7 @@
     8:8:boolean argumentsAreConsecutiveInputArguments():213 -> hc
     9:10:boolean argumentsAreConsecutiveInputArguments():213:214 -> hc
     boolean isInvoke() -> kb
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> oa
+    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> oa
     1:1:boolean couldIntroduceAnAlias():186 -> oa
     1:1:java.lang.String getInstructionName():252:252 -> sa
 com.android.tools.r8.ir.code.Invoke$Type -> a.a.a.a.g.b.ha:
@@ -16320,79 +16134,65 @@
     1:3:void <init>(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.ir.code.Value,java.util.List):25:27 -> <init>
     boolean hasInvariantOutType() -> Aa
     com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom() -> D
-    1:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:67 -> a
-    7:7:com.android.tools.r8.graph.DexCallSite getCallSite():41:41 -> a
-    7:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67 -> a
-    8:12:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:71 -> a
-    13:13:com.android.tools.r8.graph.DexCallSite getCallSite():41:41 -> a
-    13:13:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):73 -> a
-    14:21:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):73:80 -> a
-    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):106:106 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):90:90 -> b
-    1:1:com.android.tools.r8.graph.DexType getReturnType():37:37 -> dc
+    1:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:62 -> a
+    7:7:com.android.tools.r8.graph.DexCallSite getCallSite():36:36 -> a
+    7:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62 -> a
+    8:12:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:66 -> a
+    13:13:com.android.tools.r8.graph.DexCallSite getCallSite():36:36 -> a
+    13:13:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68 -> a
+    14:21:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:75 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):101:101 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85:85 -> b
+    1:1:com.android.tools.r8.graph.DexType getReturnType():32:32 -> dc
     java.lang.String getTypeString() -> fc
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():41:41 -> hc
+    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():36:36 -> hc
     boolean isInvokeCustom() -> lb
-    1:1:java.lang.String toString():56:56 -> toString
+    1:1:java.lang.String toString():51:51 -> toString
     2:2:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> toString
-    2:2:java.lang.String toString():56 -> toString
-    3:3:java.lang.String toString():56:56 -> toString
+    2:2:java.lang.String toString():51 -> toString
+    3:3:java.lang.String toString():51:51 -> toString
 com.android.tools.r8.ir.code.InvokeDirect -> a.a.a.a.g.b.ka:
     boolean $assertionsDisabled -> m
     boolean itf -> l
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):42:45 -> <init>
+    1:1:void <clinit>():28:28 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):33:33 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):37:40 -> <init>
     com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> E
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:85 -> a
-    20:20:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):118:118 -> a
-    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):131:131 -> a
-    22:22:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):146:146 -> a
-    23:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):153:168 -> a
-    39:80:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):212:253 -> a
-    81:81:boolean lambda$canBeDeadCode$0(java.util.List,com.android.tools.r8.ir.code.Instruction):247:247 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):102:102 -> b
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():56:56 -> ec
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:75 -> a
+    20:20:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexType):108:108 -> a
+    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):121:121 -> a
+    22:22:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):135:135 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92:92 -> b
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():46:46 -> ec
     java.lang.String getTypeString() -> fc
     boolean isInvokeDirect() -> mb
 com.android.tools.r8.ir.code.InvokeInterface -> a.a.a.a.g.b.la:
     boolean $assertionsDisabled -> l
-    1:1:void <clinit>():27:27 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):30:30 -> <init>
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):51:69 -> a
-    20:22:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):90:92 -> a
-    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):104:104 -> a
-    24:24:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):119:119 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):74:74 -> b
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():40:40 -> ec
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):25:25 -> <init>
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):41:59 -> a
+    20:22:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexType):80:82 -> a
+    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):94:94 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):64:64 -> b
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():30:30 -> ec
     java.lang.String getTypeString() -> fc
     boolean isInvokeInterface() -> nb
 com.android.tools.r8.ir.code.InvokeMethod -> a.a.a.a.g.b.ma:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexMethod method -> i
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):27:28 -> <init>
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):26:27 -> <init>
     boolean hasInvariantOutType() -> Aa
     com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod() -> F
     com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis) -> a
-    com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType) -> a
-    1:6:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):75:80 -> a
-    7:7:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    7:7:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):85 -> a
-    8:8:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):85:85 -> a
-    9:9:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    9:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):86 -> a
-    10:11:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):86:87 -> a
-    12:12:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    12:12:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):87 -> a
-    13:13:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):87:87 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):42:42 -> b
-    2:2:com.android.tools.r8.graph.DexMethod getInvokedMethod():37:37 -> b
-    2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):42 -> b
-    1:1:com.android.tools.r8.graph.DexType getReturnType():33:33 -> dc
-    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():37:37 -> hc
+    com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexType) -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):41:41 -> b
+    2:2:com.android.tools.r8.graph.DexMethod getInvokedMethod():36:36 -> b
+    2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):41 -> b
+    1:1:com.android.tools.r8.graph.DexType getReturnType():32:32 -> dc
+    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():36:36 -> hc
     boolean isInvokeMethod() -> ob
-    1:1:java.lang.String toString():47:47 -> toString
+    1:1:java.lang.String toString():46:46 -> toString
 com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> a.a.a.a.g.b.na:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():17:17 -> <clinit>
@@ -16408,14 +16208,14 @@
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,java.util.List):26:27 -> <init>
     boolean hasInvariantOutType() -> Aa
     com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> H
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):72:72 -> a
-    2:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):77:77 -> a
-    3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):104:104 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> b
-    1:1:com.android.tools.r8.graph.DexType getArrayType():51:51 -> dc
-    1:1:com.android.tools.r8.graph.DexType getReturnType():56 -> dc
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):67:67 -> a
+    2:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):72:72 -> a
+    3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):99:99 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):61:61 -> b
+    1:1:com.android.tools.r8.graph.DexType getArrayType():46:46 -> dc
+    1:1:com.android.tools.r8.graph.DexType getReturnType():51 -> dc
     java.lang.String getTypeString() -> fc
-    1:1:com.android.tools.r8.graph.DexType getArrayType():51:51 -> hc
+    1:1:com.android.tools.r8.graph.DexType getArrayType():46:46 -> hc
     boolean isInvokeMultiNewArray() -> qb
 com.android.tools.r8.ir.code.InvokeNewArray -> a.a.a.a.g.b.pa:
     com.android.tools.r8.graph.DexType type -> i
@@ -16424,35 +16224,35 @@
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,java.util.List):27:28 -> <init>
     boolean hasInvariantOutType() -> Aa
     com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> I
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:81 -> a
-    20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):102:102 -> a
-    21:21:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):107:107 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):86:86 -> b
-    1:1:com.android.tools.r8.graph.DexType getArrayType():42:42 -> dc
-    1:1:com.android.tools.r8.graph.DexType getReturnType():38 -> dc
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:76 -> a
+    20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):97:97 -> a
+    21:21:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):102:102 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):81:81 -> b
+    1:1:com.android.tools.r8.graph.DexType getArrayType():37:37 -> dc
+    1:1:com.android.tools.r8.graph.DexType getReturnType():33 -> dc
     java.lang.String getTypeString() -> fc
-    1:1:com.android.tools.r8.graph.DexType getArrayType():42:42 -> hc
+    1:1:com.android.tools.r8.graph.DexType getArrayType():37:37 -> hc
     boolean isInvokeNewArray() -> rb
-    1:1:java.lang.String toString():57:57 -> toString
+    1:1:java.lang.String toString():52:52 -> toString
 com.android.tools.r8.ir.code.InvokePolymorphic -> a.a.a.a.g.b.qa:
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexProto proto -> k
     1:1:void <clinit>():26:26 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):31:32 -> <init>
     com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> J
-    com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType) -> a
-    1:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:68 -> a
-    8:8:com.android.tools.r8.graph.DexProto getProto():56:56 -> a
-    8:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68 -> a
-    9:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:74 -> a
-    16:16:com.android.tools.r8.graph.DexProto getProto():56:56 -> a
-    16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75 -> a
-    17:24:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:82 -> a
-    25:25:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):131:131 -> a
-    26:26:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):139:139 -> a
-    1:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):99:101 -> b
-    1:1:com.android.tools.r8.graph.DexType getReturnType():42:42 -> dc
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():47:47 -> ec
+    com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexType) -> a
+    1:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:63 -> a
+    8:8:com.android.tools.r8.graph.DexProto getProto():51:51 -> a
+    8:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63 -> a
+    9:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:69 -> a
+    16:16:com.android.tools.r8.graph.DexProto getProto():51:51 -> a
+    16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70 -> a
+    17:24:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:77 -> a
+    25:25:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):126:126 -> a
+    26:26:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):134:134 -> a
+    1:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:96 -> b
+    1:1:com.android.tools.r8.graph.DexType getReturnType():37:37 -> dc
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():42:42 -> ec
     java.lang.String getTypeString() -> fc
     boolean isInvokePolymorphic() -> sb
 com.android.tools.r8.ir.code.InvokeStatic -> a.a.a.a.g.b.ra:
@@ -16462,17 +16262,17 @@
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):36:37 -> <init>
     3:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):41:42 -> <init>
     com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> K
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:81 -> a
-    20:21:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):102:103 -> a
-    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):116:116 -> a
-    23:23:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):124:124 -> a
-    24:24:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):139:139 -> a
-    25:34:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):146:155 -> a
-    35:35:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):188:188 -> a
-    36:45:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):146:155 -> a
-    36:45:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):188 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):86:86 -> b
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():52:52 -> ec
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:76 -> a
+    20:21:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexType):97:98 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):111:111 -> a
+    23:23:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):119:119 -> a
+    24:24:boolean definitelyTriggersClassInitialization(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):133:133 -> a
+    25:34:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):140:149 -> a
+    35:35:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):182:182 -> a
+    36:45:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):140:149 -> a
+    36:45:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):182 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):81:81 -> b
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():47:47 -> ec
     java.lang.String getTypeString() -> fc
     boolean isInvokeStatic() -> tb
 com.android.tools.r8.ir.code.InvokeSuper -> a.a.a.a.g.b.sa:
@@ -16481,12 +16281,12 @@
     1:1:void <clinit>():27:27 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):32:33 -> <init>
     com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> L
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:72 -> a
-    20:20:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):101:101 -> a
-    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):118:118 -> a
-    22:22:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):128:128 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):82:82 -> b
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():43:43 -> ec
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):49:67 -> a
+    20:23:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexType):96:99 -> a
+    24:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):113:113 -> a
+    25:25:boolean definitelyTriggersClassInitialization(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):122:122 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):77:77 -> b
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():38:38 -> ec
     java.lang.String getTypeString() -> fc
     boolean isInvokeSuper() -> ub
 com.android.tools.r8.ir.code.InvokeVirtual -> a.a.a.a.g.b.ta:
@@ -16494,16 +16294,16 @@
     1:1:void <clinit>():27:27 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):30:30 -> <init>
     com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual() -> M
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):51:69 -> a
-    20:22:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):90:92 -> a
-    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):104:104 -> a
-    24:24:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):119:119 -> a
-    25:36:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):126:137 -> a
-    37:37:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):146:146 -> a
-    38:49:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):126:137 -> a
-    38:49:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):146 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):74:74 -> b
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():40:40 -> ec
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):46:64 -> a
+    20:22:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexType):85:87 -> a
+    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):99:99 -> a
+    24:24:boolean definitelyTriggersClassInitialization(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):113:113 -> a
+    25:40:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120:135 -> a
+    41:41:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):144:144 -> a
+    42:57:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120:135 -> a
+    42:57:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):144 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):69:69 -> b
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():35:35 -> ec
     java.lang.String getTypeString() -> fc
     boolean isInvokeVirtual() -> vb
 com.android.tools.r8.ir.code.JumpInstruction -> a.a.a.a.g.b.ua:
@@ -16591,14 +16391,14 @@
     boolean instructionTypeCanThrow() -> Ea
     com.android.tools.r8.ir.code.Monitor asMonitor() -> P
     int maxInValueRegister() -> Zb
-    1:1:int maxOutValueRegister():81:81 -> _b
-    1:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:65 -> a
-    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):103:103 -> a
-    10:10:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):135:135 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:71 -> b
-    1:1:boolean isEnter():44:44 -> cc
-    1:1:com.android.tools.r8.ir.code.Value object():40:40 -> dc
-    1:7:java.lang.String getInstructionName():108:114 -> sa
+    1:1:int maxOutValueRegister():76:76 -> _b
+    1:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:60 -> a
+    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):98:98 -> a
+    10:10:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):130:130 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> b
+    1:1:boolean isEnter():39:39 -> cc
+    1:1:com.android.tools.r8.ir.code.Value object():35:35 -> dc
+    1:7:java.lang.String getInstructionName():103:109 -> sa
     boolean isMonitor() -> zb
 com.android.tools.r8.ir.code.Monitor$Type -> a.a.a.a.g.b.xa:
     com.android.tools.r8.ir.code.Monitor$Type ENTER -> a
@@ -16613,19 +16413,19 @@
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
     boolean hasInvariantOutType() -> Aa
     boolean isMove() -> Ab
-    1:1:boolean isOutConstant():77:77 -> Lb
+    1:1:boolean isOutConstant():72:72 -> Lb
     com.android.tools.r8.ir.code.Move asMove() -> Q
     int maxInValueRegister() -> Zb
     int maxOutValueRegister() -> _b
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47:47 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):99:99 -> a
-    3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):104:104 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67:67 -> b
-    1:1:com.android.tools.r8.ir.code.Value dest():33:33 -> cc
-    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> dc
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):42:42 -> a
+    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):94:94 -> a
+    3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):99:99 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):62:62 -> b
+    1:1:com.android.tools.r8.ir.code.Value dest():28:28 -> cc
+    1:1:com.android.tools.r8.ir.code.Value src():32:32 -> dc
     boolean couldIntroduceAnAlias() -> oa
-    1:1:java.lang.String toString():72:72 -> toString
-    1:2:com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction():82:83 -> va
+    1:1:java.lang.String toString():67:67 -> toString
+    1:2:com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction():77:78 -> va
 com.android.tools.r8.ir.code.MoveException -> a.a.a.a.g.b.Aa:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType exceptionType -> h
@@ -16635,19 +16435,19 @@
     boolean hasInvariantOutType() -> Aa
     boolean isMoveException() -> Bb
     com.android.tools.r8.ir.code.MoveException asMoveException() -> R
-    1:1:int maxInValueRegister():47:47 -> Zb
+    1:1:int maxInValueRegister():42:42 -> Zb
     int maxOutValueRegister() -> _b
-    1:1:com.android.tools.r8.ir.code.Value dest():36:36 -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):41 -> a
-    2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):41:42 -> a
-    4:5:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):79:80 -> a
-    6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):86:86 -> a
-    7:7:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):112:112 -> a
-    1:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):58:61 -> b
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():990:990 -> b
-    5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):61 -> b
-    6:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):62:62 -> b
-    1:1:com.android.tools.r8.graph.DexType getExceptionType():116:116 -> cc
+    1:1:com.android.tools.r8.ir.code.Value dest():31:31 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):36 -> a
+    2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):36:37 -> a
+    4:5:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):74:75 -> a
+    6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):81:81 -> a
+    7:7:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):107:107 -> a
+    1:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):53:56 -> b
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():960:960 -> b
+    5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):56 -> b
+    6:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):57:57 -> b
+    1:1:com.android.tools.r8.graph.DexType getExceptionType():111:111 -> cc
 com.android.tools.r8.ir.code.Mul -> a.a.a.a.g.b.Ba:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
     boolean isMul() -> Cb
@@ -16656,18 +16456,18 @@
     float foldFloat(float,float) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):64:64 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):56:56 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):84:84 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):99:99 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):40:40 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):79:79 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):69:69 -> d
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):94:94 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):59:59 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):51:51 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):79:79 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:94 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):35:35 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):74:74 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):64:64 -> d
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):89:89 -> d
     boolean isCommutative() -> dc
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):74:74 -> e
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):89:89 -> e
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):48:48 -> f
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):69:69 -> e
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):84:84 -> e
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):43:43 -> f
 com.android.tools.r8.ir.code.Neg -> a.a.a.a.g.b.Ca:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
@@ -16676,41 +16476,41 @@
     boolean isNeg() -> Db
     com.android.tools.r8.ir.code.Neg asNeg() -> T
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.dest():22:22 -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):50 -> a
-    2:18:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):50:66 -> a
-    19:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:63 -> a
-    20:20:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60:60 -> a
-    21:21:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:57 -> a
-    22:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:68 -> a
-    37:55:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):83:101 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):44:44 -> b
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45 -> a
+    2:18:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:61 -> a
+    19:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:58 -> a
+    20:20:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:55 -> a
+    21:21:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52:52 -> a
+    22:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):49:63 -> a
+    37:55:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):78:96 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):39:39 -> b
 com.android.tools.r8.ir.code.NewArrayEmpty -> a.a.a.a.g.b.Da:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexType type -> h
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):26:27 -> <init>
     boolean hasInvariantOutType() -> Aa
-    1:4:boolean instructionInstanceCanThrow():73:76 -> Da
+    1:4:boolean instructionInstanceCanThrow():68:71 -> Da
     boolean instructionTypeCanThrow() -> Ea
     boolean isNewArrayEmpty() -> Eb
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> U
     int maxInValueRegister() -> Zb
     int maxOutValueRegister() -> _b
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):50:50 -> a
-    2:2:com.android.tools.r8.ir.code.Value dest():41:41 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):51 -> a
-    3:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):51:52 -> a
-    5:8:boolean instructionInstanceCanThrow():73:76 -> a
-    5:8:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):81 -> a
-    9:10:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):85:86 -> a
-    11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):107:107 -> a
-    12:12:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):135:135 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):91:91 -> b
-    1:1:com.android.tools.r8.ir.code.Value size():45:45 -> cc
-    1:1:java.lang.String toString():37:37 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():118:118 -> toString
-    2:2:java.lang.String toString():37 -> toString
-    3:3:java.lang.String toString():37:37 -> toString
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:45 -> a
+    2:2:com.android.tools.r8.ir.code.Value dest():36:36 -> a
+    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):46 -> a
+    3:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):46:47 -> a
+    5:8:boolean instructionInstanceCanThrow():68:71 -> a
+    5:8:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):76 -> a
+    9:10:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):80:81 -> a
+    11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):102:102 -> a
+    12:12:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):130:130 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):86:86 -> b
+    1:1:com.android.tools.r8.ir.code.Value size():40:40 -> cc
+    1:1:java.lang.String toString():32:32 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():360:360 -> toString
+    2:2:java.lang.String toString():32 -> toString
+    3:3:java.lang.String toString():32:32 -> toString
 com.android.tools.r8.ir.code.NewArrayFilledData -> a.a.a.a.g.b.Ea:
     long size -> i
     short[] data -> j
@@ -16723,39 +16523,35 @@
     boolean isNewArrayFilledData() -> Fb
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> V
     int maxInValueRegister() -> Zb
-    1:1:int maxOutValueRegister():78:78 -> _b
-    1:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):51:52 -> a
-    3:8:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):84:89 -> a
-    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):113:113 -> a
-    1:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):62:68 -> b
-    1:1:com.android.tools.r8.code.FillArrayDataPayload createPayload():46:46 -> cc
-    1:1:com.android.tools.r8.ir.code.Value src():42:42 -> dc
+    1:1:int maxOutValueRegister():73:73 -> _b
+    1:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):46:47 -> a
+    3:8:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):79:84 -> a
+    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):108:108 -> a
+    1:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):57:63 -> b
+    1:1:com.android.tools.r8.code.FillArrayDataPayload createPayload():41:41 -> cc
+    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> dc
 com.android.tools.r8.ir.code.NewInstance -> a.a.a.a.g.b.Fa:
     boolean allowSpilling -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType clazz -> h
-    1:1:void <clinit>():26:26 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):32:32 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):29:34 -> <init>
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):29:29 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):26:31 -> <init>
     boolean hasInvariantOutType() -> Aa
     boolean instructionTypeCanThrow() -> Ea
     boolean isNewInstance() -> Gb
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> W
-    1:1:int maxInValueRegister():64:64 -> Zb
+    1:1:int maxInValueRegister():56:56 -> Zb
     int maxOutValueRegister() -> _b
-    1:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):48:49 -> a
-    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):92:92 -> a
-    4:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):118:118 -> a
-    5:5:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):128:128 -> a
-    6:33:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):135:162 -> a
-    34:34:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):140:140 -> a
-    35:35:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):165:165 -> a
-    36:36:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):174:174 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):59:59 -> b
-    1:1:com.android.tools.r8.ir.code.Value dest():43:43 -> cc
-    1:1:boolean isSpillingAllowed():182:182 -> dc
-    1:1:void markNoSpilling():178:178 -> ec
-    1:1:java.lang.String toString():54:54 -> toString
+    1:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):40:41 -> a
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):84:84 -> a
+    4:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):110:110 -> a
+    5:5:boolean definitelyTriggersClassInitialization(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):119:119 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):51:51 -> b
+    1:1:com.android.tools.r8.ir.code.Value dest():35:35 -> cc
+    1:1:boolean isSpillingAllowed():128:128 -> dc
+    1:1:void markNoSpilling():124:124 -> ec
+    1:1:java.lang.String toString():46:46 -> toString
 com.android.tools.r8.ir.code.NextUntilIterator -> a.a.a.a.g.b.Ga:
     1:3:java.lang.Object nextUntil(java.util.function.Predicate):18:20 -> a
 com.android.tools.r8.ir.code.NonNull -> a.a.a.a.g.b.Ha:
@@ -16767,17 +16563,17 @@
     boolean isNonNull() -> Hb
     boolean isOutConstant() -> Lb
     com.android.tools.r8.ir.code.NonNull asNonNull() -> X
-    1:1:int maxInValueRegister():82:82 -> Zb
-    1:1:int maxOutValueRegister():87:87 -> _b
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:72 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):103:103 -> a
-    3:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):108:109 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):97:97 -> b
-    1:1:com.android.tools.r8.ir.code.Value dest():34:34 -> cc
-    1:1:com.android.tools.r8.ir.code.Value src():38:38 -> dc
+    1:1:int maxInValueRegister():77:77 -> Zb
+    1:1:int maxOutValueRegister():82:82 -> _b
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:67 -> a
+    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):98:98 -> a
+    3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):103:103 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92:92 -> b
+    1:1:com.android.tools.r8.ir.code.Value dest():29:29 -> cc
+    1:1:com.android.tools.r8.ir.code.Value src():33:33 -> dc
     boolean isIntroducingAnAlias() -> jb
     boolean couldIntroduceAnAlias() -> oa
-    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():67:67 -> pa
+    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():62:62 -> pa
 com.android.tools.r8.ir.code.Not -> a.a.a.a.g.b.Ia:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
@@ -16785,13 +16581,13 @@
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:25 -> <init>
     boolean isNot() -> Ib
     com.android.tools.r8.ir.code.Not asNot() -> Y
-    1:15:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):40:54 -> a
-    16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:59 -> a
+    1:15:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):35:49 -> a
+    16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:54 -> a
     17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.dest():22:22 -> a
-    17:17:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61 -> a
-    18:28:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61:71 -> a
-    29:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:73 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> b
+    17:17:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56 -> a
+    18:28:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56:66 -> a
+    29:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60:68 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):73:73 -> b
 com.android.tools.r8.ir.code.NumberConversion -> a.a.a.a.g.b.Ja:
     com.android.tools.r8.ir.code.NumericType to -> i
     com.android.tools.r8.ir.code.NumericType from -> h
@@ -16799,26 +16595,26 @@
     boolean isNumberConversion() -> Jb
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> Z
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.dest():22:22 -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53 -> a
-    2:75:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:126 -> a
-    76:87:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):111:122 -> a
-    88:88:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):116:116 -> a
-    89:89:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):113:113 -> a
-    90:101:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):96:107 -> a
-    102:102:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):101:101 -> a
-    103:103:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):98:98 -> a
-    104:115:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81:92 -> a
-    116:116:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86:86 -> a
-    117:117:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83:83 -> a
-    118:138:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:77 -> a
-    139:139:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74:74 -> a
-    140:140:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:71 -> a
-    141:141:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:68 -> a
-    142:142:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:65 -> a
-    143:143:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:62 -> a
-    144:213:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:128 -> a
-    214:214:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):152:152 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):133:137 -> b
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):48 -> a
+    2:75:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):48:121 -> a
+    76:87:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):106:117 -> a
+    88:88:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):111:111 -> a
+    89:89:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):108:108 -> a
+    90:101:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):91:102 -> a
+    102:102:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):96:96 -> a
+    103:103:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):93:93 -> a
+    104:115:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:87 -> a
+    116:116:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81:81 -> a
+    117:117:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:78 -> a
+    118:138:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52:72 -> a
+    139:139:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:69 -> a
+    140:140:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:66 -> a
+    141:141:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:63 -> a
+    142:142:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60:60 -> a
+    143:143:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:57 -> a
+    144:213:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:123 -> a
+    214:214:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):147:147 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):128:132 -> b
 com.android.tools.r8.ir.code.NumericType -> a.a.a.a.g.b.Ka:
     com.android.tools.r8.ir.code.NumericType DOUBLE -> g
     com.android.tools.r8.ir.code.NumericType FLOAT -> f
@@ -16842,14 +16638,14 @@
     boolean isOr() -> Kb
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):42:42 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):37:37 -> a
     com.android.tools.r8.ir.code.Or asOr() -> aa
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):52:52 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):67:67 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):72:72 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):57:57 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):62:62 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):47:47 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):47:47 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):62:62 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67:67 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):52:52 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):57:57 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):42:42 -> d
     boolean isCommutative() -> dc
 com.android.tools.r8.ir.code.Phi -> a.a.a.a.g.b.Na:
     com.android.tools.r8.ir.code.Phi$RegisterReadType readType -> u
@@ -16872,7 +16668,7 @@
     32:32:com.android.tools.r8.ir.code.BasicBlock getBlock():68:68 -> a
     32:32:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):106 -> a
     33:34:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):107:108 -> a
-    35:35:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():958:958 -> a
+    35:35:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():916:916 -> a
     35:35:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):108 -> a
     36:46:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):108:118 -> a
     47:76:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):96:125 -> a
@@ -16897,20 +16693,20 @@
     162:179:boolean knownToBeBoolean(java.util.HashSet):337:354 -> a
     180:181:boolean verifyIsStackPhi(java.util.Set):379:380 -> a
     182:185:void lambda$verifyIsStackPhi$0(java.util.Set,com.android.tools.r8.ir.code.Value):382:385 -> a
+    186:186:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.DexDefinitionSupplier):414:414 -> a
+    187:187:java.util.List getOperands():175:175 -> a
+    187:187:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.DexDefinitionSupplier):415 -> a
+    188:189:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.DexDefinitionSupplier):415:416 -> a
     1:1:com.android.tools.r8.ir.code.BasicBlock getBlock():68:68 -> aa
     1:2:void removeOperand(int):179:180 -> b
     3:14:void removeOperandsByIndex(java.util.List):184:195 -> b
     15:15:void removeDefinitionsUser(java.util.Map):321:321 -> b
-    16:16:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):414:414 -> b
-    17:17:java.util.List getOperands():175:175 -> b
-    17:17:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):415 -> b
-    18:19:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):415:416 -> b
     1:1:java.util.List getOperands():175:175 -> ba
     com.android.tools.r8.ir.code.Phi asPhi() -> c
     1:1:boolean isTrivialPhi():216:216 -> ca
     1:1:boolean usesValueOneTime(com.android.tools.r8.ir.code.Value):397:397 -> d
     1:9:java.lang.String printPhi():292:300 -> da
-    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():958:958 -> da
+    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():916:916 -> da
     10:10:java.lang.String printPhi():300 -> da
     11:12:java.lang.String printPhi():300:301 -> da
     1:1:void removeTrivialPhi():231:231 -> ea
@@ -16925,16 +16721,16 @@
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue):20:20 -> <init>
     boolean hasInvariantOutType() -> Aa
     boolean isPop() -> Mb
-    1:1:int maxInValueRegister():55:55 -> Zb
-    1:1:int maxOutValueRegister():60:60 -> _b
+    1:1:int maxInValueRegister():50:50 -> Zb
+    1:1:int maxOutValueRegister():55:55 -> _b
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):66:66 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:71 -> a
-    1:1:void addInValue(com.android.tools.r8.ir.code.Value):30:30 -> b
-    2:5:void com.android.tools.r8.ir.code.Instruction.addInValue(com.android.tools.r8.ir.code.Value):86:89 -> b
-    2:5:void addInValue(com.android.tools.r8.ir.code.Value):31 -> b
-    6:6:void addInValue(com.android.tools.r8.ir.code.Value):34:34 -> b
-    7:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):50:50 -> b
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):61:61 -> a
+    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:66 -> a
+    1:1:void addInValue(com.android.tools.r8.ir.code.Value):25:25 -> b
+    2:5:void com.android.tools.r8.ir.code.Instruction.addInValue(com.android.tools.r8.ir.code.Value):84:87 -> b
+    2:5:void addInValue(com.android.tools.r8.ir.code.Value):26 -> b
+    6:6:void addInValue(com.android.tools.r8.ir.code.Value):29:29 -> b
+    7:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):45:45 -> b
 com.android.tools.r8.ir.code.Position -> a.a.a.a.g.b.Pa:
     com.android.tools.r8.ir.code.Position NO_POSITION_SYNTHETIC -> g
     com.android.tools.r8.graph.DexString file -> b
@@ -16962,26 +16758,26 @@
 com.android.tools.r8.ir.code.PreviousUntilIterator -> a.a.a.a.g.b.Qa:
 com.android.tools.r8.ir.code.Rem -> a.a.a.a.g.b.Ra:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    1:1:boolean instructionTypeCanThrow():129:129 -> Ea
+    1:1:boolean instructionTypeCanThrow():124:124 -> Ea
     boolean isRem() -> Nb
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
-    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):64:64 -> a
-    2:2:int foldIntegers(int,int):109:109 -> a
-    3:3:long foldLongs(long,long):114:114 -> a
-    4:8:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):134:138 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):59:59 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):84:84 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):99:99 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):59:59 -> a
+    2:2:int foldIntegers(int,int):104:104 -> a
+    3:3:long foldLongs(long,long):109:109 -> a
+    4:8:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):129:133 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):54:54 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):79:79 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:94 -> b
     com.android.tools.r8.ir.code.Rem asRem() -> ba
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):49:49 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):79:79 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):69:69 -> d
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):94:94 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):44:44 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):74:74 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):64:64 -> d
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):89:89 -> d
     boolean isCommutative() -> dc
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):74:74 -> e
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):89:89 -> e
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):54:54 -> f
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):69:69 -> e
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):84:84 -> e
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):49:49 -> f
 com.android.tools.r8.ir.code.Return -> a.a.a.a.g.b.Sa:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
@@ -16989,47 +16785,47 @@
     2:2:void <init>(com.android.tools.r8.ir.code.Value):28:28 -> <init>
     boolean isReturn() -> Ob
     int maxInValueRegister() -> Zb
-    1:1:int maxOutValueRegister():92:92 -> _b
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:70 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):109:109 -> a
-    1:15:com.android.tools.r8.code.Instruction createDexInstruction(com.android.tools.r8.ir.conversion.DexBuilder):51:65 -> b
-    16:23:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:82 -> b
-    24:26:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isValueTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):342:344 -> b
-    24:26:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):82 -> b
+    1:1:int maxOutValueRegister():87:87 -> _b
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:65 -> a
+    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):104:104 -> a
+    1:15:com.android.tools.r8.code.Instruction createDexInstruction(com.android.tools.r8.ir.conversion.DexBuilder):46:60 -> b
+    16:23:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):70:77 -> b
+    24:26:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isValueTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):335:337 -> b
+    24:26:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):77 -> b
     com.android.tools.r8.ir.code.Return asReturn() -> ca
-    1:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getReturnType():41:42 -> dc
-    1:1:boolean isReturnVoid():37:37 -> ec
-    1:2:com.android.tools.r8.ir.code.Value returnValue():46:47 -> fc
+    1:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getReturnType():36:37 -> dc
+    1:1:boolean isReturnVoid():32:32 -> ec
+    1:2:com.android.tools.r8.ir.code.Value returnValue():41:42 -> fc
 com.android.tools.r8.ir.code.Shl -> a.a.a.a.g.b.Ta:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     boolean isShl() -> Pb
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):48:48 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):58:58 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):73:73 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):63:63 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):43:43 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):53:53 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):68:68 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):73:73 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):58:58 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):63:63 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):48:48 -> d
     com.android.tools.r8.ir.code.Shl asShl() -> da
     boolean isCommutative() -> dc
-    1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):28:28 -> f
+    1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):23:23 -> f
 com.android.tools.r8.ir.code.Shr -> a.a.a.a.g.b.Ua:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     boolean isShr() -> Qb
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):48:48 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):58:58 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):73:73 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):63:63 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):43:43 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):53:53 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):68:68 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):73:73 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):58:58 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):63:63 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):48:48 -> d
     boolean isCommutative() -> dc
     com.android.tools.r8.ir.code.Shr asShr() -> ea
-    1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):28:28 -> f
+    1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):23:23 -> f
 com.android.tools.r8.ir.code.SingleConstant -> a.a.a.a.g.b.Va:
 com.android.tools.r8.ir.code.StackValue -> a.a.a.a.g.b.Wa:
     boolean $assertionsDisabled -> s
@@ -17045,49 +16841,48 @@
     boolean isStaticGet() -> Rb
     int maxInValueRegister() -> Zb
     int maxOutValueRegister() -> _b
-    1:1:com.android.tools.r8.ir.code.Value dest():48:48 -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59 -> a
-    2:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:89 -> a
-    33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):87:87 -> a
-    34:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:68 -> a
-    35:54:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:83 -> a
-    55:55:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):80:80 -> a
-    56:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:77 -> a
-    57:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74:74 -> a
-    58:78:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:91 -> a
-    79:103:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):103:127 -> a
-    104:104:boolean lambda$canBeDeadCode$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):130:130 -> a
-    105:105:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):155:155 -> a
-    106:106:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):192:192 -> a
-    107:107:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):202:202 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):145:149 -> b
-    1:1:com.android.tools.r8.ir.code.Value dest():48:48 -> ec
+    1:1:com.android.tools.r8.ir.code.Value dest():43:43 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54 -> a
+    2:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:84 -> a
+    33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:82 -> a
+    34:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:63 -> a
+    35:54:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:78 -> a
+    55:55:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
+    56:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:72 -> a
+    57:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:69 -> a
+    58:78:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:86 -> a
+    79:101:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):98:120 -> a
+    102:102:boolean lambda$canBeDeadCode$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):123:123 -> a
+    103:103:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):148:148 -> a
+    104:104:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):185:185 -> a
+    105:105:boolean definitelyTriggersClassInitialization(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):194:194 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):138:142 -> b
+    1:1:com.android.tools.r8.ir.code.Value dest():43:43 -> ec
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> fa
     boolean couldIntroduceAnAlias() -> oa
-    1:1:java.lang.String toString():160:160 -> toString
+    1:1:java.lang.String toString():153:153 -> toString
 com.android.tools.r8.ir.code.StaticPut -> a.a.a.a.g.b.Za:
     boolean $assertionsDisabled -> k
-    1:1:void <clinit>():31:31 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):34:34 -> <init>
+    1:1:void <clinit>():30:30 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):33:33 -> <init>
     boolean instructionTypeCanThrow() -> Ea
     boolean isStaticPut() -> Sb
     int maxInValueRegister() -> Zb
-    1:1:int maxOutValueRegister():98:98 -> _b
-    1:31:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):50:80 -> a
-    32:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:78 -> a
-    33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:59 -> a
-    34:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:74 -> a
-    54:54:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:71 -> a
-    55:55:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:68 -> a
-    56:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:65 -> a
-    57:77:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:82 -> a
-    78:88:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):104:114 -> a
-    89:89:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):134:134 -> a
-    90:90:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):170:170 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):124:128 -> b
-    1:2:com.android.tools.r8.ir.code.Value inValue():43:44 -> ec
+    1:1:int maxOutValueRegister():92:92 -> _b
+    1:31:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):44:74 -> a
+    32:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:72 -> a
+    33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:53 -> a
+    34:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):49:68 -> a
+    54:54:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:65 -> a
+    55:55:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:62 -> a
+    56:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:59 -> a
+    57:77:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56:76 -> a
+    78:78:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):108:108 -> a
+    79:79:boolean definitelyTriggersClassInitialization(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):143:143 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):98:102 -> b
+    1:2:com.android.tools.r8.ir.code.Value inValue():37:38 -> ec
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> ga
-    1:1:java.lang.String toString():139:139 -> toString
+    1:1:java.lang.String toString():113:113 -> toString
 com.android.tools.r8.ir.code.Sub -> a.a.a.a.g.b._a:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():24:24 -> <clinit>
@@ -17097,37 +16892,37 @@
     float foldFloat(float,float) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):57:57 -> a
-    2:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):159:194 -> a
-    38:38:com.android.tools.r8.code.Instruction CreateInt(int,int,int):42:42 -> a
-    38:38:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):195 -> a
-    39:39:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):197:197 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):52:52 -> a
+    2:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):154:189 -> a
+    38:38:com.android.tools.r8.code.Instruction CreateInt(int,int,int):37:37 -> a
+    38:38:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):190 -> a
+    39:39:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):192:192 -> a
     40:64:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:89 -> a
-    40:64:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):160 -> a
+    40:64:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):155 -> a
     65:74:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:86 -> a
-    65:74:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):160 -> a
+    65:74:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):155 -> a
     75:91:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83:99 -> a
-    75:91:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):160 -> a
+    75:91:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):155 -> a
     92:113:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):96:117 -> a
-    92:113:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):160 -> a
+    92:113:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):155 -> a
     114:123:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):105:114 -> a
-    114:123:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):160 -> a
+    114:123:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):155 -> a
     124:133:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):111:120 -> a
-    124:133:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):160 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):52:52 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):77:77 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:94 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):42:42 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):72:72 -> c
-    3:15:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):140:152 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):62:62 -> d
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):89:89 -> d
+    124:133:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):155 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):47:47 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):72:72 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):89:89 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):37:37 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):67:67 -> c
+    3:15:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):135:147 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):57:57 -> d
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):84:84 -> d
     boolean isCommutative() -> dc
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):67:67 -> e
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):83:83 -> e
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):47:47 -> f
-    1:8:int maxInOutValueRegisterSize():126:133 -> fc
-    1:3:boolean negativeFitsInDexInstruction(com.android.tools.r8.ir.code.Value):118:120 -> h
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):62:62 -> e
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):78:78 -> e
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):42:42 -> f
+    1:8:int maxInOutValueRegisterSize():121:128 -> fc
+    1:3:boolean negativeFitsInDexInstruction(com.android.tools.r8.ir.code.Value):113:115 -> h
     com.android.tools.r8.ir.code.Sub asSub() -> ha
 com.android.tools.r8.ir.code.Switch -> a.a.a.a.g.b.ab:
     int[] keys -> i
@@ -17136,56 +16931,56 @@
     int[] targetBlockIndices -> j
     1:1:void <clinit>():26:26 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.code.Value,int[],int[],int):37:41 -> <init>
-    6:13:boolean valid():50:57 -> <init>
+    6:13:boolean valid():45:52 -> <init>
     6:13:void <init>(com.android.tools.r8.ir.code.Value,int[],int[],int):41 -> <init>
     boolean isSwitch() -> Ub
     int maxInValueRegister() -> Zb
     int maxOutValueRegister() -> _b
-    1:1:long numberOfTargetsIfPacked(int[]):67:67 -> a
-    2:2:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):72:72 -> a
-    3:3:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode,long):78:78 -> a
-    4:4:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode):158:158 -> a
-    4:4:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):172 -> a
-    5:5:long packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):163:163 -> a
-    5:5:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):172 -> a
-    6:6:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):168:168 -> a
-    6:6:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):172 -> a
-    7:11:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):196:200 -> a
-    12:38:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):252:278 -> a
-    39:42:void print(com.android.tools.r8.utils.CfgPrinter):309:312 -> a
+    1:1:long numberOfTargetsIfPacked(int[]):62:62 -> a
+    2:2:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):67:67 -> a
+    3:3:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode,long):73:73 -> a
+    4:4:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode):153:153 -> a
+    4:4:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):167 -> a
+    5:5:long packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):158:158 -> a
+    5:5:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):167 -> a
+    6:6:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):163:163 -> a
+    6:6:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):167 -> a
+    7:11:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):191:195 -> a
+    12:38:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):247:273 -> a
+    39:42:void print(com.android.tools.r8.utils.CfgPrinter):304:307 -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> b
-    1:1:long estimatedSparseSize(com.android.tools.r8.utils.InternalOutputMode,long):96:96 -> b
-    2:2:int baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):113:113 -> b
-    2:2:long estimatedSparseSize(com.android.tools.r8.utils.InternalOutputMode,long):96 -> b
-    3:3:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142:142 -> b
-    3:3:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):83 -> b
-    4:4:int baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):113:113 -> b
-    4:4:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):83 -> b
-    5:6:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):85:86 -> b
-    7:7:int basePackedSize(com.android.tools.r8.utils.InternalOutputMode):102:102 -> b
-    7:7:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):87 -> b
-    8:8:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):92:92 -> b
-    9:9:int getKey(int):210:210 -> b
-    10:10:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):248:248 -> b
-    1:2:long packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):123:124 -> c
-    3:5:long packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):135:137 -> c
-    6:6:void setFallthroughBlockIndex(int):239:239 -> c
-    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():231:231 -> cc
-    1:1:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142:142 -> d
-    2:2:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):147:147 -> d
-    3:3:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):243:243 -> d
-    4:4:int[] targetBlockIndices():218:218 -> d
-    4:4:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):243 -> d
-    5:5:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):243:243 -> d
-    1:1:int getFallthroughBlockIndex():235:235 -> dc
-    1:1:int getFirstKey():176:176 -> ec
-    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():222:224 -> fc
-    1:1:int[] getKeys():214:214 -> gc
-    1:1:int numberOfKeys():206:206 -> hc
+    1:1:long estimatedSparseSize(com.android.tools.r8.utils.InternalOutputMode,long):91:91 -> b
+    2:2:int baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):108:108 -> b
+    2:2:long estimatedSparseSize(com.android.tools.r8.utils.InternalOutputMode,long):91 -> b
+    3:3:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):137:137 -> b
+    3:3:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):78 -> b
+    4:4:int baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):108:108 -> b
+    4:4:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):78 -> b
+    5:6:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):80:81 -> b
+    7:7:int basePackedSize(com.android.tools.r8.utils.InternalOutputMode):97:97 -> b
+    7:7:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):82 -> b
+    8:8:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):87:87 -> b
+    9:9:int getKey(int):205:205 -> b
+    10:10:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):243:243 -> b
+    1:2:long packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):118:119 -> c
+    3:5:long packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):130:132 -> c
+    6:6:void setFallthroughBlockIndex(int):234:234 -> c
+    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():226:226 -> cc
+    1:1:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):137:137 -> d
+    2:2:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):142:142 -> d
+    3:3:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):238:238 -> d
+    4:4:int[] targetBlockIndices():213:213 -> d
+    4:4:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):238 -> d
+    5:5:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):238:238 -> d
+    1:1:int getFallthroughBlockIndex():230:230 -> dc
+    1:1:int getFirstKey():171:171 -> ec
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():217:219 -> fc
+    1:1:int[] getKeys():209:209 -> gc
+    1:1:int numberOfKeys():201:201 -> hc
     com.android.tools.r8.ir.code.Switch asSwitch() -> ia
-    1:1:int[] targetBlockIndices():218:218 -> ic
-    1:1:com.android.tools.r8.ir.code.Value value():62:62 -> jc
-    1:11:java.lang.String toString():294:304 -> toString
+    1:1:int[] targetBlockIndices():213:213 -> ic
+    1:1:com.android.tools.r8.ir.code.Value value():57:57 -> jc
+    1:11:java.lang.String toString():289:299 -> toString
 com.android.tools.r8.ir.code.Throw -> a.a.a.a.g.b.bb:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
@@ -17193,15 +16988,15 @@
     boolean instructionTypeCanThrow() -> Ea
     boolean isThrow() -> Vb
     int maxInValueRegister() -> Zb
-    1:1:int maxOutValueRegister():44:44 -> _b
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):34:34 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):71:71 -> a
-    3:17:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):86:100 -> a
-    18:19:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.Value.getDefinition():233:234 -> a
-    18:19:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):101 -> a
-    20:21:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):102:103 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):55:55 -> b
-    1:1:com.android.tools.r8.ir.code.Value exception():29:29 -> dc
+    1:1:int maxOutValueRegister():39:39 -> _b
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):29:29 -> a
+    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):66:66 -> a
+    3:17:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):81:95 -> a
+    18:19:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.Value.getDefinition():231:232 -> a
+    18:19:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):96 -> a
+    20:21:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):97:98 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):50:50 -> b
+    1:1:com.android.tools.r8.ir.code.Value exception():24:24 -> dc
     com.android.tools.r8.ir.code.Throw asThrow() -> ja
 com.android.tools.r8.ir.code.Unop -> a.a.a.a.g.b.cb:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
@@ -17217,15 +17012,15 @@
     boolean isUshr() -> Xb
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):48:48 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):58:58 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):73:73 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):63:63 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):43:43 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):53:53 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):68:68 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):73:73 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):58:58 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):63:63 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):48:48 -> d
     boolean isCommutative() -> dc
-    1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):28:28 -> f
+    1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):23:23 -> f
     com.android.tools.r8.ir.code.Ushr asUshr() -> ka
 com.android.tools.r8.ir.code.Value -> a.a.a.a.g.b.gb:
     boolean knownToBeBoolean -> m
@@ -17246,142 +17041,140 @@
     java.util.LinkedList phiUsers -> e
     com.android.tools.r8.ir.code.Value$DebugData debugData -> o
     java.util.LinkedList users -> c
-    1:164:void <clinit>():35:198 -> <clinit>
-    1:1:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):218:218 -> <init>
-    2:21:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):202:221 -> <init>
-    1:1:boolean isConstant():770:770 -> A
-    1:1:boolean isDexItemBasedConstString():756:756 -> B
+    1:164:void <clinit>():33:196 -> <clinit>
+    1:1:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):216:216 -> <init>
+    2:21:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):200:219 -> <init>
+    1:1:boolean isConstant():751:751 -> A
+    1:1:boolean isDexItemBasedConstString():737:737 -> B
     boolean isFixedRegisterValue() -> C
-    1:1:boolean isLinked():369:369 -> D
-    1:3:boolean isNeverNull():785:787 -> E
+    1:1:boolean isLinked():367:367 -> D
+    1:3:boolean isNeverNull():766:768 -> E
     boolean isPhi() -> F
-    1:1:boolean isThis():835:835 -> G
-    1:1:boolean isUninitializedLocal():520:520 -> H
-    1:1:boolean isUsed():445:445 -> I
+    1:1:boolean isThis():816:816 -> G
+    1:1:boolean isUninitializedLocal():501:501 -> H
+    1:1:boolean isUsed():443:443 -> I
     boolean isValueOnStack() -> J
-    1:3:boolean isZero():932:934 -> K
-    1:8:boolean knownToBeBoolean():810:817 -> L
-    1:3:void markAsArgument():796:798 -> M
-    1:3:void markAsThis():824:826 -> N
-    1:1:void markNonDebugLocalRead():131:131 -> O
-    1:3:boolean needsRegister():660:662 -> P
-    1:1:int numberOfAllNonDebugUsers():433:433 -> Q
-    1:1:int numberOfAllUsers():441 -> Q
-    2:2:int numberOfAllUsers():441:441 -> Q
-    1:1:int numberOfDebugUsers():437:437 -> R
-    1:5:int numberOfPhiUsers():425:429 -> S
-    1:5:int numberOfUsers():417:421 -> T
-    1:1:com.android.tools.r8.ir.code.ValueType outType():739:739 -> U
-    1:1:int requiredRegisters():272:272 -> V
-    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():396:397 -> W
-    1:4:java.util.Set uniquePhiUsers():406:409 -> X
-    1:4:java.util.Set uniqueUsers():389:392 -> Y
+    1:3:boolean isZero():890:892 -> K
+    1:8:boolean knownToBeBoolean():791:798 -> L
+    1:3:void markAsArgument():777:779 -> M
+    1:3:void markAsThis():805:807 -> N
+    1:1:void markNonDebugLocalRead():129:129 -> O
+    1:3:boolean needsRegister():641:643 -> P
+    1:1:int numberOfAllNonDebugUsers():431:431 -> Q
+    1:1:int numberOfAllUsers():439 -> Q
+    2:2:int numberOfAllUsers():439:439 -> Q
+    1:1:int numberOfDebugUsers():435:435 -> R
+    1:5:int numberOfPhiUsers():423:427 -> S
+    1:5:int numberOfUsers():415:419 -> T
+    1:1:com.android.tools.r8.ir.code.ValueType outType():720:720 -> U
+    1:1:int requiredRegisters():270:270 -> V
+    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():394:395 -> W
+    1:4:java.util.Set uniquePhiUsers():404:407 -> X
+    1:4:java.util.Set uniqueUsers():387:390 -> Y
     boolean lambda$fullyRemovePhiUser$1(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi) -> 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):39:52 -> a
-    15:15:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):41:41 -> a
-    16:75:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):57:116 -> a
-    76:77:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):111:112 -> a
-    78:79:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):106:107 -> a
-    80:81:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):101:102 -> a
-    82:86:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):93:97 -> a
-    87:88:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):88:89 -> a
-    89:90:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):83:84 -> a
-    91:107:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):62:78 -> a
-    108:112:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):75:79 -> a
-    113:113:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):122:122 -> a
-    114:114:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueTypeConstraint):126:126 -> a
-    114:114:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):122 -> a
-    115:117:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):284:286 -> a
-    118:121:boolean hasSameOrNoLocal(com.android.tools.r8.ir.code.Value):295:298 -> a
-    122:123:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):338:339 -> a
-    124:125:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):343:344 -> a
-    124:125:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):339 -> a
-    126:134:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():166:174 -> a
-    126:134:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):344 -> a
-    126:134:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):339 -> a
-    135:135:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():172:172 -> a
-    135:135:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):344 -> a
-    135:135:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):339 -> a
-    136:136:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():169:169 -> a
-    136:136:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):344 -> a
-    136:136:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):339 -> a
-    137:137:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):339:339 -> a
-    138:145:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):449:456 -> a
-    146:147:void addPhiUser(com.android.tools.r8.ir.code.Phi):500:501 -> a
-    148:149:java.util.Set affectedValues():551:552 -> a
-    150:150:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    150:150:java.util.Set affectedValues():553 -> a
-    151:151:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    151:151:java.util.Set affectedValues():554 -> a
-    152:156:java.util.Set affectedValues():554:558 -> a
-    157:172:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):590:605 -> a
-    173:173:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
-    173:173:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):605 -> a
-    174:186:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):605:617 -> a
-    187:196:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):624:633 -> a
-    197:210:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):179:192 -> a
-    197:210:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):633 -> a
-    211:211:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):180:180 -> a
-    211:211:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):633 -> a
-    212:212:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):633:633 -> a
-    213:221:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):638:646 -> a
-    222:223:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):651:652 -> a
-    224:224:void setKnownToBeBoolean(boolean):806:806 -> a
-    225:225:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):871:871 -> a
-    226:226:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):877:877 -> a
-    227:243:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):897:913 -> a
-    244:244:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    244:244:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):916 -> a
-    245:251:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):918:924 -> a
-    252:252:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):954:954 -> 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):37:50 -> a
+    15:15:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):39:39 -> a
+    16:75:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):55:114 -> a
+    76:77:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):109:110 -> a
+    78:79:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):104:105 -> a
+    80:81:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):99:100 -> a
+    82:86:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):91:95 -> a
+    87:88:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):86:87 -> a
+    89:90:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):81:82 -> a
+    91:107:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):60:76 -> a
+    108:112:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):73:77 -> a
+    113:113:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):120:120 -> a
+    114:114:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueTypeConstraint):124:124 -> a
+    114:114:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):120 -> a
+    115:117:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):282:284 -> a
+    118:121:boolean hasSameOrNoLocal(com.android.tools.r8.ir.code.Value):293:296 -> a
+    122:123:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):336:337 -> a
+    124:125:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):341:342 -> a
+    124:125:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):337 -> a
+    126:134:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():164:172 -> a
+    126:134:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):342 -> a
+    126:134:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):337 -> a
+    135:135:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():170:170 -> a
+    135:135:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):342 -> a
+    135:135:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):337 -> a
+    136:136:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():167:167 -> a
+    136:136:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):342 -> a
+    136:136:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):337 -> a
+    137:137:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):337:337 -> a
+    138:139:void addPhiUser(com.android.tools.r8.ir.code.Phi):481:482 -> a
+    140:141:java.util.Set affectedValues():532:533 -> a
+    142:142:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    142:142:java.util.Set affectedValues():534 -> a
+    143:143:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    143:143:java.util.Set affectedValues():535 -> a
+    144:148:java.util.Set affectedValues():535:539 -> a
+    149:164:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):571:586 -> a
+    165:165:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
+    165:165:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):586 -> a
+    166:178:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):586:598 -> a
+    179:188:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):605:614 -> a
+    189:202:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):177:190 -> a
+    189:202:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):614 -> a
+    203:203:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):178:178 -> a
+    203:203:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):614 -> a
+    204:204:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):614:614 -> a
+    205:213:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):619:627 -> a
+    214:215:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):632:633 -> a
+    216:216:void setKnownToBeBoolean(boolean):787:787 -> a
+    217:217:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):852:852 -> a
+    218:231:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.Set):858:871 -> a
+    232:232:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    232:232:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.Set):874 -> a
+    233:239:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.Set):876:882 -> a
+    240:240:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):912:912 -> a
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> b
     boolean lambda$fullyRemoveUser$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> b
-    1:4:void linkTo(com.android.tools.r8.ir.code.Value):348:351 -> b
-    5:6:void removePhiUser(com.android.tools.r8.ir.code.Phi):505:506 -> b
-    7:8:void addDebugUser(com.android.tools.r8.ir.code.Instruction):515:516 -> b
-    9:10:void setNeedsRegister(boolean):666:667 -> b
-    11:11:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):944:944 -> b
+    1:4:void linkTo(com.android.tools.r8.ir.code.Value):346:349 -> b
+    5:6:void removePhiUser(com.android.tools.r8.ir.code.Phi):486:487 -> b
+    7:8:void addDebugUser(com.android.tools.r8.ir.code.Instruction):496:497 -> b
+    9:10:void setNeedsRegister(boolean):647:648 -> b
+    11:11:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):902:902 -> b
     com.android.tools.r8.ir.code.Phi asPhi() -> c
-    1:2:void addUser(com.android.tools.r8.ir.code.Instruction):475:476 -> c
-    3:4:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):510:511 -> c
-    5:17:void replaceUsers(com.android.tools.r8.ir.code.Value):565:577 -> c
+    1:2:void addUser(com.android.tools.r8.ir.code.Instruction):456:457 -> c
+    3:4:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):491:492 -> c
+    5:17:void replaceUsers(com.android.tools.r8.ir.code.Value):546:558 -> c
     boolean lambda$replaceSelectiveUsers$2(com.android.tools.r8.ir.code.Value) -> d
-    1:6:void clearUsers():490:495 -> d
-    7:11:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):528:532 -> d
-    1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):480:481 -> e
-    3:8:void clearUsersInfo():540:545 -> e
-    1:2:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):485:486 -> f
-    3:4:void computeNeedsRegister():671:672 -> f
-    1:1:java.util.Set debugUsers():413:413 -> g
-    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():401:402 -> h
-    1:1:int hashCode():705:705 -> hashCode
-    1:17:com.android.tools.r8.ir.code.Value getAliasedValue():247:263 -> i
-    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():743:744 -> j
-    1:7:java.util.List getDebugLocalEnds():315:321 -> k
-    1:7:java.util.List getDebugLocalStarts():302:308 -> l
-    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():656:656 -> m
-    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():276:276 -> n
-    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():381:381 -> o
-    1:1:int getNumber():268:268 -> p
-    1:1:com.android.tools.r8.ir.code.Value getPreviousConsecutive():385:385 -> q
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():958:958 -> r
-    1:11:com.android.tools.r8.utils.LongInterval getValueRange():855:865 -> s
-    1:1:boolean hasLocalInfo():280:280 -> t
-    1:8:java.lang.String toString():710:717 -> toString
-    9:9:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> toString
-    9:9:java.lang.String toString():718 -> toString
-    10:27:java.lang.String toString():718:735 -> toString
-    1:1:boolean hasUsersInfo():536:536 -> u
-    1:1:boolean hasValueRange():843:843 -> v
-    1:8:boolean internalComputeNeedsRegister():676:683 -> w
-    1:1:boolean isArgument():802:802 -> x
-    1:1:boolean isConstNumber():748:748 -> y
-    1:1:boolean isConstString():752:752 -> z
+    1:6:void clearUsers():471:476 -> d
+    7:11:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):509:513 -> d
+    1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):461:462 -> e
+    3:8:void clearUsersInfo():521:526 -> e
+    1:2:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):466:467 -> f
+    3:4:void computeNeedsRegister():652:653 -> f
+    1:1:java.util.Set debugUsers():411:411 -> g
+    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():399:400 -> h
+    1:1:int hashCode():686:686 -> hashCode
+    1:17:com.android.tools.r8.ir.code.Value getAliasedValue():245:261 -> i
+    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():724:725 -> j
+    1:7:java.util.List getDebugLocalEnds():313:319 -> k
+    1:7:java.util.List getDebugLocalStarts():300:306 -> l
+    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():637:637 -> m
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():274:274 -> n
+    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():379:379 -> o
+    1:1:int getNumber():266:266 -> p
+    1:1:com.android.tools.r8.ir.code.Value getPreviousConsecutive():383:383 -> q
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():916:916 -> r
+    1:11:com.android.tools.r8.utils.LongInterval getValueRange():836:846 -> s
+    1:1:boolean hasLocalInfo():278:278 -> t
+    1:8:java.lang.String toString():691:698 -> toString
+    9:9:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> toString
+    9:9:java.lang.String toString():699 -> toString
+    10:27:java.lang.String toString():699:716 -> toString
+    1:1:boolean hasUsersInfo():517:517 -> u
+    1:1:boolean hasValueRange():824:824 -> v
+    1:8:boolean internalComputeNeedsRegister():657:664 -> w
+    1:1:boolean isArgument():783:783 -> x
+    1:1:boolean isConstNumber():729:729 -> y
+    1:1:boolean isConstString():733:733 -> z
 com.android.tools.r8.ir.code.Value$DebugData -> a.a.a.a.g.b.eb:
     java.util.Map users -> b
     com.android.tools.r8.graph.DebugLocalInfo local -> a
-    1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):141:141 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):139:142 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):139:139 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):137:140 -> <init>
 com.android.tools.r8.ir.code.Value$DebugUse -> a.a.a.a.g.b.fb:
     com.android.tools.r8.ir.code.Value$DebugUse START -> b
     com.android.tools.r8.ir.code.Value$DebugUse[] $VALUES -> e
@@ -17389,9 +17182,9 @@
     com.android.tools.r8.ir.code.Value$DebugUse LIVE_FINAL -> d
     com.android.tools.r8.ir.code.Value$DebugUse END -> c
     boolean $assertionsDisabled -> f
-    1:2:void <clinit>():149:150 -> <clinit>
-    3:3:void <clinit>():149:149 -> <clinit>
-    1:1:void <init>(java.lang.String,int):149:149 -> <init>
+    1:2:void <clinit>():147:148 -> <clinit>
+    3:3:void <clinit>():147:147 -> <clinit>
+    1:1:void <init>(java.lang.String,int):147:147 -> <init>
 com.android.tools.r8.ir.code.ValueNumberGenerator -> a.a.a.a.g.b.hb:
     int nextValueNumber -> a
     1:2:void <init>():6:7 -> <init>
@@ -17480,13 +17273,13 @@
     boolean isXor() -> Yb
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):42:42 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):52:52 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):67:67 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):72:72 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):57:57 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):62:62 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):47:47 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):37:37 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):47:47 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):62:62 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67:67 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):52:52 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):57:57 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):42:42 -> d
     boolean isCommutative() -> dc
     com.android.tools.r8.ir.code.Xor asXor() -> la
 com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver -> a.a.a.a.g.c.c:
@@ -17540,11 +17333,8 @@
     1:1:void <clinit>():53:53 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.InternalOutputMode):211:211 -> <init>
     2:173:void <init>(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.InternalOutputMode):56:227 -> <init>
-    void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder) -> a
-    int getMoveExceptionRegister(int) -> a
     void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder) -> a
     void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder) -> a
-    void setUp() -> a
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> a
     1:5:boolean canThrowHelper(com.android.tools.r8.cf.code.CfInstruction):260:264 -> a
     6:9:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):269:272 -> a
@@ -17557,64 +17347,67 @@
     40:40:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):304 -> a
     41:43:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):305:307 -> a
     44:47:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):306:309 -> a
-    48:75:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):397:424 -> a
-    76:97:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):433:454 -> a
-    98:98:int instructionCount():232:232 -> a
-    98:98:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):456 -> a
-    99:101:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):457:459 -> a
-    102:105:void endLocals(com.android.tools.r8.ir.conversion.IRBuilder):605:608 -> a
-    102:105:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):478 -> a
-    106:118:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):461:473 -> a
-    119:119:void build(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.conversion.IRBuilder):497:497 -> a
-    119:119:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):481 -> a
-    120:126:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):483:489 -> a
-    127:130:void startLocals(com.android.tools.r8.ir.conversion.IRBuilder):614:617 -> a
-    127:130:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):492 -> a
-    131:132:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):501:502 -> a
-    133:137:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):108:112 -> a
-    133:137:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):502 -> a
-    138:153:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):116:131 -> a
-    138:153:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):112 -> a
-    138:153:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):502 -> a
-    154:154:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):504:504 -> a
-    155:155:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):117:117 -> a
-    155:155:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):112 -> a
-    155:155:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):502 -> a
-    156:157:int getLabelOffset(com.android.tools.r8.cf.code.CfLabel):513:514 -> a
-    158:168:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):518:528 -> a
-    169:169:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):527:527 -> a
-    170:193:com.android.tools.r8.graph.DexType convertUninitialized(com.android.tools.r8.cf.code.CfFrame$FrameType):532:555 -> a
-    194:194:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int):569:569 -> a
-    195:200:com.android.tools.r8.ir.code.Position getCanonicalPosition(com.android.tools.r8.ir.code.Position):679:684 -> a
-    201:201:com.android.tools.r8.ir.code.Position getCanonicalPosition(com.android.tools.r8.ir.code.Position):679:679 -> a
-    int instructionOffset(int) -> b
+    48:51:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):350:353 -> a
+    52:52:boolean isStatic():382:382 -> a
+    52:52:void buildArgumentInstructions(com.android.tools.r8.ir.conversion.IRBuilder):362 -> a
+    52:52:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):354 -> a
+    53:68:void buildArgumentInstructions(com.android.tools.r8.ir.conversion.IRBuilder):363:378 -> a
+    53:68:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):354 -> a
+    69:71:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):355:357 -> a
+    72:99:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):397:424 -> a
+    100:121:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):433:454 -> a
+    122:122:int instructionCount():232:232 -> a
+    122:122:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):456 -> a
+    123:125:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):457:459 -> a
+    126:129:void endLocals(com.android.tools.r8.ir.conversion.IRBuilder):605:608 -> a
+    126:129:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):478 -> a
+    130:142:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):461:473 -> a
+    143:143:void build(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.conversion.IRBuilder):497:497 -> a
+    143:143:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):481 -> a
+    144:150:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):483:489 -> a
+    151:154:void startLocals(com.android.tools.r8.ir.conversion.IRBuilder):614:617 -> a
+    151:154:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):492 -> a
+    155:156:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):501:502 -> a
+    157:161:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):108:112 -> a
+    157:161:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):502 -> a
+    162:177:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):116:131 -> a
+    162:177:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):112 -> a
+    162:177:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):502 -> a
+    178:178:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):504:504 -> a
+    179:179:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):117:117 -> a
+    179:179:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):112 -> a
+    179:179:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):502 -> a
+    180:181:int getLabelOffset(com.android.tools.r8.cf.code.CfLabel):513:514 -> a
+    182:192:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):518:528 -> a
+    193:193:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):527:527 -> a
+    194:217:com.android.tools.r8.graph.DexType convertUninitialized(com.android.tools.r8.cf.code.CfFrame$FrameType):532:555 -> a
+    218:218:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int):569:569 -> a
+    219:219:boolean verifyCurrentInstructionCanThrow():647:647 -> a
+    220:233:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):657:670 -> a
+    234:239:com.android.tools.r8.ir.code.Position getCanonicalPosition(com.android.tools.r8.ir.code.Position):679:684 -> a
+    240:240:com.android.tools.r8.ir.code.Position getCanonicalPosition(com.android.tools.r8.ir.code.Position):679:679 -> a
+    void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder) -> b
+    int getMoveExceptionRegister(int) -> b
+    void setUp() -> b
     1:2:boolean isControlFlow(com.android.tools.r8.cf.code.CfInstruction):623:624 -> b
-    3:5:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):631:633 -> b
-    6:11:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):632:637 -> b
-    12:12:boolean verifyCurrentInstructionCanThrow():647:647 -> b
-    1:4:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):350:353 -> c
-    5:5:boolean isStatic():382:382 -> c
-    5:5:void buildArgumentInstructions(com.android.tools.r8.ir.conversion.IRBuilder):362 -> c
-    5:5:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):354 -> c
-    6:21:void buildArgumentInstructions(com.android.tools.r8.ir.conversion.IRBuilder):363:378 -> c
-    6:21:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):354 -> c
-    22:24:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):355:357 -> c
-    25:25:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):579:579 -> c
-    26:26:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):574:574 -> c
-    26:26:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):580 -> c
-    27:29:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):582:584 -> c
-    30:30:com.android.tools.r8.ir.code.Position getCurrentPosition():675:675 -> c
-    1:1:int instructionCount():232:232 -> d
-    2:2:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):574:574 -> d
+    int instructionOffset(int) -> c
+    1:1:int instructionCount():232:232 -> c
+    2:4:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):631:633 -> c
+    5:10:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):632:637 -> c
+    int instructionIndex(int) -> d
+    1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():675:675 -> d
+    boolean verifyRegister(int) -> e
     1:1:int getCurrentInstructionIndex():509:509 -> e
-    2:15:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):657:670 -> e
-    boolean verifyRegister(int) -> f
-    1:1:boolean localsChanged():601:601 -> f
-    int instructionIndex(int) -> g
-    1:9:void setLocalVariableLists():588:596 -> g
-    10:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps.emptyMap():198:198 -> g
-    10:10:void setLocalVariableLists():597 -> g
-    11:11:void setLocalVariableLists():597:597 -> g
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):579:579 -> f
+    2:2:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):574:574 -> f
+    2:2:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):580 -> f
+    3:5:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):582:584 -> f
+    6:6:boolean localsChanged():601:601 -> f
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):574:574 -> g
+    2:10:void setLocalVariableLists():588:596 -> g
+    11:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps.emptyMap():198:198 -> g
+    11:11:void setLocalVariableLists():597 -> g
+    12:12:void setLocalVariableLists():597:597 -> g
     1:1:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList getLocalVariables(int):313:313 -> h
     2:2:boolean com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList.validFor(int):163:163 -> h
     2:2:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList getLocalVariables(int):313 -> h
@@ -17805,345 +17598,337 @@
     java.util.List switchPayloadInfos -> d
     com.android.tools.r8.ir.regalloc.RegisterAllocator registerAllocator -> b
     java.util.Set ifsNeedingRewrite -> f
-    1:1:void <clinit>():82:82 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):124:125 -> <init>
-    3:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions):128:128 -> <init>
-    4:43:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions):94:133 -> <init>
-    1:1:com.android.tools.r8.ir.conversion.DexBuilder$Info access$000(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):82:82 -> a
-    2:2:boolean access$202(com.android.tools.r8.ir.conversion.DexBuilder,boolean):82:82 -> a
-    3:6:boolean identicalInstructionsAfterBuildingDexCode(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):141:144 -> a
-    7:9:com.android.tools.r8.ir.conversion.DexBuilder$Info buildInfoForComparison(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):149:151 -> a
-    10:38:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):339:367 -> a
-    39:41:boolean isTrivialFallthroughTarget(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):329:331 -> a
-    39:41:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):368 -> a
-    42:104:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):370:432 -> a
-    105:106:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):589:590 -> a
-    105:106:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):433 -> a
-    107:109:boolean isNonMaterializingConstNumber(com.android.tools.r8.ir.code.Instruction):597:599 -> a
-    107:109:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):591 -> a
-    107:109:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):433 -> a
-    110:110:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):592:592 -> a
-    110:110:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):433 -> a
-    111:155:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):435:479 -> a
+    1:1:void <clinit>():83:83 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):125:127 -> <init>
+    4:4:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions):130:130 -> <init>
+    5:45:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions):95:135 -> <init>
+    1:1:com.android.tools.r8.ir.conversion.DexBuilder$Info access$000(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):83:83 -> a
+    2:2:boolean access$202(com.android.tools.r8.ir.conversion.DexBuilder,boolean):83:83 -> a
+    3:6:boolean identicalInstructionsAfterBuildingDexCode(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):143:146 -> a
+    7:9:com.android.tools.r8.ir.conversion.DexBuilder$Info buildInfoForComparison(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):151:153 -> a
+    10:38:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):315:343 -> a
+    39:41:boolean isTrivialFallthroughTarget(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):305:307 -> a
+    39:41:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):344 -> a
+    42:104:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):346:408 -> a
+    105:106:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):565:566 -> a
+    105:106:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):409 -> a
+    107:109:boolean isNonMaterializingConstNumber(com.android.tools.r8.ir.code.Instruction):573:575 -> a
+    107:109:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):567 -> a
+    107:109:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):409 -> a
+    110:110:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):568:568 -> a
+    110:110:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):409 -> a
+    111:155:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):411:455 -> a
     156:156:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):401:401 -> a
-    156:156:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):480 -> a
-    157:170:void rewriteIfs():496:509 -> a
-    157:170:com.android.tools.r8.graph.DexCode build():183 -> a
-    171:179:void reset():159:167 -> a
-    171:179:com.android.tools.r8.graph.DexCode build():186 -> a
-    180:218:com.android.tools.r8.graph.DexCode build():190:228 -> a
+    156:156:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):456 -> a
+    157:170:void rewriteIfs():472:485 -> a
+    157:170:com.android.tools.r8.graph.DexCode build():185 -> a
+    171:179:void reset():161:169 -> a
+    171:179:com.android.tools.r8.graph.DexCode build():188 -> a
+    180:218:com.android.tools.r8.graph.DexCode build():192:230 -> a
     219:219:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    219:219:com.android.tools.r8.graph.DexCode build():229 -> a
-    220:231:com.android.tools.r8.graph.DexCode build():230:241 -> a
-    232:232:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():926:926 -> a
-    232:232:com.android.tools.r8.graph.DexCode build():241 -> a
-    233:251:com.android.tools.r8.graph.DexCode build():242:260 -> a
-    252:252:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    252:252:com.android.tools.r8.graph.DexCode build():261 -> a
-    253:254:com.android.tools.r8.graph.DexCode build():264:265 -> a
-    255:255:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    255:255:com.android.tools.r8.graph.DexCode build():266 -> a
-    256:256:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    256:256:com.android.tools.r8.graph.DexCode build():268 -> a
-    257:257:com.android.tools.r8.graph.DexCode build():269:269 -> a
-    258:258:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    258:258:com.android.tools.r8.graph.DexCode build():270 -> a
-    259:269:com.android.tools.r8.graph.DexCode build():273:283 -> a
-    270:270:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    270:270:com.android.tools.r8.graph.DexCode build():284 -> a
-    271:271:com.android.tools.r8.graph.DexCode build():285:285 -> a
-    272:283:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):717:728 -> a
-    272:283:com.android.tools.r8.graph.DexCode build():288 -> a
-    284:284:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):672:672 -> a
-    284:284:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):728 -> a
-    284:284:com.android.tools.r8.graph.DexCode build():288 -> a
-    285:291:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):728:734 -> a
-    285:291:com.android.tools.r8.graph.DexCode build():288 -> a
-    292:292:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):672:672 -> a
-    292:292:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):734 -> a
-    292:292:com.android.tools.r8.graph.DexCode build():288 -> a
-    293:295:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):734:736 -> a
-    293:295:com.android.tools.r8.graph.DexCode build():288 -> a
-    296:296:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    296:296:com.android.tools.r8.graph.DexCode build():289 -> a
-    297:305:com.android.tools.r8.graph.DexCode build():290:298 -> a
-    306:306:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    306:306:com.android.tools.r8.graph.DexCode build():299 -> a
-    307:310:com.android.tools.r8.graph.DexCode build():300:303 -> a
-    311:311:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    311:311:com.android.tools.r8.graph.DexCode build():304 -> a
-    312:312:com.android.tools.r8.graph.DexCode build():305:305 -> a
-    313:313:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    313:313:com.android.tools.r8.graph.DexCode build():305 -> a
-    314:314:com.android.tools.r8.graph.DexCode build():305:305 -> a
-    315:315:int com.android.tools.r8.code.FillArrayDataPayload.getSize():75:75 -> a
-    315:315:com.android.tools.r8.graph.DexCode build():306 -> a
-    316:316:com.android.tools.r8.graph.DexCode build():307:307 -> a
-    317:319:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():743:745 -> a
-    317:319:com.android.tools.r8.graph.DexCode build():311 -> a
-    320:325:com.android.tools.r8.graph.DexCode$Try[] getDexTryItems(java.util.List,java.util.Map):846:851 -> a
-    320:325:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():747 -> a
-    320:325:com.android.tools.r8.graph.DexCode build():311 -> a
-    326:326:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():748:748 -> a
-    326:326:com.android.tools.r8.graph.DexCode build():311 -> a
-    327:344:com.android.tools.r8.graph.DexCode$TryHandler[] getDexTryHandlers(java.util.Map):857:874 -> a
-    327:344:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():748 -> a
-    327:344:com.android.tools.r8.graph.DexCode build():311 -> a
-    345:353:com.android.tools.r8.graph.DexCode build():314:322 -> a
-    354:354:int allocatedRegister(com.android.tools.r8.ir.code.Value,int):525:525 -> a
-    355:358:void addGoto(com.android.tools.r8.ir.code.Goto):535:538 -> a
-    359:373:boolean needsNopBetweenMoveAndInstanceOf(com.android.tools.r8.code.InstanceOf):543:557 -> a
-    359:373:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.code.InstanceOf):567 -> a
-    374:376:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.code.InstanceOf):568:570 -> a
-    377:378:void addIf(com.android.tools.r8.ir.code.If):575:576 -> a
-    379:379:void addMove(com.android.tools.r8.ir.code.Move):580:580 -> a
-    380:380:void addNop(com.android.tools.r8.ir.code.Instruction):603:603 -> a
-    381:384:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):613:616 -> a
-    385:388:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):614:617 -> a
-    389:390:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction[]):621:622 -> a
-    391:393:void addSwitch(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.code.Format31t):626:628 -> a
-    394:395:void addFillArrayData(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.code.FillArrayData):632:633 -> a
-    396:397:void addArgument(com.android.tools.r8.ir.code.Argument):637:638 -> a
-    398:402:void addReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.code.Instruction):642:646 -> a
-    403:403:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):651:651 -> a
-    404:405:void setSingleInfo(com.android.tools.r8.ir.conversion.DexBuilder$Info):683:684 -> a
-    404:405:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):653 -> a
-    406:408:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):656:658 -> a
-    409:409:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):672:672 -> a
-    409:409:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):658 -> a
-    410:414:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):658:662 -> a
-    415:418:void setInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):676:679 -> a
-    415:418:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):663 -> a
-    419:419:int instructionNumberToIndex(int):667:667 -> a
-    420:420:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):672:672 -> a
-    420:420:com.android.tools.r8.ir.conversion.DexBuilder$Info access$100(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.Instruction):82 -> a
-    421:432:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):688:699 -> a
-    433:433:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):672:672 -> a
-    433:433:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):699 -> a
-    434:434:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):699:699 -> a
-    435:440:com.android.tools.r8.ir.code.BasicBlock computeNextBlock(com.android.tools.r8.ir.code.BasicBlock):707:712 -> a
-    435:440:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):700 -> a
-    441:444:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):700:703 -> a
-    445:501:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):754:810 -> a
-    502:502:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):672:672 -> a
-    502:502:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):811 -> a
-    503:520:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):811:828 -> a
-    1:1:void needsIfRewriting(com.android.tools.r8.ir.code.BasicBlock):515:515 -> b
-    1:1:void access$300(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):82 -> b
-    2:3:void requestOutgoingRegisters(int):519:520 -> b
-    4:4:int argumentOrAllocateRegister(com.android.tools.r8.ir.code.Value,int):531:531 -> b
-    5:5:void addNothing(com.android.tools.r8.ir.code.Instruction):584:584 -> b
-    6:8:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):834:836 -> b
-    9:9:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):672:672 -> b
-    9:9:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):837 -> b
-    10:13:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):838:841 -> b
-    14:14:com.android.tools.r8.utils.InternalOptions getOptions():880:880 -> b
-    1:1:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):672:672 -> c
-    2:2:com.android.tools.r8.ir.regalloc.RegisterAllocator getRegisterAllocator():884:884 -> c
-    1:1:boolean isBuildingForComparison():155:155 -> d
+    219:219:com.android.tools.r8.graph.DexCode build():231 -> a
+    220:230:com.android.tools.r8.graph.DexCode build():232:242 -> a
+    231:231:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():896:896 -> a
+    231:231:com.android.tools.r8.graph.DexCode build():242 -> a
+    232:238:com.android.tools.r8.graph.DexCode build():243:249 -> a
+    239:239:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
+    239:239:com.android.tools.r8.graph.DexCode build():250 -> a
+    240:247:com.android.tools.r8.graph.DexCode build():252:259 -> a
+    248:248:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
+    248:248:com.android.tools.r8.graph.DexCode build():260 -> a
+    249:249:com.android.tools.r8.graph.DexCode build():261:261 -> a
+    250:261:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):693:704 -> a
+    250:261:com.android.tools.r8.graph.DexCode build():264 -> a
+    262:262:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):648:648 -> a
+    262:262:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):704 -> a
+    262:262:com.android.tools.r8.graph.DexCode build():264 -> a
+    263:269:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):704:710 -> a
+    263:269:com.android.tools.r8.graph.DexCode build():264 -> a
+    270:270:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):648:648 -> a
+    270:270:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):710 -> a
+    270:270:com.android.tools.r8.graph.DexCode build():264 -> a
+    271:273:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):710:712 -> a
+    271:273:com.android.tools.r8.graph.DexCode build():264 -> a
+    274:274:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
+    274:274:com.android.tools.r8.graph.DexCode build():265 -> a
+    275:283:com.android.tools.r8.graph.DexCode build():266:274 -> a
+    284:284:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
+    284:284:com.android.tools.r8.graph.DexCode build():275 -> a
+    285:288:com.android.tools.r8.graph.DexCode build():276:279 -> a
+    289:289:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
+    289:289:com.android.tools.r8.graph.DexCode build():280 -> a
+    290:290:com.android.tools.r8.graph.DexCode build():281:281 -> a
+    291:291:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    291:291:com.android.tools.r8.graph.DexCode build():281 -> a
+    292:292:com.android.tools.r8.graph.DexCode build():281:281 -> a
+    293:293:int com.android.tools.r8.code.FillArrayDataPayload.getSize():75:75 -> a
+    293:293:com.android.tools.r8.graph.DexCode build():282 -> a
+    294:294:com.android.tools.r8.graph.DexCode build():283:283 -> a
+    295:297:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():719:721 -> a
+    295:297:com.android.tools.r8.graph.DexCode build():287 -> a
+    298:303:com.android.tools.r8.graph.DexCode$Try[] getDexTryItems(java.util.List,java.util.Map):822:827 -> a
+    298:303:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():723 -> a
+    298:303:com.android.tools.r8.graph.DexCode build():287 -> a
+    304:304:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():724:724 -> a
+    304:304:com.android.tools.r8.graph.DexCode build():287 -> a
+    305:322:com.android.tools.r8.graph.DexCode$TryHandler[] getDexTryHandlers(java.util.Map):833:850 -> a
+    305:322:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():724 -> a
+    305:322:com.android.tools.r8.graph.DexCode build():287 -> a
+    323:331:com.android.tools.r8.graph.DexCode build():290:298 -> a
+    332:332:int allocatedRegister(com.android.tools.r8.ir.code.Value,int):501:501 -> a
+    333:336:void addGoto(com.android.tools.r8.ir.code.Goto):511:514 -> a
+    337:351:boolean needsNopBetweenMoveAndInstanceOf(com.android.tools.r8.code.InstanceOf):519:533 -> a
+    337:351:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.code.InstanceOf):543 -> a
+    352:354:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.code.InstanceOf):544:546 -> a
+    355:356:void addIf(com.android.tools.r8.ir.code.If):551:552 -> a
+    357:357:void addMove(com.android.tools.r8.ir.code.Move):556:556 -> a
+    358:358:void addNop(com.android.tools.r8.ir.code.Instruction):579:579 -> a
+    359:362:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):589:592 -> a
+    363:366:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):590:593 -> a
+    367:368:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction[]):597:598 -> a
+    369:371:void addSwitch(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.code.Format31t):602:604 -> a
+    372:373:void addFillArrayData(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.code.FillArrayData):608:609 -> a
+    374:375:void addArgument(com.android.tools.r8.ir.code.Argument):613:614 -> a
+    376:380:void addReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.code.Instruction):618:622 -> a
+    381:381:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):627:627 -> a
+    382:383:void setSingleInfo(com.android.tools.r8.ir.conversion.DexBuilder$Info):659:660 -> a
+    382:383:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):629 -> a
+    384:386:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):632:634 -> a
+    387:387:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):648:648 -> a
+    387:387:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):634 -> a
+    388:392:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):634:638 -> a
+    393:396:void setInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):652:655 -> a
+    393:396:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):639 -> a
+    397:397:int instructionNumberToIndex(int):643:643 -> a
+    398:398:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):648:648 -> a
+    398:398:com.android.tools.r8.ir.conversion.DexBuilder$Info access$100(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.Instruction):83 -> a
+    399:410:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):664:675 -> a
+    411:411:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):648:648 -> a
+    411:411:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):675 -> a
+    412:412:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):675:675 -> a
+    413:418:com.android.tools.r8.ir.code.BasicBlock computeNextBlock(com.android.tools.r8.ir.code.BasicBlock):683:688 -> a
+    413:418:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):676 -> a
+    419:422:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):676:679 -> a
+    423:479:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):730:786 -> a
+    480:480:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):648:648 -> a
+    480:480:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):787 -> a
+    481:498:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):787:804 -> a
+    1:1:void needsIfRewriting(com.android.tools.r8.ir.code.BasicBlock):491:491 -> b
+    1:1:void access$300(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):83 -> b
+    2:3:void requestOutgoingRegisters(int):495:496 -> b
+    4:4:int argumentOrAllocateRegister(com.android.tools.r8.ir.code.Value,int):507:507 -> b
+    5:5:void addNothing(com.android.tools.r8.ir.code.Instruction):560:560 -> b
+    6:8:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):810:812 -> b
+    9:9:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):648:648 -> b
+    9:9:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):813 -> b
+    10:13:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):814:817 -> b
+    14:14:com.android.tools.r8.utils.InternalOptions getOptions():856:856 -> b
+    1:1:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):648:648 -> c
+    2:2:com.android.tools.r8.ir.regalloc.RegisterAllocator getRegisterAllocator():860:860 -> c
+    1:1:boolean isBuildingForComparison():157:157 -> d
 com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> a.a.a.a.g.c.u:
-    1:1:void <init>(com.android.tools.r8.ir.code.Instruction):1053:1053 -> <init>
+    1:1:void <init>(com.android.tools.r8.ir.code.Instruction):1029:1029 -> <init>
     void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List) -> a
     int computeSize(com.android.tools.r8.ir.conversion.DexBuilder) -> a
-    1:1:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1082:1082 -> a
+    1:1:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1058:1058 -> a
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
 com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> a.a.a.a.g.c.v:
     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):1528:1530 -> <init>
+    1:3:void <init>(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.code.FillArrayData):1504:1506 -> <init>
 com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> a.a.a.a.g.c.w:
     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):960:961 -> <init>
-    1:1:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):981:981 -> a
+    1:2:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):936:937 -> <init>
+    1:1:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):957:957 -> a
     2:2:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    2:2:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):981 -> a
-    3:3:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):982:982 -> a
-    4:4:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):987:987 -> a
-    5:6:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):992:993 -> a
-    1:1:int getSize():966:966 -> d
-    1:1:int maxSize():976:976 -> e
-    1:1:int minSize():971:971 -> f
+    2:2:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):957 -> a
+    3:3:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):958:958 -> a
+    4:4:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):963:963 -> a
+    5:6:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):968:969 -> a
+    1:1:int getSize():942:942 -> d
+    1:1:int maxSize():952:952 -> e
+    1:1:int minSize():947:947 -> f
 com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> a.a.a.a.g.c.x:
     boolean $assertionsDisabled -> f
     int size -> e
-    1:1:void <clinit>():1086:1086 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Goto):1091:1091 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Goto):1088:1088 -> <init>
-    1:1:com.android.tools.r8.ir.code.Goto getJump():1095:1095 -> a
-    1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1159 -> a
-    2:13:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1160:1171 -> a
+    1:1:void <clinit>():1062:1062 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Goto):1067:1067 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Goto):1064:1064 -> <init>
+    1:1:com.android.tools.r8.ir.code.Goto getJump():1071:1071 -> a
+    1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1135 -> a
+    2:13:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1136:1147 -> a
     14:14:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    14:14:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1171 -> a
-    15:24:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1172:1181 -> a
+    14:14:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1147 -> a
+    15:24:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1148:1157 -> a
     25:25:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    25:25:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1181 -> a
-    26:48:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1182:1204 -> a
-    49:53:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1193:1197 -> a
-    54:72:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1188:1206 -> a
+    25:25:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1157 -> a
+    26:48:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1158:1180 -> a
+    49:53:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1169:1173 -> a
+    54:72:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1164:1182 -> a
     73:73:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    73:73:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1206 -> a
-    74:74:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1207:1207 -> a
-    75:75:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1118:1118 -> a
-    76:76:com.android.tools.r8.ir.code.Goto getJump():1095:1095 -> a
-    76:76:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1119 -> a
-    77:111:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1120:1154 -> a
-    112:112:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1213:1213 -> a
-    1:2:int getSize():1100:1101 -> d
-    1:1:int maxSize():1112:1112 -> e
-    1:1:int minSize():1106:1106 -> f
+    73:73:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1182 -> a
+    74:74:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1183:1183 -> a
+    75:75:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1094:1094 -> a
+    76:76:com.android.tools.r8.ir.code.Goto getJump():1071:1071 -> a
+    76:76:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1095 -> a
+    77:111:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1096:1130 -> a
+    112:112:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1189:1189 -> a
+    1:2:int getSize():1076:1077 -> d
+    1:1:int maxSize():1088:1088 -> e
+    1:1:int minSize():1082:1082 -> f
 com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> a.a.a.a.g.c.y:
     boolean $assertionsDisabled -> f
     int size -> e
-    1:1:void <clinit>():1217:1217 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.If):1222:1222 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.If):1219:1219 -> <init>
-    1:1:com.android.tools.r8.ir.code.Instruction getIR():1217:1217 -> a
-    2:2:void setMaxOffset(int):1217:1217 -> a
-    3:4:int getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1226:1227 -> a
-    5:5:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1248:1248 -> a
-    5:5:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331 -> a
-    6:6:int getMaxOffset():1217:1217 -> a
-    6:6:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1249 -> a
-    6:6:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331 -> a
-    7:7:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1250:1250 -> a
-    7:7:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331 -> a
-    8:8:int getOffset():1217:1217 -> a
-    8:8:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1252 -> a
-    8:8:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331 -> a
-    9:9:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1252:1252 -> a
-    9:9:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331 -> a
-    10:10:int getOffset():1217:1217 -> a
-    10:10:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1257 -> a
-    10:10:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331 -> a
-    11:11:int getOffset():1217:1217 -> a
-    11:11:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1258 -> a
-    11:11:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331 -> a
-    12:15:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1332:1335 -> a
-    16:52:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1263:1299 -> a
-    53:53:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1296:1296 -> a
-    54:54:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1293:1293 -> a
-    55:55:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1290:1290 -> a
-    56:56:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1287:1287 -> a
-    57:94:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1284:1321 -> a
-    95:95:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1318:1318 -> a
-    96:96:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1315:1315 -> a
-    97:97:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1312:1312 -> a
-    98:98:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1309:1309 -> a
-    99:99:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1306:1306 -> a
-    100:100:int getOffset():1217:1217 -> a
-    100:100:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1325 -> a
+    1:1:void <clinit>():1193:1193 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.If):1198:1198 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.If):1195:1195 -> <init>
+    1:1:com.android.tools.r8.ir.code.Instruction getIR():1193:1193 -> a
+    2:2:void setMaxOffset(int):1193:1193 -> a
+    3:4:int getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1202:1203 -> a
+    5:5:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1224:1224 -> a
+    5:5:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    6:6:int getMaxOffset():1193:1193 -> a
+    6:6:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1225 -> a
+    6:6:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    7:7:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1226:1226 -> a
+    7:7:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    8:8:int getOffset():1193:1193 -> a
+    8:8:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1228 -> a
+    8:8:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    9:9:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1228:1228 -> a
+    9:9:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    10:10:int getOffset():1193:1193 -> a
+    10:10:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1233 -> a
+    10:10:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    11:11:int getOffset():1193:1193 -> a
+    11:11:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1234 -> a
+    11:11:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    12:15:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1308:1311 -> a
+    16:52:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1239:1275 -> a
+    53:53:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1272:1272 -> a
+    54:54:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1269:1269 -> a
+    55:55:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1266:1266 -> a
+    56:56:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1263:1263 -> a
+    57:94:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1260:1297 -> a
+    95:95:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1294:1294 -> a
+    96:96:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1291:1291 -> a
+    97:97:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1288:1288 -> a
+    98:98:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1285:1285 -> a
+    99:99:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1282:1282 -> a
+    100:100:int getOffset():1193:1193 -> a
+    100:100:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1301 -> a
     101:101:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    101:101:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1325 -> a
-    102:102:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1326:1326 -> a
-    103:108:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1355:1360 -> a
-    1:1:void com.android.tools.r8.ir.conversion.DexBuilder$Info.setMinOffset(int):934:934 -> b
-    1:1:void setMinOffset(int):1217 -> b
-    2:2:int getMaxOffset():1217:1217 -> b
-    3:5:boolean branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1242:1244 -> b
-    1:1:int getOffset():1217:1217 -> c
-    2:2:void setOffset(int):1217:1217 -> c
-    3:6:int[] getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1231:1234 -> c
-    1:1:int getSize():1350:1350 -> d
+    101:101:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1301 -> a
+    102:102:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1302:1302 -> a
+    103:108:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1331:1336 -> a
+    1:1:void com.android.tools.r8.ir.conversion.DexBuilder$Info.setMinOffset(int):910:910 -> b
+    1:1:void setMinOffset(int):1193 -> b
+    2:2:int getMaxOffset():1193:1193 -> b
+    3:5:boolean branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1218:1220 -> b
+    1:1:int getOffset():1193:1193 -> c
+    2:2:void setOffset(int):1193:1193 -> c
+    3:6:int[] getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1207:1210 -> c
+    1:1:int getSize():1326:1326 -> d
     int maxSize() -> e
     int minSize() -> f
-    1:1:com.android.tools.r8.ir.code.Instruction getIR():1217:1217 -> g
-    1:1:com.android.tools.r8.ir.code.If getBranch():1238 -> g
-    2:2:com.android.tools.r8.ir.code.If getBranch():1238:1238 -> g
+    1:1:com.android.tools.r8.ir.code.Instruction getIR():1193:1193 -> g
+    1:1:com.android.tools.r8.ir.code.If getBranch():1214 -> g
+    2:2:com.android.tools.r8.ir.code.If getBranch():1214:1214 -> g
 com.android.tools.r8.ir.conversion.DexBuilder$Info -> a.a.a.a.g.c.z:
     com.android.tools.r8.ir.code.Instruction ir -> a
     int offset -> b
     int maxOffset -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():888:888 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Instruction):897:897 -> <init>
-    2:9:void <init>(com.android.tools.r8.ir.code.Instruction):892:899 -> <init>
+    1:1:void <clinit>():864:864 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Instruction):873:873 -> <init>
+    2:9:void <init>(com.android.tools.r8.ir.code.Instruction):868:875 -> <init>
     void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List) -> a
     int computeSize(com.android.tools.r8.ir.conversion.DexBuilder) -> a
     boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder) -> a
-    1:2:void setMaxOffset(int):944:945 -> a
-    3:3:com.android.tools.r8.ir.code.Instruction getIR():949:949 -> a
-    1:1:void setMinOffset(int):934:934 -> b
-    2:3:int getMaxOffset():939:940 -> b
-    1:2:int getOffset():919:920 -> c
-    3:4:void setOffset(int):924:925 -> c
+    1:2:void setMaxOffset(int):920:921 -> a
+    3:3:com.android.tools.r8.ir.code.Instruction getIR():925:925 -> a
+    1:1:void setMinOffset(int):910:910 -> b
+    2:3:int getMaxOffset():915:916 -> b
+    1:2:int getOffset():895:896 -> c
+    3:4:void setOffset(int):900:901 -> c
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
 com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> a.a.a.a.g.c.A:
     boolean $assertionsDisabled -> f
     int size -> e
-    1:1:void <clinit>():1364:1364 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Move):1369:1369 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Move):1366:1366 -> <init>
-    1:1:com.android.tools.r8.ir.code.Instruction getIR():1364:1364 -> a
-    2:2:void setMaxOffset(int):1364:1364 -> a
-    3:3:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1377:1377 -> a
-    3:3:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1396 -> a
-    4:4:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1381:1381 -> a
-    4:4:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1397 -> a
-    5:13:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1399:1407 -> a
-    14:17:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1386:1389 -> a
-    18:18:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1377:1377 -> a
-    18:18:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1390 -> a
-    19:19:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1377:1377 -> a
-    19:19:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1390 -> a
-    20:20:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1381:1381 -> a
-    20:20:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1391 -> a
-    21:21:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1381:1381 -> a
-    21:21:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1391 -> a
-    22:23:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1412:1413 -> a
-    24:24:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1377:1377 -> a
-    24:24:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1414 -> a
-    25:25:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1381:1381 -> a
-    25:25:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1415 -> a
-    26:65:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1417:1456 -> a
-    66:73:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1434:1441 -> a
-    74:82:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1420:1428 -> a
-    83:83:int getOffset():1364:1364 -> a
-    83:83:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1458 -> a
+    1:1:void <clinit>():1340:1340 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Move):1345:1345 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Move):1342:1342 -> <init>
+    1:1:com.android.tools.r8.ir.code.Instruction getIR():1340:1340 -> a
+    2:2:void setMaxOffset(int):1340:1340 -> a
+    3:3:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1353:1353 -> a
+    3:3:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1372 -> a
+    4:4:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1357:1357 -> a
+    4:4:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1373 -> a
+    5:13:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1375:1383 -> a
+    14:17:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1362:1365 -> a
+    18:18:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1353:1353 -> a
+    18:18:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1366 -> a
+    19:19:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1353:1353 -> a
+    19:19:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1366 -> a
+    20:20:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1357:1357 -> a
+    20:20:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1367 -> a
+    21:21:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1357:1357 -> a
+    21:21:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1367 -> a
+    22:23:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1388:1389 -> a
+    24:24:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1353:1353 -> a
+    24:24:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1390 -> a
+    25:25:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1357:1357 -> a
+    25:25:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1391 -> a
+    26:65:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1393:1432 -> a
+    66:73:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1410:1417 -> a
+    74:82:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1396:1404 -> a
+    83:83:int getOffset():1340:1340 -> a
+    83:83:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1434 -> a
     84:84:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    84:84:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1458 -> a
-    85:85:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1459:1459 -> a
-    86:86:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1430:1430 -> a
-    1:1:void com.android.tools.r8.ir.conversion.DexBuilder$Info.setMinOffset(int):934:934 -> b
-    1:1:void setMinOffset(int):1364 -> b
-    2:2:int getMaxOffset():1364:1364 -> b
-    3:3:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1381:1381 -> b
-    1:1:int getOffset():1364:1364 -> c
-    2:2:void setOffset(int):1364:1364 -> c
-    3:3:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1377:1377 -> c
-    1:2:int getSize():1476:1477 -> d
-    1:1:int maxSize():1470:1470 -> e
-    1:1:int minSize():1464:1464 -> f
-    1:1:com.android.tools.r8.ir.code.Instruction getIR():1364:1364 -> g
-    1:1:com.android.tools.r8.ir.code.Move getMove():1373 -> g
-    2:2:com.android.tools.r8.ir.code.Move getMove():1373:1373 -> g
+    84:84:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1434 -> a
+    85:85:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1435:1435 -> a
+    86:86:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1406:1406 -> a
+    1:1:void com.android.tools.r8.ir.conversion.DexBuilder$Info.setMinOffset(int):910:910 -> b
+    1:1:void setMinOffset(int):1340 -> b
+    2:2:int getMaxOffset():1340:1340 -> b
+    3:3:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1357:1357 -> b
+    1:1:int getOffset():1340:1340 -> c
+    2:2:void setOffset(int):1340:1340 -> c
+    3:3:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1353:1353 -> c
+    1:2:int getSize():1452:1453 -> d
+    1:1:int maxSize():1446:1446 -> e
+    1:1:int minSize():1440:1440 -> f
+    1:1:com.android.tools.r8.ir.code.Instruction getIR():1340:1340 -> g
+    1:1:com.android.tools.r8.ir.code.Move getMove():1349 -> g
+    2:2:com.android.tools.r8.ir.code.Move getMove():1349:1349 -> g
 com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> a.a.a.a.g.c.B:
     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[]):1004:1010 -> <init>
-    1:1:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1015:1015 -> a
-    2:4:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1020:1022 -> a
+    1:7:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction[]):980:986 -> <init>
+    1:1:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):991:991 -> a
+    2:4:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):996:998 -> a
     5:5:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    5:5:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1023 -> a
-    6:6:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1024:1024 -> a
-    7:8:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1045:1046 -> a
-    1:1:int getSize():1040:1040 -> d
-    1:1:int maxSize():1035:1035 -> e
-    1:1:int minSize():1030:1030 -> f
+    5:5:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):999 -> a
+    6:6:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1000:1000 -> a
+    7:8:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1021:1022 -> a
+    1:1:int getSize():1016:1016 -> d
+    1:1:int maxSize():1011:1011 -> e
+    1:1:int minSize():1006:1006 -> f
 com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> a.a.a.a.g.c.C:
     com.android.tools.r8.ir.code.Switch ir -> a
     com.android.tools.r8.code.Format31t dex -> b
-    1:3:void <init>(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.code.Format31t):1517:1519 -> <init>
+    1:3:void <init>(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.code.Format31t):1493:1495 -> <init>
 com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> a.a.a.a.g.c.D:
     com.android.tools.r8.ir.code.CatchHandlers handlers -> a
     int start -> b
     int end -> c
-    1:4:void <init>(com.android.tools.r8.ir.code.CatchHandlers,int,int):1500:1503 -> <init>
-    1:1:int compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1508:1508 -> a
-    1:1:int compareTo(java.lang.Object):1494:1494 -> compareTo
+    1:4:void <init>(com.android.tools.r8.ir.code.CatchHandlers,int,int):1476:1479 -> <init>
+    1:1:int compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1484:1484 -> a
+    1:1:int compareTo(java.lang.Object):1470:1470 -> compareTo
 com.android.tools.r8.ir.conversion.DexSourceCode -> a.a.a.a.g.c.F:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.code.Position currentPosition -> i
@@ -18158,73 +17943,73 @@
     com.android.tools.r8.graph.DexEncodedMethod method -> b
     com.android.tools.r8.ir.conversion.SwitchPayloadResolver switchPayloadResolver -> d
     java.util.List debugEntries -> k
-    1:1:void <clinit>():59:59 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):83:83 -> <init>
-    2:24:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):65:87 -> <init>
+    1:1:void <clinit>():57:57 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):81:81 -> <init>
+    2:24:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):63:85 -> <init>
     25:29:java.util.List com.android.tools.r8.graph.DexDebugInfo.computeEntries(com.android.tools.r8.graph.DexMethod):28:32 -> <init>
-    25:29:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):89 -> <init>
-    30:35:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):89:94 -> <init>
+    25:29:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):87 -> <init>
+    30:35:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):87:92 -> <init>
     void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean) -> a
-    void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder) -> a
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int) -> a
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> a
-    1:3:void setUp():126:128 -> a
-    4:4:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    4:4:void setUp():128 -> a
-    5:10:void setUp():128:133 -> a
-    11:11:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):203:203 -> a
-    12:20:void updateCurrentCatchHandlers(int,com.android.tools.r8.graph.DexItemFactory):248:256 -> a
-    12:20:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):203 -> a
-    21:31:void updateDebugPosition(int,com.android.tools.r8.ir.conversion.IRBuilder):274:284 -> a
-    21:31:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):204 -> a
-    32:33:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):205:206 -> a
-    34:37:int getMoveExceptionRegister(int):216:219 -> a
-    38:39:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):291:292 -> a
-    40:48:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):291:299 -> a
-    49:49:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):294:294 -> a
-    50:51:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):321:322 -> a
-    52:52:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):321:321 -> a
-    53:56:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):328:331 -> a
-    57:57:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):328:328 -> a
-    58:58:boolean isMoveResult(com.android.tools.r8.code.Instruction):354:354 -> a
-    59:59:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):361:361 -> a
-    60:60:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    60:60:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):362 -> a
-    61:91:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):363:393 -> a
-    92:92:java.util.Set getUniqueTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):468:468 -> a
-    92:92:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):393 -> a
-    93:98:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):393:398 -> a
-    99:99:boolean isInvoke(com.android.tools.r8.code.Instruction):335:335 -> a
-    99:99:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):398 -> a
-    100:105:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):398:403 -> a
-    106:106:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    106:106:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):404 -> a
-    107:121:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):404:418 -> a
-    122:131:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexCode$Try):440:449 -> a
-    132:133:void lambda$getCurrentCatchHandlers$0(java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):446:447 -> a
-    134:142:void forEachTryRange(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):454:462 -> a
-    143:144:java.util.List getTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):472:473 -> a
-    145:145:void lambda$getTryHandlerOffsets$1(java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):473:473 -> a
-    1:1:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):211:211 -> b
-    2:2:boolean verifyCurrentInstructionCanThrow():239:239 -> b
-    3:3:int instructionOffset(int):315:315 -> b
+    1:40:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):139:178 -> a
+    41:47:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):176:182 -> a
+    48:65:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):167:184 -> a
+    66:66:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):201:201 -> a
+    67:75:void updateCurrentCatchHandlers(int,com.android.tools.r8.graph.DexItemFactory):246:254 -> a
+    67:75:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):201 -> a
+    76:86:void updateDebugPosition(int,com.android.tools.r8.ir.conversion.IRBuilder):272:282 -> a
+    76:86:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):202 -> a
+    87:88:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):203:204 -> a
+    89:92:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):224:227 -> a
+    93:93:boolean verifyCurrentInstructionCanThrow():237:237 -> a
+    94:95:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):289:290 -> a
+    96:104:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):289:297 -> a
+    105:105:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):292:292 -> a
+    106:107:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):319:320 -> a
+    108:108:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):319:319 -> a
+    109:112:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):326:329 -> a
+    113:113:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):326:326 -> a
+    114:114:boolean isMoveResult(com.android.tools.r8.code.Instruction):350:350 -> a
+    115:115:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):357:357 -> a
+    116:116:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    116:116:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):358 -> a
+    117:147:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):359:389 -> a
+    148:148:java.util.Set getUniqueTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):464:464 -> a
+    148:148:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):389 -> a
+    149:154:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):389:394 -> a
+    155:155:boolean isInvoke(com.android.tools.r8.code.Instruction):333:333 -> a
+    155:155:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):394 -> a
+    156:161:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):394:399 -> a
+    162:162:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    162:162:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):400 -> a
+    163:177:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):400:414 -> a
+    178:187:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexCode$Try):436:445 -> a
+    188:189:void lambda$getCurrentCatchHandlers$0(java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):442:443 -> a
+    190:198:void forEachTryRange(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):450:458 -> a
+    199:200:java.util.List getTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):468:469 -> a
+    201:201:void lambda$getTryHandlerOffsets$1(java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):469:469 -> a
+    void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder) -> b
+    1:3:void setUp():124:126 -> b
     4:4:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> b
-    4:4:int instructionOffset(int):315 -> b
-    com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int) -> c
-    1:40:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):141:180 -> c
-    41:47:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):178:184 -> c
-    48:65:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):169:186 -> c
-    66:66:com.android.tools.r8.ir.code.Position getCurrentPosition():234:234 -> c
-    1:2:void clear():304:305 -> clear
-    com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> d
-    1:1:int instructionCount():105:105 -> d
-    1:4:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):226:229 -> e
-    1:1:boolean verifyRegister(int):100:100 -> f
-    1:1:int instructionIndex(int):310:310 -> g
-    1:3:com.android.tools.r8.graph.DexDebugEntry getDebugEntryAtOffset(int):262:264 -> h
-    1:1:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):431:431 -> i
-    2:2:boolean inTryRange(com.android.tools.r8.graph.DexCode$Try,int):426:426 -> i
-    2:2:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):432 -> i
+    4:4:void setUp():126 -> b
+    5:10:void setUp():126:131 -> b
+    11:14:int getMoveExceptionRegister(int):214:217 -> b
+    1:1:int instructionCount():103:103 -> c
+    2:2:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):209:209 -> c
+    3:3:int instructionOffset(int):313:313 -> c
+    4:4:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> c
+    4:4:int instructionOffset(int):313 -> c
+    1:2:void clear():302:303 -> clear
+    1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():232:232 -> d
+    2:2:int instructionIndex(int):308:308 -> d
+    1:1:boolean verifyRegister(int):98:98 -> e
+    com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int) -> f
+    com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> g
+    1:3:com.android.tools.r8.graph.DexDebugEntry getDebugEntryAtOffset(int):260:262 -> h
+    1:1:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):427:427 -> i
+    2:2:boolean inTryRange(com.android.tools.r8.graph.DexCode$Try,int):422:422 -> i
+    2:2:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):428 -> i
 com.android.tools.r8.ir.conversion.IRBuilder -> a.a.a.a.g.c.M:
     java.util.Queue ssaWorklist -> f
     int currentInstructionOffset -> j
@@ -18415,176 +18200,172 @@
     524:526:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1127:1129 -> a
     524:526:void addConstString(int,com.android.tools.r8.graph.DexString):1135 -> a
     527:527:void addConstString(int,com.android.tools.r8.graph.DexString):1136:1136 -> a
-    528:530:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference):1140:1142 -> a
-    531:533:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1127:1129 -> a
-    531:533:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference):1143 -> a
-    534:536:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference):1144:1146 -> a
-    537:540:com.android.tools.r8.ir.code.Monitor addMonitor(com.android.tools.r8.ir.code.Monitor$Type,int):1173:1176 -> a
-    541:541:void addMove(com.android.tools.r8.ir.code.ValueType,int,int):1181:1181 -> a
-    542:548:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1185:1191 -> a
-    549:549:void addInstruction(com.android.tools.r8.ir.code.Instruction):2225:2225 -> a
-    549:549:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1191 -> a
-    550:550:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1195:1195 -> a
-    551:551:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int,int):1277:1277 -> a
-    552:552:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int,int):1275:1275 -> a
-    553:559:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1292:1298 -> a
-    560:560:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1306:1306 -> a
-    561:561:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1304:1304 -> a
-    562:565:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1319:1322 -> a
-    566:570:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1327:1331 -> a
-    571:577:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1329:1335 -> a
-    578:578:void addInstruction(com.android.tools.r8.ir.code.Instruction):2225:2225 -> a
-    578:578:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1336 -> a
-    579:582:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1340:1343 -> a
-    583:583:void addInstruction(com.android.tools.r8.ir.code.Instruction):2225:2225 -> a
-    583:583:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1344 -> a
-    584:593: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):1356:1365 -> a
-    594:619: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):1359:1384 -> a
-    620:624: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):1394:1398 -> a
-    625:628: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):1397:1400 -> a
-    629:645:void addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1406:1422 -> a
-    646:663:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1427:1444 -> a
-    664:668:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1449:1453 -> a
-    669:672:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1452:1455 -> a
-    673:696:void addInvokeRegisters(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int[]):1466:1489 -> a
-    697:713:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1493:1509 -> a
-    714:738:void addInvokeRange(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int):1530:1554 -> a
-    739:753:void addInvokeRangeNewArray(com.android.tools.r8.graph.DexType,int,int):1558:1572 -> a
-    754:757:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1619:1622 -> a
-    758:758:void addInstruction(com.android.tools.r8.ir.code.Instruction):2225:2225 -> a
-    758:758:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1623 -> a
-    759:762:void addNewArrayFilledData(int,int,long,short[]):1652:1655 -> a
-    763:763:void addInstruction(com.android.tools.r8.ir.code.Instruction):2225:2225 -> a
-    763:763:void addNewArrayFilledData(int,int,long,short[]):1656 -> a
-    764:764:void addReturn():1681:1681 -> a
-    765:767:void addReturn(com.android.tools.r8.ir.code.Return):1686:1688 -> a
-    765:767:void addReturn():1681 -> a
-    768:771:void addStaticGet(int,com.android.tools.r8.graph.DexField):1692:1695 -> a
-    772:778:void addStaticGet(int,com.android.tools.r8.graph.DexField):1693:1699 -> a
-    779:779:void addInstruction(com.android.tools.r8.ir.code.Instruction):2225:2225 -> a
-    779:779:void addStaticGet(int,com.android.tools.r8.graph.DexField):1700 -> a
-    780:829:void addSwitch(int,int[],int,int[]):1732:1781 -> a
-    830:834:com.android.tools.r8.ir.code.Switch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1787:1791 -> a
-    830:834:void addSwitch(int,int[],int,int[]):1782 -> a
-    835:835:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2379:2379 -> a
-    835:835:com.android.tools.r8.ir.code.Switch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1793 -> a
-    835:835:void addSwitch(int,int[],int,int[]):1782 -> a
-    836:859:com.android.tools.r8.ir.code.Switch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1794:1817 -> a
-    836:859:void addSwitch(int,int[],int,int[]):1782 -> a
-    860:860:void addSwitch(int,int[],int,int[]):1783:1783 -> a
-    861:864:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1943:1946 -> a
-    865:865:void addInstruction(com.android.tools.r8.ir.code.Instruction):2225:2225 -> a
-    865:865:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1947 -> a
-    866:867: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):1987:1988 -> a
-    868:887:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2003:2022 -> a
-    868:887:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):1991 -> a
-    888:891:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2068:2071 -> a
-    888:891:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2027 -> a
-    888:891:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):1991 -> a
-    892:902:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():162:172 -> a
-    892:902:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2072 -> a
-    892:902:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2027 -> a
-    892:902:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):1991 -> a
-    903:903:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():168:168 -> a
-    903:903:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2072 -> a
-    903:903:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2027 -> a
-    903:903:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):1991 -> a
-    904:904:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():166:166 -> a
-    904:904:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2072 -> a
-    904:904:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2027 -> a
-    904:904:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):1991 -> a
-    905:905:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():164:164 -> a
-    905:905:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2072 -> a
-    905:905:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2027 -> a
-    905:905:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):1991 -> a
-    906:924:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2073:2091 -> a
-    906:924:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2027 -> a
-    906:924: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):1991 -> a
-    925:927:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,com.android.tools.r8.ir.code.BasicBlock):2059:2061 -> a
-    925:927:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2029 -> a
-    925:927: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):1991 -> a
-    928:952:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2030:2054 -> a
-    928:952: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):1991 -> a
-    953:953:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2096:2096 -> a
-    954:957:com.android.tools.r8.ir.code.Value readIntLiteral(long):2116:2119 -> a
-    958:960:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo,com.android.tools.r8.graph.DebugLocalInfo):2126:2128 -> a
-    961:961:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2151:2151 -> a
-    962:962:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2155:2155 -> a
-    962:962:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1953 -> a
-    963:967:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1954:1958 -> a
-    968:968:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():520:520 -> a
-    968:968:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1958 -> a
-    969:979:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1959:1969 -> a
-    980:984:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1967:1971 -> a
-    985:985:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2155:2155 -> a
-    985:985:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2133 -> a
-    986:999:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2134:2147 -> a
-    1000:1000:void lambda$ensureBlockForThrowingInstruction$2(com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo,java.lang.Integer):2208:2208 -> a
-    1001:1026:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2229:2254 -> a
-    1027:1031:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2243:2247 -> a
-    1032:1038:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2245:2251 -> a
-    1039:1039:boolean isOffsetProcessed(int):2318:2318 -> a
-    1039:1039:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2311 -> a
-    1039:1039:void ensureSuccessorBlock(int,int,boolean):2347 -> a
-    1040:1042:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2312:2314 -> a
-    1040:1042:void ensureSuccessorBlock(int,int,boolean):2347 -> a
-    1043:1046:int getBlockStartOffset(int):2302:2305 -> a
-    1043:1046:void ensureSuccessorBlock(int,int,boolean):2348 -> a
-    1047:1047:void ensureSuccessorBlock(int,int,boolean):2349:2349 -> a
-    1048:1048:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalSuccessor(int):278:278 -> a
-    1048:1048:void ensureSuccessorBlock(int,int,boolean):2351 -> a
-    1049:1049:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalPredecessor(int):274:274 -> a
-    1049:1049:void ensureSuccessorBlock(int,int,boolean):2352 -> a
-    1050:1050:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalSuccessor(int):291:291 -> a
-    1050:1050:void ensureSuccessorBlock(int,int,boolean):2354 -> a
-    1051:1053:void ensureSuccessorBlock(int,int,boolean):2355:2357 -> a
-    1054:1054:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2379:2379 -> a
-    1054:1054:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1263 -> a
-    1055:1055:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2379:2379 -> a
-    1055:1055:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1264 -> a
-    1056:1061:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1265:1270 -> a
-    1062:1062:int getOffset(com.android.tools.r8.ir.code.BasicBlock):2383:2383 -> a
-    1063:1066:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2396:2399 -> a
-    1067:1067:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2398:2398 -> a
-    1068:1070:void generateSplitEdgeBlocks():2413:2415 -> a
-    1068:1070:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
-    1071:1071:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2375:2375 -> a
-    1071:1071:void generateSplitEdgeBlocks():2415 -> a
-    1071:1071:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
-    1072:1072:void generateSplitEdgeBlocks():2416:2416 -> a
-    1072:1072:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
-    1073:1074:boolean com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.hasMoreThanASingleNormalExit():306:307 -> a
-    1073:1074:void generateSplitEdgeBlocks():2417 -> a
-    1073:1074:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
-    1075:1090:void generateSplitEdgeBlocks():2420:2435 -> a
-    1075:1090:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
-    1091:1099:void generateSplitEdgeBlocks():2432:2440 -> a
-    1091:1099:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
-    1100:1105:com.android.tools.r8.ir.code.BasicBlock createSplitEdgeBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2456:2461 -> a
-    1100:1105:void generateSplitEdgeBlocks():2440 -> a
-    1100:1105:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
-    1106:1116:void generateSplitEdgeBlocks():2441:2451 -> a
-    1106:1116:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
-    1117:1118:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():299:300 -> a
-    1117:1118:void generateSplitEdgeBlocks():2451 -> a
-    1117:1118:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
-    1119:1120:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):173:174 -> a
-    1119:1120:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():300 -> a
-    1119:1120:void generateSplitEdgeBlocks():2451 -> a
-    1119:1120:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
-    1121:1121:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():301:301 -> a
-    1121:1121:void generateSplitEdgeBlocks():2451 -> a
-    1121:1121:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
-    1122:1123:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):173:174 -> a
-    1122:1123:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():301 -> a
-    1122:1123:void generateSplitEdgeBlocks():2451 -> a
-    1122:1123:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
-    1124:1124:void generateSplitEdgeBlocks():2451:2451 -> a
-    1124:1124:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
-    1125:1125:void addInstruction(com.android.tools.r8.ir.code.Instruction):2225:2225 -> a
-    1125:1125:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2401 -> a
-    1126:1126:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2402:2402 -> a
-    1127:1127:boolean isIntegerType(com.android.tools.r8.ir.code.NumericType):2550:2550 -> a
+    528:531:com.android.tools.r8.ir.code.Monitor addMonitor(com.android.tools.r8.ir.code.Monitor$Type,int):1173:1176 -> a
+    532:532:void addMove(com.android.tools.r8.ir.code.ValueType,int,int):1181:1181 -> a
+    533:539:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1185:1191 -> a
+    540:540:void addInstruction(com.android.tools.r8.ir.code.Instruction):2225:2225 -> a
+    540:540:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1191 -> a
+    541:541:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1195:1195 -> a
+    542:542:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int,int):1277:1277 -> a
+    543:543:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int,int):1275:1275 -> a
+    544:550:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1292:1298 -> a
+    551:551:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1306:1306 -> a
+    552:552:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1304:1304 -> a
+    553:556:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1319:1322 -> a
+    557:561:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1327:1331 -> a
+    562:568:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1329:1335 -> a
+    569:569:void addInstruction(com.android.tools.r8.ir.code.Instruction):2225:2225 -> a
+    569:569:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1336 -> a
+    570:573:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1340:1343 -> a
+    574:574:void addInstruction(com.android.tools.r8.ir.code.Instruction):2225:2225 -> a
+    574:574:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1344 -> a
+    575:584: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):1356:1365 -> a
+    585:610: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):1359:1384 -> a
+    611:615: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):1394:1398 -> a
+    616:619: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):1397:1400 -> a
+    620:636:void addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1406:1422 -> a
+    637:654:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1427:1444 -> a
+    655:659:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1449:1453 -> a
+    660:663:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1452:1455 -> a
+    664:687:void addInvokeRegisters(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int[]):1466:1489 -> a
+    688:704:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1493:1509 -> a
+    705:729:void addInvokeRange(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int):1530:1554 -> a
+    730:744:void addInvokeRangeNewArray(com.android.tools.r8.graph.DexType,int,int):1558:1572 -> a
+    745:748:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1619:1622 -> a
+    749:749:void addInstruction(com.android.tools.r8.ir.code.Instruction):2225:2225 -> a
+    749:749:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1623 -> a
+    750:753:void addNewArrayFilledData(int,int,long,short[]):1652:1655 -> a
+    754:754:void addInstruction(com.android.tools.r8.ir.code.Instruction):2225:2225 -> a
+    754:754:void addNewArrayFilledData(int,int,long,short[]):1656 -> a
+    755:755:void addReturn():1681:1681 -> a
+    756:758:void addReturn(com.android.tools.r8.ir.code.Return):1686:1688 -> a
+    756:758:void addReturn():1681 -> a
+    759:762:void addStaticGet(int,com.android.tools.r8.graph.DexField):1692:1695 -> a
+    763:769:void addStaticGet(int,com.android.tools.r8.graph.DexField):1693:1699 -> a
+    770:770:void addInstruction(com.android.tools.r8.ir.code.Instruction):2225:2225 -> a
+    770:770:void addStaticGet(int,com.android.tools.r8.graph.DexField):1700 -> a
+    771:820:void addSwitch(int,int[],int,int[]):1732:1781 -> a
+    821:825:com.android.tools.r8.ir.code.Switch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1787:1791 -> a
+    821:825:void addSwitch(int,int[],int,int[]):1782 -> a
+    826:826:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2379:2379 -> a
+    826:826:com.android.tools.r8.ir.code.Switch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1793 -> a
+    826:826:void addSwitch(int,int[],int,int[]):1782 -> a
+    827:850:com.android.tools.r8.ir.code.Switch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1794:1817 -> a
+    827:850:void addSwitch(int,int[],int,int[]):1782 -> a
+    851:851:void addSwitch(int,int[],int,int[]):1783:1783 -> a
+    852:855:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1943:1946 -> a
+    856:856:void addInstruction(com.android.tools.r8.ir.code.Instruction):2225:2225 -> a
+    856:856:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1947 -> a
+    857:858: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):1987:1988 -> a
+    859:878:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2003:2022 -> a
+    859:878: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):1991 -> a
+    879:882:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2068:2071 -> a
+    879:882:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2027 -> a
+    879:882: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):1991 -> a
+    883:893:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():162:172 -> a
+    883:893:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2072 -> a
+    883:893:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2027 -> a
+    883:893: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):1991 -> a
+    894:894:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():168:168 -> a
+    894:894:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2072 -> a
+    894:894:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2027 -> a
+    894:894: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):1991 -> a
+    895:895:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():166:166 -> a
+    895:895:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2072 -> a
+    895:895:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2027 -> a
+    895:895: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):1991 -> a
+    896:896:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():164:164 -> a
+    896:896:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2072 -> a
+    896:896:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2027 -> a
+    896:896:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):1991 -> a
+    897:915:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2073:2091 -> a
+    897:915:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2027 -> a
+    897:915:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):1991 -> a
+    916:918:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,com.android.tools.r8.ir.code.BasicBlock):2059:2061 -> a
+    916:918:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2029 -> a
+    916:918: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):1991 -> a
+    919:943:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2030:2054 -> a
+    919:943: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):1991 -> a
+    944:944:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2096:2096 -> a
+    945:948:com.android.tools.r8.ir.code.Value readIntLiteral(long):2116:2119 -> a
+    949:951:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo,com.android.tools.r8.graph.DebugLocalInfo):2126:2128 -> a
+    952:952:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2151:2151 -> a
+    953:953:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2155:2155 -> a
+    953:953:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1953 -> a
+    954:958:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1954:1958 -> a
+    959:959:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():501:501 -> a
+    959:959:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1958 -> a
+    960:970:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1959:1969 -> a
+    971:975:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1967:1971 -> a
+    976:976:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2155:2155 -> a
+    976:976:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2133 -> a
+    977:990:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2134:2147 -> a
+    991:991:void lambda$ensureBlockForThrowingInstruction$2(com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo,java.lang.Integer):2208:2208 -> a
+    992:1017:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2229:2254 -> a
+    1018:1022:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2243:2247 -> a
+    1023:1029:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2245:2251 -> a
+    1030:1030:boolean isOffsetProcessed(int):2318:2318 -> a
+    1030:1030:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2311 -> a
+    1030:1030:void ensureSuccessorBlock(int,int,boolean):2347 -> a
+    1031:1033:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2312:2314 -> a
+    1031:1033:void ensureSuccessorBlock(int,int,boolean):2347 -> a
+    1034:1037:int getBlockStartOffset(int):2302:2305 -> a
+    1034:1037:void ensureSuccessorBlock(int,int,boolean):2348 -> a
+    1038:1038:void ensureSuccessorBlock(int,int,boolean):2349:2349 -> a
+    1039:1039:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalSuccessor(int):278:278 -> a
+    1039:1039:void ensureSuccessorBlock(int,int,boolean):2351 -> a
+    1040:1040:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalPredecessor(int):274:274 -> a
+    1040:1040:void ensureSuccessorBlock(int,int,boolean):2352 -> a
+    1041:1041:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalSuccessor(int):291:291 -> a
+    1041:1041:void ensureSuccessorBlock(int,int,boolean):2354 -> a
+    1042:1044:void ensureSuccessorBlock(int,int,boolean):2355:2357 -> a
+    1045:1045:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2379:2379 -> a
+    1045:1045:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1263 -> a
+    1046:1046:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2379:2379 -> a
+    1046:1046:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1264 -> a
+    1047:1052:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1265:1270 -> a
+    1053:1053:int getOffset(com.android.tools.r8.ir.code.BasicBlock):2383:2383 -> a
+    1054:1057:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2396:2399 -> a
+    1058:1058:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2398:2398 -> a
+    1059:1061:void generateSplitEdgeBlocks():2413:2415 -> a
+    1059:1061:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
+    1062:1062:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2375:2375 -> a
+    1062:1062:void generateSplitEdgeBlocks():2415 -> a
+    1062:1062:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
+    1063:1063:void generateSplitEdgeBlocks():2416:2416 -> a
+    1063:1063:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
+    1064:1065:boolean com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.hasMoreThanASingleNormalExit():306:307 -> a
+    1064:1065:void generateSplitEdgeBlocks():2417 -> a
+    1064:1065:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
+    1066:1081:void generateSplitEdgeBlocks():2420:2435 -> a
+    1066:1081:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
+    1082:1090:void generateSplitEdgeBlocks():2432:2440 -> a
+    1082:1090:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
+    1091:1096:com.android.tools.r8.ir.code.BasicBlock createSplitEdgeBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2456:2461 -> a
+    1091:1096:void generateSplitEdgeBlocks():2440 -> a
+    1091:1096:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
+    1097:1107:void generateSplitEdgeBlocks():2441:2451 -> a
+    1097:1107:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
+    1108:1109:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():299:300 -> a
+    1108:1109:void generateSplitEdgeBlocks():2451 -> a
+    1108:1109:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
+    1110:1111:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):173:174 -> a
+    1110:1111:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():300 -> a
+    1110:1111:void generateSplitEdgeBlocks():2451 -> a
+    1110:1111:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
+    1112:1112:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():301:301 -> a
+    1112:1112:void generateSplitEdgeBlocks():2451 -> a
+    1112:1112:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
+    1113:1114:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):173:174 -> a
+    1113:1114:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():301 -> a
+    1113:1114:void generateSplitEdgeBlocks():2451 -> a
+    1113:1114:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
+    1115:1115:void generateSplitEdgeBlocks():2451:2451 -> a
+    1115:1115:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2400 -> a
+    1116:1116:void addInstruction(com.android.tools.r8.ir.code.Instruction):2225:2225 -> a
+    1116:1116:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2401 -> a
+    1117:1117:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2402:2402 -> a
+    1118:1118:boolean isIntegerType(com.android.tools.r8.ir.code.NumericType):2550:2550 -> a
     1:14:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):923:936 -> b
     15:17:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):935:937 -> b
     18:18:void addInstruction(com.android.tools.r8.ir.code.Instruction):2225:2225 -> b
@@ -18817,226 +18598,220 @@
     1:1:com.android.tools.r8.ir.code.BasicBlock access$100(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):179:179 -> a
     1:1:int access$400(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):179:179 -> b
 com.android.tools.r8.ir.conversion.IRConverter -> a.a.a.a.g.c.N:
-    com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer idempotentFunctionCallCanonicalizer -> y
+    com.android.tools.r8.utils.CfgPrinter printer -> n
     com.android.tools.r8.ir.conversion.OptimizationFeedback simpleOptimizationFeedback -> C
     com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.ir.optimize.classinliner.ClassInliner classInliner -> j
-    com.android.tools.r8.ir.optimize.ServiceLoaderRewriter serviceLoaderRewriter -> z
-    com.android.tools.r8.ir.desugar.Java8MethodRewriter java8MethodRewriter -> h
+    com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet -> b
+    com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> f
+    com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization classInitializerDefaultsOptimization -> d
+    com.android.tools.r8.ir.desugar.Java8MethodRewriter java8MethodRewriter -> i
+    com.android.tools.r8.ir.desugar.StringConcatRewriter stringConcatRewriter -> e
+    com.android.tools.r8.ir.optimize.string.StringOptimizer stringOptimizer -> w
+    com.android.tools.r8.ir.optimize.MemberValuePropagation memberValuePropagation -> p
+    com.android.tools.r8.ir.analysis.TypeChecker typeChecker -> y
+    com.android.tools.r8.utils.InternalOptions options -> m
+    com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> q
+    com.android.tools.r8.ir.desugar.InterfaceMethodRewriter interfaceMethodRewriter -> g
+    com.android.tools.r8.ir.optimize.Inliner inliner -> s
+    com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> t
     java.util.List onWaveDoneActions -> E
-    com.android.tools.r8.ir.optimize.NonNullTracker nonNullTracker -> q
-    com.android.tools.r8.utils.Timing timing -> b
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger lambdaMerger -> i
-    com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter twrCloseResourceRewriter -> g
-    com.android.tools.r8.ir.optimize.Devirtualizer devirtualizer -> t
-    com.android.tools.r8.utils.CfgPrinter printer -> m
-    com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> e
-    com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization classInitializerDefaultsOptimization -> c
-    com.android.tools.r8.ir.desugar.StringConcatRewriter stringConcatRewriter -> d
+    com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization uninstantiatedTypeOptimization -> x
+    com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> o
+    com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> l
+    com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer covariantReturnTypeAnnotationTransformer -> v
+    com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer idempotentFunctionCallCanonicalizer -> z
+    com.android.tools.r8.ir.optimize.classinliner.ClassInliner classInliner -> k
     com.android.tools.r8.ir.optimize.DeadCodeRemover deadCodeRemover -> A
-    com.android.tools.r8.ir.optimize.string.StringOptimizer stringOptimizer -> v
-    com.android.tools.r8.ir.optimize.MemberValuePropagation memberValuePropagation -> o
-    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 -> p
-    com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> s
+    com.android.tools.r8.utils.Timing timing -> c
     com.android.tools.r8.graph.DexString highestSortingString -> D
-    com.android.tools.r8.ir.desugar.InterfaceMethodRewriter interfaceMethodRewriter -> f
-    com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization uninstantiatedTypeOptimization -> w
     com.android.tools.r8.ir.conversion.OptimizationFeedbackDelayed delayedOptimizationFeedback -> B
-    com.android.tools.r8.ir.optimize.Inliner inliner -> r
-    com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> n
     boolean $assertionsDisabled -> F
-    com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> k
-    com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer covariantReturnTypeAnnotationTransformer -> u
+    com.android.tools.r8.ir.optimize.NonNullTracker nonNullTracker -> r
+    com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter twrCloseResourceRewriter -> h
+    com.android.tools.r8.ir.optimize.lambda.LambdaMerger lambdaMerger -> j
+    com.android.tools.r8.ir.optimize.Devirtualizer devirtualizer -> u
     1:1:void <clinit>():107:107 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):257:257 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):159:159 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):257 -> <init>
-    3:34:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):143:174 -> <init>
-    3:34:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):257 -> <init>
-    35:40:boolean com.android.tools.r8.utils.InternalOptions.isInterfaceMethodDesugaringEnabled():672:677 -> <init>
-    35:40:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):174 -> <init>
-    35:40:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):257 -> <init>
-    41:44:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):175:178 -> <init>
-    41:44:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):257 -> <init>
-    45:45:boolean enableTwrCloseResourceDesugaring():261:261 -> <init>
-    45:45:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):178 -> <init>
-    45:45:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):257 -> <init>
-    46:75:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):179:208 -> <init>
-    46:75:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):257 -> <init>
-    76:76:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):194:194 -> <init>
-    76:76:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):257 -> <init>
-    77:121:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):193:237 -> <init>
-    77:121:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):257 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):260:260 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.shaking.RootSetBuilder$RootSet):160:160 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):260 -> <init>
+    3:36:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.shaking.RootSetBuilder$RootSet):143:176 -> <init>
+    3:36:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):260 -> <init>
+    37:42:boolean com.android.tools.r8.utils.InternalOptions.isInterfaceMethodDesugaringEnabled():643:648 -> <init>
+    37:42:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.shaking.RootSetBuilder$RootSet):176 -> <init>
+    37:42:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):260 -> <init>
+    43:46:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.shaking.RootSetBuilder$RootSet):177:180 -> <init>
+    43:46:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):260 -> <init>
+    47:47:boolean enableTwrCloseResourceDesugaring():264:264 -> <init>
+    47:47:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.shaking.RootSetBuilder$RootSet):180 -> <init>
+    47:47:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):260 -> <init>
+    48:81:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.shaking.RootSetBuilder$RootSet):181:214 -> <init>
+    48:81:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):260 -> <init>
+    82:82:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.shaking.RootSetBuilder$RootSet):202:202 -> <init>
+    82:82:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):260 -> <init>
+    83:124:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.shaking.RootSetBuilder$RootSet):199:240 -> <init>
+    83:124:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):260 -> <init>
     boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$16(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    1:2:boolean removeLambdaDeserializationMethods():275:276 -> a
-    1:2:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):336 -> a
-    3:8:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):338:343 -> a
-    9:11:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):283:285 -> a
-    9:11:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):345 -> a
-    12:12:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):346:346 -> a
-    13:14:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):307:308 -> a
-    13:14:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):346 -> a
-    15:16:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):316:317 -> a
-    15:16:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):347 -> a
-    17:18:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):323:324 -> a
-    17:18:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):348 -> a
-    19:20:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):329:330 -> a
-    19:20:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):349 -> a
-    21:27:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):358:364 -> a
-    21:27:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):351 -> a
-    28:29:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):389:390 -> a
-    28:29:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):365 -> a
-    28:29:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):351 -> a
-    30:37:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithout(com.android.tools.r8.graph.DexType):100:107 -> a
-    30:37:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):391 -> a
-    30:37:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):365 -> a
-    30:37:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):351 -> a
-    38:38:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):391:391 -> a
-    38:38:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):365 -> a
-    38:38:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):351 -> a
-    39:41:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):352:354 -> a
-    42:42:com.android.tools.r8.graph.DexApplication com.android.tools.r8.graph.LazyLoadedDexApplication$Builder.build():174:174 -> a
-    42:42:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):354 -> a
-    43:48:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):370:375 -> a
-    49:60:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):373:384 -> a
-    61:65:void convertClassesToDex(java.lang.Iterable,java.util.concurrent.ExecutorService):427:431 -> a
-    66:75:void convertMethodsToDex(com.android.tools.r8.graph.DexProgramClass):435:444 -> a
-    76:78:void lambda$convertMethodsToDex$3(boolean,com.android.tools.r8.graph.DexEncodedMethod):446:448 -> a
-    79:79:boolean isInWave():619:619 -> a
-    80:83:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):724:727 -> a
-    84:89:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):733:738 -> a
-    90:95:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):742:747 -> a
-    96:96:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():21:21 -> a
-    96:96:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):748 -> a
-    97:97:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):748:748 -> a
-    98:98:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):744:744 -> a
-    99:99:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$11(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):761:761 -> a
-    100:100:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():21:21 -> a
-    100:100:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$11(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):765 -> a
-    101:101:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$11(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):765:765 -> a
-    102:102:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$11(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):761:761 -> a
-    103:109:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):783:789 -> a
-    110:110:com.android.tools.r8.ir.optimize.InliningOracle lambda$rewriteCode$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):1016:1016 -> a
-    111:116:void computeMayHaveSideEffects(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1185:1190 -> a
-    117:125:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):1205:1213 -> a
-    117:125:void computeMayHaveSideEffects(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1191 -> a
-    126:126:void computeMayHaveSideEffects(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1192:1192 -> a
-    127:129:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.stream(java.lang.Iterable):62:64 -> a
-    127:129:void computeMayHaveSideEffects(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1192 -> a
-    130:135:void computeMayHaveSideEffects(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1192:1197 -> a
-    136:136:boolean lambda$computeMayHaveSideEffects$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1195:1195 -> a
-    137:142:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1272:1277 -> a
-    143:147:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1275:1279 -> a
-    148:148:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1366:1366 -> a
-    149:149:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():862:862 -> a
-    149:149:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1366 -> a
-    150:161:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1369:1380 -> a
-    162:164:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1426:1428 -> a
-    162:164:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1381 -> a
-    165:165:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1384:1384 -> a
-    166:167:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1433:1434 -> a
-    166:167:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1385 -> a
-    168:169:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1438:1439 -> a
-    168:169:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1388 -> a
-    170:171:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1391:1392 -> a
-    172:176:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1412:1416 -> a
-    172:176:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1393 -> a
-    177:182:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1394:1399 -> a
-    183:194:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1448:1459 -> a
-    183:194:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1400 -> a
-    195:196:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$15(com.android.tools.r8.graph.DexItemFactory):1374:1375 -> a
-    197:197:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$15(com.android.tools.r8.graph.DexItemFactory):1373:1373 -> a
-    198:198:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1421:1421 -> a
-    199:199:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1497:1497 -> a
-    200:200:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
-    200:200:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1498 -> a
-    201:206:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1499:1504 -> a
-    207:213:java.lang.String com.android.tools.r8.ir.code.IRCode.toString():368:374 -> a
-    207:213:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1505 -> a
-    214:223:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1506:1515 -> a
-    1:7:boolean enableTryWithResourcesDesugaring():265:271 -> b
-    8:27:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):397:416 -> b
-    28:34:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):415:421 -> b
-    35:48:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):123:136 -> b
-    35:48:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):421 -> b
-    49:49:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):421:421 -> b
-    50:50:void lambda$convertClassesToDex$2(com.android.tools.r8.graph.DexProgramClass):429:429 -> b
-    51:57:void convertMethodToDex(com.android.tools.r8.graph.DexEncodedMethod):454:460 -> b
+    1:1:java.util.Set libraryMethodsReturningNonNull(com.android.tools.r8.graph.DexItemFactory):288:288 -> a
+    2:3:boolean removeLambdaDeserializationMethods():296:297 -> a
+    2:3:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):357 -> a
+    4:9:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):359:364 -> a
+    10:12:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):304:306 -> a
+    10:12:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):366 -> a
+    13:13:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):367:367 -> a
+    14:15:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):328:329 -> a
+    14:15:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):367 -> a
+    16:17:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):337:338 -> a
+    16:17:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):368 -> a
+    18:19:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):344:345 -> a
+    18:19:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):369 -> a
+    20:21:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):350:351 -> a
+    20:21:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):370 -> a
+    22:28:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):379:385 -> a
+    22:28:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):372 -> a
+    29:30:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):410:411 -> a
+    29:30:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):386 -> a
+    29:30:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):372 -> a
+    31:38:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithout(com.android.tools.r8.graph.DexType):83:90 -> a
+    31:38:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):412 -> a
+    31:38:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):386 -> a
+    31:38:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):372 -> a
+    39:39:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):412:412 -> a
+    39:39:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):386 -> a
+    39:39:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):372 -> a
+    40:42:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):373:375 -> a
+    43:43:com.android.tools.r8.graph.DexApplication com.android.tools.r8.graph.LazyLoadedDexApplication$Builder.build():174:174 -> a
+    43:43:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):375 -> a
+    44:49:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):391:396 -> a
+    50:61:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):394:405 -> a
+    62:66:void convertClassesToDex(java.lang.Iterable,java.util.concurrent.ExecutorService):448:452 -> a
+    67:76:void convertMethodsToDex(com.android.tools.r8.graph.DexProgramClass):456:465 -> a
+    77:79:void lambda$convertMethodsToDex$3(boolean,com.android.tools.r8.graph.DexEncodedMethod):467:469 -> a
+    80:80:boolean isInWave():640:640 -> a
+    81:84:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):745:748 -> a
+    85:90:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):754:759 -> a
+    91:96:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):763:768 -> a
+    97:97:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():21:21 -> a
+    97:97:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):769 -> a
+    98:98:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):769:769 -> a
+    99:99:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):765:765 -> a
+    100:100:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$11(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):782:782 -> a
+    101:101:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():21:21 -> a
+    101:101:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$11(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):786 -> a
+    102:102:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$11(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):786:786 -> a
+    103:103:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$11(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):782:782 -> a
+    104:110:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):804:810 -> a
+    111:111:com.android.tools.r8.ir.optimize.InliningOracle lambda$rewriteCode$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):1032:1032 -> a
+    112:117:void computeMayHaveSideEffects(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1187:1192 -> a
+    118:120:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.stream(java.lang.Iterable):62:64 -> a
+    118:120:void computeMayHaveSideEffects(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1192 -> a
+    121:126:void computeMayHaveSideEffects(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1192:1197 -> a
+    127:127:boolean lambda$computeMayHaveSideEffects$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1195:1195 -> a
+    128:133:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1248:1253 -> a
+    134:138:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1251:1255 -> a
+    139:139:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1342:1342 -> a
+    140:140:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():833:833 -> a
+    140:140:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1342 -> a
+    141:152:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1345:1356 -> a
+    153:155:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1402:1404 -> a
+    153:155:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1357 -> a
+    156:156:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1360:1360 -> a
+    157:158:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1409:1410 -> a
+    157:158:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1361 -> a
+    159:160:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1414:1415 -> a
+    159:160:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1364 -> a
+    161:162:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1367:1368 -> a
+    163:167:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1388:1392 -> a
+    163:167:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1369 -> a
+    168:173:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1370:1375 -> a
+    174:185:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1424:1435 -> a
+    174:185:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1376 -> a
+    186:186:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1397:1397 -> a
+    187:187:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1473:1473 -> a
+    188:188:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
+    188:188:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1474 -> a
+    189:194:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1475:1480 -> a
+    195:201:java.lang.String com.android.tools.r8.ir.code.IRCode.toString():368:374 -> a
+    195:201:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1481 -> a
+    202:211:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1482:1491 -> a
+    1:7:boolean enableTryWithResourcesDesugaring():268:274 -> b
+    8:27:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):418:437 -> b
+    28:34:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):436:442 -> b
+    35:48:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):106:119 -> b
+    35:48:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):442 -> b
+    49:49:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):442:442 -> b
+    50:50:void lambda$convertClassesToDex$2(com.android.tools.r8.graph.DexProgramClass):450:450 -> b
+    51:57:void convertMethodToDex(com.android.tools.r8.graph.DexEncodedMethod):475:481 -> b
     58:58:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():21:21 -> b
-    58:58:void convertMethodToDex(com.android.tools.r8.graph.DexEncodedMethod):460 -> b
-    59:62:void convertMethodToDex(com.android.tools.r8.graph.DexEncodedMethod):460:463 -> b
-    63:66:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):756:759 -> b
-    67:79:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):758:770 -> b
-    80:82:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):807:809 -> b
-    83:96:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):808:821 -> b
-    97:102:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1481:1486 -> b
-    97:102:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):828 -> b
-    103:109:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):829:835 -> b
-    110:110:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():878:878 -> b
-    110:110:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):835 -> b
-    111:136:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):836:861 -> b
-    137:143:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback):1237:1243 -> b
-    137:143:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):862 -> b
-    144:148:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):870:874 -> b
-    149:190:void com.android.tools.r8.ir.optimize.ServiceLoaderRewriter.rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):61:102 -> b
-    149:190:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):874 -> b
-    191:257:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):877:943 -> b
-    258:274:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):942:958 -> b
-    275:277:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):794:796 -> b
-    275:277:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):959 -> b
-    278:330:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):962:1014 -> b
-    331:398:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1006:1073 -> b
-    399:424:void computeNonNullParamHints(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1123:1148 -> b
-    399:424:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1074 -> b
-    425:425:boolean com.android.tools.r8.graph.DexClass.hasKotlinInfo():809:809 -> b
-    425:425:void computeNonNullParamHints(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1149 -> b
-    425:425:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1074 -> b
-    426:426:void computeNonNullParamHints(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1166:1166 -> b
-    426:426:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1074 -> b
-    427:427:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1172:1172 -> b
-    427:427:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1077 -> b
-    428:432:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1078:1082 -> b
-    433:438:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):556:561 -> b
-    433:438:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1082 -> b
-    439:458:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1083:1102 -> b
-    459:459:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():886:886 -> b
-    459:459:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1102 -> b
-    460:471:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1103:1114 -> b
-    472:476:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1113:1117 -> b
-    477:481:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1227:1231 -> b
-    477:481:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1118 -> b
-    482:482:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1256:1256 -> b
-    482:482:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1232 -> b
-    482:482:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1118 -> b
-    483:488:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1295:1300 -> b
-    483:488:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1258 -> b
-    483:488:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1232 -> b
-    483:488:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1118 -> b
-    489:489:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():911:911 -> b
-    489:489:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1300 -> b
-    489:489:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1258 -> b
-    489:489:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1232 -> b
-    489:489:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1118 -> b
-    490:498:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1301:1309 -> b
-    490:498:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1258 -> b
-    490:498:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1232 -> b
-    490:498:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1118 -> b
-    499:506:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1259:1266 -> b
-    499:506:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1232 -> b
-    499:506:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1118 -> b
-    507:507:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1318:1318 -> b
-    508:508:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():899:899 -> b
-    508:508:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1318 -> b
-    509:524:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1322:1337 -> b
-    525:537:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1465:1477 -> b
-    525:537:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1346 -> b
-    538:541:boolean lambda$workaroundForwardingInitializerBug$14(com.android.tools.r8.ir.code.Instruction):1338:1341 -> b
+    58:58:void convertMethodToDex(com.android.tools.r8.graph.DexEncodedMethod):481 -> b
+    59:62:void convertMethodToDex(com.android.tools.r8.graph.DexEncodedMethod):481:484 -> b
+    63:66:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):777:780 -> b
+    67:79:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):779:791 -> b
+    80:82:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):828:830 -> b
+    83:96:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):829:842 -> b
+    97:102:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1457:1462 -> b
+    97:102:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):849 -> b
+    103:109:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):850:856 -> b
+    110:110:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():849:849 -> b
+    110:110:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):856 -> b
+    111:136:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):857:882 -> b
+    137:143:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback):1213:1219 -> b
+    137:143:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):883 -> b
+    144:212:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):891:959 -> b
+    213:229:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):958:974 -> b
+    230:232:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):815:817 -> b
+    230:232:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):975 -> b
+    233:285:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):978:1030 -> b
+    286:353:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1022:1089 -> b
+    354:379:void computeNonNullParamHints(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1138:1163 -> b
+    354:379:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1090 -> b
+    380:380:boolean com.android.tools.r8.graph.DexClass.hasKotlinInfo():791:791 -> b
+    380:380:void computeNonNullParamHints(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1164 -> b
+    380:380:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1090 -> b
+    381:381:void computeNonNullParamHints(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1181:1181 -> b
+    381:381:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1090 -> b
+    382:386:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1093:1097 -> b
+    387:392:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):529:534 -> b
+    387:392:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1097 -> b
+    393:412:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1098:1117 -> b
+    413:413:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():857:857 -> b
+    413:413:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1117 -> b
+    414:425:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1118:1129 -> b
+    426:430:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1128:1132 -> b
+    431:435:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1203:1207 -> b
+    431:435:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1133 -> b
+    436:436:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1232:1232 -> b
+    436:436:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1208 -> b
+    436:436:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1133 -> b
+    437:442:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1271:1276 -> b
+    437:442:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1234 -> b
+    437:442:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1208 -> b
+    437:442:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1133 -> b
+    443:443:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():882:882 -> b
+    443:443:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1276 -> b
+    443:443:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1234 -> b
+    443:443:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1208 -> b
+    443:443:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1133 -> b
+    444:452:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1277:1285 -> b
+    444:452:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1234 -> b
+    444:452:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1208 -> b
+    444:452:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1133 -> b
+    453:460:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1235:1242 -> b
+    453:460:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1208 -> b
+    453:460:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1133 -> b
+    461:461:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1294:1294 -> b
+    462:462:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():870:870 -> b
+    462:462:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1294 -> b
+    463:478:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1298:1313 -> b
+    479:491:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1441:1453 -> b
+    479:491:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1322 -> b
+    492:495:boolean lambda$workaroundForwardingInitializerBug$14(com.android.tools.r8.ir.code.Instruction):1314:1317 -> b
+    496:497:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$15(com.android.tools.r8.graph.DexItemFactory):1350:1351 -> b
+    498:498:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$15(com.android.tools.r8.graph.DexItemFactory):1349:1349 -> b
     boolean lambda$convertMethodToDex$4(com.android.tools.r8.graph.DexEncodedMethod) -> c
-    1:1:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$0(com.android.tools.r8.graph.DexProgramClass):374:374 -> c
-    1:1:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$1(com.android.tools.r8.graph.DexProgramClass):413:413 -> d
-    2:6:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1283:1287 -> d
+    1:4:java.util.Set libraryMethodsReturningReceiver():278:281 -> c
+    5:5:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$0(com.android.tools.r8.graph.DexProgramClass):395:395 -> c
+    1:1:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$1(com.android.tools.r8.graph.DexProgramClass):434:434 -> d
+    2:6:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1259:1263 -> d
 com.android.tools.r8.ir.conversion.JarSourceCode -> a.a.a.a.g.c.S:
     com.android.tools.r8.ir.code.Position currentPosition -> j
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode currentInstruction -> g
@@ -19067,363 +18842,366 @@
     1:103:void <clinit>():77:179 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.org.objectweb.asm.tree.MethodNode,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):212:212 -> <init>
     2:58:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.org.objectweb.asm.tree.MethodNode,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):167:223 -> <init>
-    void setUp() -> a
-    1:3:void lambda$computeBlockEntryJarStates$0(java.util.Queue,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.lang.Integer):450:452 -> a
-    4:7:void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder):469:472 -> a
-    8:13:void buildExceptionalPostlude(com.android.tools.r8.ir.conversion.IRBuilder):477:482 -> a
-    8:13:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):531 -> a
-    14:14:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode getInstruction(int):665:665 -> a
-    14:14:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):534 -> a
-    15:16:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):535:536 -> a
-    17:20:boolean verifyExceptionEdgesAreRecorded(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):586:589 -> a
-    17:20:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):536 -> a
-    21:21:boolean verifyExceptionEdgesAreRecorded(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):588:588 -> a
-    21:21:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):536 -> a
-    22:62:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):542:582 -> a
-    63:89:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):493:519 -> a
-    90:90:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode getInstruction(int):665:665 -> a
-    90:90:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):519 -> a
-    91:94:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):519:522 -> a
-    95:95:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):598:598 -> a
-    96:96:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):604:604 -> a
-    97:97:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int):611:611 -> a
-    98:98:int getMoveExceptionRegister():646:646 -> a
-    98:98:int getMoveExceptionRegister(int):641 -> a
-    99:100:boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo):656:657 -> a
-    101:101:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode getInstruction(int):665:665 -> a
-    101:101:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):747 -> a
-    102:139:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):749:786 -> a
-    140:140:int getOffset(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):856:856 -> a
-    141:141:int[] getSwitchTargets(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.List):881:881 -> a
-    142:142:int getOffset(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):856:856 -> a
-    142:142:int[] getSwitchTargets(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.List):882 -> a
-    143:145:int[] getSwitchTargets(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.List):882:884 -> a
-    146:175:com.android.tools.r8.ir.code.Invoke$Type invokeType(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode):1005:1034 -> a
-    146:175:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2607 -> a
-    176:176:com.android.tools.r8.ir.code.Invoke$Type invokeType(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode):1014:1014 -> a
-    176:176:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2607 -> a
-    177:195:com.android.tools.r8.ir.code.Invoke$Type invokeType(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode):1012:1030 -> a
-    177:195:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2607 -> a
-    196:196:com.android.tools.r8.ir.code.Invoke$Type invokeType(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode):1028:1028 -> a
-    196:196:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2607 -> a
-    197:197:com.android.tools.r8.ir.code.Invoke$Type invokeType(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode):1007:1007 -> a
-    197:197:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2607 -> a
-    198:207:boolean isCallToPolymorphicSignatureMethod(java.lang.String,java.lang.String):3027:3036 -> a
-    198:207:com.android.tools.r8.ir.code.Invoke$Type invokeType(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode):1007 -> a
-    198:207:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2607 -> a
-    208:210:com.android.tools.r8.ir.code.Invoke$Type invokeType(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode):1008:1010 -> a
-    208:210:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2607 -> a
-    211:261:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2610:2660 -> a
-    262:262:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2655:2655 -> a
-    263:264:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2646:2647 -> a
-    265:292:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2638:2665 -> a
-    293:297:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2663:2667 -> a
-    298:298:com.android.tools.r8.org.objectweb.asm.Type makeArrayType(com.android.tools.r8.org.objectweb.asm.Type):1039:1039 -> a
-    299:299:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1124:1124 -> a
-    300:300:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1122:1122 -> a
-    301:301:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1119:1119 -> a
-    302:303:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1115:1116 -> a
-    304:304:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1112:1112 -> a
-    305:305:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1109:1109 -> a
-    306:309:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1103:1106 -> a
-    310:310:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1100:1100 -> a
-    311:314:void updateStateForDupOneBelowTwo(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot):1612:1615 -> a
-    315:317:void updateStateForDupOneBelowOne(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot):1619:1621 -> a
-    318:326:void updateStateForInvoke(java.lang.String,boolean):1768:1776 -> a
-    327:374:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1867:1914 -> a
-    375:375:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1911:1911 -> a
-    376:377:void build(com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode,com.android.tools.r8.ir.conversion.IRBuilder):2891:2892 -> a
-    376:377:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1911 -> a
-    378:378:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1908:1908 -> a
-    379:379:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1905:1905 -> a
-    380:384:void build(com.android.tools.r8.org.objectweb.asm.tree.LookupSwitchInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2820:2824 -> a
-    380:384:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1905 -> a
-    385:385:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1902:1902 -> a
-    386:386:void build(com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2816:2816 -> a
-    386:386:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1902 -> a
-    387:387:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1899:1899 -> a
-    388:389:void build(com.android.tools.r8.org.objectweb.asm.tree.IincInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2811:2812 -> a
-    388:389:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1899 -> a
-    390:390:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1896:1896 -> a
-    391:420:void build(com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2777:2806 -> a
-    391:420:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1896 -> a
-    421:421:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1893:1893 -> a
-    422:422:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1890:1890 -> a
-    423:430:void build(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2725:2732 -> a
-    423:430:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1890 -> a
-    431:446:void build(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2731:2746 -> a
-    431:446:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1890 -> a
-    447:469:void build(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2745:2767 -> a
-    447:469:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1890 -> a
-    470:477:void build(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2757:2764 -> a
-    470:477:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1890 -> a
-    478:479:void build(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2751:2752 -> a
-    478:479:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1890 -> a
-    480:480:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1887:1887 -> a
-    481:481:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1884:1884 -> a
-    482:482:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1881:1881 -> a
-    483:505:void build(com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2571:2593 -> a
-    483:505:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1881 -> a
-    506:508:void build(com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2587:2589 -> a
-    506:508:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1881 -> a
-    509:511:void build(com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2581:2583 -> a
-    509:511:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1881 -> a
-    512:512:void build(com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2578:2578 -> a
-    512:512:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1881 -> a
-    513:513:void build(com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2575:2575 -> a
-    513:513:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1881 -> a
-    514:514:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1878:1878 -> a
-    515:547:void build(com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2534:2566 -> a
-    515:547:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1878 -> a
-    548:552:void build(com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2551:2555 -> a
-    548:552:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1878 -> a
-    553:557:void build(com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2543:2547 -> a
-    553:557:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1878 -> a
-    558:560:void build(com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2537:2539 -> a
-    558:560:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1878 -> a
-    561:561:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875:1875 -> a
-    562:589:void build(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2491:2518 -> a
-    562:589:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875 -> a
-    590:590:void build(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2512:2512 -> a
-    590:590:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875 -> a
-    591:591:void build(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2508:2508 -> a
-    591:591:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875 -> a
-    592:596:void build(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2500:2504 -> a
-    592:596:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875 -> a
-    597:630:void build(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2496:2529 -> a
-    597:630:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875 -> a
-    631:631:void build(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2515:2515 -> a
-    631:631:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875 -> a
-    632:632:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1872:1872 -> a
-    633:650:void build(com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2469:2486 -> a
-    633:650:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1872 -> a
-    651:652:void build(com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2472:2473 -> a
-    651:652:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1872 -> a
-    653:653:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869:1869 -> a
-    654:1074:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1929:2349 -> a
-    654:1074:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1075:1076:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1958:1959 -> a
-    1075:1076:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1077:1077:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1958:1958 -> a
-    1077:1077:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1078:1079:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1953:1954 -> a
-    1078:1079:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1080:1080:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1953:1953 -> a
-    1080:1080:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1081:1081:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1948:1948 -> a
-    1081:1081:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1082:1082:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1944:1944 -> a
-    1082:1082:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1083:1373:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1935:2225 -> a
-    1083:1373:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1374:1378:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2212:2216 -> a
-    1374:1378:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1379:1383:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2203:2207 -> a
-    1379:1383:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1384:1395:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2186:2197 -> a
-    1384:1395:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1396:1400:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2173:2177 -> a
-    1396:1400:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1401:1416:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2150:2165 -> a
-    1401:1416:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1417:1426:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2118:2127 -> a
-    1417:1426:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1427:1449:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2088:2110 -> a
-    1427:1449:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1450:1465:void dupTwoBelowTwo(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.IRBuilder):2444:2459 -> a
-    1450:1465:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2112 -> a
-    1450:1465:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1466:1476:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2073:2083 -> a
-    1466:1476:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1477:1492:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2053:2068 -> a
-    1477:1492:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1493:1503:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2038:2048 -> a
-    1493:1503:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1504:1515:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2023:2034 -> a
-    1504:1515:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1516:1519:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2015:2018 -> a
-    1516:1519:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1520:1523:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2007:2010 -> a
-    1520:1523:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1524:1525:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2002:2003 -> a
-    1524:1525:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1526:1536:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1988:1998 -> a
-    1526:1536:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1537:1835:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1997:2295 -> a
-    1537:1835:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1836:1840:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2282:2286 -> a
-    1836:1840:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1841:1844:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2274:2277 -> a
-    1841:1844:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1845:1845:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2271:2271 -> a
-    1845:1845:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1846:1846:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2268:2268 -> a
-    1846:1846:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1847:1847:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2265:2265 -> a
-    1847:1847:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1848:1848:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2262:2262 -> a
-    1848:1848:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1849:1849:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2259:2259 -> a
-    1849:1849:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1850:1850:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2256:2256 -> a
-    1850:1850:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1851:1851:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2253:2253 -> a
-    1851:1851:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1852:1852:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2250:2250 -> a
-    1852:1852:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1853:1853:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2247:2247 -> a
-    1853:1853:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1854:1854:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2244:2244 -> a
-    1854:1854:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1855:1855:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2241:2241 -> a
-    1855:1855:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1856:1856:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2238:2238 -> a
-    1856:1856:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1857:1857:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2235:2235 -> a
-    1857:1857:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1858:1858:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2232:2232 -> a
-    1858:1858:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1859:1954:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2229:2324 -> a
-    1859:1954:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1955:1956:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2319:2320 -> a
-    1955:1956:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1957:1958:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2314:2315 -> a
-    1957:1958:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1959:1960:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2309:2310 -> a
-    1959:1960:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1961:1962:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2304:2305 -> a
-    1961:1962:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1963:2009:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2299:2345 -> a
-    1963:2009:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    2010:2011:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2339:2340 -> a
-    2010:2011:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    2012:2013:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2334:2335 -> a
-    2012:2013:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    2014:2016:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2328:2330 -> a
-    2014:2016:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    2017:2024:boolean isExitingThrow(com.android.tools.r8.org.objectweb.asm.tree.InsnNode):2354:2361 -> a
-    2017:2024:void addThrow(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,int,com.android.tools.r8.ir.conversion.IRBuilder):2365 -> a
-    2025:2025:void addThrow(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,int,com.android.tools.r8.ir.conversion.IRBuilder):2366:2366 -> a
-    2026:2026:int getOffset(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):856:856 -> a
-    2026:2026:void addThrow(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,int,com.android.tools.r8.ir.conversion.IRBuilder):2368 -> a
-    2027:2045:void addThrow(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,int,com.android.tools.r8.ir.conversion.IRBuilder):2369:2387 -> a
-    2046:2051:void addReturn(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.code.ValueTypeConstraint,int,com.android.tools.r8.ir.conversion.IRBuilder):2392:2397 -> a
-    2052:2062:void dupOneBelowTwo(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.IRBuilder):2402:2412 -> a
-    2063:2070:void dupOneBelowOne(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.IRBuilder):2416:2423 -> a
-    2071:2073:void buildConversion(com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.ir.conversion.IRBuilder):2463:2465 -> a
-    2074:2079:void build(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2599:2604 -> a
-    2080:2080:void build(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2601:2601 -> a
-    2081:2103:void buildInvoke(java.lang.String,com.android.tools.r8.org.objectweb.asm.Type,boolean,com.android.tools.r8.ir.conversion.IRBuilder,java.util.function.BiConsumer):2680:2702 -> a
-    2104:2104:void addArgument(java.util.List,java.util.List,com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.ir.conversion.JarState$Slot):2711:2711 -> a
-    2105:2105:boolean com.android.tools.r8.ir.conversion.JarState$Slot.isCompatibleWith(com.android.tools.r8.org.objectweb.asm.Type):158:158 -> a
-    2105:2105:void addArgument(java.util.List,java.util.List,com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.ir.conversion.JarState$Slot):2711 -> a
-    2106:2108:void addArgument(java.util.List,java.util.List,com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.ir.conversion.JarState$Slot):2711:2713 -> a
-    2109:2111:void build(com.android.tools.r8.org.objectweb.asm.tree.InvokeDynamicInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2717:2719 -> a
-    2112:2112:void lambda$build$3(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):2721:2721 -> a
-    2113:2113:void buildSwitch(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.List,int[],com.android.tools.r8.ir.conversion.IRBuilder):2829:2829 -> a
-    2114:2114:int getOffset(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):856:856 -> a
-    2114:2114:void buildSwitch(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.List,int[],com.android.tools.r8.ir.conversion.IRBuilder):2830 -> a
-    2115:2120:void buildSwitch(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.List,int[],com.android.tools.r8.ir.conversion.IRBuilder):2831:2836 -> a
-    2121:2167:void build(com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2841:2887 -> a
-    2168:2168:com.android.tools.r8.ir.code.Position lambda$getCanonicalPosition$4(java.lang.Integer):2926:2926 -> a
-    int instructionOffset(int) -> b
+    1:4:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):285:288 -> a
+    5:14:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap recordArgumentTypes(com.android.tools.r8.ir.conversion.IRBuilder):396:405 -> a
+    5:14:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):291 -> a
+    15:15:boolean isWide(com.android.tools.r8.org.objectweb.asm.Type):413:413 -> a
+    15:15:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap recordArgumentTypes(com.android.tools.r8.ir.conversion.IRBuilder):406 -> a
+    15:15:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):291 -> a
+    16:16:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap recordArgumentTypes(com.android.tools.r8.ir.conversion.IRBuilder):407:407 -> a
+    16:16:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):291 -> a
+    17:17:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):292:292 -> a
+    18:18:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.<init>(int):95:95 -> a
+    18:18:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):292 -> a
+    19:53:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):293:327 -> a
+    54:62:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):301:309 -> a
+    63:79:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):305:321 -> a
+    80:101:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):317:338 -> a
+    102:109:void buildArgumentInstructions(com.android.tools.r8.ir.conversion.IRBuilder):376:383 -> a
+    102:109:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):342 -> a
+    110:110:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.conversion.IRBuilder.getTypeLattice(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):174:174 -> a
+    110:110:void buildArgumentInstructions(com.android.tools.r8.ir.conversion.IRBuilder):383 -> a
+    110:110:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):342 -> a
+    111:119:void buildArgumentInstructions(com.android.tools.r8.ir.conversion.IRBuilder):384:392 -> a
+    111:119:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):342 -> a
+    120:137:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):345:362 -> a
+    138:138:int actualArgumentCount():247:247 -> a
+    138:138:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):362 -> a
+    139:139:int formalParameterCount():243:243 -> a
+    139:139:int actualArgumentCount():247 -> a
+    139:139:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):362 -> a
+    140:140:int formalParameterCount():243:243 -> a
+    140:140:int actualArgumentCount():247 -> a
+    140:140:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):362 -> a
+    141:150:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):362:371 -> a
+    151:153:void lambda$computeBlockEntryJarStates$0(java.util.Queue,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.lang.Integer):450:452 -> a
+    154:159:void buildExceptionalPostlude(com.android.tools.r8.ir.conversion.IRBuilder):477:482 -> a
+    154:159:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):531 -> a
+    160:160:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode getInstruction(int):665:665 -> a
+    160:160:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):534 -> a
+    161:162:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):535:536 -> a
+    163:166:boolean verifyExceptionEdgesAreRecorded(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):586:589 -> a
+    163:166:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):536 -> a
+    167:167:boolean verifyExceptionEdgesAreRecorded(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):588:588 -> a
+    167:167:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):536 -> a
+    168:208:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):542:582 -> a
+    209:235:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):493:519 -> a
+    236:236:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode getInstruction(int):665:665 -> a
+    236:236:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):519 -> a
+    237:240:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):519:522 -> a
+    241:241:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):598:598 -> a
+    242:242:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):604:604 -> a
+    243:243:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int):611:611 -> a
+    244:244:boolean verifyCurrentInstructionCanThrow():651:651 -> a
+    245:246:boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo):656:657 -> a
+    247:247:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode getInstruction(int):665:665 -> a
+    247:247:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):747 -> a
+    248:285:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):749:786 -> a
+    286:286:int getOffset(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):856:856 -> a
+    287:287:int[] getSwitchTargets(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.List):881:881 -> a
+    288:288:int getOffset(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):856:856 -> a
+    288:288:int[] getSwitchTargets(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.List):882 -> a
+    289:291:int[] getSwitchTargets(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.List):882:884 -> a
+    292:321:com.android.tools.r8.ir.code.Invoke$Type invokeType(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode):1005:1034 -> a
+    292:321:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2607 -> a
+    322:322:com.android.tools.r8.ir.code.Invoke$Type invokeType(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode):1014:1014 -> a
+    322:322:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2607 -> a
+    323:341:com.android.tools.r8.ir.code.Invoke$Type invokeType(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode):1012:1030 -> a
+    323:341:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2607 -> a
+    342:342:com.android.tools.r8.ir.code.Invoke$Type invokeType(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode):1028:1028 -> a
+    342:342:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2607 -> a
+    343:343:com.android.tools.r8.ir.code.Invoke$Type invokeType(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode):1007:1007 -> a
+    343:343:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2607 -> a
+    344:353:boolean isCallToPolymorphicSignatureMethod(java.lang.String,java.lang.String):3027:3036 -> a
+    344:353:com.android.tools.r8.ir.code.Invoke$Type invokeType(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode):1007 -> a
+    344:353:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2607 -> a
+    354:356:com.android.tools.r8.ir.code.Invoke$Type invokeType(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode):1008:1010 -> a
+    354:356:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2607 -> a
+    357:407:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2610:2660 -> a
+    408:408:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2655:2655 -> a
+    409:410:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2646:2647 -> a
+    411:438:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2638:2665 -> a
+    439:443:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2663:2667 -> a
+    444:444:com.android.tools.r8.org.objectweb.asm.Type makeArrayType(com.android.tools.r8.org.objectweb.asm.Type):1039:1039 -> a
+    445:445:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1124:1124 -> a
+    446:446:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1122:1122 -> a
+    447:447:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1119:1119 -> a
+    448:449:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1115:1116 -> a
+    450:450:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1112:1112 -> a
+    451:451:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1109:1109 -> a
+    452:455:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1103:1106 -> a
+    456:456:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1100:1100 -> a
+    457:460:void updateStateForDupOneBelowTwo(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot):1612:1615 -> a
+    461:463:void updateStateForDupOneBelowOne(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot):1619:1621 -> a
+    464:472:void updateStateForInvoke(java.lang.String,boolean):1768:1776 -> a
+    473:520:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1867:1914 -> a
+    521:521:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1911:1911 -> a
+    522:523:void build(com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode,com.android.tools.r8.ir.conversion.IRBuilder):2891:2892 -> a
+    522:523:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1911 -> a
+    524:524:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1908:1908 -> a
+    525:525:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1905:1905 -> a
+    526:530:void build(com.android.tools.r8.org.objectweb.asm.tree.LookupSwitchInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2820:2824 -> a
+    526:530:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1905 -> a
+    531:531:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1902:1902 -> a
+    532:532:void build(com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2816:2816 -> a
+    532:532:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1902 -> a
+    533:533:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1899:1899 -> a
+    534:535:void build(com.android.tools.r8.org.objectweb.asm.tree.IincInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2811:2812 -> a
+    534:535:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1899 -> a
+    536:536:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1896:1896 -> a
+    537:566:void build(com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2777:2806 -> a
+    537:566:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1896 -> a
+    567:567:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1893:1893 -> a
+    568:568:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1890:1890 -> a
+    569:576:void build(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2725:2732 -> a
+    569:576:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1890 -> a
+    577:592:void build(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2731:2746 -> a
+    577:592:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1890 -> a
+    593:615:void build(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2745:2767 -> a
+    593:615:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1890 -> a
+    616:623:void build(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2757:2764 -> a
+    616:623:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1890 -> a
+    624:625:void build(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2751:2752 -> a
+    624:625:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1890 -> a
+    626:626:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1887:1887 -> a
+    627:627:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1884:1884 -> a
+    628:628:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1881:1881 -> a
+    629:651:void build(com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2571:2593 -> a
+    629:651:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1881 -> a
+    652:654:void build(com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2587:2589 -> a
+    652:654:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1881 -> a
+    655:657:void build(com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2581:2583 -> a
+    655:657:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1881 -> a
+    658:658:void build(com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2578:2578 -> a
+    658:658:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1881 -> a
+    659:659:void build(com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2575:2575 -> a
+    659:659:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1881 -> a
+    660:660:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1878:1878 -> a
+    661:693:void build(com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2534:2566 -> a
+    661:693:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1878 -> a
+    694:698:void build(com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2551:2555 -> a
+    694:698:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1878 -> a
+    699:703:void build(com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2543:2547 -> a
+    699:703:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1878 -> a
+    704:706:void build(com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2537:2539 -> a
+    704:706:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1878 -> a
+    707:707:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875:1875 -> a
+    708:735:void build(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2491:2518 -> a
+    708:735:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875 -> a
+    736:736:void build(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2512:2512 -> a
+    736:736:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875 -> a
+    737:737:void build(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2508:2508 -> a
+    737:737:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875 -> a
+    738:742:void build(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2500:2504 -> a
+    738:742:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875 -> a
+    743:776:void build(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2496:2529 -> a
+    743:776:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875 -> a
+    777:777:void build(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2515:2515 -> a
+    777:777:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875 -> a
+    778:778:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1872:1872 -> a
+    779:796:void build(com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2469:2486 -> a
+    779:796:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1872 -> a
+    797:798:void build(com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2472:2473 -> a
+    797:798:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1872 -> a
+    799:799:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869:1869 -> a
+    800:1220:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1929:2349 -> a
+    800:1220:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1221:1222:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1958:1959 -> a
+    1221:1222:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1223:1223:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1958:1958 -> a
+    1223:1223:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1224:1225:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1953:1954 -> a
+    1224:1225:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1226:1226:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1953:1953 -> a
+    1226:1226:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1227:1227:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1948:1948 -> a
+    1227:1227:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1228:1228:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1944:1944 -> a
+    1228:1228:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1229:1519:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1935:2225 -> a
+    1229:1519:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1520:1524:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2212:2216 -> a
+    1520:1524:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1525:1529:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2203:2207 -> a
+    1525:1529:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1530:1541:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2186:2197 -> a
+    1530:1541:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1542:1546:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2173:2177 -> a
+    1542:1546:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1547:1562:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2150:2165 -> a
+    1547:1562:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1563:1572:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2118:2127 -> a
+    1563:1572:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1573:1595:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2088:2110 -> a
+    1573:1595:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1596:1611:void dupTwoBelowTwo(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.IRBuilder):2444:2459 -> a
+    1596:1611:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2112 -> a
+    1596:1611:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1612:1622:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2073:2083 -> a
+    1612:1622:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1623:1638:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2053:2068 -> a
+    1623:1638:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1639:1649:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2038:2048 -> a
+    1639:1649:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1650:1661:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2023:2034 -> a
+    1650:1661:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1662:1665:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2015:2018 -> a
+    1662:1665:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1666:1669:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2007:2010 -> a
+    1666:1669:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1670:1671:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2002:2003 -> a
+    1670:1671:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1672:1682:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1988:1998 -> a
+    1672:1682:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1683:1981:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1997:2295 -> a
+    1683:1981:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1982:1986:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2282:2286 -> a
+    1982:1986:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1987:1990:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2274:2277 -> a
+    1987:1990:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1991:1991:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2271:2271 -> a
+    1991:1991:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1992:1992:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2268:2268 -> a
+    1992:1992:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1993:1993:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2265:2265 -> a
+    1993:1993:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1994:1994:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2262:2262 -> a
+    1994:1994:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1995:1995:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2259:2259 -> a
+    1995:1995:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1996:1996:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2256:2256 -> a
+    1996:1996:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1997:1997:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2253:2253 -> a
+    1997:1997:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1998:1998:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2250:2250 -> a
+    1998:1998:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1999:1999:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2247:2247 -> a
+    1999:1999:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    2000:2000:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2244:2244 -> a
+    2000:2000:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    2001:2001:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2241:2241 -> a
+    2001:2001:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    2002:2002:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2238:2238 -> a
+    2002:2002:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    2003:2003:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2235:2235 -> a
+    2003:2003:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    2004:2004:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2232:2232 -> a
+    2004:2004:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    2005:2100:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2229:2324 -> a
+    2005:2100:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    2101:2102:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2319:2320 -> a
+    2101:2102:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    2103:2104:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2314:2315 -> a
+    2103:2104:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    2105:2106:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2309:2310 -> a
+    2105:2106:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    2107:2108:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2304:2305 -> a
+    2107:2108:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    2109:2155:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2299:2345 -> a
+    2109:2155:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    2156:2157:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2339:2340 -> a
+    2156:2157:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    2158:2159:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2334:2335 -> a
+    2158:2159:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    2160:2162:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2328:2330 -> a
+    2160:2162:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    2163:2170:boolean isExitingThrow(com.android.tools.r8.org.objectweb.asm.tree.InsnNode):2354:2361 -> a
+    2163:2170:void addThrow(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,int,com.android.tools.r8.ir.conversion.IRBuilder):2365 -> a
+    2171:2171:void addThrow(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,int,com.android.tools.r8.ir.conversion.IRBuilder):2366:2366 -> a
+    2172:2172:int getOffset(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):856:856 -> a
+    2172:2172:void addThrow(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,int,com.android.tools.r8.ir.conversion.IRBuilder):2368 -> a
+    2173:2191:void addThrow(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,int,com.android.tools.r8.ir.conversion.IRBuilder):2369:2387 -> a
+    2192:2197:void addReturn(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.code.ValueTypeConstraint,int,com.android.tools.r8.ir.conversion.IRBuilder):2392:2397 -> a
+    2198:2208:void dupOneBelowTwo(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.IRBuilder):2402:2412 -> a
+    2209:2216:void dupOneBelowOne(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.IRBuilder):2416:2423 -> a
+    2217:2219:void buildConversion(com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.ir.conversion.IRBuilder):2463:2465 -> a
+    2220:2225:void build(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2599:2604 -> a
+    2226:2226:void build(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2601:2601 -> a
+    2227:2249:void buildInvoke(java.lang.String,com.android.tools.r8.org.objectweb.asm.Type,boolean,com.android.tools.r8.ir.conversion.IRBuilder,java.util.function.BiConsumer):2680:2702 -> a
+    2250:2250:void addArgument(java.util.List,java.util.List,com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.ir.conversion.JarState$Slot):2711:2711 -> a
+    2251:2251:boolean com.android.tools.r8.ir.conversion.JarState$Slot.isCompatibleWith(com.android.tools.r8.org.objectweb.asm.Type):158:158 -> a
+    2251:2251:void addArgument(java.util.List,java.util.List,com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.ir.conversion.JarState$Slot):2711 -> a
+    2252:2254:void addArgument(java.util.List,java.util.List,com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.ir.conversion.JarState$Slot):2711:2713 -> a
+    2255:2257:void build(com.android.tools.r8.org.objectweb.asm.tree.InvokeDynamicInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2717:2719 -> a
+    2258:2258:void lambda$build$3(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):2721:2721 -> a
+    2259:2259:void buildSwitch(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.List,int[],com.android.tools.r8.ir.conversion.IRBuilder):2829:2829 -> a
+    2260:2260:int getOffset(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):856:856 -> a
+    2260:2260:void buildSwitch(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.List,int[],com.android.tools.r8.ir.conversion.IRBuilder):2830 -> a
+    2261:2266:void buildSwitch(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.List,int[],com.android.tools.r8.ir.conversion.IRBuilder):2831:2836 -> a
+    2267:2313:void build(com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2841:2887 -> a
+    2314:2332:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):2898:2916 -> a
+    2333:2334:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):2902:2903 -> a
+    2335:2335:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):2902:2902 -> a
+    2336:2336:com.android.tools.r8.ir.code.Position lambda$getCanonicalPosition$4(java.lang.Integer):2926:2926 -> a
+    void setUp() -> b
     1:3:void lambda$computeBlockEntryJarStates$1(java.util.Queue,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.lang.Integer):457:459 -> b
-    4:12:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):626:634 -> b
-    13:18:java.util.List getTryHandlerGuards(java.util.List):845:850 -> b
-    13:18:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):635 -> b
-    19:19:java.util.List getTryHandlerGuards(java.util.List):847:847 -> b
-    19:19:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):635 -> b
-    20:22:java.util.List getTryHandlerOffsets(java.util.List):837:839 -> b
-    20:22:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):636 -> b
-    23:23:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):636:636 -> b
-    24:24:boolean verifyCurrentInstructionCanThrow():651:651 -> b
-    25:75:boolean canThrow(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):686:736 -> b
-    76:99:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):952:975 -> b
-    100:116:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):955:971 -> b
-    117:117:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):969:969 -> b
-    118:118:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):967:967 -> b
-    119:119:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):965:965 -> b
-    120:120:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):961:961 -> b
-    121:125:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):959:963 -> b
-    126:126:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):957:957 -> b
-    127:131:void updateStateForDupTwoBelowOne(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot):1625:1629 -> b
-    132:136:void processLocalVariablesAtExit(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1919:1923 -> b
-    137:149:void dupTwoBelowOne(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.IRBuilder):2427:2439 -> b
-    1:4:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):285:288 -> c
-    5:14:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap recordArgumentTypes(com.android.tools.r8.ir.conversion.IRBuilder):396:405 -> c
-    5:14:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):291 -> c
-    15:15:boolean isWide(com.android.tools.r8.org.objectweb.asm.Type):413:413 -> c
-    15:15:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap recordArgumentTypes(com.android.tools.r8.ir.conversion.IRBuilder):406 -> c
-    15:15:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):291 -> c
-    16:16:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap recordArgumentTypes(com.android.tools.r8.ir.conversion.IRBuilder):407:407 -> c
-    16:16:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):291 -> c
-    17:17:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):292:292 -> c
-    18:18:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.<init>(int):95:95 -> c
-    18:18:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):292 -> c
-    19:53:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):293:327 -> c
-    54:62:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):301:309 -> c
-    63:79:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):305:321 -> c
-    80:101:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):317:338 -> c
-    102:109:void buildArgumentInstructions(com.android.tools.r8.ir.conversion.IRBuilder):376:383 -> c
-    102:109:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):342 -> c
-    110:110:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.conversion.IRBuilder.getTypeLattice(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):174:174 -> c
-    110:110:void buildArgumentInstructions(com.android.tools.r8.ir.conversion.IRBuilder):383 -> c
-    110:110:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):342 -> c
-    111:119:void buildArgumentInstructions(com.android.tools.r8.ir.conversion.IRBuilder):384:392 -> c
-    111:119:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):342 -> c
-    120:137:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):345:362 -> c
-    138:138:int actualArgumentCount():247:247 -> c
-    138:138:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):362 -> c
-    139:139:int formalParameterCount():243:243 -> c
-    139:139:int actualArgumentCount():247 -> c
-    139:139:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):362 -> c
-    140:140:int formalParameterCount():243:243 -> c
-    140:140:int actualArgumentCount():247 -> c
-    140:140:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):362 -> c
-    141:150:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):362:371 -> c
-    151:151:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):621:621 -> c
-    152:168:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):860:876 -> c
-    169:170:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):866:867 -> c
-    171:179:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):862:870 -> c
-    180:204:int[] getJumpTargets(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode):890:914 -> c
-    180:204:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):870 -> c
-    205:205:int[] getJumpTargets(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode):911:911 -> c
-    205:205:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):870 -> c
-    206:206:int[] getJumpTargets(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode):909:909 -> c
-    206:206:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):870 -> c
-    207:207:int[] getJumpTargets(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode):907:907 -> c
-    207:207:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):870 -> c
-    208:208:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):873:873 -> c
-    209:212:int[] getVarTargets(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode):919:922 -> c
-    209:212:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):873 -> c
-    213:213:int[] getVarTargets(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode):920:920 -> c
-    213:213:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):873 -> c
-    214:230:com.android.tools.r8.ir.code.NumericType numericType(com.android.tools.r8.org.objectweb.asm.Type):984:1000 -> c
-    231:231:com.android.tools.r8.ir.code.NumericType numericType(com.android.tools.r8.org.objectweb.asm.Type):998:998 -> c
-    232:234:com.android.tools.r8.ir.code.NumericType numericType(com.android.tools.r8.org.objectweb.asm.Type):994:996 -> c
-    235:235:com.android.tools.r8.ir.code.NumericType numericType(com.android.tools.r8.org.objectweb.asm.Type):992:992 -> c
-    236:236:com.android.tools.r8.ir.code.NumericType numericType(com.android.tools.r8.org.objectweb.asm.Type):990:990 -> c
-    237:239:com.android.tools.r8.ir.code.NumericType numericType(com.android.tools.r8.org.objectweb.asm.Type):986:988 -> c
-    240:240:com.android.tools.r8.ir.code.Position getCurrentPosition():2921:2921 -> c
-    1:1:int instructionCount():252:252 -> d
-    2:3:void buildMonitorExit(com.android.tools.r8.ir.conversion.IRBuilder):486:487 -> d
-    4:4:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):616:616 -> d
-    5:6:java.util.List getTryHandlers(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):815:816 -> d
-    7:7:int getOffset(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):856:856 -> d
-    7:7:java.util.List getPotentialTryHandlers(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):793 -> d
-    7:7:java.util.List getTryHandlers(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):818 -> d
-    8:10:java.util.List getPotentialTryHandlers(int):804:806 -> d
-    8:10:java.util.List getPotentialTryHandlers(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):794 -> d
-    8:10:java.util.List getTryHandlers(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):818 -> d
-    11:12:boolean tryBlockRelevant(com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode,int):798:799 -> d
-    11:12:java.util.List getPotentialTryHandlers(int):807 -> d
-    11:12:java.util.List getPotentialTryHandlers(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):794 -> d
-    11:12:java.util.List getTryHandlers(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):818 -> d
-    13:13:java.util.List getPotentialTryHandlers(int):808:808 -> d
-    13:13:java.util.List getPotentialTryHandlers(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):794 -> d
-    13:13:java.util.List getTryHandlers(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):818 -> d
-    14:27:java.util.List getTryHandlers(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):818:831 -> d
-    28:29:void updateStateForConversion(com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.org.objectweb.asm.Type):1860:1861 -> d
+    4:7:void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder):469:472 -> b
+    8:8:int getMoveExceptionRegister():646:646 -> b
+    8:8:int getMoveExceptionRegister(int):641 -> b
+    9:59:boolean canThrow(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):686:736 -> b
+    60:83:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):952:975 -> b
+    84:100:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):955:971 -> b
+    101:101:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):969:969 -> b
+    102:102:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):967:967 -> b
+    103:103:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):965:965 -> b
+    104:104:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):961:961 -> b
+    105:109:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):959:963 -> b
+    110:110:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):957:957 -> b
+    111:115:void updateStateForDupTwoBelowOne(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot):1625:1629 -> b
+    116:120:void processLocalVariablesAtExit(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1919:1923 -> b
+    121:133:void dupTwoBelowOne(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.IRBuilder):2427:2439 -> b
+    int instructionOffset(int) -> c
+    1:1:int instructionCount():252:252 -> c
+    2:10:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):626:634 -> c
+    11:16:java.util.List getTryHandlerGuards(java.util.List):845:850 -> c
+    11:16:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):635 -> c
+    17:17:java.util.List getTryHandlerGuards(java.util.List):847:847 -> c
+    17:17:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):635 -> c
+    18:20:java.util.List getTryHandlerOffsets(java.util.List):837:839 -> c
+    18:20:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):636 -> c
+    21:21:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):636:636 -> c
+    22:38:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):860:876 -> c
+    39:40:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):866:867 -> c
+    41:49:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):862:870 -> c
+    50:74:int[] getJumpTargets(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode):890:914 -> c
+    50:74:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):870 -> c
+    75:75:int[] getJumpTargets(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode):911:911 -> c
+    75:75:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):870 -> c
+    76:76:int[] getJumpTargets(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode):909:909 -> c
+    76:76:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):870 -> c
+    77:77:int[] getJumpTargets(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode):907:907 -> c
+    77:77:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):870 -> c
+    78:78:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):873:873 -> c
+    79:82:int[] getVarTargets(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode):919:922 -> c
+    79:82:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):873 -> c
+    83:83:int[] getVarTargets(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode):920:920 -> c
+    83:83:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):873 -> c
+    84:100:com.android.tools.r8.ir.code.NumericType numericType(com.android.tools.r8.org.objectweb.asm.Type):984:1000 -> c
+    101:101:com.android.tools.r8.ir.code.NumericType numericType(com.android.tools.r8.org.objectweb.asm.Type):998:998 -> c
+    102:104:com.android.tools.r8.ir.code.NumericType numericType(com.android.tools.r8.org.objectweb.asm.Type):994:996 -> c
+    105:105:com.android.tools.r8.ir.code.NumericType numericType(com.android.tools.r8.org.objectweb.asm.Type):992:992 -> c
+    106:106:com.android.tools.r8.ir.code.NumericType numericType(com.android.tools.r8.org.objectweb.asm.Type):990:990 -> c
+    107:109:com.android.tools.r8.ir.code.NumericType numericType(com.android.tools.r8.org.objectweb.asm.Type):986:988 -> c
+    int instructionIndex(int) -> d
+    1:2:void buildMonitorExit(com.android.tools.r8.ir.conversion.IRBuilder):486:487 -> d
+    3:4:java.util.List getTryHandlers(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):815:816 -> d
+    5:5:int getOffset(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):856:856 -> d
+    5:5:java.util.List getPotentialTryHandlers(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):793 -> d
+    5:5:java.util.List getTryHandlers(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):818 -> d
+    6:8:java.util.List getPotentialTryHandlers(int):804:806 -> d
+    6:8:java.util.List getPotentialTryHandlers(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):794 -> d
+    6:8:java.util.List getTryHandlers(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):818 -> d
+    9:10:boolean tryBlockRelevant(com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode,int):798:799 -> d
+    9:10:java.util.List getPotentialTryHandlers(int):807 -> d
+    9:10:java.util.List getPotentialTryHandlers(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):794 -> d
+    9:10:java.util.List getTryHandlers(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):818 -> d
+    11:11:java.util.List getPotentialTryHandlers(int):808:808 -> d
+    11:11:java.util.List getPotentialTryHandlers(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):794 -> d
+    11:11:java.util.List getTryHandlers(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):818 -> d
+    12:25:java.util.List getTryHandlers(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):818:831 -> d
+    26:27:void updateStateForConversion(com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.org.objectweb.asm.Type):1860:1861 -> d
+    28:28:com.android.tools.r8.ir.code.Position getCurrentPosition():2921:2921 -> d
+    boolean verifyRegister(int) -> e
     1:1:boolean generateMethodSynchronization():238:238 -> e
     2:24:void computeBlockEntryJarStates(com.android.tools.r8.ir.conversion.IRBuilder):417:439 -> e
     25:72:void updateState(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):1199:1246 -> e
@@ -19686,14 +19464,11 @@
     1486:1486:com.android.tools.r8.ir.code.ValueType valueType(com.android.tools.r8.org.objectweb.asm.Type):941:941 -> e
     1487:1487:com.android.tools.r8.ir.code.ValueType valueType(com.android.tools.r8.org.objectweb.asm.Type):939:939 -> e
     1488:1488:com.android.tools.r8.ir.code.ValueType valueType(com.android.tools.r8.org.objectweb.asm.Type):937:937 -> e
-    1489:1507:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):2898:2916 -> e
-    1508:1509:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):2902:2903 -> e
-    1510:1510:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):2902:2902 -> e
-    boolean verifyRegister(int) -> f
-    1:1:boolean isThrow(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):677:677 -> f
-    2:26:com.android.tools.r8.ir.code.Position getExceptionalExitPosition():2942:2966 -> f
-    int instructionIndex(int) -> g
-    1:1:int getMoveExceptionRegister():646:646 -> g
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):621:621 -> f
+    2:2:boolean isThrow(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):677:677 -> f
+    3:27:com.android.tools.r8.ir.code.Position getExceptionalExitPosition():2942:2966 -> f
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):616:616 -> g
+    2:2:int getMoveExceptionRegister():646:646 -> g
     1:1:java.lang.String arrayTypeDesc(int):1061:1061 -> h
     2:5:com.android.tools.r8.ir.code.Position getPreamblePosition():2930:2933 -> h
     1:1:boolean isStatic():227:227 -> i
@@ -19797,7 +19572,7 @@
     129:136:boolean recordStateForTarget(int,com.android.tools.r8.ir.conversion.JarState$Local[],com.android.tools.r8.com.google.common.collect.ImmutableList):812:819 -> a
     137:137:boolean isRefinement(com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.org.objectweb.asm.Type):824:824 -> a
     138:151:java.lang.String localsToString(java.util.Collection):910:923 -> a
-    152:152:java.lang.String com.android.tools.r8.org.objectweb.asm.Type.toString():889:889 -> a
+    152:152:java.lang.String com.android.tools.r8.org.objectweb.asm.Type.toString():904:904 -> a
     152:152:java.lang.String localsToString(java.util.Collection):925 -> a
     153:157:java.lang.String localsToString(java.util.Collection):925:929 -> a
     1:10:void closeLocals():549:558 -> b
@@ -19855,7 +19630,7 @@
     59:59:boolean verifySlots(com.android.tools.r8.ir.conversion.JarState$Slot[],com.android.tools.r8.org.objectweb.asm.Type):877:877 -> b
     59:59:com.android.tools.r8.ir.conversion.JarState$Slot[] popReverse(int,com.android.tools.r8.org.objectweb.asm.Type):763 -> b
     60:63:java.lang.String stackToString(java.util.Collection):890:893 -> b
-    64:64:java.lang.String com.android.tools.r8.org.objectweb.asm.Type.toString():889:889 -> b
+    64:64:java.lang.String com.android.tools.r8.org.objectweb.asm.Type.toString():904:904 -> b
     64:64:java.lang.String stackToString(java.util.Collection):895 -> b
     65:76:java.lang.String stackToString(java.util.Collection):895:906 -> b
     1:7:com.android.tools.r8.com.google.common.collect.ImmutableList getLocals():592:598 -> c
@@ -19958,80 +19733,79 @@
     java.util.Map protoFixupCache -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():69:69 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):75:75 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView):73:76 -> <init>
-    1:5:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,java.util.Set):80:84 -> a
-    6:14:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):93:101 -> a
-    15:35:boolean unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):432:452 -> a
-    15:35:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
-    36:56:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):106:126 -> a
-    57:61:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):459:463 -> a
-    57:61:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):127 -> a
-    62:64:com.android.tools.r8.graph.DexValue$DexValueMethodHandle rewriteDexValueMethodHandle(com.android.tools.r8.graph.DexValue$DexValueMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):488:490 -> a
-    62:64:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):463 -> a
-    62:64:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):127 -> a
-    65:81:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):464:480 -> a
-    65:81:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):127 -> a
-    82:125:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):128:171 -> a
-    126:141:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):166:181 -> a
-    142:142:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):387:387 -> a
-    142:142:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):181 -> a
-    143:150:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):183:190 -> a
-    151:169:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):569:587 -> a
-    151:169:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):189 -> a
-    170:206:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):192:228 -> a
-    207:328:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):227:348 -> a
-    329:360:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):344:375 -> a
-    361:408:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):495:542 -> a
-    409:414:com.android.tools.r8.graph.DexValue$DexValueMethodType rewriteDexMethodType(com.android.tools.r8.graph.DexValue$DexValueMethodType):549:554 -> a
-    415:415:boolean canInvokeTargetWithInvokeVirtual(com.android.tools.r8.graph.DexEncodedMethod):601:601 -> a
-    416:422:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):605:611 -> a
-    423:423:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):78:78 -> a
-    423:423:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):616 -> a
-    424:427:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):619:622 -> a
+    1:1:void <clinit>():70:70 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):76:76 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.AppView):74:77 -> <init>
+    1:5:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,java.util.Set):81:85 -> a
+    6:14:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):94:102 -> a
+    15:35:boolean unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):433:453 -> a
+    15:35:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):104 -> a
+    36:56:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):107:127 -> a
+    57:61:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):460:464 -> a
+    57:61:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):128 -> a
+    62:64:com.android.tools.r8.graph.DexValue$DexValueMethodHandle rewriteDexValueMethodHandle(com.android.tools.r8.graph.DexValue$DexValueMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):489:491 -> a
+    62:64:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):464 -> a
+    62:64:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):128 -> a
+    65:81:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):465:481 -> a
+    65:81:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):128 -> a
+    82:125:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):129:172 -> a
+    126:141:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):167:182 -> a
+    142:142:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):388:388 -> a
+    142:142:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):182 -> a
+    143:150:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):184:191 -> a
+    151:179:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):567:595 -> a
+    151:179:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):190 -> a
+    180:216:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):193:229 -> a
+    217:338:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):228:349 -> a
+    339:370:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):345:376 -> a
+    371:415:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):496:540 -> a
+    416:421:com.android.tools.r8.graph.DexValue$DexValueMethodType rewriteDexMethodType(com.android.tools.r8.graph.DexValue$DexValueMethodType):547:552 -> a
+    422:422:boolean canInvokeTargetWithInvokeVirtual(com.android.tools.r8.graph.DexEncodedMethod):599:599 -> a
+    423:429:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):603:609 -> a
+    430:430:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):328:328 -> a
+    430:430:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):614 -> a
+    431:434:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):617:620 -> a
 com.android.tools.r8.ir.conversion.OptimizationFeedback -> a.a.a.a.g.c.da:
+    void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
     void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget) -> a
-    void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
-    void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int) -> a
     void methodReturnsConstantNumber(com.android.tools.r8.graph.DexEncodedMethod,long) -> a
     void methodReturnsConstantString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString) -> a
     void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility) -> a
+    void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet) -> a
     void setParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ParameterUsagesInfo) -> a
     void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer) -> a
-    void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> b
-    void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod) -> b
+    void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> b
+    void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod) -> b
     void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet) -> b
-    void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod) -> c
-    void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod) -> d
-    void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> e
+    void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod) -> c
+    void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> d
+    void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod) -> e
 com.android.tools.r8.ir.conversion.OptimizationFeedbackDelayed -> a.a.a.a.g.c.ea:
     java.util.Map optimizationInfos -> a
     java.util.Map processed -> b
-    1:6:void <init>():21:26 -> <init>
-    1:1:void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int):47:47 -> a
-    2:2:void methodReturnsConstantNumber(com.android.tools.r8.graph.DexEncodedMethod,long):52:52 -> a
-    3:3:void methodReturnsConstantString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):57:57 -> a
-    4:4:void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod):67:67 -> a
-    5:5:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):77:77 -> a
-    6:6:void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):94:94 -> a
-    7:7:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):100:100 -> a
-    8:8:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):105:105 -> a
-    9:9:void setParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ParameterUsagesInfo):116:116 -> a
-    10:10:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):121:121 -> a
-    1:1:void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):88:88 -> b
-    2:2:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):110:110 -> b
-    3:3:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):126:126 -> b
-    1:1:void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod):72:72 -> c
-    1:1:void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod):82:82 -> d
-    1:1:void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod):62:62 -> e
-    1:6:com.android.tools.r8.graph.UpdatableOptimizationInfo getOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedMethod):30:35 -> f
+    1:6:void <init>():19:24 -> <init>
+    1:1:void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int):39:39 -> a
+    2:2:void methodReturnsConstantNumber(com.android.tools.r8.graph.DexEncodedMethod,long):44:44 -> a
+    3:3:void methodReturnsConstantString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):49:49 -> a
+    4:4:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):69:69 -> a
+    5:5:void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):80:80 -> a
+    6:6:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):92:92 -> a
+    7:7:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):97:97 -> a
+    8:8:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):102:102 -> a
+    9:9:void setParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ParameterUsagesInfo):108:108 -> a
+    10:10:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):113:113 -> a
+    1:1:void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod):64:64 -> b
+    2:2:void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):86:86 -> b
+    3:3:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):118:118 -> b
+    1:1:void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod):59:59 -> c
+    1:1:void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod):54:54 -> d
+    1:1:void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod):74:74 -> e
+    1:6:com.android.tools.r8.graph.UpdatableOptimizationInfo getOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedMethod):28:33 -> f
 com.android.tools.r8.ir.conversion.OptimizationFeedbackSimple -> a.a.a.a.g.c.fa:
-    1:1:void <init>():17:17 -> <init>
-    void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
-    void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod) -> a
+    1:1:void <init>():15:15 -> <init>
+    void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
     void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int) -> a
     void methodReturnsConstantNumber(com.android.tools.r8.graph.DexEncodedMethod,long) -> a
     void methodReturnsConstantString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString) -> a
@@ -20039,35 +19813,36 @@
     void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet) -> a
     void setParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ParameterUsagesInfo) -> a
     void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer) -> a
-    1:1:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):58:58 -> a
-    void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> b
+    1:1:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):50:50 -> a
+    2:2:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):81:81 -> a
+    void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> b
+    void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod) -> b
     void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet) -> b
-    1:1:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):89:89 -> b
-    void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod) -> c
-    1:1:void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod):63:63 -> d
-    void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> e
+    void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod) -> c
+    void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> d
+    1:1:void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod):55:55 -> e
 com.android.tools.r8.ir.conversion.SourceCode -> a.a.a.a.g.c.ga:
     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
+    void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder) -> a
+    com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int) -> a
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int) -> a
-    int getMoveExceptionRegister(int) -> a
     void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder) -> a
     void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder) -> a
-    void setUp() -> a
     int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder) -> a
+    boolean verifyCurrentInstructionCanThrow() -> a
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> a
-    com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder) -> b
-    int instructionOffset(int) -> b
-    boolean verifyCurrentInstructionCanThrow() -> b
-    void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder) -> c
-    com.android.tools.r8.ir.code.Position getCurrentPosition() -> c
-    com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int) -> c
-    com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> d
-    int instructionCount() -> d
-    com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int) -> e
-    boolean verifyRegister(int) -> f
-    int instructionIndex(int) -> g
+    void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder) -> b
+    int getMoveExceptionRegister(int) -> b
+    void setUp() -> b
+    com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder) -> c
+    int instructionCount() -> c
+    int instructionOffset(int) -> c
+    com.android.tools.r8.ir.code.Position getCurrentPosition() -> d
+    int instructionIndex(int) -> d
+    boolean verifyRegister(int) -> e
+    com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int) -> f
+    com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> g
 com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> a.a.a.a.g.c.ia:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
@@ -20156,9 +19931,9 @@
     21:21:void lambda$prepareInstructions$2(java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):129:129 -> a
     1:1:void lambda$prepareInstructions$3(int,com.android.tools.r8.ir.conversion.IRBuilder):133:133 -> b
     1:1:void lambda$prepareInstructions$4(int,com.android.tools.r8.ir.conversion.IRBuilder):134:134 -> c
-    1:46:void prepareInstructions():89:134 -> h
-    1:21:boolean checkSignatures():33:53 -> l
-    1:1:boolean delegatingToConstructor():68:68 -> m
+    1:46:void prepareInstructions():89:134 -> g
+    1:21:boolean checkSignatures():33:53 -> k
+    1:1:boolean delegatingToConstructor():68:68 -> l
 com.android.tools.r8.ir.desugar.ClassProcessor -> a.a.a.a.g.d.b:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -20204,7 +19979,7 @@
     25:26:boolean hasVirtualMethodWithSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):256:257 -> a
     25:26:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):85 -> a
     27:27:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):86:86 -> a
-    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():632:632 -> a
+    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():628:628 -> a
     28:28:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):90 -> a
     29:29:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):90:90 -> a
     30:42:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):87:99 -> a
@@ -20217,7 +19992,7 @@
     95:121:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):208:234 -> a
     122:126:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):222:226 -> a
     127:146:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):223:242 -> a
-    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():632:632 -> a
+    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():628:628 -> a
     147:147:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):246 -> a
     148:148:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):246:246 -> a
     149:149:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):243:243 -> a
@@ -20259,115 +20034,92 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):116:116 -> <init>
     2:35:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):88:121 -> <init>
     1:56:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):127:182 -> a
-    57:57:com.android.tools.r8.graph.DexMethod staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):348:348 -> a
+    57:57:com.android.tools.r8.graph.DexMethod staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):336:336 -> a
     57:57:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):183 -> a
     58:58:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):184:184 -> a
-    59:69:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):182:192 -> a
+    59:67:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):182:190 -> a
+    68:68:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):331:331 -> a
+    68:68:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):191 -> a
+    69:69:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):192:192 -> a
     70:98:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):190:218 -> a
-    99:100:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):375:376 -> a
+    99:100:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):361:362 -> a
     99:100:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):218 -> a
     101:101:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):219:219 -> a
-    102:102:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):387:387 -> a
+    102:102:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):368:368 -> a
     102:102:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):220 -> a
-    103:103:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):383:383 -> a
-    103:103:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):387 -> a
-    103:103:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):220 -> a
-    104:104:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):221:221 -> a
-    105:144:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):219:258 -> a
-    145:145:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):387:387 -> a
-    145:145:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):259 -> a
-    146:146:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):383:383 -> a
-    146:146:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):387 -> a
-    146:146:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):259 -> a
-    147:147:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):260:260 -> a
-    148:157:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):258:267 -> a
-    158:158:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):397:397 -> a
-    158:158:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):268 -> a
-    159:159:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):393:393 -> a
-    159:159:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):397 -> a
-    159:159:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):268 -> a
-    160:160:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):269:269 -> a
-    161:161:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):267:267 -> a
-    162:164:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):240:242 -> a
-    165:165:java.util.Set lambda$rewriteMethodReferences$0(com.android.tools.r8.graph.DexLibraryClass):186:186 -> a
-    166:175:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):278:287 -> a
-    176:177:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):298:299 -> a
-    178:178:java.lang.String getCompanionClassDescriptor(java.lang.String):293:293 -> a
-    178:178:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):300 -> a
-    179:179:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):301:301 -> a
-    180:184:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):310:314 -> a
-    185:194:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):359:368 -> a
-    195:195:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):365:365 -> a
-    196:196:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):387:387 -> a
-    197:197:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):383:383 -> a
-    197:197:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):387 -> a
-    198:198:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):411:411 -> a
-    199:205:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):462:468 -> a
-    199:205:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):411 -> a
-    206:212:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):411:417 -> a
-    213:226:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):445:458 -> a
-    213:226:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):418 -> a
-    227:231:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):418:422 -> a
-    232:232:boolean isInMainDexList(com.android.tools.r8.graph.DexType):337:337 -> a
-    232:232:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):422 -> a
-    233:237:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):422:426 -> a
-    238:240:void clear():433:435 -> a
-    238:240:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):429 -> a
-    241:242:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):440:441 -> a
-    243:257:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):472:486 -> a
-    258:258:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):479:479 -> a
-    259:273:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):516:530 -> a
-    274:274:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):529:529 -> a
-    275:275:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):546:546 -> a
-    276:277:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):559:560 -> a
-    276:277:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):550 -> a
-    278:295:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):494:511 -> a
-    278:295:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):562 -> a
-    278:295:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):550 -> a
-    296:296:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():628:628 -> a
-    296:296:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):511 -> a
-    296:296:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):562 -> a
-    296:296:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):550 -> a
-    297:297:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):511:511 -> a
-    297:297:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):562 -> a
-    297:297:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):550 -> a
-    298:298:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):510:510 -> a
-    298:298:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):562 -> a
-    298:298:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):550 -> a
-    299:333:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):563:597 -> a
-    299:333:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):550 -> a
-    334:334:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):551:551 -> a
-    335:337:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):567:569 -> a
-    335:337:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):550 -> a
-    1:1:boolean hasDispatchClassSuffix(com.android.tools.r8.graph.DexType):353:353 -> b
-    2:2:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):397:397 -> b
-    3:3:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):393:393 -> b
-    3:3:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):397 -> b
-    1:1:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):343:343 -> c
-    2:2:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):305:305 -> c
-    2:2:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):343 -> c
-    3:3:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):343:343 -> c
-    1:1:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):534:534 -> d
-    2:2:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):319:319 -> d
-    2:2:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):535 -> d
-    3:3:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):324:324 -> d
-    3:3:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):536 -> d
-    4:4:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):329:329 -> d
-    4:4:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):324 -> d
-    4:4:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):536 -> d
-    5:5:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):319:319 -> d
-    5:5:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):329 -> d
-    5:5:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):324 -> d
-    5:5:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):536 -> d
-    6:9:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):329:332 -> d
-    6:9:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):324 -> d
-    6:9:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):536 -> d
-    10:12:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):331:333 -> d
-    10:12:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):324 -> d
-    10:12:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):536 -> d
-    13:14:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):538:539 -> d
-    15:15:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():628:628 -> d
-    15:15:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):539 -> d
+    103:103:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):221:221 -> a
+    104:143:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):219:258 -> a
+    144:144:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):368:368 -> a
+    144:144:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):259 -> a
+    145:145:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):260:260 -> a
+    146:155:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):258:267 -> a
+    156:156:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):374:374 -> a
+    156:156:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):268 -> a
+    157:157:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):269:269 -> a
+    158:158:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):267:267 -> a
+    159:161:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):240:242 -> a
+    162:162:java.util.Set lambda$rewriteMethodReferences$0(com.android.tools.r8.graph.DexLibraryClass):186:186 -> a
+    163:172:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):278:287 -> a
+    173:177:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):294:298 -> a
+    178:186:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String):346:354 -> a
+    187:187:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String):352:352 -> a
+    188:188:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):368:368 -> a
+    189:189:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):388:388 -> a
+    190:196:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):439:445 -> a
+    190:196:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):388 -> a
+    197:203:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):388:394 -> a
+    204:217:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):422:435 -> a
+    204:217:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):395 -> a
+    218:222:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):395:399 -> a
+    223:223:boolean isInMainDexList(com.android.tools.r8.graph.DexType):325:325 -> a
+    223:223:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):399 -> a
+    224:228:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):399:403 -> a
+    229:231:void clear():410:412 -> a
+    229:231:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):406 -> a
+    232:233:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):417:418 -> a
+    234:248:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):449:463 -> a
+    249:249:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):456:456 -> a
+    250:264:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):493:507 -> a
+    265:265:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):506:506 -> a
+    266:266:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):523:523 -> a
+    267:268:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):536:537 -> a
+    267:268:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):527 -> a
+    269:286:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):471:488 -> a
+    269:286:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):539 -> a
+    269:286:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):527 -> a
+    287:287:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():624:624 -> a
+    287:287:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):488 -> a
+    287:287:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):539 -> a
+    287:287:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):527 -> a
+    288:288:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):488:488 -> a
+    288:288:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):539 -> a
+    288:288:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):527 -> a
+    289:289:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):487:487 -> a
+    289:289:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):539 -> a
+    289:289:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):527 -> a
+    290:324:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):540:574 -> a
+    290:324:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):527 -> a
+    325:325:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):528:528 -> a
+    326:328:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):544:546 -> a
+    326:328:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):527 -> a
+    1:5:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):303:307 -> b
+    6:6:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):374:374 -> b
+    1:1:boolean hasDispatchClassSuffix(com.android.tools.r8.graph.DexType):341:341 -> c
+    2:2:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):511:511 -> c
+    3:3:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):312:312 -> c
+    3:3:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):512 -> c
+    4:4:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):317:317 -> c
+    4:4:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):513 -> c
+    5:5:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):312:312 -> c
+    5:5:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):317 -> c
+    5:5:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):513 -> c
+    6:9:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):317:320 -> c
+    6:9:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):513 -> c
+    10:12:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):319:321 -> c
+    10:12:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):513 -> c
+    13:14:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):515:516 -> c
+    15:15:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():624:624 -> c
+    15:15:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):516 -> c
 com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor -> a.a.a.a.g.d.g:
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor ExcludeDexResources -> b
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor IncludeAllResources -> a
@@ -20383,39 +20135,39 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):59:59 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):57:61 -> <init>
     1:9:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):65:73 -> a
-    10:21:boolean canMoveToCompanionClass(com.android.tools.r8.graph.DexEncodedMethod):280:291 -> a
+    10:21:boolean canMoveToCompanionClass(com.android.tools.r8.graph.DexEncodedMethod):283:294 -> a
     10:21:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):74 -> a
     22:36:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):80:94 -> a
-    37:44:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):93:100 -> a
-    45:46:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):84:85 -> a
-    47:48:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):75:76 -> a
-    49:74:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):304:329 -> a
-    49:74:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):104 -> a
-    75:75:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):105:105 -> a
-    76:76:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):305:305 -> a
-    76:76:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):104 -> a
-    77:91:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):110:124 -> a
-    92:95:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):337:340 -> a
-    92:95:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):125 -> a
-    96:101:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):126:131 -> a
-    102:122:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):130:150 -> a
-    123:128:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):149:154 -> a
-    129:144:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):144:159 -> a
-    145:145:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):338:338 -> a
-    145:145:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):125 -> a
-    146:164:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):163:181 -> a
-    165:165:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):305:305 -> a
-    165:165:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):181 -> a
-    166:184:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):182:200 -> a
-    185:209:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):204:228 -> a
-    210:210:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):348:348 -> a
-    210:210:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):228 -> a
-    211:230:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):229:248 -> a
-    231:285:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):221:275 -> a
-    286:286:com.android.tools.r8.ir.conversion.SourceCode lambda$process$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):238:238 -> a
-    287:287:void com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.<init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.ir.code.Position,boolean):37:37 -> a
-    287:287:com.android.tools.r8.ir.conversion.SourceCode lambda$process$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):238 -> a
-com.android.tools.r8.ir.desugar.Java8MethodRewriter -> a.a.a.a.g.d.t:
+    37:47:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):93:103 -> a
+    48:49:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):84:85 -> a
+    50:51:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):75:76 -> a
+    52:77:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):307:332 -> a
+    52:77:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):107 -> a
+    78:78:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):108:108 -> a
+    79:79:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):308:308 -> a
+    79:79:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):107 -> a
+    80:94:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):113:127 -> a
+    95:98:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):340:343 -> a
+    95:98:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):128 -> a
+    99:102:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):129:132 -> a
+    103:103:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):331:331 -> a
+    103:103:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):132 -> a
+    104:105:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):133:134 -> a
+    106:126:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):133:153 -> a
+    127:132:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):152:157 -> a
+    133:148:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):147:162 -> a
+    149:149:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):341:341 -> a
+    149:149:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):128 -> a
+    150:187:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):166:203 -> a
+    188:212:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):207:231 -> a
+    213:213:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):336:336 -> a
+    213:213:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):231 -> a
+    214:233:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):232:251 -> a
+    234:288:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):224:278 -> a
+    289:289:com.android.tools.r8.ir.conversion.SourceCode lambda$process$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):241:241 -> a
+    290:290:void com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.<init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.ir.code.Position,boolean):37:37 -> a
+    290:290:com.android.tools.r8.ir.conversion.SourceCode lambda$process$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):241 -> a
+com.android.tools.r8.ir.desugar.Java8MethodRewriter -> a.a.a.a.g.d.r:
     com.android.tools.r8.graph.DexItemFactory factory -> d
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> g
@@ -20435,7 +20187,7 @@
     22:28:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):102:108 -> a
     29:29:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):87:87 -> a
     29:29:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):110 -> a
-    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():632:632 -> a
+    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():628:628 -> a
     30:30:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):88 -> a
     30:30:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):110 -> a
     31:31:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):89:89 -> a
@@ -20451,56 +20203,47 @@
 com.android.tools.r8.ir.desugar.Java8MethodRewriter$ByteMethods -> a.a.a.a.g.d.k:
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,java.lang.String):163:163 -> <init>
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$ByteMethods hashCodeCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):167:167 -> a
-com.android.tools.r8.ir.desugar.Java8MethodRewriter$CharacterMethods -> a.a.a.a.g.d.l:
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,java.lang.String):400:400 -> <init>
-    1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$CharacterMethods hashCodeCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):404:404 -> a
-com.android.tools.r8.ir.desugar.Java8MethodRewriter$DoubleMethods -> a.a.a.a.g.d.m:
+com.android.tools.r8.ir.desugar.Java8MethodRewriter$DoubleMethods -> a.a.a.a.g.d.l:
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,java.lang.String):230:230 -> <init>
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$DoubleMethods hashCodeCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):234:234 -> a
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$DoubleMethods isFiniteCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):250:250 -> b
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$DoubleMethods maxCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):238:238 -> c
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$DoubleMethods minCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):242:242 -> d
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$DoubleMethods sumCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):246:246 -> e
-com.android.tools.r8.ir.desugar.Java8MethodRewriter$FloatMethods -> a.a.a.a.g.d.n:
+com.android.tools.r8.ir.desugar.Java8MethodRewriter$FloatMethods -> a.a.a.a.g.d.m:
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,java.lang.String):277:277 -> <init>
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$FloatMethods hashCodeCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):281:281 -> a
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$FloatMethods isFiniteCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):297:297 -> b
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$FloatMethods maxCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):285:285 -> c
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$FloatMethods minCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):289:289 -> d
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$FloatMethods sumCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):293:293 -> e
-com.android.tools.r8.ir.desugar.Java8MethodRewriter$IntegerMethods -> a.a.a.a.g.d.o:
+com.android.tools.r8.ir.desugar.Java8MethodRewriter$IntegerMethods -> a.a.a.a.g.d.n:
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,java.lang.String):192:192 -> <init>
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$IntegerMethods hashCodeCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):196:196 -> a
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$IntegerMethods maxCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):200:200 -> b
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$IntegerMethods minCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):204:204 -> c
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$IntegerMethods sumCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):208:208 -> d
-com.android.tools.r8.ir.desugar.Java8MethodRewriter$LongMethods -> a.a.a.a.g.d.p:
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,java.lang.String):362:362 -> <init>
-    1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$LongMethods hashCodeCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):366:366 -> a
-    1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$LongMethods maxCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):370:370 -> b
-    1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$LongMethods minCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):374:374 -> c
-    1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$LongMethods sumCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):378:378 -> d
-com.android.tools.r8.ir.desugar.Java8MethodRewriter$RewritableMethods -> a.a.a.a.g.d.r:
+com.android.tools.r8.ir.desugar.Java8MethodRewriter$RewritableMethods -> a.a.a.a.g.d.p:
     java.util.Map rewritable -> a
-    1:173:void <init>(com.android.tools.r8.graph.DexItemFactory):417:589 -> <init>
-    1:1:java.util.Map addOrGetClass(com.android.tools.r8.graph.DexString):593:593 -> a
-    2:2:java.util.Map addOrGetMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):598:598 -> a
-    3:7:com.android.tools.r8.ir.desugar.Java8MethodRewriter$RewritableMethods$MethodGenerator getGenerator(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):602:606 -> a
-    1:1:java.util.Map lambda$addOrGetClass$0(com.android.tools.r8.graph.DexString):593:593 -> b
-    1:1:java.util.Map lambda$addOrGetMethod$1(com.android.tools.r8.graph.DexString):598:598 -> c
-com.android.tools.r8.ir.desugar.Java8MethodRewriter$RewritableMethods$MethodGenerator -> a.a.a.a.g.d.q:
+    1:137:void <init>(com.android.tools.r8.graph.DexItemFactory):365:501 -> <init>
+    1:1:java.util.Map addOrGetClass(com.android.tools.r8.graph.DexString):505:505 -> a
+    2:2:java.util.Map addOrGetMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):510:510 -> a
+    3:7:com.android.tools.r8.ir.desugar.Java8MethodRewriter$RewritableMethods$MethodGenerator getGenerator(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):514:518 -> a
+    1:1:java.util.Map lambda$addOrGetClass$0(com.android.tools.r8.graph.DexString):505:505 -> b
+    1:1:java.util.Map lambda$addOrGetMethod$1(com.android.tools.r8.graph.DexString):510:510 -> c
+com.android.tools.r8.ir.desugar.Java8MethodRewriter$RewritableMethods$MethodGenerator -> a.a.a.a.g.d.o:
     com.android.tools.r8.graph.DexString clazz -> b
     com.android.tools.r8.graph.DexString method -> c
     com.android.tools.r8.graph.DexProto proto -> d
     java.util.function.BiFunction generator -> a
     com.android.tools.r8.graph.DexMethod dexMethod -> e
-    1:5:void <init>(java.util.function.BiFunction,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):621:625 -> <init>
-    1:9:com.android.tools.r8.graph.DexMethod generateMethod(com.android.tools.r8.graph.DexItemFactory):629:637 -> a
-    10:10:com.android.tools.r8.ir.synthetic.TemplateMethodCode generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):641:641 -> a
-com.android.tools.r8.ir.desugar.Java8MethodRewriter$ShortMethods -> a.a.a.a.g.d.s:
+    1:5:void <init>(java.util.function.BiFunction,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):533:537 -> <init>
+    1:8:com.android.tools.r8.graph.DexMethod generateMethod(com.android.tools.r8.graph.DexItemFactory):541:548 -> a
+    9:9:com.android.tools.r8.ir.synthetic.TemplateMethodCode generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):552:552 -> a
+com.android.tools.r8.ir.desugar.Java8MethodRewriter$ShortMethods -> a.a.a.a.g.d.q:
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,java.lang.String):178:178 -> <init>
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$ShortMethods hashCodeCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):182:182 -> a
-com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode -> a.a.a.a.g.d.u:
+com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode -> a.a.a.a.g.d.s:
     com.android.tools.r8.graph.DexMethod mainMethod -> p
     1:1:void com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode.<init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):29:29 -> <init>
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):23 -> <init>
@@ -20508,131 +20251,128 @@
     1:1:void lambda$prepareInstructions$0(java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):51:51 -> a
     1:1:void lambda$prepareInstructions$1(int,com.android.tools.r8.ir.conversion.IRBuilder):65:65 -> b
     1:1:void lambda$prepareInstructions$2(int,com.android.tools.r8.ir.conversion.IRBuilder):66:66 -> c
-    1:17:void prepareInstructions():29:45 -> h
-    18:40:void prepareInstructions():44:66 -> h
-com.android.tools.r8.ir.desugar.LambdaClass -> a.a.a.a.g.d.B:
-    java.util.concurrent.atomic.AtomicBoolean addToMainDexList -> i
-    boolean $assertionsDisabled -> l
-    com.android.tools.r8.graph.DexField instanceField -> g
-    com.android.tools.r8.ir.desugar.LambdaClass$Target target -> h
+    1:17:void prepareInstructions():29:45 -> g
+    18:40:void prepareInstructions():44:66 -> g
+com.android.tools.r8.ir.desugar.LambdaClass -> a.a.a.a.g.d.z:
+    java.util.concurrent.atomic.AtomicBoolean addToMainDexList -> h
+    com.android.tools.r8.graph.DexField instanceField -> f
+    com.android.tools.r8.ir.desugar.LambdaClass$Target target -> g
+    boolean $assertionsDisabled -> k
+    java.util.function.Supplier lazyDexClass -> j
     com.android.tools.r8.ir.desugar.LambdaRewriter rewriter -> a
-    java.util.function.Supplier lazyDexClass -> k
-    com.android.tools.r8.graph.DexMethod createInstanceMethod -> f
     com.android.tools.r8.graph.DexType type -> b
     com.android.tools.r8.ir.desugar.LambdaDescriptor descriptor -> c
     com.android.tools.r8.graph.DexMethod classConstructor -> e
     com.android.tools.r8.graph.DexMethod constructor -> d
-    java.util.Collection synthesizedFrom -> j
+    java.util.Collection synthesizedFrom -> i
     1:1:void <clinit>():59:59 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):78:78 -> <init>
-    2:23:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):69:90 -> <init>
-    24:24:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):336:336 -> <init>
-    24:24:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    25:64:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):359:398 -> <init>
-    25:64:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):337 -> <init>
-    25:64:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    65:65:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):397:397 -> <init>
-    65:65:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):337 -> <init>
-    65:65:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    66:66:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):396:396 -> <init>
-    66:66:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):337 -> <init>
-    66:66:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    67:80:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):341:354 -> <init>
-    67:80:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    81:81:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):343:343 -> <init>
-    81:81:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    82:84:com.android.tools.r8.ir.desugar.LambdaClass$Target createInterfaceMethodTarget(com.android.tools.r8.graph.DexType):474:476 -> <init>
-    82:84:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):345 -> <init>
-    82:84:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    85:102:com.android.tools.r8.ir.desugar.LambdaClass$Target createConstructorTarget(com.android.tools.r8.graph.DexType):451:468 -> <init>
-    85:102:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):347 -> <init>
-    85:102:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    103:105:com.android.tools.r8.ir.desugar.LambdaClass$Target createConstructorTarget(com.android.tools.r8.graph.DexType):467:469 -> <init>
-    103:105:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):347 -> <init>
-    103:105:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    106:107:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):405:406 -> <init>
-    106:107:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):352 -> <init>
-    106:107:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    108:129:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):405:426 -> <init>
-    108:129:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):352 -> <init>
-    108:129:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    130:133:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):425:428 -> <init>
-    130:133:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):352 -> <init>
-    130:133:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    134:144:com.android.tools.r8.ir.desugar.LambdaClass$Target createStaticMethodTarget(com.android.tools.r8.graph.DexType):434:444 -> <init>
-    134:144:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):349 -> <init>
-    134:144:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    145:147:com.android.tools.r8.ir.desugar.LambdaClass$Target createStaticMethodTarget(com.android.tools.r8.graph.DexType):443:445 -> <init>
-    145:147:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):349 -> <init>
-    145:147:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    148:160:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93:105 -> <init>
-    161:167:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):103:109 -> <init>
-    1:21:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):115:135 -> a
-    22:22:com.android.tools.r8.graph.DexProgramClass getOrCreateLambdaClass():139:139 -> a
-    23:24:com.android.tools.r8.graph.DexField getCaptureField(int):184:185 -> a
-    25:25:com.android.tools.r8.graph.DexField getCaptureField(int):184:184 -> a
-    26:33:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):193:200 -> a
-    34:62:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):205:233 -> a
-    63:63:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeVirtualMethods$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):218:218 -> a
-    64:64:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeVirtualMethods$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):236:236 -> a
-    65:65:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeDirectMethods$2(com.android.tools.r8.ir.code.Position):261:261 -> a
-    1:1:boolean isStateless():189:189 -> b
+    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):74:74 -> <init>
+    2:20:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):68:86 -> <init>
+    21:21:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):307:307 -> <init>
+    21:21:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    22:61:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):330:369 -> <init>
+    22:61:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):308 -> <init>
+    22:61:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    62:62:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):368:368 -> <init>
+    62:62:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):308 -> <init>
+    62:62:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    63:63:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):367:367 -> <init>
+    63:63:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):308 -> <init>
+    63:63:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    64:77:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):312:325 -> <init>
+    64:77:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    78:78:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):314:314 -> <init>
+    78:78:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    79:81:com.android.tools.r8.ir.desugar.LambdaClass$Target createInterfaceMethodTarget(com.android.tools.r8.graph.DexType):445:447 -> <init>
+    79:81:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):316 -> <init>
+    79:81:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    82:99:com.android.tools.r8.ir.desugar.LambdaClass$Target createConstructorTarget(com.android.tools.r8.graph.DexType):422:439 -> <init>
+    82:99:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):318 -> <init>
+    82:99:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    100:102:com.android.tools.r8.ir.desugar.LambdaClass$Target createConstructorTarget(com.android.tools.r8.graph.DexType):438:440 -> <init>
+    100:102:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):318 -> <init>
+    100:102:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    103:104:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):376:377 -> <init>
+    103:104:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):323 -> <init>
+    103:104:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    105:126:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):376:397 -> <init>
+    105:126:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):323 -> <init>
+    105:126:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    127:130:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):396:399 -> <init>
+    127:130:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):323 -> <init>
+    127:130:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    131:141:com.android.tools.r8.ir.desugar.LambdaClass$Target createStaticMethodTarget(com.android.tools.r8.graph.DexType):405:415 -> <init>
+    131:141:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):320 -> <init>
+    131:141:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    142:144:com.android.tools.r8.ir.desugar.LambdaClass$Target createStaticMethodTarget(com.android.tools.r8.graph.DexType):414:416 -> <init>
+    142:144:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):320 -> <init>
+    142:144:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    145:154:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89:98 -> <init>
+    1:21:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):104:124 -> a
+    22:22:com.android.tools.r8.graph.DexProgramClass getLambdaClass():128:128 -> a
+    23:24:com.android.tools.r8.graph.DexField getCaptureField(int):168:169 -> a
+    25:25:com.android.tools.r8.graph.DexField getCaptureField(int):168:168 -> a
+    26:33:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):177:184 -> a
+    34:62:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):189:217 -> a
+    63:63:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeVirtualMethods$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):202:202 -> a
+    64:64:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeVirtualMethods$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):220:220 -> a
+    65:65:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeDirectMethods$2(com.android.tools.r8.ir.code.Position):242:242 -> a
+    1:1:boolean isStateless():173:173 -> b
     2:2:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isStateless():162:162 -> b
-    2:2:boolean isStateless():189 -> b
-    3:3:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeDirectMethods$3(com.android.tools.r8.ir.code.Position):273:273 -> b
-    1:1:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeDirectMethods$4(com.android.tools.r8.ir.code.Position):283:283 -> c
-    2:2:com.android.tools.r8.graph.DexString generateUniqueLambdaMethodName():480:480 -> c
-    1:38:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeDirectMethods():244:281 -> d
-    1:11:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():148:158 -> e
-    12:15:com.android.tools.r8.graph.DexTypeList buildInterfaces():327:330 -> e
-    12:15:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():161 -> e
-    16:20:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():161:165 -> e
-    21:36:com.android.tools.r8.graph.DexEncodedField[] synthesizeStaticFields():305:320 -> e
-    21:36:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():166 -> e
-    37:45:com.android.tools.r8.graph.DexEncodedField[] synthesizeInstanceFields():290:298 -> e
-    37:45:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():167 -> e
-    46:57:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():168:179 -> e
-com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> a.a.a.a.g.d.v:
+    2:2:boolean isStateless():173 -> b
+    3:3:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeDirectMethods$3(com.android.tools.r8.ir.code.Position):254:254 -> b
+    1:1:com.android.tools.r8.graph.DexString generateUniqueLambdaMethodName():451:451 -> c
+    1:25:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeDirectMethods():228:252 -> d
+    1:11:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():132:142 -> e
+    12:15:com.android.tools.r8.graph.DexTypeList buildInterfaces():298:301 -> e
+    12:15:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():145 -> e
+    16:20:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():145:149 -> e
+    21:36:com.android.tools.r8.graph.DexEncodedField[] synthesizeStaticFields():276:291 -> e
+    21:36:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():150 -> e
+    37:45:com.android.tools.r8.graph.DexEncodedField[] synthesizeInstanceFields():261:269 -> e
+    37:45:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():151 -> e
+    46:57:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():152:163 -> e
+com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> a.a.a.a.g.d.t:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
-    1:1:void <clinit>():638:638 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):640:641 -> <init>
-    1:1:boolean ensureAccessibility():647:647 -> a
-    2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.LambdaClass$Target.programDefinitionFor(com.android.tools.r8.graph.DexType):507:507 -> a
-    2:2:boolean ensureAccessibility():647 -> a
-    3:26:boolean ensureAccessibility():648:671 -> a
-    27:27:boolean ensureAccessibility():669:669 -> a
-    28:28:com.android.tools.r8.ir.conversion.SourceCode lambda$ensureAccessibility$0(com.android.tools.r8.ir.code.Position):664:664 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> a.a.a.a.g.d.w:
+    1:1:void <clinit>():609:609 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):611:612 -> <init>
+    1:1:boolean ensureAccessibility():618:618 -> a
+    2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.LambdaClass$Target.programDefinitionFor(com.android.tools.r8.graph.DexType):478:478 -> a
+    2:2:boolean ensureAccessibility():618 -> a
+    3:26:boolean ensureAccessibility():619:642 -> a
+    27:27:boolean ensureAccessibility():640:640 -> a
+    28:28:com.android.tools.r8.ir.conversion.SourceCode lambda$ensureAccessibility$0(com.android.tools.r8.ir.code.Position):635:635 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> a.a.a.a.g.d.u:
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):597:598 -> <init>
-    1:24:boolean ensureAccessibility():605:628 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> a.a.a.a.g.d.x:
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):568:569 -> <init>
+    1:24:boolean ensureAccessibility():576:599 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> a.a.a.a.g.d.v:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
-    1:1:void <clinit>():546:546 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):548:549 -> <init>
-    1:28:boolean ensureAccessibility():556:583 -> a
-    29:36:boolean ensureAccessibility():582:589 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> a.a.a.a.g.d.y:
-    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Invoke$Type):515:515 -> <init>
+    1:1:void <clinit>():517:517 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):519:520 -> <init>
+    1:28:boolean ensureAccessibility():527:554 -> a
+    29:36:boolean ensureAccessibility():553:560 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> a.a.a.a.g.d.w:
+    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Invoke$Type):486:486 -> <init>
     boolean ensureAccessibility() -> a
-com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> a.a.a.a.g.d.z:
+com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> a.a.a.a.g.d.x:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
-    1:1:void <clinit>():525:525 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass):527:528 -> <init>
-    1:5:boolean ensureAccessibility():534:538 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$Target -> a.a.a.a.g.d.A:
+    1:1:void <clinit>():496:496 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass):498:499 -> <init>
+    1:5:boolean ensureAccessibility():505:509 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$Target -> a.a.a.a.g.d.y:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> b
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> c
     com.android.tools.r8.graph.DexMethod callTarget -> a
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():487:487 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):492:496 -> <init>
+    1:1:void <clinit>():458:458 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):463:467 -> <init>
     boolean ensureAccessibility() -> a
-    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):503:503 -> a
-com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode -> a.a.a.a.g.d.C:
+    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):474:474 -> a
+com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode -> a.a.a.a.g.d.A:
     boolean $assertionsDisabled -> p
     1:1:void <clinit>():15:15 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):18:19 -> <init>
@@ -20640,22 +20380,16 @@
     1:6:void lambda$prepareInstructions$1(int,com.android.tools.r8.ir.conversion.IRBuilder):29:34 -> c
     7:7:void lambda$prepareInstructions$1(int,com.android.tools.r8.ir.conversion.IRBuilder):29:29 -> c
     1:1:void lambda$prepareInstructions$2(int,com.android.tools.r8.ir.conversion.IRBuilder):38:38 -> d
-    1:17:void prepareInstructions():25:41 -> h
-com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> a.a.a.a.g.d.D:
+    1:17:void prepareInstructions():25:41 -> g
+com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> a.a.a.a.g.d.B:
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):19:19 -> <init>
     1:5:void lambda$prepareInstructions$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder):28:32 -> a
     6:6:void lambda$prepareInstructions$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder):28:28 -> a
     7:7:void lambda$prepareInstructions$1(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.conversion.IRBuilder):42:42 -> a
     1:8:boolean equals(java.lang.Object):61:68 -> equals
-    1:23:void prepareInstructions():25:47 -> h
+    1:23:void prepareInstructions():25:47 -> g
     1:2:int hashCode():55:56 -> hashCode
-com.android.tools.r8.ir.desugar.LambdaCreateInstanceSourceCode -> a.a.a.a.g.d.E:
-    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):18:18 -> <init>
-    1:1:void lambda$prepareInstructions$1(java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):36:36 -> a
-    1:1:void lambda$prepareInstructions$0(int,com.android.tools.r8.ir.conversion.IRBuilder):25:25 -> b
-    1:1:void lambda$prepareInstructions$2(int,com.android.tools.r8.ir.conversion.IRBuilder):43:43 -> c
-    1:20:void prepareInstructions():24:43 -> h
-com.android.tools.r8.ir.desugar.LambdaDescriptor -> a.a.a.a.g.d.F:
+com.android.tools.r8.ir.desugar.LambdaDescriptor -> a.a.a.a.g.d.C:
     java.util.Set bridges -> g
     com.android.tools.r8.graph.DexString name -> b
     com.android.tools.r8.ir.desugar.LambdaDescriptor MATCH_FAILED -> j
@@ -20707,7 +20441,7 @@
     3:3:com.android.tools.r8.graph.MethodAccessFlags getAccessibility():147:147 -> b
     4:4:boolean targetFoundInClass(com.android.tools.r8.graph.DexType):151:151 -> b
     1:4:com.android.tools.r8.graph.DexType getImplReceiverType():85:88 -> c
-com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> a.a.a.a.g.d.G:
+com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> a.a.a.a.g.d.D:
     boolean $assertionsDisabled -> p
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode.<init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):29:29 -> <init>
@@ -20717,7 +20451,7 @@
     14:46:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):82:114 -> a
     47:47:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57:57 -> a
     47:47:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):121 -> a
-    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):431:431 -> a
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):403:403 -> a
     48:48:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57 -> a
     48:48:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):121 -> a
     49:58:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):122:131 -> a
@@ -20729,7 +20463,7 @@
     69:86:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):289:306 -> a
     87:87:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57:57 -> a
     87:87:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
-    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):431:431 -> a
+    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):403:403 -> a
     88:88:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57 -> a
     88:88:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
     89:130:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):310:351 -> a
@@ -20765,71 +20499,65 @@
     65:112:int addPrimitiveWideningConversion(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):368:415 -> d
     1:1:void lambda$prepareInstructions$4(int,com.android.tools.r8.ir.conversion.IRBuilder):249:249 -> e
     1:1:void lambda$prepareInstructions$5(int,com.android.tools.r8.ir.conversion.IRBuilder):252:252 -> f
-    1:28:void prepareInstructions():162:189 -> h
-    29:46:boolean checkSignatures(com.android.tools.r8.graph.DexType[],com.android.tools.r8.graph.DexType[],com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexType):34:51 -> h
-    29:46:void prepareInstructions():187 -> h
-    47:78:void prepareInstructions():192:223 -> h
-    79:80:int prepareParameterValue(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):279:280 -> h
-    79:80:void prepareInstructions():222 -> h
-    81:111:void prepareInstructions():222:252 -> h
-com.android.tools.r8.ir.desugar.LambdaRewriter -> a.a.a.a.g.d.H:
+    1:28:void prepareInstructions():162:189 -> g
+    29:46:boolean checkSignatures(com.android.tools.r8.graph.DexType[],com.android.tools.r8.graph.DexType[],com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexType):34:51 -> g
+    29:46:void prepareInstructions():187 -> g
+    47:78:void prepareInstructions():192:223 -> g
+    79:80:int prepareParameterValue(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):279:280 -> g
+    79:80:void prepareInstructions():222 -> g
+    81:111:void prepareInstructions():222:252 -> g
+com.android.tools.r8.ir.desugar.LambdaRewriter -> a.a.a.a.g.d.E:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString constructorName -> e
+    boolean $assertionsDisabled -> k
     com.android.tools.r8.graph.DexString classConstructorName -> f
-    boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexString instanceFieldName -> g
-    com.android.tools.r8.graph.DexString createInstanceMethodName -> h
-    java.util.Map knownCallSites -> j
-    java.util.Map knownLambdaClasses -> k
+    java.util.Map knownCallSites -> i
+    java.util.Map knownLambdaClasses -> j
+    com.android.tools.r8.com.google.common.collect.BiMap methodMapping -> h
     com.android.tools.r8.graph.DexMethod objectInitMethod -> d
-    com.android.tools.r8.com.google.common.collect.BiMap methodMapping -> i
     com.android.tools.r8.ir.conversion.IRConverter converter -> b
-    1:1:void <clinit>():50:50 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):88:88 -> <init>
-    2:31:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):70:99 -> <init>
-    1:10:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):108:117 -> a
-    11:15:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):217:221 -> a
-    11:15:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):116 -> a
-    16:16:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):220:220 -> a
-    16:16:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):116 -> a
-    17:17:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118:118 -> a
-    18:28:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):231:241 -> a
-    18:28:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):123 -> a
-    29:29:boolean isInMainDexList(com.android.tools.r8.graph.DexType):225:225 -> a
-    29:29:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):242 -> a
-    29:29:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):123 -> a
-    30:30:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):243:243 -> a
-    30:30:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):123 -> a
-    31:31:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):124:124 -> a
-    32:47:void patchInstruction(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):269:284 -> a
-    32:47:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):129 -> a
-    48:109:void patchInstruction(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):283:344 -> a
-    48:109:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):129 -> a
-    110:111:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():143:144 -> a
-    110:111:void patchInstruction(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):346 -> a
-    110:111:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):129 -> a
-    112:113:void patchInstruction(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):346:347 -> a
-    112:113:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):129 -> a
-    114:122:boolean removeLambdaDeserializationMethods(java.lang.Iterable):137:145 -> a
-    123:123:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):184:184 -> a
-    123:123:boolean removeLambdaDeserializationMethods(java.lang.Iterable):145 -> a
-    124:126:boolean removeLambdaDeserializationMethods(java.lang.Iterable):146:148 -> a
-    127:133:void adjustAccessibility():167:173 -> a
-    134:134:void adjustAccessibility():172:172 -> a
-    135:136:com.android.tools.r8.graph.DexProgramClass getLambdaClass(com.android.tools.r8.graph.DexType):182:183 -> a
-    137:146:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):189:198 -> a
-    147:147:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):195:195 -> a
-    148:150:java.lang.Object getKnown(java.util.Map,java.lang.Object):249:251 -> a
-    151:158:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):255:262 -> a
-    1:1:boolean hasLambdaClassPrefix(com.android.tools.r8.graph.DexType):85:85 -> b
-com.android.tools.r8.ir.desugar.LambdaRewriterGraphLense -> a.a.a.a.g.d.I:
+    1:1:void <clinit>():49:49 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):85:85 -> <init>
+    2:30:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):67:95 -> <init>
+    1:10:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):104:113 -> a
+    11:15:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):212:216 -> a
+    11:15:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):112 -> a
+    16:16:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):215:215 -> a
+    16:16:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):112 -> a
+    17:17:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):114:114 -> a
+    18:25:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):226:233 -> a
+    18:25:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):119 -> a
+    26:26:boolean isInMainDexList(com.android.tools.r8.graph.DexType):220:220 -> a
+    26:26:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):234 -> a
+    26:26:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):119 -> a
+    27:27:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):235:235 -> a
+    27:27:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):119 -> a
+    28:28:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):120:120 -> a
+    29:44:void patchInstruction(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):261:276 -> a
+    29:44:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):125 -> a
+    45:95:void patchInstruction(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):275:325 -> a
+    45:95:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):125 -> a
+    96:104:boolean removeLambdaDeserializationMethods(java.lang.Iterable):133:141 -> a
+    105:105:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):184:184 -> a
+    105:105:boolean removeLambdaDeserializationMethods(java.lang.Iterable):141 -> a
+    106:108:boolean removeLambdaDeserializationMethods(java.lang.Iterable):142:144 -> a
+    109:115:void adjustAccessibility():163:169 -> a
+    116:116:void adjustAccessibility():168:168 -> a
+    117:118:com.android.tools.r8.graph.DexProgramClass getLambdaClass(com.android.tools.r8.graph.DexType):178:179 -> a
+    119:127:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):185:193 -> a
+    128:128:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):191:191 -> a
+    129:131:java.lang.Object getKnown(java.util.Map,java.lang.Object):241:243 -> a
+    132:139:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):247:254 -> a
+    1:1:boolean hasLambdaClassPrefix(com.android.tools.r8.graph.DexType):82:82 -> b
+com.android.tools.r8.ir.desugar.LambdaRewriterGraphLense -> a.a.a.a.g.d.F:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():15:15 -> <clinit>
     1:5:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory):20:24 -> <init>
     6:6:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory):19:19 -> <init>
     1:3:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):31:33 -> b
-com.android.tools.r8.ir.desugar.StringConcatRewriter -> a.a.a.a.g.d.O:
+com.android.tools.r8.ir.desugar.StringConcatRewriter -> a.a.a.a.g.d.L:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexMethod defaultAppendMethod -> h
@@ -20840,50 +20568,50 @@
     java.util.Map paramTypeToAppendMethod -> g
     1:1:void <init>(com.android.tools.r8.graph.AppView):63:63 -> <init>
     2:9:void <init>(com.android.tools.r8.graph.AppView):60:67 -> <init>
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> <init>
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> <init>
     10:10:void <init>(com.android.tools.r8.graph.AppView):67 -> <init>
     11:11:void <init>(com.android.tools.r8.graph.AppView):68:68 -> <init>
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> <init>
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> <init>
     12:12:void <init>(com.android.tools.r8.graph.AppView):68 -> <init>
     13:13:void <init>(com.android.tools.r8.graph.AppView):69:69 -> <init>
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> <init>
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> <init>
     14:14:void <init>(com.android.tools.r8.graph.AppView):69 -> <init>
     15:15:void <init>(com.android.tools.r8.graph.AppView):70:70 -> <init>
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> <init>
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> <init>
     16:16:void <init>(com.android.tools.r8.graph.AppView):70 -> <init>
     17:19:void <init>(com.android.tools.r8.graph.AppView):72:74 -> <init>
     20:27:void <init>(com.android.tools.r8.graph.AppView):72:79 -> <init>
     28:35:void <init>(com.android.tools.r8.graph.AppView):76:83 -> <init>
     36:42:void <init>(com.android.tools.r8.graph.AppView):81:87 -> <init>
     43:50:void <init>(com.android.tools.r8.graph.AppView):85:92 -> <init>
-    51:51:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1081:1081 -> <init>
+    51:51:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):980:980 -> <init>
     51:51:void <init>(com.android.tools.r8.graph.AppView):91 -> <init>
     52:55:void <init>(com.android.tools.r8.graph.AppView):91:94 -> <init>
-    56:56:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1081:1081 -> <init>
+    56:56:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):980:980 -> <init>
     56:56:void <init>(com.android.tools.r8.graph.AppView):93 -> <init>
     57:60:void <init>(com.android.tools.r8.graph.AppView):93:96 -> <init>
-    61:61:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1081:1081 -> <init>
+    61:61:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):980:980 -> <init>
     61:61:void <init>(com.android.tools.r8.graph.AppView):95 -> <init>
     62:65:void <init>(com.android.tools.r8.graph.AppView):95:98 -> <init>
-    66:66:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1081:1081 -> <init>
+    66:66:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):980:980 -> <init>
     66:66:void <init>(com.android.tools.r8.graph.AppView):97 -> <init>
     67:70:void <init>(com.android.tools.r8.graph.AppView):97:100 -> <init>
-    71:71:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1081:1081 -> <init>
+    71:71:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):980:980 -> <init>
     71:71:void <init>(com.android.tools.r8.graph.AppView):99 -> <init>
     72:75:void <init>(com.android.tools.r8.graph.AppView):99:102 -> <init>
-    76:76:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1081:1081 -> <init>
+    76:76:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):980:980 -> <init>
     76:76:void <init>(com.android.tools.r8.graph.AppView):101 -> <init>
     77:80:void <init>(com.android.tools.r8.graph.AppView):101:104 -> <init>
-    81:81:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1081:1081 -> <init>
+    81:81:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):980:980 -> <init>
     81:81:void <init>(com.android.tools.r8.graph.AppView):103 -> <init>
     82:85:void <init>(com.android.tools.r8.graph.AppView):103:106 -> <init>
-    86:86:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1081:1081 -> <init>
+    86:86:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):980:980 -> <init>
     86:86:void <init>(com.android.tools.r8.graph.AppView):105 -> <init>
     87:90:void <init>(com.android.tools.r8.graph.AppView):105:108 -> <init>
-    91:91:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1081:1081 -> <init>
+    91:91:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):980:980 -> <init>
     91:91:void <init>(com.android.tools.r8.graph.AppView):107 -> <init>
     92:95:void <init>(com.android.tools.r8.graph.AppView):107:110 -> <init>
-    96:96:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1081:1081 -> <init>
+    96:96:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):980:980 -> <init>
     96:96:void <init>(com.android.tools.r8.graph.AppView):109 -> <init>
     97:97:void <init>(com.android.tools.r8.graph.AppView):109:109 -> <init>
     1:1:com.android.tools.r8.graph.DexItemFactory access$100(com.android.tools.r8.ir.desugar.StringConcatRewriter):40:40 -> a
@@ -20933,8 +20661,8 @@
     162:164:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.DexMethod,java.lang.String):457:459 -> a
     1:1:com.android.tools.r8.graph.DexMethod access$200(com.android.tools.r8.ir.desugar.StringConcatRewriter):40:40 -> b
     1:1:com.android.tools.r8.graph.DexMethod access$300(com.android.tools.r8.ir.desugar.StringConcatRewriter):40:40 -> c
-com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> a.a.a.a.g.d.J:
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> a.a.a.a.g.d.N:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> a.a.a.a.g.d.G:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> a.a.a.a.g.d.K:
     java.util.ListIterator blocks -> c
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> f
     com.android.tools.r8.graph.AppView appView -> a
@@ -20955,30 +20683,33 @@
     5:5:void addChunk(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod):314:314 -> a
     6:6:void addChunk(java.lang.String,com.android.tools.r8.graph.DexMethod):318:318 -> a
     7:17:void desugar():339:349 -> a
-    18:22:void desugar():348:352 -> a
-    23:25:void com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk.addAppendCall(com.android.tools.r8.ir.code.Value):414:416 -> a
-    23:25:void desugar():353 -> a
-    26:26:void com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk.addAppendCall(com.android.tools.r8.ir.code.Value):414:414 -> a
-    26:26:void desugar():353 -> a
-    27:41:void desugar():357:371 -> a
-    42:72:void desugar():370:400 -> a
+    18:18: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):33:33 -> a
+    18:18:void desugar():349 -> a
+    19:23:void desugar():348:352 -> a
+    24:26:void com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk.addAppendCall(com.android.tools.r8.ir.code.Value):414:416 -> a
+    24:26:void desugar():353 -> a
+    27:27:void access$400(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,com.android.tools.r8.ir.code.Instruction):284:284 -> a
+    27:27:void com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk.addAppendCall(com.android.tools.r8.ir.code.Value):414 -> a
+    27:27:void desugar():353 -> a
+    28:42:void desugar():357:371 -> a
+    43:73:void desugar():370:400 -> a
     1:1:com.android.tools.r8.ir.code.IRCode access$600(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder):284:284 -> b
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ArgumentChunk -> a.a.a.a.g.d.K:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ArgumentChunk -> a.a.a.a.g.d.H:
     com.android.tools.r8.ir.code.Value value -> c
     1:2:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod):424:425 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getOrCreateValue():430:430 -> a
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk -> a.a.a.a.g.d.L:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk -> a.a.a.a.g.d.I:
     com.android.tools.r8.graph.DexMethod method -> a
     com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder this$1 -> b
     1:2:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,com.android.tools.r8.graph.DexMethod):407:408 -> <init>
     com.android.tools.r8.ir.code.Value getOrCreateValue() -> a
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ConstantChunk -> a.a.a.a.g.d.M:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ConstantChunk -> a.a.a.a.g.d.J:
     com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder this$1 -> d
     java.lang.String str -> c
     1:3:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,java.lang.String,com.android.tools.r8.graph.DexMethod):437:439 -> <init>
     1:7:com.android.tools.r8.ir.code.Value getOrCreateValue():444:450 -> a
     8:8:com.android.tools.r8.ir.code.Value getOrCreateValue():446:446 -> a
-com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode -> a.a.a.a.g.d.P:
+com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode -> a.a.a.a.g.d.M:
     com.android.tools.r8.ir.desugar.LambdaClass lambda -> n
     boolean $assertionsDisabled -> o
     com.android.tools.r8.graph.DexMethod currentMethod -> m
@@ -20987,11 +20718,11 @@
     4:4:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):29:29 -> <init>
     1:2:int enforceParameterType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):51:52 -> a
     3:3:void lambda$enforceParameterType$0(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
-    1:3:com.android.tools.r8.graph.DexType[] captures():37:39 -> i
-    1:1:com.android.tools.r8.ir.desugar.LambdaDescriptor descriptor():33:33 -> j
-    1:1:com.android.tools.r8.graph.DexItemFactory factory():43:43 -> k
+    1:3:com.android.tools.r8.graph.DexType[] captures():37:39 -> h
+    1:1:com.android.tools.r8.ir.desugar.LambdaDescriptor descriptor():33:33 -> i
+    1:1:com.android.tools.r8.graph.DexItemFactory factory():43:43 -> j
     1:1:java.lang.String toString():59:59 -> toString
-com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter -> a.a.a.a.g.d.S:
+com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter -> a.a.a.a.g.d.O:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set referencingClasses -> d
     boolean $assertionsDisabled -> e
@@ -21000,7 +20731,7 @@
     1:1:void <clinit>():51:51 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):63:63 -> <init>
     2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):61:67 -> <init>
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> <init>
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> <init>
     9:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):68 -> <init>
     10:14:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):69:73 -> <init>
     1:18:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):79:96 -> a
@@ -21008,7 +20739,7 @@
     24:36:boolean isSynthesizedCloseResourceMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):105:117 -> a
     37:76:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):124:163 -> a
     77:77:boolean lambda$synthesizeUtilityClass$0(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexProgramClass):160:160 -> a
-com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter$CloseResourceMethodCode -> a.a.a.a.g.d.Q:
+com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter$CloseResourceMethodCode -> a.a.a.a.g.d.N:
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):171:171 -> <init>
 com.android.tools.r8.ir.optimize.BasicBlockInstructionsEquivalence -> a.a.a.a.g.e.a:
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> a
@@ -21042,327 +20773,328 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):101:101 -> <init>
     2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):98:104 -> <init>
     1:13:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):108:120 -> a
-    14:40:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):321:347 -> a
+    14:40:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):320:346 -> a
     14:40:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
-    41:42:boolean com.android.tools.r8.graph.DexClass.definesStaticField(com.android.tools.r8.graph.DexField):404:405 -> a
-    41:42:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):348 -> a
+    41:42:boolean com.android.tools.r8.graph.DexClass.definesStaticField(com.android.tools.r8.graph.DexField):402:403 -> a
+    41:42:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):347 -> a
     41:42:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
-    43:48:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):349:354 -> a
+    43:48:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):348:353 -> a
     43:48:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
-    49:51:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():760:762 -> a
-    49:51:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):354 -> a
+    49:51:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():741:743 -> a
+    49:51:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):353 -> a
     49:51:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
-    52:60:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):357:365 -> a
+    52:60:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):356:364 -> a
     52:60:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
-    61:65:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):406:410 -> a
-    61:65:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):367 -> a
+    61:65:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):405:409 -> a
+    61:65:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):366 -> a
     61:65:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
-    66:95:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):369:398 -> a
+    66:95:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):368:397 -> a
     66:95:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
-    96:114:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):382:400 -> a
+    96:114:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):381:399 -> a
     96:114:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
     115:127:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):125:137 -> a
-    128:149:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):253:274 -> a
+    128:149:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):252:273 -> a
     128:149:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
-    150:187:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):278:315 -> a
-    150:187:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):274 -> a
+    150:187:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):277:314 -> a
+    150:187:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):273 -> a
     150:187:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
     188:188:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137:137 -> a
-    189:189:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):315:315 -> a
-    189:189:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):274 -> a
+    189:189:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):314:314 -> a
+    189:189:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):273 -> a
     189:189:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
-    190:198:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138:146 -> a
-    199:199:boolean com.android.tools.r8.ir.code.ConstNumber.getBooleanValue():67:67 -> a
-    199:199:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):147 -> a
-    200:216:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):147:163 -> a
-    217:326:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):139:248 -> a
-    327:327:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):398:398 -> a
+    190:190:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):283:283 -> a
+    190:190:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):273 -> a
+    190:190:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
+    191:199:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138:146 -> a
+    200:200:boolean com.android.tools.r8.ir.code.ConstNumber.getBooleanValue():62:62 -> a
+    200:200:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):147 -> a
+    201:217:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):147:163 -> a
+    218:326:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):139:247 -> a
+    327:327:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):397:397 -> a
     327:327:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
-    328:336:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):416:424 -> a
+    328:336:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):415:423 -> a
 com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> a.a.a.a.g.e.b:
 com.android.tools.r8.ir.optimize.CodeRewriter -> a.a.a.a.g.e.m:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
-    boolean $assertionsDisabled -> e
-    com.android.tools.r8.utils.InternalOptions options -> d
+    java.util.Set libraryMethodsReturningReceiver -> d
+    boolean $assertionsDisabled -> f
+    com.android.tools.r8.utils.InternalOptions options -> e
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
     1:1:void <clinit>():141:141 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):160:164 -> <init>
+    1:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,java.util.Set):164:169 -> <init>
     boolean lambda$computeConstantArrayValues$11(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction) -> a
-    1:2:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):190:191 -> a
-    3:26:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):202:225 -> a
-    27:36:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):230:239 -> a
-    37:37:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):292:292 -> a
-    38:38:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():870:870 -> a
-    38:38:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):292 -> a
+    1:2:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):195:196 -> a
+    3:26:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):207:230 -> a
+    27:36:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):235:244 -> a
+    37:37:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):297:297 -> a
+    38:38:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():841:841 -> a
+    38:38:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):297 -> a
     39:40:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():519:520 -> a
-    39:40:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):292 -> a
-    41:64:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):297:320 -> a
-    65:101:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):468:504 -> a
-    102:103:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):336:337 -> a
-    102:103:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):505 -> a
-    104:118:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):506:520 -> a
-    119:120:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):336:337 -> a
-    119:120:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):521 -> a
-    121:130:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):522:531 -> a
-    131:144:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):579:592 -> a
-    145:145:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):589:589 -> a
-    146:157:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):602:613 -> a
-    158:165:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):618:625 -> a
-    166:166:int codeUnitMargin():632:632 -> a
-    167:167:int lambda$rewriteSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):769:769 -> a
-    168:182:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):921:935 -> a
-    183:201:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):245:263 -> a
-    183:201:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):936 -> a
-    202:202:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):938:938 -> a
-    203:216:void collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):269:282 -> a
-    203:216:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):939 -> a
+    39:40:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):297 -> a
+    41:64:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):302:325 -> a
+    65:101:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):473:509 -> a
+    102:103:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):341:342 -> a
+    102:103:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):510 -> a
+    104:118:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):511:525 -> a
+    119:120:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):341:342 -> a
+    119:120:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):526 -> a
+    121:130:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):527:536 -> a
+    131:144:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):584:597 -> a
+    145:145:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):594:594 -> a
+    146:157:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):607:618 -> a
+    158:165:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):623:630 -> a
+    166:166:int codeUnitMargin():637:637 -> a
+    167:167:int lambda$rewriteSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):774:774 -> a
+    168:182:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):926:940 -> a
+    183:201:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):250:268 -> a
+    183:201:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):941 -> a
+    202:202:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):943:943 -> a
+    203:216:void collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):274:287 -> a
+    203:216:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):944 -> a
     217:217:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):401:401 -> a
-    217:217:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):943 -> a
-    218:225:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):945:952 -> a
+    217:217:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):948 -> a
+    218:225:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):950:957 -> a
     226:226:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):401:401 -> a
-    226:226:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):956 -> a
-    227:228:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):958:959 -> a
-    229:232:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.OptimizationFeedback):1012:1015 -> a
-    233:239:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.OptimizationFeedback):1014:1020 -> a
-    240:240:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.OptimizationFeedback):1019:1019 -> a
-    241:294:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1036:1089 -> a
-    295:339:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1064:1108 -> a
-    340:413:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):1264:1337 -> a
-    414:414:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):1369:1369 -> a
-    415:419:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1372:1376 -> a
-    420:435:boolean isKotlinNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):1434:1449 -> a
-    420:435:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1378 -> a
-    436:457:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1379:1400 -> a
-    458:463:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1399:1404 -> a
-    464:471:boolean isInstantiationOfNullPointerException(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):1468:1475 -> a
-    464:471:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1404 -> a
-    472:492:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1405:1425 -> a
-    493:495:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1457:1459 -> a
-    496:496:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1489:1489 -> a
-    497:513:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$4(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1492:1508 -> a
-    514:573:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1520:1579 -> a
-    574:614:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1539:1579 -> a
-    615:628:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1566:1579 -> a
-    629:629:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1587:1587 -> a
-    630:630:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1586:1586 -> a
-    631:637:com.android.tools.r8.graph.DexType getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1597:1603 -> a
-    631:637:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1590 -> a
-    638:638:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1590:1590 -> a
-    639:643:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1589:1593 -> a
-    644:681:void disableAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1751:1788 -> a
-    682:693:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1872:1883 -> a
-    694:739:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1989:2034 -> a
-    694:739:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1883 -> a
-    740:740:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):2028:2028 -> a
-    740:740:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1883 -> a
-    741:743:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1895:1897 -> a
-    744:757:boolean removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1903:1916 -> a
-    758:758:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtCheckCastVerifierBug():998:998 -> a
-    758:758:boolean removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1916 -> a
-    759:785:boolean removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1917:1943 -> a
-    786:786:boolean com.android.tools.r8.ir.analysis.type.Nullability.lessThanOrEqual(com.android.tools.r8.ir.analysis.type.Nullability):62:62 -> a
-    786:786:boolean removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1943 -> a
-    787:808:boolean removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1943:1964 -> a
-    809:810:boolean lambda$removeCheckCastInstructionIfTrivial$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):1928:1929 -> a
-    811:823:boolean isTypeInaccessibleInCurrentContext(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1969:1981 -> a
-    824:834:void removeOrReplaceByDebugLocalWrite(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2051:2061 -> a
-    835:836:boolean lambda$shortenLiveRanges$7(com.android.tools.r8.ir.code.ConstInstruction):2231:2232 -> a
-    837:891:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):2296:2350 -> a
-    892:903:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):2355:2366 -> a
-    904:906:boolean lambda$insertConstantInBlock$10(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):2360:2362 -> a
-    907:907:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():831:831 -> a
-    907:907:boolean lambda$insertConstantInBlock$10(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):2363 -> a
-    908:908:boolean lambda$insertConstantInBlock$10(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):2363:2363 -> a
-    909:956:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):2401:2448 -> a
-    957:962:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2778:2783 -> a
-    963:964:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2967:2968 -> a
-    965:965:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2972:2972 -> a
-    966:970:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3381:3385 -> a
-    971:986:void rewriteLongCompareAndRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3436:3451 -> a
-    987:1003:void rewriteLongCompareAndRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3449:3465 -> a
-    1004:1027:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3476:3499 -> a
-    1028:1062:java.util.Set computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3536:3570 -> a
-    1028:1062:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3503 -> a
-    1063:1066:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3504:3507 -> a
-    1067:1067:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>():120:120 -> a
-    1067:1067:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3507 -> a
-    1068:1068:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3508:3508 -> a
-    1069:1069:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>():120:120 -> a
-    1069:1069:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3508 -> a
-    1070:1087:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3509:3526 -> a
-    1088:1097:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3581:3590 -> a
-    1098:1098:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3643:3643 -> a
-    1099:1108:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3649:3658 -> a
-    1099:1108:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3645 -> a
-    1109:1109:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3655:3655 -> a
-    1109:1109:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3645 -> a
-    1110:1115:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3664:3669 -> a
-    1116:1132:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3679:3695 -> a
-    1133:1133:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> a
-    1133:1133:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3695 -> a
-    1134:1134:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3696:3696 -> a
-    1135:1135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> a
-    1135:1135:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3696 -> a
-    1136:1136:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3699:3699 -> a
-    1137:1146:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3698:3707 -> a
-    1147:1208:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3705:3766 -> a
-    1209:1224:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3765:3780 -> a
-    1225:1234:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3784:3793 -> a
-    1235:1245:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3807:3817 -> a
-    1235:1245:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3793 -> a
-    1246:1246:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3794:3794 -> a
-    1247:1272:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):3840:3865 -> a
-    1247:1272:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3794 -> a
-    1273:1277:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3795:3799 -> a
-    1278:1278:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3796:3796 -> a
-    1279:1279:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3815:3815 -> a
-    1279:1279:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3793 -> a
-    1280:1280:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3811:3811 -> a
-    1280:1280:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3793 -> a
-    1281:1287:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3821:3827 -> a
-    1:1:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):180:180 -> b
-    2:6:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1135:1139 -> b
-    7:13:com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage collectParameterUsages(int,com.android.tools.r8.ir.code.Value):1151:1157 -> b
-    7:13:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1142 -> b
-    14:17:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1144:1147 -> b
-    18:19:boolean isClassDesiredAssertionStatusInvoke(com.android.tools.r8.ir.code.Instruction):1795:1796 -> b
-    20:21:com.android.tools.r8.ir.code.Value blockWithAssertionsDisabledFieldPut(com.android.tools.r8.ir.code.BasicBlock):1820:1821 -> b
-    22:23:boolean isAssertionsDisabledFieldPut(com.android.tools.r8.ir.code.Instruction):1801:1802 -> b
-    22:23:com.android.tools.r8.ir.code.Value blockWithAssertionsDisabledFieldPut(com.android.tools.r8.ir.code.BasicBlock):1823 -> b
-    24:24:com.android.tools.r8.ir.code.Value blockWithAssertionsDisabledFieldPut(com.android.tools.r8.ir.code.BasicBlock):1823:1823 -> b
-    25:25:boolean lambda$shortenLiveRanges$8(com.android.tools.r8.ir.code.ConstInstruction):2240:2240 -> b
-    26:26:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2800:2800 -> b
-    27:34:boolean hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2787:2794 -> b
-    27:34:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2801 -> b
-    35:51:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2803:2819 -> b
-    52:61:boolean shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2765:2774 -> b
-    52:61:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2820 -> b
-    62:77:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2821:2836 -> b
-    78:80:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$15():3928:3930 -> b
-    81:81:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$15():3928:3928 -> b
-    1:40:void identifyReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):964:1003 -> c
-    41:41:boolean isNotDebugInstruction(com.android.tools.r8.ir.code.Instruction):1806:1806 -> c
-    42:48:com.android.tools.r8.ir.code.Value blockWithSingleConstNumberAndGoto(com.android.tools.r8.ir.code.BasicBlock):1810:1816 -> c
-    49:49:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3184:3184 -> c
-    1:9:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):869:877 -> d
-    10:22:com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo com.android.tools.r8.ir.optimize.SwitchUtils.analyzeSwitchOverEnum(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):62:74 -> d
-    10:22:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):877 -> d
-    23:38:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1114:1129 -> d
-    39:118:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeInstanceInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.function.Function):1175:1254 -> d
-    39:118:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1129 -> d
-    119:119:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1130:1130 -> d
-    120:120:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1127:1127 -> d
-    121:144:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3347:3370 -> d
-    145:145:boolean lambda$logArgumentTypes$14(com.android.tools.r8.ir.code.Instruction):3688:3688 -> d
-    1:77:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1608:1684 -> e
-    78:78:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):401:401 -> e
-    78:78:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1685 -> e
-    79:93:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1686:1700 -> e
-    94:94:java.util.List lambda$shortenLiveRangesInsideBlock$9(com.android.tools.r8.ir.code.BasicBlock):2344:2344 -> e
-    1:100:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):727:826 -> f
-    101:181:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.Switch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):636:716 -> f
-    101:181:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):827 -> f
-    182:182:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> f
-    182:182:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.Switch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):717 -> f
-    182:182:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):827 -> f
-    183:183:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.Switch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):722:722 -> f
-    183:183:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):827 -> f
-    184:203:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):830:849 -> f
-    1:40:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3600:3639 -> g
-    1:59:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2217:2275 -> h
-    60:86:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2260:2286 -> h
-    1:12:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2478:2489 -> i
-    13:29:boolean allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2454:2470 -> i
-    13:29:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2490 -> i
-    30:46:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2493:2509 -> i
-    47:64:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2508:2525 -> i
-    65:81:short[] computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):2374:2390 -> i
-    65:81:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2526 -> i
-    82:124:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2530:2572 -> i
-    1:6:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2614:2619 -> j
-    7:24:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2658:2675 -> j
-    7:24:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2619 -> j
-    25:35:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2624:2634 -> j
-    36:60:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2581:2605 -> j
-    36:60:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2636 -> j
-    61:74:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2637:2650 -> j
-    75:75:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2610:2610 -> j
-    75:75:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2636 -> j
-    1:6:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2840:2845 -> k
-    7:23:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.BasicBlock):3415:3431 -> k
-    7:23:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2846 -> k
-    24:35:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3389:3400 -> k
-    24:35:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2847 -> k
-    36:49:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():27:40 -> k
-    36:49:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3400 -> k
-    36:49:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2847 -> k
-    50:50:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():38:38 -> k
-    50:50:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3400 -> k
-    50:50:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2847 -> k
-    51:51:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():36:36 -> k
-    51:51:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3400 -> k
-    51:51:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2847 -> k
-    52:52:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():34:34 -> k
-    52:52:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3400 -> k
-    52:52:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2847 -> k
-    53:53:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():32:32 -> k
-    53:53:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3400 -> k
-    53:53:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2847 -> k
-    54:62:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3400:3408 -> k
-    54:62:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2847 -> k
-    63:124:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3276:3337 -> k
-    63:124:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2849 -> k
-    125:175:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2854:2904 -> k
-    176:177:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2896:2897 -> k
-    178:224:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2888:2934 -> k
-    225:262:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2924:2961 -> k
-    1:26:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2074:2099 -> l
-    1:4:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2113:2116 -> m
-    5:8:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2153:2156 -> m
-    5:8:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2117 -> m
-    9:17:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2171:2179 -> m
-    9:17:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2157 -> m
-    9:17:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2117 -> m
-    18:18:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> m
-    18:18:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2179 -> m
-    18:18:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2157 -> m
-    18:18:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2117 -> m
-    19:21:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2179:2181 -> m
-    19:21:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2157 -> m
-    19:21:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2117 -> m
-    22:29:boolean hasPath(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2202:2209 -> m
-    22:29:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2182 -> m
-    22:29:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2157 -> m
-    22:29:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2117 -> m
-    30:31:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2187:2188 -> m
-    30:31:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2157 -> m
-    30:31:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2117 -> m
-    32:52:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2118:2138 -> m
-    53:71:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2126:2144 -> m
-    1:15:void workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3984:3998 -> n
-    1:46:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3927:3972 -> o
-    1:37:boolean hasJavacClinitAssertionCode(com.android.tools.r8.ir.code.IRCode):1827:1863 -> p
-    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$6(com.android.tools.r8.ir.code.IRCode):2218:2218 -> q
-    1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):168:180 -> r
-    14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):177:183 -> r
+    226:226:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):961 -> a
+    227:228:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):963:964 -> a
+    229:232:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.OptimizationFeedback):1017:1020 -> a
+    233:239:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.OptimizationFeedback):1019:1025 -> a
+    240:240:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.OptimizationFeedback):1024:1024 -> a
+    241:294:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1041:1094 -> a
+    295:339:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1069:1113 -> a
+    340:402:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):1269:1331 -> a
+    403:403:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):1363:1363 -> a
+    404:408:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1366:1370 -> a
+    409:424:boolean isKotlinNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):1428:1443 -> a
+    409:424:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1372 -> a
+    425:446:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1373:1394 -> a
+    447:452:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1393:1398 -> a
+    453:460:boolean isInstantiationOfNullPointerException(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):1462:1469 -> a
+    453:460:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1398 -> a
+    461:481:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1399:1419 -> a
+    482:484:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1451:1453 -> a
+    485:485:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1483:1483 -> a
+    486:501:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$4(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1486:1501 -> a
+    502:561:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1513:1572 -> a
+    562:602:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1532:1572 -> a
+    603:616:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1559:1572 -> a
+    617:617:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1580:1580 -> a
+    618:618:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1579:1579 -> a
+    619:625:com.android.tools.r8.graph.DexType getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1590:1596 -> a
+    619:625:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1583 -> a
+    626:626:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1583:1583 -> a
+    627:631:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1582:1586 -> a
+    632:669:void disableAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1729:1766 -> a
+    670:681:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1850:1861 -> a
+    682:727:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1965:2010 -> a
+    682:727:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1861 -> a
+    728:728:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):2004:2004 -> a
+    728:728:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1861 -> a
+    729:731:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1873:1875 -> a
+    732:745:boolean removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1881:1894 -> a
+    746:746:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtCheckCastVerifierBug():968:968 -> a
+    746:746:boolean removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1894 -> a
+    747:771:boolean removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1895:1919 -> a
+    772:772:boolean com.android.tools.r8.ir.analysis.type.Nullability.lessThanOrEqual(com.android.tools.r8.ir.analysis.type.Nullability):47:47 -> a
+    772:772:boolean removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1919 -> a
+    773:794:boolean removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1919:1940 -> a
+    795:795:boolean lambda$removeCheckCastInstructionIfTrivial$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):1905:1905 -> a
+    796:808:boolean isTypeInaccessibleInCurrentContext(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1945:1957 -> a
+    809:819:void removeOrReplaceByDebugLocalWrite(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2027:2037 -> a
+    820:821:boolean lambda$shortenLiveRanges$7(com.android.tools.r8.ir.code.ConstInstruction):2207:2208 -> a
+    822:876:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):2272:2326 -> a
+    877:888:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):2331:2342 -> a
+    889:891:boolean lambda$insertConstantInBlock$10(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):2336:2338 -> a
+    892:892:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():802:802 -> a
+    892:892:boolean lambda$insertConstantInBlock$10(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):2339 -> a
+    893:893:boolean lambda$insertConstantInBlock$10(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):2339:2339 -> a
+    894:941:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):2377:2424 -> a
+    942:947:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2752:2757 -> a
+    948:949:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2941:2942 -> a
+    950:950:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2946:2946 -> a
+    951:955: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):3355:3359 -> a
+    956:971:void rewriteLongCompareAndRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3410:3425 -> a
+    972:988:void rewriteLongCompareAndRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3423:3439 -> a
+    989:1012:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3450:3473 -> a
+    1013:1047:java.util.Set computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3510:3544 -> a
+    1013:1047:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3477 -> a
+    1048:1051:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3478:3481 -> a
+    1052:1052:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>():120:120 -> a
+    1052:1052:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3481 -> a
+    1053:1053:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3482:3482 -> a
+    1054:1054:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>():120:120 -> a
+    1054:1054:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3482 -> a
+    1055:1072:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3483:3500 -> a
+    1073:1082:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3555:3564 -> a
+    1083:1083:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3617:3617 -> a
+    1084:1093:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3623:3632 -> a
+    1084:1093:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3619 -> a
+    1094:1094:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3629:3629 -> a
+    1094:1094:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3619 -> a
+    1095:1100: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):3638:3643 -> a
+    1101:1117:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3653:3669 -> a
+    1118:1118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> a
+    1118:1118:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3669 -> a
+    1119:1119:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3670:3670 -> a
+    1120:1120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> a
+    1120:1120:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3670 -> a
+    1121:1121:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3673:3673 -> a
+    1122:1131:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3672:3681 -> a
+    1132:1193:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3679:3740 -> a
+    1194:1209:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3739:3754 -> a
+    1210:1216:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3796:3802 -> a
+    1:1:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):185:185 -> b
+    2:6:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1140:1144 -> b
+    7:13:com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage collectParameterUsages(int,com.android.tools.r8.ir.code.Value):1156:1162 -> b
+    7:13:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1147 -> b
+    14:17:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1149:1152 -> b
+    18:19:boolean isClassDesiredAssertionStatusInvoke(com.android.tools.r8.ir.code.Instruction):1773:1774 -> b
+    20:21:com.android.tools.r8.ir.code.Value blockWithAssertionsDisabledFieldPut(com.android.tools.r8.ir.code.BasicBlock):1798:1799 -> b
+    22:23:boolean isAssertionsDisabledFieldPut(com.android.tools.r8.ir.code.Instruction):1779:1780 -> b
+    22:23:com.android.tools.r8.ir.code.Value blockWithAssertionsDisabledFieldPut(com.android.tools.r8.ir.code.BasicBlock):1801 -> b
+    24:24:com.android.tools.r8.ir.code.Value blockWithAssertionsDisabledFieldPut(com.android.tools.r8.ir.code.BasicBlock):1801:1801 -> b
+    25:25:boolean lambda$shortenLiveRanges$8(com.android.tools.r8.ir.code.ConstInstruction):2216:2216 -> b
+    26:26:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2774:2774 -> b
+    27:34:boolean hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2761:2768 -> b
+    27:34:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2775 -> b
+    35:51:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2777:2793 -> b
+    52:61:boolean shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2739:2748 -> b
+    52:61:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2794 -> b
+    62:77:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2795:2810 -> b
+    78:80:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$15():3903:3905 -> b
+    81:81:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$15():3903:3903 -> b
+    1:40:void identifyReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):969:1008 -> c
+    41:41:boolean isNotDebugInstruction(com.android.tools.r8.ir.code.Instruction):1784:1784 -> c
+    42:48:com.android.tools.r8.ir.code.Value blockWithSingleConstNumberAndGoto(com.android.tools.r8.ir.code.BasicBlock):1788:1794 -> c
+    49:59:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode):3758:3768 -> c
+    60:70:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3782:3792 -> c
+    60:70:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode):3768 -> c
+    71:71:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode):3769:3769 -> c
+    72:97:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):3815:3840 -> c
+    72:97:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode):3769 -> c
+    98:102:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode):3770:3774 -> c
+    103:103:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode):3771:3771 -> c
+    104:104:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3790:3790 -> c
+    104:104:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode):3768 -> c
+    105:105:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3786:3786 -> c
+    105:105:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode):3768 -> c
+    1:16:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1119:1134 -> d
+    17:96:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeInstanceInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.function.Function):1180:1259 -> d
+    17:96:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1134 -> d
+    97:97:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1135:1135 -> d
+    98:98:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1132:1132 -> d
+    99:99:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3158:3158 -> d
+    100:123:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3321:3344 -> d
+    124:124:boolean lambda$logArgumentTypes$14(com.android.tools.r8.ir.code.Instruction):3662:3662 -> d
+    1:9:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):874:882 -> e
+    10:22:com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo com.android.tools.r8.ir.optimize.SwitchUtils.analyzeSwitchOverEnum(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):62:74 -> e
+    10:22:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):882 -> e
+    23:23:java.util.List lambda$shortenLiveRangesInsideBlock$9(com.android.tools.r8.ir.code.BasicBlock):2320:2320 -> e
+    1:78:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1601:1678 -> f
+    1:100:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):732:831 -> g
+    101:181:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.Switch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):641:721 -> g
+    101:181:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):832 -> g
+    182:182:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> g
+    182:182:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.Switch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):722 -> g
+    182:182:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):832 -> g
+    183:183:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.Switch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):727:727 -> g
+    183:183:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):832 -> g
+    184:203:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):835:854 -> g
+    1:40:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3574:3613 -> h
+    1:59:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2193:2251 -> i
+    60:86:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2236:2262 -> i
+    1:12:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2454:2465 -> j
+    13:29:boolean allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2430:2446 -> j
+    13:29:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2466 -> j
+    30:46:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2469:2485 -> j
+    47:64:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2484:2501 -> j
+    65:81:short[] computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):2350:2366 -> j
+    65:81:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2502 -> j
+    82:124:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2506:2548 -> j
+    1:6:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2590:2595 -> k
+    7:24:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2634:2651 -> k
+    7:24:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2595 -> k
+    25:35:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2600:2610 -> k
+    36:60:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2557:2581 -> k
+    36:60:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2612 -> k
+    61:74:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2613:2626 -> k
+    75:75:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2586:2586 -> k
+    75:75:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2612 -> k
+    1:6:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2814:2819 -> l
+    7:23:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.BasicBlock):3389:3405 -> l
+    7:23:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2820 -> l
+    24:35:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3363:3374 -> l
+    24:35:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2821 -> l
+    36:49:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():27:40 -> l
+    36:49:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3374 -> l
+    36:49:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2821 -> l
+    50:50:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():38:38 -> l
+    50:50:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3374 -> l
+    50:50:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2821 -> l
+    51:51:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():36:36 -> l
+    51:51:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3374 -> l
+    51:51:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2821 -> l
+    52:52:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():34:34 -> l
+    52:52:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3374 -> l
+    52:52:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2821 -> l
+    53:53:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():32:32 -> l
+    53:53:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3374 -> l
+    53:53:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2821 -> l
+    54:62:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3374:3382 -> l
+    54:62:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2821 -> l
+    63:124:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3250:3311 -> l
+    63:124:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2823 -> l
+    125:175:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2828:2878 -> l
+    176:177:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2870:2871 -> l
+    178:224:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2862:2908 -> l
+    225:262:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2898:2935 -> l
+    1:26:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2050:2075 -> m
+    1:4:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2089:2092 -> n
+    5:8:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2129:2132 -> n
+    5:8:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2093 -> n
+    9:17:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2147:2155 -> n
+    9:17:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2133 -> n
+    9:17:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2093 -> n
+    18:18:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> n
+    18:18:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2155 -> n
+    18:18:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2133 -> n
+    18:18:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2093 -> n
+    19:21:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2155:2157 -> n
+    19:21:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2133 -> n
+    19:21:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2093 -> n
+    22:29:boolean hasPath(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2178:2185 -> n
+    22:29:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2158 -> n
+    22:29:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2133 -> n
+    22:29:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2093 -> n
+    30:31:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2163:2164 -> n
+    30:31:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2133 -> n
+    30:31:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2093 -> n
+    32:52:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2094:2114 -> n
+    53:71:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2102:2120 -> n
+    1:14:void workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3959:3972 -> o
+    1:46:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3902:3947 -> p
+    1:37:boolean hasJavacClinitAssertionCode(com.android.tools.r8.ir.code.IRCode):1805:1841 -> q
+    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$6(com.android.tools.r8.ir.code.IRCode):2194:2194 -> r
+    1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):173:185 -> s
+    14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):182:188 -> s
 com.android.tools.r8.ir.optimize.CodeRewriter$1 -> a.a.a.a.g.e.d:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
-    1:1:void <clinit>():2882:2882 -> <clinit>
+    1:1:void <clinit>():2856:2856 -> <clinit>
 com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> a.a.a.a.g.e.e:
-    com.android.tools.r8.utils.InternalOptions options -> a
+    com.android.tools.r8.ir.code.IRCode code -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():2679:2679 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):2684:2686 -> <init>
-    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.CodeRewriter$1):2679 -> <init>
-    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2679:2679 -> a
-    2:21:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2694:2713 -> a
-    2:21:boolean doEquivalent(java.lang.Object,java.lang.Object):2679 -> a
-    22:22:int doHash(java.lang.Object):2679:2679 -> a
-    23:37:int doHash(com.android.tools.r8.ir.code.Instruction):2724:2738 -> a
-    23:37:int doHash(java.lang.Object):2679 -> a
-    38:43:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2745:2750 -> a
-    44:48:int getHashCode(com.android.tools.r8.ir.code.Value):2756:2760 -> a
+    1:1:void <clinit>():2655:2655 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.code.IRCode):2659:2660 -> <init>
+    1:2:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.CodeRewriter$1):2655 -> <init>
+    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2655:2655 -> a
+    2:21:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2668:2687 -> a
+    2:21:boolean doEquivalent(java.lang.Object,java.lang.Object):2655 -> a
+    22:22:int doHash(java.lang.Object):2655:2655 -> a
+    23:37:int doHash(com.android.tools.r8.ir.code.Instruction):2698:2712 -> a
+    23:37:int doHash(java.lang.Object):2655 -> a
+    38:43:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2719:2724 -> a
+    44:48:int getHashCode(com.android.tools.r8.ir.code.Value):2730:2734 -> a
 com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> a.a.a.a.g.e.f:
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> g
     com.android.tools.r8.ir.code.BasicBlock target -> f
@@ -21370,17 +21102,17 @@
     com.android.tools.r8.ir.code.IRCode code -> c
     boolean $assertionsDisabled -> h
     int right -> e
-    1:1:void <clinit>():401:401 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRCode):409:410 -> <init>
+    1:1:void <clinit>():406:406 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRCode):414:415 -> <init>
     java.lang.Object self() -> a
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setLeft(com.android.tools.r8.ir.code.Value):419:419 -> a
-    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):424:424 -> a
-    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):434:434 -> a
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):429:429 -> b
-    2:10:com.android.tools.r8.ir.code.BasicBlock build():439:447 -> b
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setLeft(com.android.tools.r8.ir.code.Value):424:424 -> a
+    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):429:429 -> a
+    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):439:439 -> a
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):434:434 -> b
+    2:10:com.android.tools.r8.ir.code.BasicBlock build():444:452 -> b
     11:15: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.Instruction):1291:1295 -> b
-    11:15:com.android.tools.r8.ir.code.BasicBlock build():447 -> b
-    16:21:com.android.tools.r8.ir.code.BasicBlock build():449:454 -> b
+    11:15:com.android.tools.r8.ir.code.BasicBlock build():452 -> b
+    16:21:com.android.tools.r8.ir.code.BasicBlock build():454:459 -> b
 com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult -> a.a.a.a.g.e.g:
     com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult FALSE -> c
     com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult TRUE -> b
@@ -21391,41 +21123,41 @@
 com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> a.a.a.a.g.e.h:
     com.android.tools.r8.ir.code.Position position -> b
     int blockNumber -> a
-    1:2:void <init>(com.android.tools.r8.ir.code.Position):329:330 -> <init>
+    1:2:void <init>(com.android.tools.r8.ir.code.Position):334:335 -> <init>
     java.lang.Object self() -> a
 com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect -> a.a.a.a.g.e.i:
     com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect NO_EFFECT -> d
     com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect DESIRED_EFFECT -> a
     com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect OTHER_EFFECT -> c
     com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect CONDITIONAL_EFFECT -> b
-    1:4:void <clinit>():1355:1358 -> <clinit>
-    5:5:void <clinit>():1354:1354 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1354:1354 -> <init>
+    1:4:void <clinit>():1349:1352 -> <clinit>
+    5:5:void <clinit>():1348:1348 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1348:1348 -> <init>
 com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> a.a.a.a.g.e.j:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList keys -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():534:534 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):538:538 -> <init>
-    2:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):536:542 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList access$000(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):534:534 -> a
-    2:2:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):570:570 -> a
-    1:1:int getMax():551:551 -> b
-    1:1:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):560 -> b
-    2:2:int getMin():547:547 -> b
-    2:2:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):560 -> b
-    3:3:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):561:561 -> b
-    4:4:int com.android.tools.r8.ir.code.Switch.baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):113:113 -> b
-    4:4:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):564 -> b
-    5:5:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):564:564 -> b
-    6:6:int com.android.tools.r8.ir.code.Switch.basePackedSize(com.android.tools.r8.utils.InternalOutputMode):102:102 -> b
-    6:6:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):565 -> b
-    7:7:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):565:565 -> b
-    8:8:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):555:555 -> b
-    9:9:int getMax():551:551 -> b
-    9:9:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):555 -> b
-    10:10:int getMin():547:547 -> b
-    10:10:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):555 -> b
-    11:12:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):555:556 -> b
+    1:1:void <clinit>():539:539 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):543:543 -> <init>
+    2:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):541:547 -> <init>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList access$000(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):539:539 -> a
+    2:2:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):575:575 -> a
+    1:1:int getMax():556:556 -> b
+    1:1:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):565 -> b
+    2:2:int getMin():552:552 -> b
+    2:2:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):565 -> b
+    3:3:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):566:566 -> b
+    4:4:int com.android.tools.r8.ir.code.Switch.baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):108:108 -> b
+    4:4:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):569 -> b
+    5:5:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):569:569 -> b
+    6:6:int com.android.tools.r8.ir.code.Switch.basePackedSize(com.android.tools.r8.utils.InternalOutputMode):97:97 -> b
+    6:6:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):570 -> b
+    7:7:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):570:570 -> b
+    8:8:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):560:560 -> b
+    9:9:int getMax():556:556 -> b
+    9:9:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):560 -> b
+    10:10:int getMin():552:552 -> b
+    10:10:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):560 -> b
+    11:12:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):560:561 -> b
 com.android.tools.r8.ir.optimize.CodeRewriter$SCC -> a.a.a.a.g.e.k:
     java.util.Deque unassignedStack -> d
     java.util.Set unassignedSet -> c
@@ -21434,59 +21166,56 @@
     java.util.Deque preorderStack -> e
     boolean $assertionsDisabled -> g
     int currentTime -> a
-    1:1:void <clinit>():3872:3872 -> <clinit>
-    1:8:void <init>():3872:3879 -> <init>
-    1:8:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):3872 -> <init>
-    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):3882:3884 -> a
-    1:33:void dfs(com.android.tools.r8.ir.code.Value):3888:3920 -> b
+    1:1:void <clinit>():3847:3847 -> <clinit>
+    1:8:void <init>():3847:3854 -> <init>
+    1:8:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):3847 -> <init>
+    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):3857:3859 -> a
+    1:33:void dfs(com.android.tools.r8.ir.code.Value):3863:3895 -> b
 com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> a.a.a.a.g.e.l:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap keyToTarget -> d
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> e
     com.android.tools.r8.ir.code.Value value -> c
-    1:1:void <init>(com.android.tools.r8.ir.code.Position):347:347 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Position):343:343 -> <init>
+    1:1:void <init>(com.android.tools.r8.ir.code.Position):352:352 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Position):348:348 -> <init>
     java.lang.Object self() -> a
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):356:356 -> a
-    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):361:361 -> a
-    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):366:366 -> a
-    4:4:java.lang.Integer lambda$build$0(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):384:384 -> a
-    1:22:com.android.tools.r8.ir.code.BasicBlock build():372:393 -> b
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):361:361 -> a
+    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):366:366 -> a
+    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):371:371 -> a
+    4:4:java.lang.Integer lambda$build$0(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):389:389 -> a
+    1:22:com.android.tools.r8.ir.code.BasicBlock build():377:398 -> b
     23:26:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createSwitchBlock(int,com.android.tools.r8.ir.code.Switch):1300:1303 -> b
-    23:26:com.android.tools.r8.ir.code.BasicBlock build():393 -> b
+    23:26:com.android.tools.r8.ir.code.BasicBlock build():398 -> b
     27:27:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.keySet():87:87 -> b
-    27:27:com.android.tools.r8.ir.code.BasicBlock build():394 -> b
-    28:29:com.android.tools.r8.ir.code.BasicBlock build():394:395 -> b
-    30:30:java.lang.Integer lambda$build$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):390:390 -> b
+    27:27:com.android.tools.r8.ir.code.BasicBlock build():399 -> b
+    28:29:com.android.tools.r8.ir.code.BasicBlock build():399:400 -> b
+    30:30:java.lang.Integer lambda$build$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):395:395 -> b
 com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> a.a.a.a.g.e.o:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():29:29 -> <clinit>
-    1:59:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):34:92 -> a
-    60:61:boolean constantUsedByInvokeRange(com.android.tools.r8.ir.code.ConstInstruction):185:186 -> a
-    60:61:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):92 -> a
-    62:62:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):96:96 -> a
-    63:109:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):95:141 -> a
-    110:110:java.util.List lambda$canonicalize$0(com.android.tools.r8.ir.code.ConstInstruction):96:96 -> a
-    111:111:boolean lambda$canonicalize$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):114:114 -> a
-    112:112:int lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):115:115 -> a
-    113:116:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):118:121 -> a
-    117:131:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):119:133 -> a
-    132:143:void insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstInstruction):146:157 -> a
-    132:143:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):134 -> a
-    144:145:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):135:136 -> a
-    146:161:com.android.tools.r8.ir.code.Position findFirstNonNonePosition(com.android.tools.r8.ir.code.IRCode):161:176 -> a
-    162:162:boolean lambda$findFirstNonNonePosition$4(com.android.tools.r8.ir.code.Instruction):163:163 -> a
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:48:void canonicalize(com.android.tools.r8.ir.code.IRCode):31:78 -> a
+    49:50:boolean constantUsedByInvokeRange(com.android.tools.r8.ir.code.ConstInstruction):166:167 -> a
+    49:50:void canonicalize(com.android.tools.r8.ir.code.IRCode):78 -> a
+    51:51:void canonicalize(com.android.tools.r8.ir.code.IRCode):82:82 -> a
+    52:93:void canonicalize(com.android.tools.r8.ir.code.IRCode):81:122 -> a
+    94:94:java.util.List lambda$canonicalize$0(com.android.tools.r8.ir.code.ConstInstruction):82:82 -> a
+    95:95:boolean lambda$canonicalize$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):100:100 -> a
+    96:96:int lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):101:101 -> a
+    97:107:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):104:114 -> a
+    108:119:void insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstInstruction):127:138 -> a
+    108:119:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):115 -> a
+    120:121:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):116:117 -> a
+    122:122:boolean lambda$findFirstNonNonePosition$4(com.android.tools.r8.ir.code.Instruction):144:144 -> a
+    1:16:com.android.tools.r8.ir.code.Position findFirstNonNonePosition(com.android.tools.r8.ir.code.IRCode):142:157 -> b
 com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> a.a.a.a.g.e.n:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():36:36 -> <clinit>
-    1:1:void <init>():36:36 -> <init>
-    1:1:boolean equals(java.lang.Object,java.lang.Object):36:36 -> a
-    2:5:boolean equals(com.android.tools.r8.ir.code.ConstInstruction,com.android.tools.r8.ir.code.ConstInstruction):55:58 -> a
-    2:5:boolean equals(java.lang.Object,java.lang.Object):36 -> a
-    6:6:int hashCode(java.lang.Object):36:36 -> a
-    7:9:int hashCode(com.android.tools.r8.ir.code.ConstInstruction):39:41 -> a
-    7:9:int hashCode(java.lang.Object):36 -> a
-    10:20:int hashCode(com.android.tools.r8.ir.code.ConstInstruction):39:49 -> a
-    10:20:int hashCode(java.lang.Object):36 -> a
+    1:1:void <clinit>():33:33 -> <clinit>
+    1:1:void <init>():33:33 -> <init>
+    1:1:boolean equals(java.lang.Object,java.lang.Object):33:33 -> a
+    2:5:boolean equals(com.android.tools.r8.ir.code.ConstInstruction,com.android.tools.r8.ir.code.ConstInstruction):47:50 -> a
+    2:5:boolean equals(java.lang.Object,java.lang.Object):33 -> a
+    6:6:int hashCode(java.lang.Object):33:33 -> a
+    7:12:int hashCode(com.android.tools.r8.ir.code.ConstInstruction):36:41 -> a
+    7:12:int hashCode(java.lang.Object):33 -> a
 com.android.tools.r8.ir.optimize.DeadCodeRemover -> a.a.a.a.g.e.p:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> b
@@ -21523,9 +21252,9 @@
     1:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.Predicate,int,int):54:63 -> <init>
     com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexType) -> a
     1:14:com.android.tools.r8.graph.DexEncodedMethod validateCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):74:87 -> a
-    15:16:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType):288:289 -> a
-    17:18:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):331:332 -> a
-    19:19:boolean stillHasBudget():394:394 -> a
+    15:16:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType):289:290 -> a
+    17:18:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):333:334 -> a
+    19:19:boolean stillHasBudget():395:395 -> a
     void finish() -> b
 com.android.tools.r8.ir.optimize.Devirtualizer -> a.a.a.a.g.e.r:
     boolean $assertionsDisabled -> a
@@ -21535,13 +21264,13 @@
     java.util.Map invokesToInline -> b
     com.android.tools.r8.graph.DexEncodedMethod method -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():23:23 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):28:30 -> <init>
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):27:29 -> <init>
     com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexType) -> a
     boolean stillHasBudget() -> a
-    1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType):40:40 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):48:48 -> a
-    3:13:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod):52:62 -> a
+    1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType):39:39 -> a
+    2:2:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):47:47 -> a
+    3:13:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod):51:61 -> a
     void finish() -> b
 com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> a.a.a.a.g.e.u:
     java.util.Set idempotentMethods -> a
@@ -21591,19 +21320,19 @@
     10:12:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):83:85 -> a
     10:12:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):98 -> a
     13:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):99:104 -> a
-    19:20:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):444:445 -> a
-    21:22:void performForcedInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map):543:544 -> a
-    23:31:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):552:560 -> a
-    32:39:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):554:561 -> a
-    40:40:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):571:571 -> a
-    41:69:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):584:612 -> a
-    70:74:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):610:614 -> a
-    75:75:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason com.android.tools.r8.ir.optimize.Inliner$InlineAction.buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position):422:422 -> a
-    75:75:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):615 -> a
-    76:77:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):654:655 -> a
+    19:20:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):448:449 -> a
+    21:22:void performForcedInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map):547:548 -> a
+    23:31:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):556:564 -> a
+    32:39:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):558:565 -> a
+    40:40:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):575:575 -> a
+    41:69:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):588:616 -> a
+    70:74:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):614:618 -> a
+    75:75:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason com.android.tools.r8.ir.optimize.Inliner$InlineAction.buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position):426:426 -> a
+    75:75:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):619 -> a
+    76:77:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):658:659 -> a
     78:78:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):401:401 -> a
-    78:78:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):656 -> a
-    79:80:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):657:658 -> a
+    78:78:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):660 -> a
+    79:80:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):661:662 -> a
 com.android.tools.r8.ir.optimize.Inliner$Constraint -> a.a.a.a.g.e.v:
     com.android.tools.r8.ir.optimize.Inliner$Constraint SUBCLASS -> e
     com.android.tools.r8.ir.optimize.Inliner$Constraint PACKAGE -> d
@@ -21617,7 +21346,7 @@
     8:26:void <clinit>():193:211 -> <clinit>
     1:2:void <init>(java.lang.String,int,int):203:204 -> <init>
     1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():193:193 -> a
-    1:1:boolean isSet(int):215:215 -> c
+    1:1:boolean isSet(int):215:215 -> b
 com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget -> a.a.a.a.g.e.w:
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget ALWAYS -> d
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget NEVER -> c
@@ -21627,37 +21356,38 @@
     1:9:void <clinit>():233:241 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):243:246 -> <init>
     5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):249:253 -> <init>
-    1:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):276:281 -> a
-    7:7:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):78:78 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):282 -> a
-    8:12:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):284:288 -> a
-    13:13:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):78:78 -> a
-    13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):291 -> a
-    14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):292:292 -> a
-    15:26:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):298:309 -> a
-    27:94:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):314:381 -> a
+    1:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexDefinitionSupplier):279:284 -> a
+    7:7:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):328:328 -> a
+    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexDefinitionSupplier):285 -> a
+    8:12:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexDefinitionSupplier):287:291 -> a
+    13:13:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):328:328 -> a
+    13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexDefinitionSupplier):294 -> a
+    14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexDefinitionSupplier):295:295 -> a
+    15:17:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):301:303 -> a
+    18:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):302:313 -> a
+    30:97:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.DexDefinitionSupplier):318:385 -> a
     1:5:boolean equals(java.lang.Object):266:270 -> equals
     1:4:int hashCode():258:261 -> hashCode
-    5:5:int com.android.tools.r8.graph.DexType.computeHashCode():36:36 -> hashCode
+    5:5:int com.android.tools.r8.graph.DexType.computeHashCode():61:61 -> hashCode
     5:5:int hashCode():261 -> hashCode
 com.android.tools.r8.ir.optimize.Inliner$InlineAction -> a.a.a.a.g.e.x:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> b
-    1:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):410:413 -> <init>
+    1:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):414:417 -> <init>
 com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> a.a.a.a.g.e.y:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.graph.DexType receiverType -> b
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):532:534 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):536:538 -> <init>
 com.android.tools.r8.ir.optimize.Inliner$Reason -> a.a.a.a.g.e.z:
     com.android.tools.r8.ir.optimize.Inliner$Reason SIMPLE -> e
     com.android.tools.r8.ir.optimize.Inliner$Reason SINGLE_CALLER -> c
     com.android.tools.r8.ir.optimize.Inliner$Reason DUAL_CALLER -> d
     com.android.tools.r8.ir.optimize.Inliner$Reason FORCE -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason ALWAYS -> b
-    1:5:void <clinit>():392:396 -> <clinit>
-    6:6:void <clinit>():391:391 -> <clinit>
-    1:1:void <init>(java.lang.String,int):391:391 -> <init>
-    1:1:boolean mustBeInlined():400:400 -> a
+    1:5:void <clinit>():396:400 -> <clinit>
+    6:6:void <clinit>():395:395 -> <clinit>
+    1:1:void <init>(java.lang.String,int):395:395 -> <init>
+    1:1:boolean mustBeInlined():404:404 -> a
 com.android.tools.r8.ir.optimize.InliningConstraints -> a.a.a.a.g.e.B:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.GraphLense graphLense -> c
@@ -21670,23 +21400,24 @@
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):78:78 -> a
     3:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstanceGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):110:112 -> a
     6:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):151:153 -> a
-    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):182:182 -> a
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forArgument():58:58 -> b
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):82:82 -> b
     3:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstancePut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):120:122 -> b
     6:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):157:159 -> b
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forArrayGet():62:62 -> c
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):116:116 -> c
-    3:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):175:177 -> c
-    6:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):237:239 -> c
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokePolymorphic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):171:171 -> c
+    4:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):237:239 -> c
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forArrayLength():66:66 -> d
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeMultiNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):163:163 -> d
-    3:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):186:188 -> d
+    3:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):175:177 -> d
     6:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticPut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):243:245 -> d
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forArrayPut():70:70 -> e
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):167:167 -> e
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):182:182 -> e
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forBinop():74:74 -> f
-    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):213:213 -> f
+    2:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):186:188 -> f
+    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):213:213 -> f
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forConstInstruction():86:86 -> g
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):221:221 -> g
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forConstMethodHandle():265:265 -> h
@@ -21694,17 +21425,16 @@
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forDebugLocalsChange():94:94 -> j
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forDebugPosition():98:98 -> k
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeCustom():147:147 -> l
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokePolymorphic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):171:171 -> m
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forJumpInstruction():192:192 -> n
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forMonitor():201:201 -> o
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forMove():205:205 -> p
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forMoveException():209:209 -> q
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayFilledData():217:217 -> r
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNonNull():225:225 -> s
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forPop():229:229 -> t
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forReturn():233:233 -> u
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forThrow():257:257 -> v
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forUnop():261:261 -> w
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forJumpInstruction():192:192 -> m
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forMonitor():201:201 -> n
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forMove():205:205 -> o
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forMoveException():209:209 -> p
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayFilledData():217:217 -> q
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNonNull():225:225 -> r
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forPop():229:229 -> s
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forReturn():233:233 -> t
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forThrow():257:257 -> u
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forUnop():261:261 -> v
 com.android.tools.r8.ir.optimize.InliningOracle -> a.a.a.a.g.e.C:
     com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis) -> a
@@ -21725,16 +21455,16 @@
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():43:43 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):64:65 -> <init>
-    1:10:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):366:375 -> a
-    11:18:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):200:207 -> a
-    11:18:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):374 -> a
-    19:28:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):376:385 -> a
-    29:32:void rewriteStaticGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):275:278 -> a
-    29:32:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):379 -> a
-    33:33:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):377:377 -> a
-    34:39:void rewritePutWithConstantValues(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType):337:342 -> a
-    34:39:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):377 -> a
-    40:43:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):389:392 -> a
+    1:10:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):346:355 -> a
+    11:18:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):187:194 -> a
+    11:18:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):354 -> a
+    19:28:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):356:365 -> a
+    29:32:void rewriteStaticGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):261:264 -> a
+    29:32:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):359 -> a
+    33:33:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):357:357 -> a
+    34:39:void rewritePutWithConstantValues(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.FieldInstruction):323:328 -> a
+    34:39:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):357 -> a
+    40:43:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):369:372 -> a
 com.android.tools.r8.ir.optimize.MoveEliminator -> a.a.a.a.g.e.G:
     java.util.HashSet activeMoves -> a
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> b
@@ -21745,31 +21475,33 @@
     52:56:boolean lambda$shouldBeEliminated$0(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Move):54:58 -> a
 com.android.tools.r8.ir.optimize.NonNullTracker -> a.a.a.a.g.e.H:
     com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> b
-    1:1:void <clinit>():43:43 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.AppView):47:48 -> <init>
-    boolean lambda$addNonNullForValues$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    1:1:void addNonNull(com.android.tools.r8.ir.code.IRCode):82:82 -> a
-    2:28:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):87:113 -> a
-    29:35:boolean throwsOnNullInput(com.android.tools.r8.ir.code.Instruction):53:59 -> a
-    29:35:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):116 -> a
-    36:49:com.android.tools.r8.ir.code.Value getNonNullInput(com.android.tools.r8.ir.code.Instruction):63:76 -> a
-    36:49:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):117 -> a
-    50:51:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):118:119 -> a
-    52:52:com.android.tools.r8.ir.code.Value getNonNullInput(com.android.tools.r8.ir.code.Instruction):78:78 -> a
-    52:52:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):117 -> a
-    53:61:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):122:130 -> a
-    62:159:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):129:226 -> a
-    160:178:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):224:242 -> a
-    179:231:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):267:319 -> a
-    232:248:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):317:333 -> a
-    249:264:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):341:356 -> a
-    265:266:boolean isNonNullCandidate(com.android.tools.r8.ir.code.Value):365:366 -> a
-    267:298:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):370:401 -> a
-    299:344:boolean isNormalExitDominated(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):423:468 -> a
-    299:344:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):402 -> a
-    345:350:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):408:413 -> a
-    1:47:void cleanupNonNull(com.android.tools.r8.ir.code.IRCode):473:519 -> b
+    java.util.Set libraryMethodsReturningNonNull -> b
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():42:42 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):49:51 -> <init>
+    boolean lambda$addNonNull$0(com.android.tools.r8.ir.code.BasicBlock) -> a
+    boolean lambda$addNonNullForValues$1(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
+    1:1:void addNonNull(com.android.tools.r8.ir.code.IRCode):85:85 -> a
+    2:18:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):90:106 -> a
+    19:28:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):105:114 -> a
+    29:35:boolean throwsOnNullInput(com.android.tools.r8.ir.code.Instruction):56:62 -> a
+    29:35:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):117 -> a
+    36:49:com.android.tools.r8.ir.code.Value getNonNullInput(com.android.tools.r8.ir.code.Instruction):66:79 -> a
+    36:49:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):118 -> a
+    50:51:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):119:120 -> a
+    52:52:com.android.tools.r8.ir.code.Value getNonNullInput(com.android.tools.r8.ir.code.Instruction):81:81 -> a
+    52:52:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):118 -> a
+    53:61:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):123:131 -> a
+    62:157:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):130:225 -> a
+    158:175:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):224:241 -> a
+    176:239:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):266:329 -> a
+    240:255:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):337:352 -> a
+    256:265:boolean isNonNullCandidate(com.android.tools.r8.ir.code.Value):361:370 -> a
+    266:297:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):374:405 -> a
+    298:343:boolean isNormalExitDominated(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):427:472 -> a
+    298:343:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):406 -> a
+    344:349:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):412:417 -> a
+    1:47:void cleanupNonNull(com.android.tools.r8.ir.code.IRCode):477:523 -> b
 com.android.tools.r8.ir.optimize.Outliner -> a.a.a.a.g.e.I:
     1:1:void <clinit>():104:104 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):1202:1202 -> <init>
@@ -21855,14 +21587,14 @@
     1:1:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory):160:160 -> a
     2:37:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory,int):170:205 -> a
     38:47:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory,int):192:201 -> a
-    48:49:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getClassNameFromDescriptor(java.lang.String):227:228 -> a
-    48:49:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getCanonicalNameFromDescriptor(java.lang.String):238 -> a
+    48:49:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getClassNameFromDescriptor(java.lang.String):226:227 -> a
+    48:49:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getCanonicalNameFromDescriptor(java.lang.String):237 -> a
     48:49:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory,int):186 -> a
-    50:50:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getCanonicalNameFromDescriptor(java.lang.String):239:239 -> a
+    50:50:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getCanonicalNameFromDescriptor(java.lang.String):238:238 -> a
     50:50:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory,int):186 -> a
     51:51:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory,int):188:188 -> a
     52:52:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory,int):179:179 -> a
-    53:54:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getClassNameFromDescriptor(java.lang.String):227:228 -> a
+    53:54:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getClassNameFromDescriptor(java.lang.String):226:227 -> a
     53:54:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory,int):172 -> a
     55:89:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory,int):174:208 -> a
 com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo -> a.a.a.a.g.e.O:
@@ -21871,9 +21603,7 @@
     1:1:void <clinit>():49:49 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,int):60:61 -> <init>
     1:2:void <init>(com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption):56 -> <init>
-    3:4:void <init>(com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,int):60:61 -> <init>
     1:1:boolean needsToComputeClassName():70:70 -> a
-    1:1:com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo none():66:66 -> b
 com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption -> a.a.a.a.g.e.N:
     com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption SIMPLE_NAME -> e
     com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption[] $VALUES -> f
@@ -21885,10 +21615,9 @@
     6:6:void <clinit>():33:33 -> <clinit>
     1:1:void <init>(java.lang.String,int):33:33 -> <init>
     1:1:boolean needsToComputeClassName():41:41 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> a.a.a.a.g.e.Q:
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> a.a.a.a.g.e.S:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> a.a.a.a.g.e.Q:
     boolean $assertionsDisabled -> a
-    1:46:void <clinit>():57:102 -> <clinit>
+    1:1:void <clinit>():63:63 -> <clinit>
     void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode) -> a
 com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> a.a.a.a.g.e.a.a:
     java.util.concurrent.ConcurrentHashMap knownClasses -> b
@@ -21898,15 +21627,15 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter):34:34 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter):32:36 -> <init>
     1:54:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):128:181 -> a
-    55:96:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):158:199 -> a
-    97:97:boolean lambda$processMethodCode$0(com.android.tools.r8.ir.code.Instruction):129:129 -> a
-    98:98:boolean isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):205:205 -> a
-    98:98:boolean lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):149 -> a
-    99:102:boolean computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):221:224 -> a
-    99:102:boolean isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):207 -> a
-    99:102:boolean lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):149 -> a
-    103:108:boolean isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):207:212 -> a
-    103:108:boolean lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):149 -> a
+    55:95:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):158:198 -> a
+    96:96:boolean lambda$processMethodCode$0(com.android.tools.r8.ir.code.Instruction):129:129 -> a
+    97:97:boolean isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):204:204 -> a
+    97:97:boolean lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):149 -> a
+    98:101:boolean computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):220:223 -> a
+    98:101:boolean isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):206 -> a
+    98:101:boolean lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):149 -> a
+    102:107:boolean isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):206:211 -> a
+    102:107:boolean lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):149 -> a
 com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> a.a.a.a.g.e.a.b:
     com.android.tools.r8.ir.code.Instruction root -> c
     com.android.tools.r8.graph.AppView appView -> d
@@ -22001,11 +21730,11 @@
     425:425:void lambda$removeInstruction$3(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):925:925 -> a
     426:427:void removeInstruction(com.android.tools.r8.ir.code.Instruction):925:926 -> a
     1:11:boolean isClassAndUsageEligible():140:150 -> b
-    12:12:boolean com.android.tools.r8.graph.DexClass.hasClassInitializer():636:636 -> b
+    12:12:boolean com.android.tools.r8.graph.DexClass.hasClassInitializer():632:632 -> b
     12:12:boolean isClassAndUsageEligible():150 -> b
-    13:73:boolean isClassAndUsageEligible():153:213 -> b
-    74:78:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):857:861 -> b
-    74:78:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):874 -> b
+    13:93:boolean isClassAndUsageEligible():153:233 -> b
+    94:98:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):857:861 -> b
+    94:98:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):874 -> b
     1:19:boolean isInstanceEligible():107:125 -> c
 com.android.tools.r8.ir.optimize.lambda.CodeProcessor -> a.a.a.a.g.e.b.a:
     1:1:void <clinit>():45:45 -> <clinit>
@@ -22023,6 +21752,7 @@
     1:1:void lambda$new$0(com.android.tools.r8.graph.DexType):125:125 -> c
 com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> a.a.a.a.g.e.b.c:
     1:1:void <clinit>():31:31 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,java.util.function.Predicate,java.util.function.Consumer):37:37 -> <init>
 com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer -> a.a.a.a.g.e.c.e:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$Phase phase -> c
@@ -22033,37 +21763,37 @@
     1:1:void <clinit>():47:47 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):106:106 -> <init>
     2:53:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):57:108 -> <init>
-    1:14:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):221:234 -> a
-    15:35:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):233:253 -> a
-    36:47:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):339:350 -> a
-    36:47:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    48:61:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):273:286 -> a
-    62:74:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):468:480 -> a
-    62:74:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):286 -> a
-    75:75:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):475:475 -> a
-    75:75:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):286 -> a
-    76:98:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):298:320 -> a
-    99:132:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):487:520 -> a
-    133:133:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):490:490 -> a
-    1:3:void fixupMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):546:548 -> b
+    1:14:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):219:232 -> a
+    15:35:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):231:251 -> a
+    36:47:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):337:348 -> a
+    36:47:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):252 -> a
+    48:61:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):271:284 -> a
+    62:74:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):466:478 -> a
+    62:74:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):284 -> a
+    75:75:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):473:473 -> a
+    75:75:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):284 -> a
+    76:98:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):296:318 -> a
+    99:132:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):485:518 -> a
+    133:133:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):488:488 -> a
+    1:3:void fixupMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):544:546 -> b
 com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> a.a.a.a.g.e.c.a:
 com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> a.a.a.a.g.e.c.b:
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer this$0 -> c
-    1:2:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory):568:569 -> <init>
-    1:2:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1):566 -> <init>
-    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):591:591 -> a
-    2:2:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):616:616 -> a
-    3:3:boolean registerNewInstance(com.android.tools.r8.graph.DexType):621:621 -> a
-    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):601:601 -> b
-    2:2:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):611:611 -> b
-    3:5:boolean registerTypeReference(com.android.tools.r8.graph.DexType):636:638 -> b
-    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):596:596 -> c
-    2:2:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):626:626 -> c
-    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):606:606 -> d
-    2:2:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):631:631 -> d
-    1:2:boolean registerField(com.android.tools.r8.graph.DexField):579:580 -> e
-    3:3:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):586:586 -> e
-    1:2:boolean registerMethod(com.android.tools.r8.graph.DexMethod):573:574 -> f
+    1:2:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory):566:567 -> <init>
+    1:2:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1):564 -> <init>
+    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):589:589 -> a
+    2:2:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):614:614 -> a
+    3:3:boolean registerNewInstance(com.android.tools.r8.graph.DexType):619:619 -> a
+    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):599:599 -> b
+    2:2:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):609:609 -> b
+    3:5:boolean registerTypeReference(com.android.tools.r8.graph.DexType):634:636 -> b
+    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):594:594 -> c
+    2:2:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):624:624 -> c
+    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):604:604 -> d
+    2:2:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):629:629 -> d
+    1:2:boolean registerField(com.android.tools.r8.graph.DexField):577:578 -> e
+    3:3:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):584:584 -> e
+    1:2:boolean registerMethod(com.android.tools.r8.graph.DexMethod):571:572 -> f
 com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> a.a.a.a.g.e.c.c:
     com.android.tools.r8.graph.DexProgramClass candidate -> a
     1:1:void <clinit>():62:62 -> <clinit>
@@ -22079,31 +21809,31 @@
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> d
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> c
-    1:1:void <clinit>():41:41 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView):47:50 -> <init>
-    1:54:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):70:123 -> a
-    55:59:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):121:125 -> a
-    60:122:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):124:186 -> a
-    123:138:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):184:199 -> a
-    139:145:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):197:203 -> a
-    146:146:java.lang.Integer lambda$computeTrivialOperationsOnConstString$0(java.lang.String):135:135 -> a
-    147:147:java.lang.Integer lambda$computeTrivialOperationsOnConstString$1(java.lang.String,java.lang.String):137:137 -> a
-    148:174:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):210:236 -> a
-    175:196:boolean hasPotentialReadOutside(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):357:378 -> a
-    175:196:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):235 -> a
-    197:268:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):240:311 -> a
-    269:315:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):294:340 -> a
-    316:317:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):320:321 -> a
-    316:317:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):340 -> a
-    318:318:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):341:341 -> a
-    319:330:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):339:350 -> a
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$2(java.lang.String,java.lang.String):139:139 -> b
-    2:21:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):388:407 -> b
-    22:54:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):405:437 -> b
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$3(java.lang.String,java.lang.String):141:141 -> c
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$4(java.lang.String,java.lang.String):143:143 -> d
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$5(java.lang.String,java.lang.String):145:145 -> e
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$6(java.lang.String,java.lang.String):147:147 -> f
+    1:1:void <clinit>():42:42 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView):48:51 -> <init>
+    1:54:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):71:124 -> a
+    55:59:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):122:126 -> a
+    60:122:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):125:187 -> a
+    123:138:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):185:200 -> a
+    139:145:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):198:204 -> a
+    146:146:java.lang.Integer lambda$computeTrivialOperationsOnConstString$0(java.lang.String):136:136 -> a
+    147:147:java.lang.Integer lambda$computeTrivialOperationsOnConstString$1(java.lang.String,java.lang.String):138:138 -> a
+    148:174:void rewriteClassGetName(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.RootSetBuilder$RootSet):211:237 -> a
+    175:196:boolean hasPotentialReadOutside(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):355:376 -> a
+    175:196:void rewriteClassGetName(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.RootSetBuilder$RootSet):236 -> a
+    197:242:void rewriteClassGetName(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.RootSetBuilder$RootSet):241:286 -> a
+    243:275:void rewriteClassGetName(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.RootSetBuilder$RootSet):278:310 -> a
+    276:276:void rewriteClassGetName(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.RootSetBuilder$RootSet):302:302 -> a
+    277:314:void rewriteClassGetName(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.RootSetBuilder$RootSet):294:331 -> a
+    315:331:void rewriteClassGetName(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.RootSetBuilder$RootSet):323:339 -> a
+    332:336:void rewriteClassGetName(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.RootSetBuilder$RootSet):337:341 -> a
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$2(java.lang.String,java.lang.String):140:140 -> b
+    2:21:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):386:405 -> b
+    22:54:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):403:435 -> b
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$3(java.lang.String,java.lang.String):142:142 -> c
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$4(java.lang.String,java.lang.String):144:144 -> d
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$5(java.lang.String,java.lang.String):146:146 -> e
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$6(java.lang.String,java.lang.String):148:148 -> f
 com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator -> a.a.a.a.g.f.c:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List moveExceptionIntervals -> o
@@ -22147,181 +21877,181 @@
     220:243:com.android.tools.r8.ir.code.DebugLocalsChange createLocalsChange(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.code.Position):520:543 -> a
     244:263:com.android.tools.r8.ir.code.DebugLocalsChange createLocalsChange(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.code.Position):526:545 -> a
     264:268:void addRegisterIfUsed(java.util.Set,com.android.tools.r8.ir.regalloc.LiveIntervals):592:596 -> a
-    269:270:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):635:636 -> a
-    271:272:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):813:814 -> a
-    271:272:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):636 -> a
-    273:273:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):638:638 -> a
-    274:274:com.android.tools.r8.utils.InternalOptions options():643:643 -> a
-    275:275:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661:661 -> a
-    276:287:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):794:805 -> a
-    276:287:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):664 -> a
-    288:288:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):665:665 -> a
-    289:297:void pinArgumentRegisters():2963:2971 -> a
-    289:297:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):668 -> a
-    298:298:void pinArgumentRegisters():2968:2968 -> a
-    298:298:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):668 -> a
-    299:387:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):842:930 -> a
-    299:387:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    388:396:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1070:1078 -> a
-    388:396:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):932 -> a
-    388:396:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    397:410:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1089:1102 -> a
-    397:410:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):933 -> a
-    397:410:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    411:476:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1117:1182 -> a
-    411:476:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):938 -> a
-    411:476:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    477:526:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939:988 -> a
-    477:526:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    527:607:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1624:1704 -> a
-    527:607:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
-    527:607:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    608:608:int toInstructionPosition(int):1406:1406 -> a
-    608:608:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1704 -> a
-    608:608:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
-    608:608:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    609:620:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1709:1720 -> a
-    609:620:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
-    609:620:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    621:629:boolean freePositionsAreConsistentWithFreeRegisters(com.android.tools.r8.ir.regalloc.RegisterPositions,int):1043:1051 -> a
-    621:629:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1720 -> a
-    621:629:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
-    621:629:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    630:660:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1799:1829 -> a
-    630:660:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1723 -> a
-    630:660:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
-    630:660:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    661:691:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1729:1759 -> a
-    661:691:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
-    661:691:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    692:710:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1998:2016 -> a
-    692:710:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1761 -> a
-    692:710:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
-    692:710:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    711:794:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2015:2098 -> a
-    711:794:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1761 -> a
-    711:794:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
-    711:794:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    795:802:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1271:1278 -> a
-    795:802:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2100 -> a
-    795:802:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1761 -> a
-    795:802:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
-    795:802:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    803:821:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2101:2119 -> a
-    803:821:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1761 -> a
-    803:821:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
-    803:821:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    822:841:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1766:1785 -> a
-    822:841:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
-    822:841:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    842:887:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):672:717 -> a
-    888:902:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):690:704 -> a
-    903:910:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):678:685 -> a
-    911:951:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):682:722 -> a
-    952:955:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):721:724 -> a
-    956:956:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):723:723 -> a
-    957:964:boolean isSpillInstruction(com.android.tools.r8.ir.code.Instruction):780:787 -> a
-    965:969:int realRegisterNumberFromAllocated(int):832:836 -> a
-    970:1008:boolean invariantsHold(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):999:1037 -> a
-    1009:1010:void lambda$invariantsHold$3(java.util.TreeSet,int):1007:1008 -> a
-    1011:1019:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1191:1199 -> a
-    1020:1030:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1196:1206 -> a
-    1031:1038:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1254:1261 -> a
-    1031:1038:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1209 -> a
-    1039:1039:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1260:1260 -> a
-    1039:1039:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1209 -> a
-    1040:1040:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1210:1210 -> a
-    1041:1054:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1208:1221 -> a
-    1055:1055:int getFreeConsecutiveRegisters(int):2990:2990 -> a
-    1055:1055:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1222 -> a
-    1056:1057:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1224:1225 -> a
-    1058:1063:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1059:1064 -> a
-    1058:1063:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1225 -> a
-    1064:1064:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1063:1063 -> a
-    1064:1064:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1225 -> a
-    1065:1065:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1062:1062 -> a
-    1065:1065:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1225 -> a
-    1066:1079:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1227:1240 -> a
-    1080:1104:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1223:1247 -> a
-    1105:1124:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1283:1302 -> a
-    1125:1132:boolean registersAreFreeAndConsecutive(int,boolean):3046:3053 -> a
-    1125:1132:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1302 -> a
-    1133:1158:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1303:1328 -> a
-    1159:1213:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1344:1398 -> a
-    1214:1229:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1849:1864 -> a
-    1230:1232:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1914:1916 -> a
-    1233:1245:int getLargestCandidate(int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1928:1940 -> a
-    1246:1251:int handleWorkaround(java.util.function.Predicate,java.util.function.BiPredicate,int,com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1958:1963 -> a
-    1252:1264:int getLargestValidCandidate(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1978:1990 -> a
-    1265:1267:int getLargestPosition(com.android.tools.r8.ir.regalloc.RegisterPositions,int,boolean):2126:2128 -> a
-    1268:1272:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2136:2140 -> a
-    1273:1305:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2148:2180 -> a
-    1273:1305:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2143 -> a
-    1306:1317: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):2344:2355 -> a
-    1318:1329: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):2463:2474 -> a
-    1330:1331:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getStartOfConsecutive():374:375 -> a
-    1330:1331: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):2475 -> a
-    1332:1354: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):2476:2498 -> a
-    1355:1355:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2671:2671 -> a
-    1355:1355: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):2498 -> a
-    1356:1361: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):2499:2504 -> a
-    1362:1414:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2537:2589 -> a
-    1415:1428:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2586:2599 -> a
-    1429:1429:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2671:2671 -> a
-    1429:1429:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2599 -> a
-    1430:1466:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2600:2636 -> a
-    1467:1468:int getLiveRangeEndOnExceptionalFlow(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):2663:2664 -> a
-    1467:1468:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2640 -> a
-    1469:1486:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2637:2654 -> a
-    1487:1509:boolean implementationIsBridge(com.android.tools.r8.ir.code.IRCode):2740:2762 -> a
-    1510:1510:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2784:2784 -> a
-    1511:1515:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2889:2893 -> a
-    1511:1515:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2784 -> a
-    1516:1549:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2785:2818 -> a
-    1550:1551:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():691:692 -> a
-    1550:1551:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2820 -> a
-    1552:1552:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2821:2821 -> a
-    1553:1554:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):2769:2770 -> a
-    1553:1554:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2821 -> a
-    1555:1556:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2822:2823 -> a
-    1557:1560:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2775:2778 -> a
-    1557:1560:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2824 -> a
-    1561:1585:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2826:2850 -> a
-    1586:1612:void generateArgumentMovesAtDefinitions(com.android.tools.r8.ir.code.Invoke,java.util.PriorityQueue,com.android.tools.r8.ir.code.InstructionListIterator):2858:2884 -> a
-    1586:1612:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2851 -> a
-    1613:1613:int lambda$generateArgumentMoves$5(com.android.tools.r8.ir.code.Move,com.android.tools.r8.ir.code.Move):2792:2792 -> a
-    1614:1658:int getFreeConsecutiveRegisters(int,boolean):2994:3038 -> a
-    1659:1670:int lambda$getFreeConsecutiveRegisters$6(java.lang.Integer,java.lang.Integer):3000:3011 -> a
-    1671:1674:int getNextFreeRegister(java.util.Iterator):3062:3065 -> a
-    1675:1687:void excludeRegistersForInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):3069:3081 -> a
-    1688:1699:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3087:3098 -> a
-    1700:1700:boolean hasEqualTypesAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3193:3193 -> a
+    269:271:int registersUsed():607:609 -> a
+    272:273:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):635:636 -> a
+    274:275:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):813:814 -> a
+    274:275:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):636 -> a
+    276:276:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):638:638 -> a
+    277:277:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661:661 -> a
+    278:289:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):794:805 -> a
+    278:289:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):664 -> a
+    290:290:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):665:665 -> a
+    291:299:void pinArgumentRegisters():2963:2971 -> a
+    291:299:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):668 -> a
+    300:300:void pinArgumentRegisters():2968:2968 -> a
+    300:300:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):668 -> a
+    301:389:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):842:930 -> a
+    301:389:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    390:398:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1070:1078 -> a
+    390:398:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):932 -> a
+    390:398:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    399:412:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1089:1102 -> a
+    399:412:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):933 -> a
+    399:412:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    413:478:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1117:1182 -> a
+    413:478:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):938 -> a
+    413:478:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    479:528:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939:988 -> a
+    479:528:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    529:609:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1624:1704 -> a
+    529:609:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
+    529:609:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    610:610:int toInstructionPosition(int):1406:1406 -> a
+    610:610:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1704 -> a
+    610:610:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
+    610:610:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    611:622:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1709:1720 -> a
+    611:622:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
+    611:622:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    623:631:boolean freePositionsAreConsistentWithFreeRegisters(com.android.tools.r8.ir.regalloc.RegisterPositions,int):1043:1051 -> a
+    623:631:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1720 -> a
+    623:631:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
+    623:631:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    632:662:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1799:1829 -> a
+    632:662:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1723 -> a
+    632:662:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
+    632:662:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    663:693:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1729:1759 -> a
+    663:693:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
+    663:693:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    694:712:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1998:2016 -> a
+    694:712:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1761 -> a
+    694:712:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
+    694:712:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    713:796:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2015:2098 -> a
+    713:796:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1761 -> a
+    713:796:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
+    713:796:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    797:804:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1271:1278 -> a
+    797:804:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2100 -> a
+    797:804:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1761 -> a
+    797:804:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
+    797:804:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    805:823:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2101:2119 -> a
+    805:823:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1761 -> a
+    805:823:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
+    805:823:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    824:843:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1766:1785 -> a
+    824:843:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
+    824:843:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    844:889:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):672:717 -> a
+    890:904:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):690:704 -> a
+    905:912:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):678:685 -> a
+    913:953:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):682:722 -> a
+    954:957:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):721:724 -> a
+    958:958:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):723:723 -> a
+    959:966:boolean isSpillInstruction(com.android.tools.r8.ir.code.Instruction):780:787 -> a
+    967:971:int realRegisterNumberFromAllocated(int):832:836 -> a
+    972:1010:boolean invariantsHold(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):999:1037 -> a
+    1011:1012:void lambda$invariantsHold$3(java.util.TreeSet,int):1007:1008 -> a
+    1013:1021:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1191:1199 -> a
+    1022:1032:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1196:1206 -> a
+    1033:1040:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1254:1261 -> a
+    1033:1040:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1209 -> a
+    1041:1041:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1260:1260 -> a
+    1041:1041:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1209 -> a
+    1042:1042:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1210:1210 -> a
+    1043:1056:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1208:1221 -> a
+    1057:1057:int getFreeConsecutiveRegisters(int):2990:2990 -> a
+    1057:1057:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1222 -> a
+    1058:1059:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1224:1225 -> a
+    1060:1065:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1059:1064 -> a
+    1060:1065:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1225 -> a
+    1066:1066:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1063:1063 -> a
+    1066:1066:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1225 -> a
+    1067:1067:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1062:1062 -> a
+    1067:1067:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1225 -> a
+    1068:1081:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1227:1240 -> a
+    1082:1106:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1223:1247 -> a
+    1107:1126:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1283:1302 -> a
+    1127:1134:boolean registersAreFreeAndConsecutive(int,boolean):3046:3053 -> a
+    1127:1134:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1302 -> a
+    1135:1160:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1303:1328 -> a
+    1161:1215:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1344:1398 -> a
+    1216:1231:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1849:1864 -> a
+    1232:1234:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1914:1916 -> a
+    1235:1247:int getLargestCandidate(int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1928:1940 -> a
+    1248:1253:int handleWorkaround(java.util.function.Predicate,java.util.function.BiPredicate,int,com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1958:1963 -> a
+    1254:1266:int getLargestValidCandidate(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1978:1990 -> a
+    1267:1269:int getLargestPosition(com.android.tools.r8.ir.regalloc.RegisterPositions,int,boolean):2126:2128 -> a
+    1270:1274:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2136:2140 -> a
+    1275:1307:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2148:2180 -> a
+    1275:1307:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2143 -> a
+    1308:1319: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):2344:2355 -> a
+    1320:1331: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):2463:2474 -> a
+    1332:1333:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getStartOfConsecutive():372:373 -> a
+    1332:1333: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):2475 -> a
+    1334:1356: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):2476:2498 -> a
+    1357:1357:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2671:2671 -> a
+    1357:1357: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):2498 -> a
+    1358:1363: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):2499:2504 -> a
+    1364:1416:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2537:2589 -> a
+    1417:1430:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2586:2599 -> a
+    1431:1431:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2671:2671 -> a
+    1431:1431:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2599 -> a
+    1432:1468:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2600:2636 -> a
+    1469:1470:int getLiveRangeEndOnExceptionalFlow(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):2663:2664 -> a
+    1469:1470:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2640 -> a
+    1471:1488:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2637:2654 -> a
+    1489:1511:boolean implementationIsBridge(com.android.tools.r8.ir.code.IRCode):2740:2762 -> a
+    1512:1512:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2784:2784 -> a
+    1513:1517:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2889:2893 -> a
+    1513:1517:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2784 -> a
+    1518:1551:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2785:2818 -> a
+    1552:1553:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():672:673 -> a
+    1552:1553:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2820 -> a
+    1554:1554:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2821:2821 -> a
+    1555:1556:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):2769:2770 -> a
+    1555:1556:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2821 -> a
+    1557:1558:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2822:2823 -> a
+    1559:1562:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2775:2778 -> a
+    1559:1562:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2824 -> a
+    1563:1587:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2826:2850 -> a
+    1588:1614:void generateArgumentMovesAtDefinitions(com.android.tools.r8.ir.code.Invoke,java.util.PriorityQueue,com.android.tools.r8.ir.code.InstructionListIterator):2858:2884 -> a
+    1588:1614:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2851 -> a
+    1615:1615:int lambda$generateArgumentMoves$5(com.android.tools.r8.ir.code.Move,com.android.tools.r8.ir.code.Move):2792:2792 -> a
+    1616:1660:int getFreeConsecutiveRegisters(int,boolean):2994:3038 -> a
+    1661:1672:int lambda$getFreeConsecutiveRegisters$6(java.lang.Integer,java.lang.Integer):3000:3011 -> a
+    1673:1676:int getNextFreeRegister(java.util.Iterator):3062:3065 -> a
+    1677:1689:void excludeRegistersForInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):3069:3081 -> a
+    1690:1701:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3087:3098 -> a
+    1702:1702:boolean hasEqualTypesAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3193:3193 -> a
     void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> b
     1:1:boolean lambda$computeDebugInfo$1(com.android.tools.r8.ir.code.Instruction):325:325 -> b
-    2:4:int registersUsed():607:609 -> b
-    5:17:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):616:628 -> b
-    18:19:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):813:814 -> b
-    18:19:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):630 -> b
-    20:22:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):621:623 -> b
-    23:28:int unadjustedRealRegisterFromAllocated(int):818:823 -> b
-    29:30:void lambda$invariantsHold$4(java.util.TreeSet,int):1024:1025 -> b
-    31:48:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1425:1442 -> b
-    49:50:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1872:1873 -> b
-    51:80:void updateRegisterHints(com.android.tools.r8.ir.regalloc.LiveIntervals):1878:1907 -> b
-    51:80:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1874 -> b
-    81:82:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2185:2186 -> b
-    83:83:boolean atLeastOneOfRegistersAreTaken(int,boolean):3143:3143 -> b
-    83:83:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2186 -> b
-    84:130:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2186:2232 -> b
-    131:166:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2300:2335 -> b
-    131:166:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2235 -> b
-    167:167:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2236:2236 -> b
-    168:175:void splitRangesForSpilledArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):2249:2256 -> b
-    168:175:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2237 -> b
-    176:203:void splitRangesForSpilledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2263:2290 -> b
-    176:203:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2239 -> b
-    204:205:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2244:2245 -> b
-    206:210:void increaseCapacity(int,boolean):2982:2986 -> b
+    2:14:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):616:628 -> b
+    15:16:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):813:814 -> b
+    15:16:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):630 -> b
+    17:19:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):621:623 -> b
+    20:20:com.android.tools.r8.utils.InternalOptions options():643:643 -> b
+    21:26:int unadjustedRealRegisterFromAllocated(int):818:823 -> b
+    27:28:void lambda$invariantsHold$4(java.util.TreeSet,int):1024:1025 -> b
+    29:46:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1425:1442 -> b
+    47:48:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1872:1873 -> b
+    49:78:void updateRegisterHints(com.android.tools.r8.ir.regalloc.LiveIntervals):1878:1907 -> b
+    49:78:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1874 -> b
+    79:80:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2185:2186 -> b
+    81:81:boolean atLeastOneOfRegistersAreTaken(int,boolean):3143:3143 -> b
+    81:81:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2186 -> b
+    82:128:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2186:2232 -> b
+    129:164:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2300:2335 -> b
+    129:164:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2235 -> b
+    165:165:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2236:2236 -> b
+    166:173:void splitRangesForSpilledArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):2249:2256 -> b
+    166:173:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2237 -> b
+    174:201:void splitRangesForSpilledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2263:2290 -> b
+    174:201:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2239 -> b
+    202:203:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2244:2245 -> b
+    204:208:void increaseCapacity(int,boolean):2982:2986 -> b
     1:1:void allocateRegisters():205:205 -> c
     2:11:boolean noLinkedValues():3147:3156 -> c
     2:11:void allocateRegisters():205 -> c
@@ -22347,14 +22077,14 @@
     98:103:void computeLiveRanges():2509:2514 -> c
     98:103:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():649 -> c
     98:103:void allocateRegisters():213 -> c
-    104:104:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():755:755 -> c
+    104:104:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():726:726 -> c
     104:104:void computeLiveRanges():2514 -> c
     104:104:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():649 -> c
     104:104:void allocateRegisters():213 -> c
     105:105:void computeLiveRanges():2514:2514 -> c
     105:105:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():649 -> c
     105:105:void allocateRegisters():213 -> c
-    106:106:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():764:764 -> c
+    106:106:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():735:735 -> c
     106:106:void computeLiveRanges():2514 -> c
     106:106:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():649 -> c
     106:106:void allocateRegisters():213 -> c
@@ -22371,17 +22101,17 @@
     140:145:void allocateRegisters():237 -> c
     146:150:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1448:1452 -> c
     151:151:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1518:1518 -> c
-    152:152:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():770:770 -> c
+    152:152:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():741:741 -> c
     152:152:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1518 -> c
     153:173:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1521:1541 -> c
     174:174:void increaseCapacity(int):2977:2977 -> c
     175:175:boolean registersAreFree(int,boolean):3130:3130 -> c
     1:1:int highestUsedRegister():602:602 -> d
     2:2:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1457:1457 -> d
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():977:977 -> d
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():947:947 -> d
     3:3:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1457 -> d
     4:22:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1460:1478 -> d
-    23:23:boolean com.android.tools.r8.ir.code.NumberConversion.isLongToIntConversion():47:47 -> d
+    23:23:boolean com.android.tools.r8.ir.code.NumberConversion.isLongToIntConversion():42:42 -> d
     23:23:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1478 -> d
     24:36:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1554:1566 -> d
     37:38:boolean registerIsFree(int):3123:3124 -> d
@@ -22454,7 +22184,7 @@
     1:1:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):52:52 -> <init>
     2:23:void <init>(com.android.tools.r8.ir.code.Value):32:53 -> <init>
-    24:25:boolean com.android.tools.r8.ir.code.Value.usedInMonitorOperation():466:467 -> <init>
+    24:25:boolean com.android.tools.r8.ir.code.Value.usedInMonitorOperation():447:448 -> <init>
     24:25:void <init>(com.android.tools.r8.ir.code.Value):54 -> <init>
     26:28:void <init>(com.android.tools.r8.ir.code.Value):54:56 -> <init>
     29:29:void <init>(com.android.tools.r8.ir.regalloc.LiveIntervals):59:59 -> <init>
@@ -22533,34 +22263,34 @@
     84:84:void computeRematerializable(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):638 -> a
     85:89:void computeRematerializable(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):639:643 -> a
     1:1:boolean hasConflictingRegisters(com.android.tools.r8.ir.regalloc.LiveIntervals):318:318 -> b
-    2:3:com.android.tools.r8.ir.regalloc.LiveIntervalsUse firstUseWithConstraint():387:388 -> b
+    2:4:int firstUseAfter(int):374:376 -> b
+    5:6:com.android.tools.r8.ir.regalloc.LiveIntervalsUse firstUseWithConstraint():387:388 -> b
     1:3:void link(com.android.tools.r8.ir.regalloc.LiveIntervals):122:124 -> c
     4:5:int getEnd():261:262 -> c
-    6:8:int firstUseAfter(int):374:376 -> c
+    6:6:com.android.tools.r8.ir.regalloc.LiveIntervals getSplitCovering(int):476:476 -> c
+    7:7:com.android.tools.r8.ir.regalloc.LiveIntervals getSplitParent():202:202 -> c
+    7:7:com.android.tools.r8.ir.regalloc.LiveIntervals getSplitCovering(int):476 -> c
+    8:41:com.android.tools.r8.ir.regalloc.LiveIntervals getSplitCovering(int):476:509 -> c
     1:1:int compareTo(java.lang.Object):23:23 -> compareTo
     2:3:int compareTo(com.android.tools.r8.ir.regalloc.LiveIntervals):540:541 -> compareTo
     2:3:int compareTo(java.lang.Object):23 -> compareTo
-    1:10:int nextOverlap(com.android.tools.r8.ir.regalloc.LiveIntervals):357:366 -> d
-    11:11:int getFirstUse():383:383 -> d
-    12:12:com.android.tools.r8.ir.regalloc.LiveIntervals getSplitCovering(int):476:476 -> d
-    13:13:com.android.tools.r8.ir.regalloc.LiveIntervals getSplitParent():202:202 -> d
-    13:13:com.android.tools.r8.ir.regalloc.LiveIntervals getSplitCovering(int):476 -> d
-    14:47:com.android.tools.r8.ir.regalloc.LiveIntervals getSplitCovering(int):476:509 -> d
+    1:6:boolean overlapsPosition(int):327:332 -> d
+    7:16:int nextOverlap(com.android.tools.r8.ir.regalloc.LiveIntervals):357:366 -> d
+    17:17:int getFirstUse():383:383 -> d
     1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getHint():90:90 -> e
-    2:7:boolean overlapsPosition(int):327:332 -> e
-    8:8:boolean overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> e
+    2:3:void setMaxNonSpilledRegister(int):293:294 -> e
+    4:4:boolean overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> e
     1:1:void setHint(com.android.tools.r8.ir.regalloc.LiveIntervals):86:86 -> f
-    2:3:void setMaxNonSpilledRegister(int):293:294 -> f
+    2:3:void setRegister(int):274:275 -> f
     4:7:int getMaxNonSpilledRegister():298:301 -> f
     1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getNextConsecutive():145:145 -> g
-    2:3:void setRegister(int):274:275 -> g
-    1:1:java.util.List getRanges():252:252 -> h
-    2:4:com.android.tools.r8.ir.regalloc.LiveIntervals splitBefore(int):404:406 -> h
-    5:5:int toGapPosition(int):70:70 -> h
-    5:5:com.android.tools.r8.ir.regalloc.LiveIntervals splitBefore(int):409 -> h
-    6:43:com.android.tools.r8.ir.regalloc.LiveIntervals splitBefore(int):410:447 -> h
-    1:1:int toInstructionPosition(int):66:66 -> i
-    2:2:int getRegister():266:266 -> i
+    2:4:com.android.tools.r8.ir.regalloc.LiveIntervals splitBefore(int):404:406 -> g
+    5:5:int toGapPosition(int):70:70 -> g
+    5:5:com.android.tools.r8.ir.regalloc.LiveIntervals splitBefore(int):409 -> g
+    6:43:com.android.tools.r8.ir.regalloc.LiveIntervals splitBefore(int):410:447 -> g
+    1:1:int toInstructionPosition(int):66:66 -> h
+    2:2:java.util.List getRanges():252:252 -> h
+    1:1:int getRegister():266:266 -> i
     1:1:int getRegisterLimit():270:270 -> j
     1:1:java.util.List getSplitChildren():198:198 -> k
     1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getSplitParent():202:202 -> l
@@ -22613,10 +22343,10 @@
     void addNewBlockToShareIdenticalSuffix(com.android.tools.r8.ir.code.BasicBlock,int,java.util.List) -> a
     int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int) -> a
     boolean hasEqualTypesAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
-    com.android.tools.r8.utils.InternalOptions options() -> a
+    int registersUsed() -> a
     int getRegisterForValue(com.android.tools.r8.ir.code.Value,int) -> b
     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() -> b
 com.android.tools.r8.ir.regalloc.RegisterMove -> a.a.a.a.g.f.h:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement type -> a
     com.android.tools.r8.ir.code.Instruction definition -> d
@@ -22627,7 +22357,7 @@
     1:5:void <init>(int,int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):20:24 -> <init>
     6:11:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.Instruction):27:32 -> <init>
     1:10:boolean isBlocked(java.util.Set,java.util.Map):43:52 -> a
-    1:4:boolean writes(int):36:39 -> c
+    1:4:boolean writes(int):36:39 -> b
     1:1:int compareTo(java.lang.Object):13:13 -> compareTo
     2:28:int compareTo(com.android.tools.r8.ir.regalloc.RegisterMove):77:103 -> compareTo
     2:28:int compareTo(java.lang.Object):13 -> compareTo
@@ -22739,7 +22469,7 @@
     93:97:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):318:322 -> a
     98:106:void removeArgumentRestores(java.util.Set):334:342 -> a
     107:131:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):349:373 -> a
-    132:132:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():739:739 -> a
+    132:132:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():710:710 -> a
     132:132:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):373 -> a
     133:138:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):373:378 -> a
     139:143:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):377:381 -> a
@@ -22778,7 +22508,7 @@
     1:1:void lambda$prepareInstructions$1(int,com.android.tools.r8.ir.conversion.IRBuilder):143:143 -> b
     1:1:void lambda$prepareInstructions$2(int,com.android.tools.r8.ir.conversion.IRBuilder):145:145 -> c
     1:1:void lambda$prepareInstructions$3(int,com.android.tools.r8.ir.conversion.IRBuilder):147:147 -> d
-    1:36:void prepareInstructions():112:147 -> h
+    1:36:void prepareInstructions():112:147 -> g
 com.android.tools.r8.ir.synthetic.SynthesizedCode -> a.a.a.a.g.g.c:
     java.util.function.Consumer registryCallback -> d
     boolean com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode.$assertionsDisabled -> e
@@ -22795,10 +22525,10 @@
     2:10:com.android.tools.r8.ir.code.IRCode com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode.buildIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):0 -> a
     1:1:boolean com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode.computeEquals(java.lang.Object):87:87 -> b
     1:1:boolean com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode.computeEquals(java.lang.Object):0 -> b
-    1:1:int com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode.computeHashCode():82:82 -> f
-    1:1:int com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode.computeHashCode():0 -> f
-    boolean com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode.isEmptyVoidMethod() -> n
-    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():27:27 -> p
+    1:1:int com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode.computeHashCode():82:82 -> e
+    1:1:int com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode.computeHashCode():0 -> e
+    boolean com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode.isEmptyVoidMethod() -> m
+    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():27:27 -> o
 com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> a.a.a.a.g.g.d:
     java.util.function.Predicate doesNotEndBlock -> k
     com.android.tools.r8.ir.code.Position position -> j
@@ -22817,39 +22547,38 @@
     2:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexMethod):59:59 -> <init>
     3:41:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexMethod):38:76 -> <init>
     void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean) -> a
-    void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder) -> a
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int) -> a
+    boolean verifyCurrentInstructionCanThrow() -> a
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> a
     1:1:void add(java.util.function.Consumer):80:80 -> a
     2:3:void add(java.util.function.Consumer,java.util.function.Predicate):84:85 -> a
     2:3:void add(java.util.function.Consumer):80 -> a
     4:5:int nextRegister(com.android.tools.r8.ir.code.ValueType):89:90 -> a
     6:7:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):164:165 -> a
-    8:10:void setUp():170:172 -> a
-    11:11:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):218:218 -> a
-    12:12:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):230:230 -> a
-    13:13:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):236:236 -> a
-    14:14:int getMoveExceptionRegister(int):246:246 -> a
-    com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder) -> b
-    int instructionOffset(int) -> b
-    boolean verifyCurrentInstructionCanThrow() -> b
-    com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int) -> c
-    1:7:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):186:192 -> c
-    8:8:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):191:191 -> c
-    9:26:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):189:206 -> c
-    27:27:com.android.tools.r8.ir.code.Position getCurrentPosition():256:256 -> c
+    8:14:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):186:192 -> a
+    15:15:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):191:191 -> a
+    16:33:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):189:206 -> a
+    34:34:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):218:218 -> a
+    35:35:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):230:230 -> a
+    36:36:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):236:236 -> a
+    37:37:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):251:251 -> a
+    void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder) -> b
+    1:3:void setUp():170:172 -> b
+    4:4:int getMoveExceptionRegister(int):246:246 -> b
+    com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder) -> c
+    int instructionOffset(int) -> c
+    1:1:int instructionCount():126:126 -> c
     1:5:void clear():177:181 -> clear
-    com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> d
+    int instructionIndex(int) -> d
     boolean lambda$static$0(com.android.tools.r8.ir.conversion.IRBuilder) -> d
-    1:1:int instructionCount():126:126 -> d
+    1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():256:256 -> d
     boolean lambda$static$1(com.android.tools.r8.ir.conversion.IRBuilder) -> e
-    1:1:int getParamCount():113:113 -> e
-    2:2:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):251:251 -> e
-    boolean verifyRegister(int) -> f
-    1:3:int getReceiverRegister():101:103 -> f
-    int instructionIndex(int) -> g
-    1:3:com.android.tools.r8.ir.code.Value getReceiverValue():95:97 -> g
-    void prepareInstructions() -> h
+    boolean verifyRegister(int) -> e
+    1:3:int getReceiverRegister():101:103 -> e
+    com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int) -> f
+    1:3:com.android.tools.r8.ir.code.Value getReceiverValue():95:97 -> f
+    com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> g
+    void prepareInstructions() -> g
     1:3:int getParamRegister(int):117:119 -> h
 com.android.tools.r8.ir.synthetic.TemplateMethodCode -> a.a.a.a.g.g.e:
     java.lang.String templateMethodDesc -> k
@@ -22872,6 +22601,7 @@
     boolean equals(java.lang.Object,java.lang.Object) -> a
     int hashCode(java.lang.Object) -> a
 com.android.tools.r8.it.unimi.dsi.fastutil.HashCommon -> a.a.a.a.h.a.a.a.d:
+    1:1:void <clinit>():31:31 -> <clinit>
     int mix(int) -> a
     long nextPowerOfTwo(long) -> a
     1:2:int arraySize(int,float):228:229 -> a
@@ -22881,7 +22611,6 @@
     int defRetValue -> a
     1:1:void <init>():44:44 -> <init>
     int put(int,int) -> a
-    int remove(int) -> a
     1:4:java.lang.Integer put(java.lang.Integer,java.lang.Integer):135:138 -> a
     1:1:boolean containsKey(java.lang.Object):105:105 -> containsKey
     1:2:java.lang.Integer get(java.lang.Object):120:121 -> get
@@ -22891,7 +22620,7 @@
     1:4:java.lang.Object remove(java.lang.Object):41 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap -> a.a.a.a.h.a.a.a.a.c:
     1:1:void <init>():46:46 -> <init>
-    boolean containsValue(int) -> b
+    boolean containsValue(int) -> a
     1:1:boolean containsValue(java.lang.Object):63:63 -> containsValue
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():311:311 -> entrySet
     1:1:java.util.Set entrySet():43 -> entrySet
@@ -22933,12 +22662,12 @@
     1:1:java.lang.Object put(int,java.lang.Object):71:71 -> a
     2:4:java.lang.Object put(java.lang.Integer,java.lang.Object):135:137 -> a
     1:1:boolean containsKey(java.lang.Object):105:105 -> containsKey
-    1:1:java.lang.Object remove(int):82:82 -> d
     1:2:java.lang.Object get(java.lang.Object):120:121 -> get
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):41:41 -> put
     2:4:java.lang.Object put(java.lang.Integer,java.lang.Object):135:137 -> put
     2:4:java.lang.Object put(java.lang.Object,java.lang.Object):41 -> put
-    1:3:java.lang.Object remove(java.lang.Object):153:155 -> remove
+    1:1:java.lang.Object remove(int):82:82 -> remove
+    2:4:java.lang.Object remove(java.lang.Object):153:155 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectMap -> a.a.a.a.h.a.a.a.a.f:
     1:1:void <init>():45:45 -> <init>
     boolean containsKey(int) -> c
@@ -22984,15 +22713,15 @@
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectSortedMap$KeySet -> a.a.a.a.h.a.a.a.a.g:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectSortedMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectSortedMap):122:122 -> <init>
-    1:1:int firstInt():145:145 -> a
-    1:1:int lastInt():150:150 -> b
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet subSet(int,int):165:165 -> b
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int):160:160 -> c
+    1:1:int lastInt():150:150 -> a
+    1:1:int firstInt():145:145 -> b
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int):160:160 -> b
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet subSet(int,int):165:165 -> b
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int):155:155 -> c
     1:1:void clear():135:135 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():140:140 -> comparator
     1:1:java.util.Comparator comparator():122 -> comparator
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int):155:155 -> d
-    1:1:boolean contains(int):125:125 -> e
+    1:1:boolean contains(int):125:125 -> d
     1:1:int size():130:130 -> size
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceFunction -> a.a.a.a.h.a.a.a.a.i:
     java.lang.Object defRetValue -> a
@@ -23051,33 +22780,33 @@
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap$KeySet -> a.a.a.a.h.a.a.a.a.l:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap):122:122 -> <init>
-    1:1:int firstInt():145:145 -> a
-    1:1:int lastInt():150:150 -> b
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet subSet(int,int):165:165 -> b
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int):160:160 -> c
+    1:1:int lastInt():150:150 -> a
+    1:1:int firstInt():145:145 -> b
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int):160:160 -> b
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet subSet(int,int):165:165 -> b
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int):155:155 -> c
     1:1:void clear():135:135 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():140:140 -> comparator
     1:1:java.util.Comparator comparator():122 -> comparator
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int):155:155 -> d
-    1:1:boolean contains(int):125:125 -> e
+    1:1:boolean contains(int):125:125 -> d
     1:1:int size():130:130 -> size
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntBidirectionalIterator -> a.a.a.a.h.a.a.a.a.n:
     1:1:void <init>():34:34 -> <init>
-    int previousInt() -> d
+    int previousInt() -> c
     1:1:java.lang.Integer previous():56:56 -> previous
     1:1:java.lang.Object previous():33 -> previous
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection -> a.a.a.a.h.a.a.a.a.o:
     1:1:void <init>():37:37 -> <init>
-    1:1:boolean add(int):68:68 -> a
-    2:3:int[] toArray(int[]):148:149 -> a
+    1:2:int[] toArray(int[]):148:149 -> a
     1:1:boolean add(java.lang.Object):36:36 -> add
     2:2:boolean add(java.lang.Integer):114:114 -> add
     2:2:boolean add(java.lang.Object):36 -> add
+    3:3:boolean add(int):68:68 -> add
     1:1:int[] toIntArray(int[]):167:167 -> c
     1:1:int[] toIntArray():155 -> c
     1:1:boolean contains(java.lang.Object):129:129 -> contains
-    boolean contains(int) -> e
-    1:4:boolean rem(int):94:97 -> f
+    boolean contains(int) -> d
+    1:4:boolean rem(int):94:97 -> e
     1:1:boolean remove(java.lang.Object):143:143 -> remove
     1:14:java.lang.String toString():206:219 -> toString
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator -> a.a.a.a.h.a.a.a.a.p:
@@ -23090,35 +22819,35 @@
     boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection) -> a
     boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList) -> a
     void removeElements(int,int) -> a
+    int removeInt(int) -> a
     1:19:int compareTo(java.util.List):464:482 -> a
     20:20:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> a
     21:21:void add(int,java.lang.Integer):578:578 -> a
     1:1:void add(int,java.lang.Object):32:32 -> add
     1:5:boolean addAll(int,java.util.Collection):120:124 -> addAll
     6:6:boolean addAll(java.util.Collection):137:137 -> addAll
-    int removeInt(int) -> b
     1:1:void clear():403:403 -> clear
     1:1:int compareTo(java.lang.Object):32:32 -> compareTo
-    1:1:boolean contains(int):274:274 -> e
+    1:1:boolean contains(int):274:274 -> d
     1:14:boolean equals(java.lang.Object):430:443 -> equals
     15:15:boolean valEquals(java.lang.Object,java.lang.Object):407:407 -> equals
     15:15:boolean equals(java.lang.Object):443 -> equals
-    1:1:void ensureIndex(int):47:47 -> g
-    2:2:void ensureIndex(int):46:46 -> g
+    1:1:void ensureIndex(int):47:47 -> f
+    2:2:void ensureIndex(int):46:46 -> f
+    1:1:void ensureRestrictedIndex(int):62:62 -> g
+    2:2:void ensureRestrictedIndex(int):61:61 -> g
     1:1:java.lang.Integer get(int):606:606 -> get
     1:1:java.lang.Object get(int):32 -> get
-    1:1:void ensureRestrictedIndex(int):62:62 -> h
-    2:2:void ensureRestrictedIndex(int):61:61 -> h
+    1:5:int indexOf(int):279:283 -> h
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():180:180 -> hashCode
     1:1:int hashCode():418 -> hashCode
     2:4:int hashCode():419:421 -> hashCode
-    1:5:int indexOf(int):279:283 -> i
+    1:5:int lastIndexOf(int):290:294 -> i
     1:1:int indexOf(java.lang.Object):620:620 -> indexOf
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():180:180 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():32 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():180:180 -> iterator
     2:2:java.util.Iterator iterator():32 -> iterator
-    1:5:int lastIndexOf(int):290:294 -> j
     1:1:int lastIndexOf(java.lang.Object):634:634 -> lastIndexOf
     1:1:java.util.ListIterator listIterator():32:32 -> listIterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():192:192 -> listIterator
@@ -23142,7 +22871,7 @@
     1:1:void <clinit>():726:726 -> <clinit>
     1:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int,int):735:738 -> <init>
     1:1:boolean access$000(com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList):726:726 -> a
-    2:4:boolean add(int):750:752 -> a
+    2:4:int removeInt(int):779:781 -> a
     5:7:void getElements(int,int[],int,int):797:799 -> a
     8:8:void getElements(int,int[],int,int):798:798 -> a
     9:13:void removeElements(int,int):804:808 -> a
@@ -23153,12 +22882,12 @@
     21:21:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):542:542 -> a
     21:21:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):905 -> a
     1:1:void add(int,java.lang.Object):726:726 -> add
-    2:5:void add(int,int):758:761 -> add
+    2:4:boolean add(int):750:752 -> add
+    5:8:void add(int,int):758:761 -> add
     1:3:boolean addAll(int,java.util.Collection):766:768 -> addAll
-    1:3:int removeInt(int):779:781 -> b
     1:1:int compareTo(java.lang.Object):726:726 -> compareTo
     1:3:boolean assertRange():742:744 -> e
-    1:5:boolean rem(int):888:892 -> f
+    4:8:boolean rem(int):888:892 -> e
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.get(int):606:606 -> get
     1:1:java.lang.Object get(int):726 -> get
     1:2:int getInt(int):773:774 -> getInt
@@ -23197,10 +22926,10 @@
     3:4:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList.set(int,int):786:787 -> b
     3:4:void set(int):860 -> b
     5:5:void set(int):859:859 -> b
-    1:1:boolean hasPrevious():830:830 -> d
-    1:1:int previousInt():839 -> d
-    2:2:int previousInt():840:840 -> d
-    3:3:int previousInt():839:839 -> d
+    1:1:boolean hasPrevious():830:830 -> c
+    1:1:int previousInt():839 -> c
+    2:2:int previousInt():840:840 -> c
+    3:3:int previousInt():839:839 -> c
     1:1:boolean hasNext():826:826 -> hasNext
     1:1:boolean hasPrevious():830:830 -> hasPrevious
     1:1:int nextIndex():844:844 -> nextIndex
@@ -23226,8 +22955,8 @@
     2:2:void set(java.lang.Object):34 -> set
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSet -> a.a.a.a.h.a.a.a.a.u:
     1:1:void <init>():32:32 -> <init>
+    1:1:boolean rem(int):87:87 -> e
     1:4:boolean equals(java.lang.Object):41:44 -> equals
-    1:1:boolean rem(int):87:87 -> f
     1:5:int hashCode():57:61 -> hashCode
     1:1:boolean remove(int):75:75 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSortedSet -> a.a.a.a.h.a.a.a.a.v:
@@ -23252,10 +22981,10 @@
     1:3:void <init>():70:72 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):37:37 -> a
     2:2:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap,int):37:37 -> a
-    3:22:int put(int,int):279:298 -> a
-    23:29:int remove(int):304:310 -> a
+    3:4:boolean containsValue(int):266:267 -> a
+    5:24:int put(int,int):279:298 -> a
     1:1:int access$010(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):37:37 -> b
-    2:3:boolean containsValue(int):266:267 -> b
+    2:4:int findKey(int):234:236 -> b
     1:1:int[] access$100(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):37:37 -> c
     2:2:boolean containsKey(int):261:261 -> c
     1:1:void clear():256:256 -> clear
@@ -23264,13 +22993,13 @@
     7:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap clone():341:341 -> clone
     7:7:java.lang.Object clone():37 -> clone
     1:1:int[] access$200(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):37:37 -> d
-    2:4:int findKey(int):234:236 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet int2IntEntrySet():230:230 -> f
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():37 -> f
     1:4:int get(int):243:246 -> get
     1:1:boolean isEmpty():273:273 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():316:316 -> keySet
     1:1:java.util.Set keySet():37 -> keySet
+    1:7:int remove(int):304:310 -> remove
     1:1:int size():251:251 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():321:321 -> values
     1:1:java.util.Collection values():37 -> values
@@ -23353,26 +23082,25 @@
     7:22:int insert(int,int):248:263 -> a
     7:22:int put(int,int):270 -> a
     23:25:int put(int,int):271:273 -> a
-    26:37:int remove(int):352:363 -> a
-    1:5:boolean containsValue(int):403:407 -> b
+    26:30:boolean containsValue(int):403:407 -> a
+    1:7:void rehash(int):979:985 -> b
+    8:8:int realSize():206:206 -> b
+    8:8:void rehash(int):986 -> b
+    9:21:void rehash(int):987:999 -> b
     1:10:boolean containsKey(int):387:396 -> c
     1:4:void clear():420:423 -> clear
     1:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap clone():1017:1026 -> clone
     1:10:java.lang.Object clone():50 -> clone
     11:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap clone():1019:1019 -> clone
     11:11:java.lang.Object clone():50 -> clone
-    1:7:void rehash(int):979:985 -> d
-    8:8:int realSize():206:206 -> d
-    8:8:void rehash(int):986 -> d
-    9:21:void rehash(int):987:999 -> d
-    1:2:int removeEntry(int):220:221 -> e
-    3:8:void shiftKeys(int):333:338 -> e
-    3:8:int removeEntry(int):222 -> e
-    9:9:int removeEntry(int):223:223 -> e
-    10:15:void shiftKeys(int):341:346 -> e
-    10:15:int removeEntry(int):222 -> e
-    16:16:void shiftKeys(int):343:343 -> e
-    16:16:int removeEntry(int):222 -> e
+    1:2:int removeEntry(int):220:221 -> d
+    3:8:void shiftKeys(int):333:338 -> d
+    3:8:int removeEntry(int):222 -> d
+    9:9:int removeEntry(int):223:223 -> d
+    10:15:void shiftKeys(int):341:346 -> d
+    10:15:int removeEntry(int):222 -> d
+    16:16:void shiftKeys(int):343:343 -> d
+    16:16:int removeEntry(int):222 -> d
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet int2IntEntrySet():773:774 -> f
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():50 -> f
     1:11:int get(int):370:380 -> get
@@ -23392,6 +23120,7 @@
     6:7:void putAll(java.util.Map):239 -> putAll
     8:20:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap.putAll(java.util.Map):83:95 -> putAll
     8:20:void putAll(java.util.Map):242 -> putAll
+    1:12:int remove(int):352:363 -> remove
     1:1:int size():428:428 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():866:887 -> values
     1:22:java.util.Collection values():50 -> values
@@ -23399,9 +23128,9 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):866:866 -> <init>
     1:1:void clear():884:884 -> clear
-    1:1:boolean contains(int):879:879 -> e
-    2:6:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.containsValue(int):403:407 -> e
-    2:6:boolean contains(int):879 -> e
+    1:1:boolean contains(int):879:879 -> d
+    2:6:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.containsValue(int):403:407 -> d
+    2:6:boolean contains(int):879 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():869:869 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():869:869 -> iterator
     2:2:java.util.Iterator iterator():866 -> iterator
@@ -23442,9 +23171,9 @@
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):803:803 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1):803 -> <init>
     1:1:void clear():828:828 -> clear
-    1:1:boolean contains(int):816:816 -> e
-    2:11:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.containsKey(int):387:396 -> e
-    2:11:boolean contains(int):816 -> e
+    1:1:boolean contains(int):816:816 -> d
+    2:11:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.containsKey(int):387:396 -> d
+    2:11:boolean contains(int):816 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():806:806 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():806:806 -> iterator
     2:2:java.util.Iterator iterator():803 -> iterator
@@ -23536,13 +23265,13 @@
     134:135:java.lang.Object put(int,java.lang.Object):284:285 -> a
     136:136:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry add(int):348:348 -> a
     136:136:java.lang.Object put(int,java.lang.Object):283 -> a
-    137:138:int lastIntKey():1007:1008 -> a
-    139:139:int lastIntKey():1007:1007 -> a
+    137:138:int firstIntKey():1001:1002 -> a
+    139:139:int firstIntKey():1001:1001 -> a
     140:140:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int):1411:1411 -> a
     141:141:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap subMap(int,int):1421:1421 -> a
     1:1:int compare(int,int):232:232 -> b
-    2:3:int firstIntKey():1001:1002 -> b
-    4:4:int firstIntKey():1001:1001 -> b
+    2:3:int lastIntKey():1007:1008 -> b
+    4:4:int lastIntKey():1007:1007 -> b
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int):1416:1416 -> b
     1:1:boolean containsKey(int):980:980 -> c
     2:80:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ObjectEntrySet():1161:1239 -> c
@@ -23557,31 +23286,31 @@
     4:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$ValueIterator.next():1351:1351 -> containsValue
     4:4:boolean containsValue(java.lang.Object):693 -> containsValue
     5:5:boolean containsValue(java.lang.Object):694:694 -> containsValue
-    1:1:void allocatePaths():278:278 -> d
-    2:9:java.lang.Object remove(int):484:491 -> d
-    10:10:int compare(int,int):232:232 -> d
-    10:10:java.lang.Object remove(int):491 -> d
-    11:59:java.lang.Object remove(int):500:548 -> d
-    60:77:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry parent(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry):453:470 -> d
-    60:77:java.lang.Object remove(int):556 -> d
-    78:196:java.lang.Object remove(int):558:676 -> d
-    197:198:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry parent(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry):474:475 -> d
-    197:198:java.lang.Object remove(int):556 -> d
-    199:202:java.lang.Object remove(int):681:684 -> d
-    203:206:java.lang.Object remove(int):494:497 -> d
-    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry findKey(int):245:247 -> e
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry findKey(int):245:247 -> d
+    4:4:int compare(int,int):232:232 -> d
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry findKey(int):247 -> d
+    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry findKey(int):248:248 -> d
+    6:6:void allocatePaths():278:278 -> d
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry locateKey(int):262:264 -> e
     4:4:int compare(int,int):232:232 -> e
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry findKey(int):247 -> e
-    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry findKey(int):248:248 -> e
-    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry locateKey(int):262:264 -> f
-    4:4:int compare(int,int):232:232 -> f
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry locateKey(int):264 -> f
-    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry locateKey(int):266:266 -> f
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry locateKey(int):264 -> e
+    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry locateKey(int):266:266 -> e
     1:2:java.lang.Object get(int):995:996 -> get
     1:1:boolean isEmpty():990:990 -> isEmpty
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1334:1335 -> keySet
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1334:1335 -> keySet
     3:4:java.util.Set keySet():41 -> keySet
+    1:8:java.lang.Object remove(int):484:491 -> remove
+    9:9:int compare(int,int):232:232 -> remove
+    9:9:java.lang.Object remove(int):491 -> remove
+    10:58:java.lang.Object remove(int):500:548 -> remove
+    59:76:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry parent(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry):453:470 -> remove
+    59:76:java.lang.Object remove(int):556 -> remove
+    77:195:java.lang.Object remove(int):558:676 -> remove
+    196:197:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry parent(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry):474:475 -> remove
+    196:197:java.lang.Object remove(int):556 -> remove
+    198:201:java.lang.Object remove(int):681:684 -> remove
+    202:205:java.lang.Object remove(int):494:497 -> remove
     1:1:int size():985:985 -> size
     1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():1384:1401 -> values
     1:18:java.util.Collection values():41 -> values
@@ -23649,12 +23378,12 @@
     3:3:void incBalance():888:888 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry left():767:767 -> e
     1:3:boolean equals(java.lang.Object):946:948 -> equals
-    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry next():902:904 -> f
-    1:1:boolean pred():786:786 -> g
-    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry prev():915:917 -> h
+    1:1:boolean pred():786:786 -> f
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry prev():915:917 -> g
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry right():777:777 -> h
     1:1:int hashCode():953:953 -> hashCode
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry right():777:777 -> i
-    1:1:boolean succ():795:795 -> j
+    1:1:boolean succ():795:795 -> i
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry next():902:904 -> next
     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.Int2ObjectAVLTreeMap$EntryIterator -> a.a.a.a.h.a.a.a.a.T:
@@ -23674,7 +23403,7 @@
     1:1:void add(java.lang.Object):1252:1252 -> add
     2:2:void add(java.lang.Integer):1301:1301 -> add
     2:2:void add(java.lang.Object):1252 -> add
-    1:1:int previousInt():1267:1267 -> d
+    1:1:int previousInt():1267:1267 -> c
     1:1:java.lang.Integer next():1283:1283 -> next
     1:1:java.lang.Object next():1252 -> next
     1:1:int nextInt():1262:1262 -> nextInt
@@ -23705,11 +23434,11 @@
     1:4:java.lang.Object put(int,java.lang.Object):1648:1651 -> a
     5:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int):1686:1687 -> a
     7:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap subMap(int,int):1698:1702 -> a
-    12:14:int lastIntKey():1760:1762 -> a
-    15:15:int lastIntKey():1761:1761 -> a
+    12:14:int firstIntKey():1753:1755 -> a
+    15:15:int firstIntKey():1754:1754 -> a
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int):1692:1693 -> b
-    3:5:int firstIntKey():1753:1755 -> b
-    6:6:int firstIntKey():1754:1754 -> b
+    3:5:int lastIntKey():1760:1762 -> b
+    6:6:int lastIntKey():1761:1761 -> b
     1:81:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ObjectEntrySet():1497:1577 -> c
     1:81:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ObjectEntrySet():1435 -> c
     82:162:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ObjectEntrySet():1497:1577 -> c
@@ -23725,15 +23454,15 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():1681:1681 -> comparator
     2:2:java.util.Comparator comparator():1435 -> comparator
     1:5:boolean containsValue(java.lang.Object):1629:1633 -> containsValue
-    1:4:java.lang.Object remove(int):1657:1660 -> d
-    5:17:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry firstEntry():1712:1724 -> d
-    1:1:boolean in(int):1492:1492 -> e
-    2:14:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry lastEntry():1735:1747 -> e
+    1:1:boolean in(int):1492:1492 -> d
+    2:14:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry firstEntry():1712:1724 -> d
+    1:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry lastEntry():1735:1747 -> e
     1:1:java.lang.Object get(int):1643:1643 -> get
     1:1:boolean isEmpty():1676:1676 -> isEmpty
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1592:1593 -> keySet
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1592:1593 -> keySet
     3:4:java.util.Set keySet():1435 -> keySet
+    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.ObjectCollection values():1598:1618 -> values
     1:21:java.util.Collection values():1435 -> values
@@ -23818,14 +23547,14 @@
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$SubmapIterator -> a.a.a.a.h.a.a.a.a.aa:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap this$1 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap):1777:1778 -> <init>
-    1:2:void updateNext():1802:1803 -> c
+    1:2:void updateNext():1802:1803 -> d
     1:2:void updatePrevious():1797:1798 -> e
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$SubmapKeyIterator -> a.a.a.a.h.a.a.a.a.ba:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap):1848:1848 -> <init>
     1:1:void add(java.lang.Object):1846:1846 -> add
     2:2:void add(java.lang.Integer):1896:1896 -> add
     2:2:void add(java.lang.Object):1846 -> add
-    1:1:int previousInt():1862:1862 -> d
+    1:1:int previousInt():1862:1862 -> c
     1:1:java.lang.Integer next():1878:1878 -> next
     1:1:java.lang.Object next():1846 -> next
     1:1:int nextInt():1857:1857 -> nextInt
@@ -23855,7 +23584,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry previousEntry():1080 -> b
     2:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry previousEntry():1081:1084 -> b
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry previousEntry():1080:1080 -> b
-    1:1:void updateNext():1064:1064 -> c
+    1:1:void updateNext():1064:1064 -> d
     1:1:void updatePrevious():1076:1076 -> e
     1:1:boolean hasNext():1056:1056 -> hasNext
     1:1:boolean hasPrevious():1060:1060 -> hasPrevious
@@ -23890,12 +23619,12 @@
     7:7:java.lang.Object clone():37 -> clone
     1:2:boolean containsValue(java.lang.Object):270:271 -> containsValue
     1:1:java.lang.Object[] access$200(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap):37:37 -> d
-    2:9:java.lang.Object remove(int):308:315 -> d
-    1:3:int findKey(int):235:237 -> e
+    2:4:int findKey(int):235:237 -> d
     1:4:java.lang.Object get(int):244:247 -> get
     1:1:boolean isEmpty():277:277 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():321:321 -> keySet
     1:1:java.util.Set keySet():37 -> keySet
+    1:8:java.lang.Object remove(int):308:315 -> remove
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
@@ -23980,19 +23709,18 @@
     11:11:java.lang.Object clone():49 -> clone
     1:5:boolean containsValue(java.lang.Object):360:364 -> containsValue
     1:5:java.lang.Object removeNullEntry():228:232 -> d
-    6:17:java.lang.Object remove(int):309:320 -> d
-    1:7:void rehash(int):907:913 -> e
-    8:8:int realSize():205:205 -> e
-    8:8:void rehash(int):914 -> e
-    9:21:void rehash(int):915:927 -> e
-    1:3:java.lang.Object removeEntry(int):219:221 -> f
-    4:10:void shiftKeys(int):289:295 -> f
-    4:10:java.lang.Object removeEntry(int):222 -> f
-    11:11:java.lang.Object removeEntry(int):223:223 -> f
-    12:17:void shiftKeys(int):298:303 -> f
-    12:17:java.lang.Object removeEntry(int):222 -> f
-    18:18:void shiftKeys(int):300:300 -> f
-    18:18:java.lang.Object removeEntry(int):222 -> f
+    6:12:void rehash(int):907:913 -> d
+    13:13:int realSize():205:205 -> d
+    13:13:void rehash(int):914 -> d
+    14:26:void rehash(int):915:927 -> d
+    1:3:java.lang.Object removeEntry(int):219:221 -> e
+    4:10:void shiftKeys(int):289:295 -> e
+    4:10:java.lang.Object removeEntry(int):222 -> e
+    11:11:java.lang.Object removeEntry(int):223:223 -> e
+    12:17:void shiftKeys(int):298:303 -> e
+    12:17:java.lang.Object removeEntry(int):222 -> e
+    18:18:void shiftKeys(int):300:300 -> e
+    18:18:java.lang.Object removeEntry(int):222 -> e
     1:11:java.lang.Object get(int):327:337 -> get
     1:1:int realSize():205:205 -> hashCode
     1:1:int hashCode():971 -> hashCode
@@ -24010,6 +23738,7 @@
     6:7:void putAll(java.util.Map):240 -> putAll
     8:20:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectMap.putAll(java.util.Map):70:82 -> putAll
     8:20:void putAll(java.util.Map):243 -> putAll
+    1:12:java.lang.Object remove(int):309:320 -> remove
     1:1:int size():386:386 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():794:815 -> values
     1:22:java.util.Collection values():49 -> values
@@ -24060,9 +23789,9 @@
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):737:737 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1):737 -> <init>
     1:1:void clear():762:762 -> clear
-    1:1:boolean contains(int):750:750 -> e
-    2:11:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap.containsKey(int):344:353 -> e
-    2:11:boolean contains(int):750 -> e
+    1:1:boolean contains(int):750:750 -> d
+    2:11:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap.containsKey(int):344:353 -> d
+    2:11:boolean contains(int):750 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     2:2:java.util.Iterator iterator():737 -> iterator
@@ -24119,10 +23848,10 @@
     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.Int2ObjectSortedMap -> a.a.a.a.h.a.a.a.a.Ba:
+    int firstIntKey() -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int) -> a
-    int lastIntKey() -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap subMap(int,int) -> a
-    int firstIntKey() -> b
+    int lastIntKey() -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int) -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ObjectEntrySet() -> c
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps -> a.a.a.a.h.a.a.a.a.Da:
@@ -24132,9 +23861,9 @@
     1:1:void <init>():60:60 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap subMap(int,int):95:95 -> a
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int):101:101 -> a
-    3:3:int lastIntKey():117:117 -> a
+    3:3:int firstIntKey():112:112 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int):107:107 -> b
-    2:2:int firstIntKey():112:112 -> b
+    2:2:int lastIntKey():117:117 -> b
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ObjectEntrySet():71:71 -> c
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ObjectEntrySet():57 -> c
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ObjectEntrySet():71:71 -> c
@@ -24196,13 +23925,13 @@
     134:135:java.lang.Object put(int,java.lang.Object):284:285 -> a
     136:136:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):348:348 -> a
     136:136:java.lang.Object put(int,java.lang.Object):283 -> a
-    137:138:int lastIntKey():1007:1008 -> a
-    139:139:int lastIntKey():1007:1007 -> a
+    137:138:int firstIntKey():1001:1002 -> a
+    139:139:int firstIntKey():1001:1001 -> a
     140:140:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1411:1411 -> a
     141:141:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1421:1421 -> a
     1:1:int compare(int,int):232:232 -> b
-    2:3:int firstIntKey():1001:1002 -> b
-    4:4:int firstIntKey():1001:1001 -> b
+    2:3:int lastIntKey():1007:1008 -> b
+    4:4:int lastIntKey():1007:1007 -> b
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1416:1416 -> b
     1:1:void allocatePaths():278:278 -> c
     2:2:boolean containsKey(int):980:980 -> c
@@ -24311,12 +24040,12 @@
     3:3:void incBalance():888:888 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry left():767:767 -> e
     1:3:boolean equals(java.lang.Object):946:948 -> equals
-    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry next():902:904 -> f
-    1:1:boolean pred():786:786 -> g
-    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry prev():915:917 -> h
+    1:1:boolean pred():786:786 -> f
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry prev():915:917 -> g
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry right():777:777 -> h
     1:1:int hashCode():953:953 -> hashCode
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry right():777:777 -> i
-    1:1:boolean succ():795:795 -> j
+    1:1:boolean succ():795:795 -> i
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry next():902:904 -> next
     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 -> a.a.a.a.h.a.a.a.a.Ja:
@@ -24336,7 +24065,7 @@
     1:1:void add(java.lang.Object):1252:1252 -> add
     2:2:void add(java.lang.Integer):1301:1301 -> add
     2:2:void add(java.lang.Object):1252 -> add
-    1:1:int previousInt():1267:1267 -> d
+    1:1:int previousInt():1267:1267 -> c
     1:1:java.lang.Integer next():1283:1283 -> next
     1:1:java.lang.Object next():1252 -> next
     1:1:int nextInt():1262:1262 -> nextInt
@@ -24367,11 +24096,11 @@
     1:4:java.lang.Object put(int,java.lang.Object):1648:1651 -> a
     5:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1686:1687 -> a
     7:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1698:1702 -> a
-    12:14:int lastIntKey():1760:1762 -> a
-    15:15:int lastIntKey():1761:1761 -> a
+    12:14:int firstIntKey():1753:1755 -> a
+    15:15:int firstIntKey():1754:1754 -> a
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1692:1693 -> b
-    3:5:int firstIntKey():1753:1755 -> b
-    6:6:int firstIntKey():1754:1754 -> b
+    3:5:int lastIntKey():1760:1762 -> b
+    6:6:int lastIntKey():1761:1761 -> b
     1:1:boolean containsKey(int):1624:1624 -> c
     2:2:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.containsKey(int):980:980 -> c
     2:2:boolean containsKey(int):1624 -> c
@@ -24483,14 +24212,14 @@
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator -> a.a.a.a.h.a.a.a.a.Qa:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1777:1778 -> <init>
-    1:2:void updateNext():1802:1803 -> c
+    1:2:void updateNext():1802:1803 -> d
     1:2:void updatePrevious():1797:1798 -> e
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> a.a.a.a.h.a.a.a.a.Ra:
     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 add(java.lang.Integer):1896:1896 -> add
     2:2:void add(java.lang.Object):1846 -> add
-    1:1:int previousInt():1862:1862 -> d
+    1:1:int previousInt():1862:1862 -> c
     1:1:java.lang.Integer next():1878:1878 -> next
     1:1:java.lang.Object next():1846 -> next
     1:1:int nextInt():1857:1857 -> nextInt
@@ -24520,7 +24249,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry previousEntry():1080 -> b
     2:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry previousEntry():1081:1084 -> b
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry previousEntry():1080:1080 -> b
-    1:1:void updateNext():1064:1064 -> c
+    1:1:void updateNext():1064:1064 -> d
     1:1:void updatePrevious():1076:1076 -> e
     1:1:boolean hasNext():1056:1056 -> hasNext
     1:1:boolean hasPrevious():1060:1060 -> hasPrevious
@@ -24759,9 +24488,9 @@
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):737:737 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1):737 -> <init>
     1:1:void clear():762:762 -> clear
-    1:1:boolean contains(int):750:750 -> e
-    2:11:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.containsKey(int):344:353 -> e
-    2:11:boolean contains(int):750 -> e
+    1:1:boolean contains(int):750:750 -> d
+    2:11:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.containsKey(int):344:353 -> d
+    2:11:boolean contains(int):750 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     2:2:java.util.Iterator iterator():737 -> iterator
@@ -24818,10 +24547,10 @@
     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.Int2ReferenceSortedMap -> a.a.a.a.h.a.a.a.a.qb:
+    int firstIntKey() -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int) -> a
-    int lastIntKey() -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int) -> a
-    int firstIntKey() -> b
+    int lastIntKey() -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int) -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet() -> d
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> a.a.a.a.h.a.a.a.a.sb:
@@ -24832,27 +24561,27 @@
     6:6:void <init>(int[]):135:135 -> <init>
     7:9:void <init>(int[],int,int):149:151 -> <init>
     7:9:void <init>(int[]):135 -> <init>
-    1:2:boolean add(int):266:267 -> a
-    3:4:void getElements(int,int[],int,int):393:394 -> a
-    5:7:void removeElements(int,int):407:409 -> a
-    8:9:int[] toArray(int[]):436:437 -> a
-    10:18:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):443:451 -> a
-    19:25:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):458:464 -> a
+    1:4:int removeInt(int):294:297 -> a
+    5:5:int removeInt(int):294:294 -> a
+    6:7:void getElements(int,int[],int,int):393:394 -> a
+    8:10:void removeElements(int,int):407:409 -> a
+    11:12:int[] toArray(int[]):436:437 -> a
+    13:21:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):443:451 -> a
+    22:28:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):458:464 -> a
     1:5:void add(int,int):256:260 -> add
-    1:4:int removeInt(int):294:297 -> b
-    5:5:int removeInt(int):294:294 -> b
+    6:7:boolean add(int):266:267 -> add
     1:1:void clear():321:321 -> clear
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList clone():549:551 -> clone
     1:3:java.lang.Object clone():48 -> clone
-    1:2:int indexOf(int):280:281 -> f
-    1:2:boolean rem(int):304 -> f
-    3:3:boolean rem(int):306:306 -> f
+    1:2:int indexOf(int):280:281 -> e
+    1:2:boolean rem(int):304 -> e
+    3:3:boolean rem(int):306:306 -> e
     1:2:int getInt(int):274:275 -> getInt
     3:3:int getInt(int):274:274 -> getInt
-    1:2:int indexOf(int):280:281 -> i
+    1:2:int indexOf(int):280:281 -> h
+    1:2:int lastIndexOf(int):287:288 -> i
     1:1:boolean isEmpty():339:339 -> isEmpty
-    1:2:int lastIndexOf(int):287:288 -> j
-    1:1:void grow(int):250:250 -> k
+    1:1:void grow(int):250:250 -> j
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):493:494 -> listIterator
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):493:494 -> listIterator
     3:4:java.util.ListIterator listIterator(int):48 -> listIterator
@@ -24873,10 +24602,10 @@
     6:6:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.set(int,int):313:313 -> b
     6:6:void set(int):530 -> b
     7:7:void set(int):529:529 -> b
-    1:1:boolean hasPrevious():502:502 -> d
-    1:1:int previousInt():511 -> d
-    2:2:int previousInt():512:512 -> d
-    3:3:int previousInt():511:511 -> d
+    1:1:boolean hasPrevious():502:502 -> c
+    1:1:int previousInt():511 -> c
+    2:2:int previousInt():512:512 -> c
+    3:3:int previousInt():511:511 -> c
     1:1:boolean hasNext():498:498 -> hasNext
     1:1:boolean hasPrevious():502:502 -> hasPrevious
     1:1:int nextIndex():516:516 -> nextIndex
@@ -24893,7 +24622,7 @@
     3:4:void <init>(int):65:66 -> <init>
     5:8:void <init>(int[],int):104:107 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet):29:29 -> a
-    2:10:boolean add(int):164:172 -> a
+    1:9:boolean add(int):164:172 -> add
     1:1:int access$010(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet):29:29 -> b
     1:1:int[] access$100(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet):29:29 -> c
     1:1:void clear():178:178 -> clear
@@ -24901,8 +24630,8 @@
     1:5:java.lang.Object clone():29 -> clone
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet clone():203:203 -> clone
     6:6:java.lang.Object clone():29 -> clone
-    1:1:boolean contains(int):143:143 -> e
-    1:2:int findKey(int):111:112 -> g
+    1:1:boolean contains(int):143:143 -> d
+    1:2:int findKey(int):111:112 -> f
     1:1:boolean isEmpty():183:183 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():119:119 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():119:119 -> iterator
@@ -24931,16 +24660,15 @@
     4:4:void ensureOffsetLength(int[],int,int):389 -> a
     1:4:int[] grow(int[],int,int):204:207 -> b
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator -> a.a.a.a.h.a.a.a.a.wb:
-    int previousInt() -> d
+    int previousInt() -> c
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> a.a.a.a.h.a.a.a.a.xb:
-    boolean add(int) -> a
     int[] toIntArray() -> c
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> a.a.a.a.h.a.a.a.a.Ab:
     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 -> a.a.a.a.h.a.a.a.a.yb:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
-    boolean contains(int) -> e
+    boolean contains(int) -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():55:55 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():55:55 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():38 -> iterator
@@ -24953,10 +24681,10 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):369:371 -> <init>
     4:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):370:370 -> <init>
-    1:1:boolean add(int):376:376 -> a
     1:1:boolean add(java.lang.Object):365:365 -> add
     2:2:boolean add(java.lang.Integer):453:453 -> add
     2:2:boolean add(java.lang.Object):365 -> add
+    3:3:boolean add(int):376:376 -> add
     1:1:boolean addAll(java.util.Collection):437:437 -> addAll
     1:1:int[] toIntArray():470:470 -> c
     1:1:void clear():417:417 -> clear
@@ -24992,8 +24720,8 @@
     8:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator):830:830 -> a
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> a.a.a.a.h.a.a.a.a.Eb:
     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 previousInt():62:62 -> d
     1:1:int nextInt():57:57 -> nextInt
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> a.a.a.a.h.a.a.a.a.Fb:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator i -> a
@@ -25001,10 +24729,9 @@
     1:1:boolean hasNext():813:813 -> hasNext
     1:1:int nextInt():818:818 -> nextInt
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> a.a.a.a.h.a.a.a.a.Hb:
-    boolean add(int) -> a
     void getElements(int,int[],int,int) -> a
     void removeElements(int,int) -> a
-    int removeInt(int) -> b
+    int removeInt(int) -> a
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> a.a.a.a.h.a.a.a.a.Ib:
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> a.a.a.a.h.a.a.a.a.Lb:
     float f -> g
@@ -25027,7 +24754,7 @@
     7:7:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):280:280 -> a
     8:9:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):173:174 -> a
     8:9:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):283 -> a
-    10:23:boolean add(int):302:315 -> a
+    1:14:boolean add(int):302:315 -> add
     1:1:boolean addAll(java.util.Collection):289:289 -> addAll
     2:3:void ensureCapacity(int):266:267 -> addAll
     2:3:boolean addAll(java.util.Collection):289 -> addAll
@@ -25039,19 +24766,19 @@
     1:6:java.lang.Object clone():40 -> clone
     7:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet clone():674:674 -> clone
     7:7:java.lang.Object clone():40 -> clone
-    1:9:boolean contains(int):382:390 -> e
-    1:5:void rehash(int):639:643 -> g
-    6:6:int realSize():262:262 -> g
-    6:6:void rehash(int):644 -> g
-    7:16:void rehash(int):645:654 -> g
-    1:1:boolean removeEntry(int):348:348 -> h
-    2:7:void shiftKeys(int):331:336 -> h
-    2:7:boolean removeEntry(int):349 -> h
-    8:8:boolean removeEntry(int):350:350 -> h
-    9:13:void shiftKeys(int):339:343 -> h
-    9:13:boolean removeEntry(int):349 -> h
-    14:14:void shiftKeys(int):341:341 -> h
-    14:14:boolean removeEntry(int):349 -> h
+    1:9:boolean contains(int):382:390 -> d
+    1:5:void rehash(int):639:643 -> f
+    6:6:int realSize():262:262 -> f
+    6:6:void rehash(int):644 -> f
+    7:16:void rehash(int):645:654 -> f
+    1:1:boolean removeEntry(int):348:348 -> g
+    2:7:void shiftKeys(int):331:336 -> g
+    2:7:boolean removeEntry(int):349 -> g
+    8:8:boolean removeEntry(int):350:350 -> g
+    9:13:void shiftKeys(int):339:343 -> g
+    9:13:boolean removeEntry(int):349 -> g
+    14:14:void shiftKeys(int):341:341 -> g
+    14:14:boolean removeEntry(int):349 -> g
     1:1:int realSize():262:262 -> hashCode
     1:1:int hashCode():694 -> hashCode
     2:4:int hashCode():695:697 -> hashCode
@@ -25095,15 +24822,15 @@
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet -> a.a.a.a.h.a.a.a.a.Nb:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():52:52 -> clone
+    1:1:boolean rem(int):64:64 -> e
     1:1:boolean equals(java.lang.Object):58:58 -> equals
-    1:1:boolean rem(int):64:64 -> f
     1:1:boolean remove(int):47:47 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> a.a.a.a.h.a.a.a.a.Pb:
-    int firstInt() -> a
-    int lastInt() -> b
+    int lastInt() -> a
+    int firstInt() -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet subSet(int,int) -> b
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int) -> c
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int) -> d
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int) -> b
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int) -> c
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> a.a.a.a.h.a.a.a.a.Rb:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():168:168 -> <clinit>
@@ -25224,9 +24951,9 @@
     int defRetValue -> a
     1:1:void <init>():44:44 -> <init>
     int put(java.lang.Object,int) -> a
+    int removeInt(java.lang.Object) -> a
     1:1:void defaultReturnValue(int):55:55 -> a
     2:4:java.lang.Integer put(java.lang.Object,java.lang.Integer):123:125 -> a
-    int removeInt(java.lang.Object) -> b
     1:1:java.lang.Integer get(java.lang.Object):108:108 -> get
     1:1:java.lang.Object get(java.lang.Object):41 -> get
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):41:41 -> put
@@ -25281,11 +25008,11 @@
     6:6:boolean addAll(java.util.Collection):138:138 -> addAll
     1:1:void clear():404:404 -> clear
     1:1:boolean contains(java.lang.Object):275:275 -> contains
-    1:1:void ensureIndex(int):48:48 -> e
-    2:2:void ensureIndex(int):47:47 -> e
+    1:1:void ensureIndex(int):48:48 -> d
+    2:2:void ensureIndex(int):47:47 -> d
+    1:1:void ensureRestrictedIndex(int):63:63 -> e
+    2:2:void ensureRestrictedIndex(int):62:62 -> e
     1:7:boolean equals(java.lang.Object):427:433 -> equals
-    1:1:void ensureRestrictedIndex(int):63:63 -> f
-    2:2:void ensureRestrictedIndex(int):62:62 -> f
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():181:181 -> hashCode
     1:1:int hashCode():415 -> hashCode
     2:5:int hashCode():416:419 -> hashCode
@@ -25457,7 +25184,7 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1596:1596 -> <init>
     1:1:void clear():1614:1614 -> clear
-    1:1:boolean contains(int):1609:1609 -> e
+    1:1:boolean contains(int):1609:1609 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     2:2:java.util.Iterator iterator():1596 -> iterator
@@ -25575,7 +25302,7 @@
     1:1:int previousEntry():1136 -> b
     2:6:int previousEntry():1137:1141 -> b
     7:7:int previousEntry():1136:1136 -> b
-    1:14:void ensureIndexKnown():1099:1112 -> c
+    1:14:void ensureIndexKnown():1099:1112 -> d
     1:1:boolean hasNext():1091:1091 -> hasNext
     1:1:boolean hasPrevious():1095:1095 -> hasPrevious
     1:2:int nextIndex():1117:1118 -> nextIndex
@@ -25589,7 +25316,7 @@
     1:1:void add(java.lang.Object):1544:1544 -> add
     2:2:void add(java.lang.Integer):1565:1565 -> add
     2:2:void add(java.lang.Object):1544 -> add
-    1:1:int previousInt():1547:1547 -> d
+    1:1:int previousInt():1547:1547 -> c
     1:1:java.lang.Integer next():1590:1590 -> next
     1:1:java.lang.Object next():1544 -> next
     1:1:int nextInt():1584:1584 -> nextInt
@@ -25938,13 +25665,12 @@
     1:3:void <init>():70:72 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):37:37 -> a
     2:2:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap,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
+    3:22:int put(java.lang.Object,int):283:302 -> a
+    23:30:int removeInt(java.lang.Object):308:315 -> a
     1:1:int access$010(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):37:37 -> b
-    2:3:boolean containsValue(int):270:271 -> b
-    4:11:int removeInt(java.lang.Object):308:315 -> b
+    2:4:int findKey(java.lang.Object):235:237 -> b
+    5:6:boolean containsValue(int):270:271 -> b
     1:1:java.lang.Object[] access$100(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):37:37 -> c
-    2:4:int findKey(java.lang.Object):235:237 -> c
     1:4:void clear():257:260 -> clear
     1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap clone():344:349 -> clone
     1:6:java.lang.Object clone():37 -> clone
@@ -25954,6 +25680,7 @@
     1:1:int[] access$200(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):37:37 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet reference2IntEntrySet():231:231 -> e
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():37 -> e
+    1:4:int getInt(java.lang.Object):244:247 -> getInt
     1:1:boolean isEmpty():277:277 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():321:321 -> keySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():321:321 -> keySet
@@ -25988,7 +25715,6 @@
     1:6:void remove():153:158 -> remove
     7:7:void remove():153:153 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> a.a.a.a.h.a.a.a.b.za:
-    int getInt(java.lang.Object) -> a
     int put(java.lang.Object,int) -> a
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> a.a.a.a.h.a.a.a.b.Ia:
     float f -> l
@@ -26015,10 +25741,9 @@
     9:33:int insert(java.lang.Object,int):307:331 -> a
     9:33:int put(java.lang.Object,int):338 -> a
     34:36:int put(java.lang.Object,int):339:341 -> a
-    37:47:int getInt(java.lang.Object):721:731 -> a
-    48:71:void fixPointers(int,int):937:960 -> a
-    1:12:int removeInt(java.lang.Object):431:442 -> b
-    13:17:boolean containsValue(int):754:758 -> b
+    37:48:int removeInt(java.lang.Object):431:442 -> a
+    49:72:void fixPointers(int,int):937:960 -> a
+    1:5:boolean containsValue(int):754:758 -> b
     1:25:void fixPointers(int):899:923 -> c
     1:5:void clear():771:775 -> clear
     1:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap clone():1768:1778 -> clone
@@ -26040,6 +25765,7 @@
     21:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet reference2IntEntrySet():1422:1423 -> e
     1:2:java.lang.Object firstKey():970:971 -> firstKey
     3:3:java.lang.Object firstKey():970:970 -> firstKey
+    1:11:int getInt(java.lang.Object):721:731 -> getInt
     1:1:int realSize():262:262 -> hashCode
     1:1:int hashCode():1795 -> hashCode
     2:10:int hashCode():1796:1804 -> hashCode
@@ -26072,9 +25798,9 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1596:1596 -> <init>
     1:1:void clear():1614:1614 -> clear
-    1:1:boolean contains(int):1609:1609 -> e
-    2:6:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.containsValue(int):754:758 -> e
-    2:6:boolean contains(int):1609 -> e
+    1:1:boolean contains(int):1609:1609 -> d
+    2:6:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.containsValue(int):754:758 -> d
+    2:6:boolean contains(int):1609 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     2:2:java.util.Iterator iterator():1596 -> iterator
@@ -26192,7 +25918,7 @@
     1:1:int previousEntry():1136 -> b
     2:6:int previousEntry():1137:1141 -> b
     7:7:int previousEntry():1136:1136 -> b
-    1:14:void ensureIndexKnown():1099:1112 -> c
+    1:14:void ensureIndexKnown():1099:1112 -> d
     1:1:boolean hasNext():1091:1091 -> hasNext
     1:1:boolean hasPrevious():1095:1095 -> hasPrevious
     1:2:int nextIndex():1117:1118 -> nextIndex
@@ -26206,7 +25932,7 @@
     1:1:void add(java.lang.Object):1544:1544 -> add
     2:2:void add(java.lang.Integer):1565:1565 -> add
     2:2:void add(java.lang.Object):1544 -> add
-    1:1:int previousInt():1547:1547 -> d
+    1:1:int previousInt():1547:1547 -> c
     1:1:java.lang.Integer next():1590:1590 -> next
     1:1:java.lang.Object next():1544 -> next
     1:1:int nextInt():1584:1584 -> nextInt
@@ -26240,9 +25966,8 @@
     8:23:int insert(java.lang.Object,int):248:263 -> a
     8:23:int put(java.lang.Object,int):270 -> a
     24:26:int put(java.lang.Object,int):271:273 -> a
-    27:37:int getInt(java.lang.Object):371:381 -> a
-    1:12:int removeInt(java.lang.Object):353:364 -> b
-    13:17:boolean containsValue(int):404:408 -> b
+    27:38:int removeInt(java.lang.Object):353:364 -> a
+    1:5:boolean containsValue(int):404:408 -> b
     1:7:void rehash(int):961:967 -> c
     8:8:int realSize():205:205 -> c
     8:8:void rehash(int):968 -> c
@@ -26263,6 +25988,7 @@
     16:16:int removeEntry(int):221 -> d
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet reference2IntEntrySet():761:762 -> e
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():49 -> e
+    1:11:int getInt(java.lang.Object):371:381 -> getInt
     1:1:int realSize():205:205 -> hashCode
     1:1:int hashCode():1025 -> hashCode
     2:10:int hashCode():1026:1034 -> hashCode
@@ -26286,9 +26012,9 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):848:848 -> <init>
     1:1:void clear():866:866 -> clear
-    1:1:boolean contains(int):861:861 -> e
-    2:6:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.containsValue(int):404:408 -> e
-    2:6:boolean contains(int):861 -> e
+    1:1:boolean contains(int):861:861 -> d
+    2:6:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.containsValue(int):404:408 -> d
+    2:6:boolean contains(int):861 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():851:851 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():851:851 -> iterator
     2:2:java.util.Iterator iterator():848 -> iterator
@@ -26408,7 +26134,7 @@
     1:2:void clear():365:366 -> clear
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList clone():553:555 -> clone
     1:3:java.lang.Object clone():57 -> clone
-    1:7:void grow(int):285:291 -> g
+    1:7:void grow(int):285:291 -> f
     1:2:java.lang.Object get(int):317:318 -> get
     3:3:java.lang.Object get(int):317:317 -> get
     1:2:int indexOf(java.lang.Object):323:324 -> indexOf
@@ -26540,18 +26266,18 @@
     7:7:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet clone():642:642 -> clone
     7:7:java.lang.Object clone():40 -> clone
     1:9:boolean contains(java.lang.Object):350:358 -> contains
-    1:5:void rehash(int):607:611 -> e
-    6:6:int realSize():239:239 -> e
-    6:6:void rehash(int):612 -> e
-    7:16:void rehash(int):613:622 -> e
-    1:1:boolean removeEntry(int):314:314 -> f
-    2:7:void shiftKeys(int):297:302 -> f
-    2:7:boolean removeEntry(int):315 -> f
-    8:8:boolean removeEntry(int):316:316 -> f
-    9:13:void shiftKeys(int):305:309 -> f
-    9:13:boolean removeEntry(int):315 -> f
-    14:14:void shiftKeys(int):307:307 -> f
-    14:14:boolean removeEntry(int):315 -> f
+    1:5:void rehash(int):607:611 -> d
+    6:6:int realSize():239:239 -> d
+    6:6:void rehash(int):612 -> d
+    7:16:void rehash(int):613:622 -> d
+    1:1:boolean removeEntry(int):314:314 -> e
+    2:7:void shiftKeys(int):297:302 -> e
+    2:7:boolean removeEntry(int):315 -> e
+    8:8:boolean removeEntry(int):316:316 -> e
+    9:13:void shiftKeys(int):305:309 -> e
+    9:13:boolean removeEntry(int):315 -> e
+    14:14:void shiftKeys(int):307:307 -> e
+    14:14:boolean removeEntry(int):315 -> e
     1:1:int realSize():239:239 -> hashCode
     1:1:int hashCode():662 -> hashCode
     2:4:int hashCode():663:665 -> hashCode
@@ -26613,12 +26339,12 @@
     1:1:java.lang.Object convertWith(com.android.tools.r8.joptsimple.ValueConverter,java.lang.String):91 -> a
     2:2:java.lang.Object convertWith(com.android.tools.r8.joptsimple.ValueConverter,java.lang.String):97:97 -> a
     3:3:java.lang.Object convertWith(com.android.tools.r8.joptsimple.ValueConverter,java.lang.String):94:94 -> a
-    1:1:java.lang.String description():71:71 -> c
+    1:1:java.lang.String description():71:71 -> description
     1:5:boolean equals(java.lang.Object):137:141 -> equals
+    1:1:com.android.tools.r8.joptsimple.AbstractOptionSpec forHelp():75:75 -> g
+    1:1:boolean isForHelp():80:80 -> h
     1:1:int hashCode():146:146 -> hashCode
-    1:1:com.android.tools.r8.joptsimple.AbstractOptionSpec forHelp():75:75 -> i
-    1:1:boolean isForHelp():80:80 -> j
-    1:1:java.util.Collection options():59:59 -> k
+    1:1:java.util.Collection options():59:59 -> i
     1:1:java.lang.String toString():151:151 -> toString
 com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec -> a.a.a.a.i.b:
     java.lang.String argumentDescription -> g
@@ -26652,27 +26378,27 @@
     9:12:void handleOption(com.android.tools.r8.joptsimple.OptionParser,com.android.tools.r8.joptsimple.ArgumentList,com.android.tools.r8.joptsimple.OptionSet,java.lang.String):255:258 -> a
     13:18:void addArguments(com.android.tools.r8.joptsimple.OptionSet,java.lang.String):262:267 -> a
     19:19:java.lang.Object convert(java.lang.String):276:276 -> a
-    20:20:java.lang.String argumentDescription():305:305 -> a
-    boolean acceptsArguments() -> b
+    20:20:boolean requiresArgument():301:301 -> a
     1:5:boolean canConvertArgument(java.lang.String):280:284 -> b
     6:6:java.lang.Object convert(java.lang.String):276:276 -> b
     6:6:boolean canConvertArgument(java.lang.String):284 -> b
-    1:1:java.lang.String description():58:58 -> c
-    2:2:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec describedAs(java.lang.String):138:138 -> c
+    7:7:java.lang.String argumentDescription():305:305 -> b
+    1:1:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec describedAs(java.lang.String):138:138 -> c
+    2:2:java.lang.String argumentTypeIndicator():309:309 -> c
+    3:4:java.lang.String com.android.tools.r8.joptsimple.AbstractOptionSpec.argumentTypeIndicatorFrom(com.android.tools.r8.joptsimple.ValueConverter):105:106 -> c
+    3:4:java.lang.String argumentTypeIndicator():309 -> c
     1:1:java.util.List defaultValues():313:313 -> d
-    1:1:boolean requiresArgument():301:301 -> e
+    1:1:java.lang.String description():58:58 -> description
+    boolean representsNonOptions() -> e
     1:4:boolean equals(java.lang.Object):318:321 -> equals
     5:5:boolean requiresArgument():301:301 -> equals
     5:5:boolean equals(java.lang.Object):322 -> equals
     6:6:boolean requiresArgument():301:301 -> equals
     6:6:boolean equals(java.lang.Object):322 -> equals
-    1:1:boolean isRequired():243:243 -> f
-    1:1:java.lang.String argumentTypeIndicator():309:309 -> g
-    2:3:java.lang.String com.android.tools.r8.joptsimple.AbstractOptionSpec.argumentTypeIndicatorFrom(com.android.tools.r8.joptsimple.ValueConverter):105:106 -> g
-    2:3:java.lang.String argumentTypeIndicator():309 -> g
-    boolean representsNonOptions() -> h
+    boolean acceptsArguments() -> f
     1:1:int hashCode():327:327 -> hashCode
-    1:1:boolean isArgumentOfNumberType():293:293 -> l
+    1:1:boolean isRequired():243:243 -> isRequired
+    1:1:boolean isArgumentOfNumberType():293:293 -> j
     1:1:java.lang.String toString():58:58 -> toString
 com.android.tools.r8.joptsimple.ArgumentList -> a.a.a.a.i.c:
     java.lang.String[] arguments -> a
@@ -26779,19 +26505,18 @@
     java.lang.String argumentDescription -> e
     1:1:void <init>(java.lang.String):64:64 -> <init>
     2:2:void <init>(java.lang.String):57:57 -> <init>
+    boolean requiresArgument() -> a
     1:1:java.lang.Object convert(java.lang.String):133:133 -> a
     2:2:void handleOption(com.android.tools.r8.joptsimple.OptionParser,com.android.tools.r8.joptsimple.ArgumentList,com.android.tools.r8.joptsimple.OptionSet,java.lang.String):140:140 -> a
-    3:3:java.lang.String argumentDescription():160:160 -> a
-    boolean acceptsArguments() -> b
-    1:1:java.lang.String description():53:53 -> c
+    1:1:java.lang.String argumentDescription():160:160 -> b
+    1:1:java.lang.String argumentTypeIndicator():164:164 -> c
+    2:3:java.lang.String com.android.tools.r8.joptsimple.AbstractOptionSpec.argumentTypeIndicatorFrom(com.android.tools.r8.joptsimple.ValueConverter):105:106 -> c
+    2:3:java.lang.String argumentTypeIndicator():164 -> c
     1:1:java.util.List defaultValues():144:144 -> d
-    boolean requiresArgument() -> e
+    1:1:java.lang.String description():53:53 -> description
+    boolean representsNonOptions() -> e
     1:1:boolean equals(java.lang.Object):53:53 -> equals
-    boolean isRequired() -> f
-    1:1:java.lang.String argumentTypeIndicator():164:164 -> g
-    2:3:java.lang.String com.android.tools.r8.joptsimple.AbstractOptionSpec.argumentTypeIndicatorFrom(com.android.tools.r8.joptsimple.ValueConverter):105:106 -> g
-    2:3:java.lang.String argumentTypeIndicator():164 -> g
-    boolean representsNonOptions() -> h
+    boolean acceptsArguments() -> f
     1:1:int hashCode():53:53 -> hashCode
     1:1:java.lang.String toString():53:53 -> toString
 com.android.tools.r8.joptsimple.OptionArgumentConversionException -> a.a.a.a.i.j:
@@ -26799,14 +26524,12 @@
     1:3:void <init>(java.util.Collection,java.lang.String,java.lang.Throwable):41:43 -> <init>
     1:1:java.lang.String getMessage():48:48 -> getMessage
 com.android.tools.r8.joptsimple.OptionDescriptor -> a.a.a.a.i.k:
-    java.lang.String argumentDescription() -> a
-    boolean acceptsArguments() -> b
-    java.lang.String description() -> c
+    boolean requiresArgument() -> a
+    java.lang.String argumentDescription() -> b
+    java.lang.String argumentTypeIndicator() -> c
     java.util.List defaultValues() -> d
-    boolean requiresArgument() -> e
-    boolean isRequired() -> f
-    java.lang.String argumentTypeIndicator() -> g
-    boolean representsNonOptions() -> h
+    boolean representsNonOptions() -> e
+    boolean acceptsArguments() -> f
 com.android.tools.r8.joptsimple.OptionException -> a.a.a.a.i.l:
     java.util.List options -> a
     1:1:void <init>(java.util.Collection):47:47 -> <init>
@@ -26957,31 +26680,30 @@
     2:2:void <init>(com.android.tools.r8.joptsimple.OptionParser,java.util.Collection,java.lang.String):66:66 -> <init>
     3:3:void attachToParser():71:71 -> <init>
     3:3:void <init>(com.android.tools.r8.joptsimple.OptionParser,java.util.Collection,java.lang.String):67 -> <init>
-    java.lang.String argumentDescription() -> a
     java.lang.Object com.android.tools.r8.joptsimple.NoArgumentOptionSpec.convert(java.lang.String) -> a
+    boolean requiresArgument() -> a
     1:3:com.android.tools.r8.joptsimple.OptionSpecBuilder requiredIf(com.android.tools.r8.joptsimple.OptionSpec,com.android.tools.r8.joptsimple.OptionSpec[]):135:137 -> a
     4:4:void com.android.tools.r8.joptsimple.OptionSet.add(com.android.tools.r8.joptsimple.AbstractOptionSpec):259:259 -> a
     4:4:void com.android.tools.r8.joptsimple.NoArgumentOptionSpec.handleOption(com.android.tools.r8.joptsimple.OptionParser,com.android.tools.r8.joptsimple.ArgumentList,com.android.tools.r8.joptsimple.OptionSet,java.lang.String):51 -> a
     4:4:void com.android.tools.r8.joptsimple.NoArgumentOptionSpec.handleOption(com.android.tools.r8.joptsimple.OptionParser,com.android.tools.r8.joptsimple.ArgumentList,com.android.tools.r8.joptsimple.OptionSet,java.lang.String):0 -> a
-    boolean acceptsArguments() -> b
-    1:1:java.lang.String description():60:60 -> c
+    java.lang.String argumentDescription() -> b
+    java.lang.String argumentTypeIndicator() -> c
     1:1:java.util.List com.android.tools.r8.joptsimple.NoArgumentOptionSpec.defaultValues():80:80 -> d
     1:1:java.util.List defaultValues():60 -> d
-    boolean requiresArgument() -> e
+    1:1:java.lang.String description():60:60 -> description
+    boolean representsNonOptions() -> e
     1:1:boolean equals(java.lang.Object):60:60 -> equals
-    boolean isRequired() -> f
-    java.lang.String argumentTypeIndicator() -> g
-    boolean representsNonOptions() -> h
+    boolean acceptsArguments() -> f
+    com.android.tools.r8.joptsimple.AbstractOptionSpec forHelp() -> g
     1:1:int hashCode():60:60 -> hashCode
-    com.android.tools.r8.joptsimple.AbstractOptionSpec forHelp() -> i
-    1:1:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withOptionalArg():93:93 -> l
-    2:2:java.lang.String description():60:60 -> l
-    2:2:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withOptionalArg():93 -> l
-    3:5:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withOptionalArg():93:95 -> l
-    1:1:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withRequiredArg():80:80 -> m
-    2:2:java.lang.String description():60:60 -> m
-    2:2:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withRequiredArg():80 -> m
-    3:5:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withRequiredArg():80:82 -> m
+    1:1:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withOptionalArg():93:93 -> j
+    2:2:java.lang.String description():60:60 -> j
+    2:2:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withOptionalArg():93 -> j
+    3:5:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withOptionalArg():93:95 -> j
+    1:1:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withRequiredArg():80:80 -> k
+    2:2:java.lang.String description():60:60 -> k
+    2:2:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withRequiredArg():80 -> k
+    3:5:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withRequiredArg():80:82 -> k
     1:1:java.lang.String toString():60:60 -> toString
 com.android.tools.r8.joptsimple.OptionalArgumentOptionSpec -> a.a.a.a.i.u:
     1:1:void <init>(java.util.Collection,java.lang.String):42:42 -> <init>
@@ -27195,53 +26917,51 @@
     java.util.Map signatureMap -> b
     com.android.tools.r8.com.google.common.collect.ImmutableMap classNameMappings -> a
     1:1:void <clinit>():37:37 -> <clinit>
-    1:1:void <init>(java.util.Map):108:108 -> <init>
+    1:1:void <init>(java.util.Map):104:104 -> <init>
     1:1:void <init>(java.util.Map,com.android.tools.r8.naming.ClassNameMapper$1):37 -> <init>
-    2:9:void <init>(java.util.Map):106:113 -> <init>
+    2:9:void <init>(java.util.Map):102:109 -> <init>
     2:9:void <init>(java.util.Map,com.android.tools.r8.naming.ClassNameMapper$1):37 -> <init>
-    1:4:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):126:129 -> a
-    5:5:java.lang.String deobfuscateType(java.lang.String):158:158 -> a
-    5:5:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):129 -> a
-    6:8:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):129:131 -> a
-    9:9:java.lang.String deobfuscateType(java.lang.String):158:158 -> a
-    9:9:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):131 -> a
-    10:10:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):133:133 -> a
-    11:15:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):117:121 -> a
-    11:15:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):135 -> a
-    16:16:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):135:135 -> a
-    17:17:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):139:139 -> a
-    18:18:java.lang.String deobfuscateType(java.lang.String):158:158 -> a
-    18:18:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):139 -> a
-    19:19:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):140:140 -> a
-    20:24:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):117:121 -> a
-    20:24:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):140 -> a
-    25:25:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):140:140 -> a
-    26:30:java.lang.String deobfuscateClassName(java.lang.String):150:154 -> a
-    31:35:void write(java.io.Writer):180:184 -> a
-    36:36:java.lang.String lambda$write$0(com.android.tools.r8.naming.ClassNamingForNameMapper):182:182 -> a
-    37:44:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):223:230 -> a
-    45:54:java.lang.String lookupName(com.android.tools.r8.naming.MemberNaming$Signature,com.android.tools.r8.graph.DexType):235:244 -> a
-    55:55:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):276:276 -> a
-    56:56:java.lang.String deobfuscateType(java.lang.String):158:158 -> a
-    56:56:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):276 -> a
-    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper getClassNaming(java.lang.String):174:174 -> b
-    2:12:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):248:258 -> b
-    13:23:com.android.tools.r8.naming.MemberNaming$FieldSignature originalSignatureOf(com.android.tools.r8.graph.DexField):262:272 -> b
-    1:1:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):91:91 -> c
-    2:3:java.io.BufferedReader com.android.tools.r8.com.google.common.io.CharSource.openBufferedStream():113:114 -> c
-    2:3:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):91 -> c
-    4:4:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader):96:96 -> c
-    4:4:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):91 -> c
+    1:4:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):122:125 -> a
+    5:5:java.lang.String deobfuscateType(java.lang.String):154:154 -> a
+    5:5:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):125 -> a
+    6:8:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):125:127 -> a
+    9:9:java.lang.String deobfuscateType(java.lang.String):154:154 -> a
+    9:9:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):127 -> a
+    10:10:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):129:129 -> a
+    11:15:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):113:117 -> a
+    11:15:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):131 -> a
+    16:16:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):131:131 -> a
+    17:17:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):135:135 -> a
+    18:18:java.lang.String deobfuscateType(java.lang.String):154:154 -> a
+    18:18:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):135 -> a
+    19:19:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):136:136 -> a
+    20:24:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):113:117 -> a
+    20:24:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):136 -> a
+    25:25:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):136:136 -> a
+    26:30:java.lang.String deobfuscateClassName(java.lang.String):146:150 -> a
+    31:35:void write(java.io.Writer):176:180 -> a
+    36:36:java.lang.String lambda$write$0(com.android.tools.r8.naming.ClassNamingForNameMapper):178:178 -> a
+    37:44:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):219:226 -> a
+    45:54:java.lang.String lookupName(com.android.tools.r8.naming.MemberNaming$Signature,com.android.tools.r8.graph.DexType):231:240 -> a
+    55:55:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):272:272 -> a
+    56:56:java.lang.String deobfuscateType(java.lang.String):154:154 -> a
+    56:56:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):272 -> a
+    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper getClassNaming(java.lang.String):170:170 -> b
+    2:12:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):244:254 -> b
+    13:23:com.android.tools.r8.naming.MemberNaming$FieldSignature originalSignatureOf(com.android.tools.r8.graph.DexField):258:268 -> b
+    1:2:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):95:96 -> c
+    3:4:com.android.tools.r8.naming.ClassNameMapper mapperFromInputStream(java.io.InputStream):71:72 -> c
+    3:4:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):95 -> c
     5:5:com.android.tools.r8.naming.ClassNameMapper$Builder builder():67:67 -> c
-    5:5:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader):97 -> c
-    5:5:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):91 -> c
-    6:8:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader):98:100 -> c
-    6:8:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):91 -> c
-    9:13:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader):96:100 -> c
-    9:13:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):91 -> c
-    1:2:boolean equals(java.lang.Object):213:214 -> equals
-    1:1:int hashCode():219:219 -> hashCode
-    1:5:java.lang.String toString():191:195 -> toString
+    5:5:com.android.tools.r8.naming.ClassNameMapper mapperFromInputStream(java.io.InputStream):73 -> c
+    5:5:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):95 -> c
+    6:8:com.android.tools.r8.naming.ClassNameMapper mapperFromInputStream(java.io.InputStream):74:76 -> c
+    6:8:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):95 -> c
+    9:13:com.android.tools.r8.naming.ClassNameMapper mapperFromInputStream(java.io.InputStream):72:76 -> c
+    9:13:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):95 -> c
+    1:2:boolean equals(java.lang.Object):209:210 -> equals
+    1:1:int hashCode():215:215 -> hashCode
+    1:5:java.lang.String toString():187:191 -> toString
 com.android.tools.r8.naming.ClassNameMapper$1 -> a.a.a.a.k.a:
 com.android.tools.r8.naming.ClassNameMapper$Builder -> a.a.a.a.k.b:
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder mapBuilder -> a
@@ -27284,10 +27004,7 @@
     22:23:void forAllMemberNaming(com.android.tools.r8.utils.ThrowingConsumer):243 -> a
     22:23:void write(java.io.Writer):269 -> a
     24:30:void write(java.io.Writer):278:284 -> a
-    31:40:java.lang.String com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange.toString():399:408 -> a
-    31:40:void write(java.io.Writer):284 -> a
-    41:41:void write(java.io.Writer):284:284 -> a
-    42:42:int lambda$write$1(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):282:282 -> a
+    31:31:int lambda$write$1(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):282:282 -> a
     1:11:boolean equals(java.lang.Object):304:314 -> equals
     1:5:int hashCode():319:323 -> hashCode
     1:5:java.lang.String toString():291:295 -> toString
@@ -27331,7 +27048,7 @@
     2:2:int getNextSequenceNumber():350:350 -> a
     1:10:boolean equals(java.lang.Object):418:427 -> equals
     1:3:int hashCode():433:435 -> hashCode
-    4:6:int com.android.tools.r8.naming.MemberNaming$MethodSignature.hashCode():299:301 -> hashCode
+    4:6:int com.android.tools.r8.naming.MemberNaming$MethodSignature.hashCode():294:296 -> hashCode
     4:6:int hashCode():435 -> hashCode
     7:7:int hashCode():436:436 -> hashCode
     1:10:java.lang.String toString():399:408 -> toString
@@ -27363,20 +27080,12 @@
 com.android.tools.r8.naming.MemberNaming$MethodSignature -> a.a.a.a.k.m:
     java.lang.String type -> b
     java.lang.String[] parameters -> c
-    1:1:void <clinit>():204:204 -> <clinit>
     1:3:void <init>(java.lang.String,java.lang.String,java.lang.String[]):210:212 -> <init>
-    1:7:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):226:232 -> a
-    1:7:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod):222 -> a
-    8:8:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    8:8:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):232 -> a
-    8:8:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod):222 -> a
-    9:10:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):232:233 -> a
-    9:10:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod):222 -> a
-    11:11:com.android.tools.r8.naming.MemberNaming$Signature asRenamed(java.lang.String):274:274 -> a
-    12:12:com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind kind():279:279 -> a
-    1:8:boolean equals(java.lang.Object):287:294 -> equals
-    1:3:int hashCode():299:301 -> hashCode
-    1:1:java.lang.String toString():306:306 -> toString
+    1:1:com.android.tools.r8.naming.MemberNaming$Signature asRenamed(java.lang.String):269:269 -> a
+    2:2:com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind kind():274:274 -> a
+    1:8:boolean equals(java.lang.Object):282:289 -> equals
+    1:3:int hashCode():294:296 -> hashCode
+    1:1:java.lang.String toString():301:301 -> toString
 com.android.tools.r8.naming.MemberNaming$Signature -> a.a.a.a.k.o:
     java.lang.String name -> a
     1:2:void <init>(java.lang.String):102:103 -> <init>
@@ -27389,23 +27098,23 @@
     3:3:void <clinit>():132:132 -> <clinit>
     1:1:void <init>(java.lang.String,int):132:132 -> <init>
 com.android.tools.r8.naming.NamingLens -> a.a.a.a.k.s:
-    1:1:void <clinit>():42:42 -> <clinit>
-    1:1:void <init>():42:42 -> <init>
+    1:1:void <clinit>():45:45 -> <clinit>
+    1:1:void <init>():45:45 -> <init>
     boolean checkTargetCanBeTranslated(com.android.tools.r8.graph.DexMethod) -> a
     com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions) -> a
     com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField) -> a
-    1:1:com.android.tools.r8.naming.NamingLens getIdentityLens():103:103 -> a
+    1:1:com.android.tools.r8.naming.NamingLens getIdentityLens():115:115 -> a
     com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod) -> b
 com.android.tools.r8.naming.NamingLens$1 -> a.a.a.a.k.q:
 com.android.tools.r8.naming.NamingLens$IdentityLens -> a.a.a.a.k.r:
-    1:1:void <init>():159:159 -> <init>
-    1:1:void <init>(com.android.tools.r8.naming.NamingLens$1):157 -> <init>
+    1:1:void <init>():171:171 -> <init>
+    1:1:void <init>(com.android.tools.r8.naming.NamingLens$1):169 -> <init>
     boolean checkTargetCanBeTranslated(com.android.tools.r8.graph.DexMethod) -> a
-    1:1:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):165:165 -> a
-    2:2:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):170:170 -> a
-    3:3:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField):185:185 -> a
-    1:1:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod):175:175 -> b
+    1:1:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):177:177 -> a
+    2:2:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):182:182 -> a
+    3:3:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField):197:197 -> a
+    1:1:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod):187:187 -> b
 com.android.tools.r8.naming.ProguardMap -> a.a.a.a.k.t:
 com.android.tools.r8.naming.ProguardMapReader -> a.a.a.a.k.v:
     java.io.BufferedReader reader -> a
@@ -27554,17 +27263,17 @@
     1:2:int hashCode():41:42 -> hashCode
     1:1:java.lang.String toString():23:23 -> toString
 com.android.tools.r8.optimize.MemberRebindingAnalysis -> a.a.a.a.l.a:
-    1:1:void <clinit>():29:29 -> <clinit>
-    1:12:boolean isMemberVisibleFromOriginalContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):310:321 -> a
+    1:1:void <clinit>():30:30 -> <clinit>
+    1:12:boolean isMemberVisibleFromOriginalContext(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):314:325 -> a
 com.android.tools.r8.org.objectweb.asm.AnnotationVisitor -> a.a.a.a.m.a.a.a:
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor av -> a
-    1:1:void <init>(int):56:56 -> <init>
-    2:7:void <init>(int,com.android.tools.r8.org.objectweb.asm.AnnotationVisitor):67:72 -> <init>
-    1:2:void visit(java.lang.String,java.lang.Object):87:88 -> a
-    3:4:void visitEnum(java.lang.String,java.lang.String,java.lang.String):100:101 -> a
-    5:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):115:116 -> a
-    7:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):133:134 -> a
-    9:10:void visitEnd():141:142 -> a
+    1:1:void <init>(int):57:57 -> <init>
+    2:10:void <init>(int,com.android.tools.r8.org.objectweb.asm.AnnotationVisitor):69:77 -> <init>
+    1:2:void visit(java.lang.String,java.lang.Object):92:93 -> a
+    3:4:void visitEnum(java.lang.String,java.lang.String,java.lang.String):105:106 -> a
+    5:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):120:121 -> a
+    7:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):138:139 -> a
+    9:10:void visitEnd():146:147 -> a
 com.android.tools.r8.org.objectweb.asm.Attribute -> a.a.a.a.m.a.a.b:
     byte[] content -> b
     java.lang.String type -> a
@@ -27572,250 +27281,242 @@
     1:2:void <init>(java.lang.String):64:65 -> <init>
     1:3:com.android.tools.r8.org.objectweb.asm.Attribute read(com.android.tools.r8.org.objectweb.asm.ClassReader,int,int,char[],int,com.android.tools.r8.org.objectweb.asm.Label[]):128:130 -> a
 com.android.tools.r8.org.objectweb.asm.ClassReader -> a.a.a.a.m.a.a.c:
-    int[] bootstrapMethodOffsets -> f
-    byte[] classFileBuffer -> b
     byte[] b -> a
-    int[] cpInfoOffsets -> c
-    com.android.tools.r8.org.objectweb.asm.ConstantDynamic[] constantDynamicValues -> e
-    int header -> h
-    java.lang.String[] constantUtf8Values -> d
-    int maxStringLength -> g
-    1:1:void <init>(byte[]):162:162 -> <init>
-    2:72:void <init>(byte[],int,boolean):188:258 -> <init>
-    2:72:void <init>(byte[],int,int):176 -> <init>
-    2:72:void <init>(byte[]):162 -> <init>
-    73:101:void <init>(byte[],int,boolean):239:267 -> <init>
-    73:101:void <init>(byte[],int,int):176 -> <init>
-    73:101:void <init>(byte[]):162 -> <init>
-    102:126:int[] readBootstrapMethodsAttribute(int):3241:3265 -> <init>
-    102:126:void <init>(byte[],int,boolean):271 -> <init>
-    102:126:void <init>(byte[],int,int):176 -> <init>
-    102:126:void <init>(byte[]):162 -> <init>
-    127:127:void <init>(byte[],int,boolean):271:271 -> <init>
-    127:127:void <init>(byte[],int,int):176 -> <init>
-    127:127:void <init>(byte[]):162 -> <init>
-    128:129:void <init>(byte[],int,boolean):194:195 -> <init>
-    128:129:void <init>(byte[],int,int):176 -> <init>
-    128:129:void <init>(byte[]):162 -> <init>
-    1:1:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400:400 -> a
-    2:115:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):421:534 -> a
-    2:115:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    116:122:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):533:539 -> a
-    116:122:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    123:123:void readModuleAttributes(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):716:716 -> a
-    123:123:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):544 -> a
-    123:123:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    124:124:java.lang.String readStringish(int,char[]):3493:3493 -> a
-    124:124:java.lang.String readModule(int,char[]):3523 -> a
-    124:124:void readModuleAttributes(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):720 -> a
-    124:124:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):544 -> a
-    124:124:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    125:128:void readModuleAttributes(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):721:724 -> a
-    125:128:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):544 -> a
-    125:128:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    129:152:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):550:573 -> a
-    129:152:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    153:172:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):572:591 -> a
-    153:172:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    173:194:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):590:611 -> a
-    173:194:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    195:220:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):610:635 -> a
-    195:220:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    221:261:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):634:674 -> a
-    221:261:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    262:272:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):670:680 -> a
-    262:272:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    273:360:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):835:922 -> a
-    273:360:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
-    273:360:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    361:380:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):921:940 -> a
-    361:380:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
-    361:380:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    381:402:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):939:960 -> a
-    381:402:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
-    381:402:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    403:428:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):959:984 -> a
-    403:428:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
-    403:428:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    429:451:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):983:1005 -> a
-    429:451:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
-    429:451:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    452:452:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):685:685 -> a
-    452:452:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    453:560:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1019:1126 -> a
-    453:560:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    453:560:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    561:597:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1122:1158 -> a
-    561:597:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    561:597:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    598:625:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1156:1183 -> a
-    598:625:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    598:625:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    626:645:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1182:1201 -> a
-    626:645:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    626:645:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    646:667:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1200:1221 -> a
-    646:667:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    646:667:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    668:693:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1220:1245 -> a
-    668:693:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    668:693:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    694:737:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1244:1287 -> a
-    694:737:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    694:737:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    738:738:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):692:692 -> a
-    738:738:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400 -> a
-    739:1040:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1308:1609 -> a
-    1041:1094:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1511:1564 -> a
-    1095:1100:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1546:1551 -> a
-    1101:1369:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1490:1758 -> a
-    1370:1425:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2964:3019 -> a
-    1370:1425:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1760 -> a
-    1426:1444:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2997:3015 -> a
-    1426:1444:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1760 -> a
-    1445:1445:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2991:2991 -> a
-    1445:1445:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1760 -> a
-    1446:1452:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2988:2994 -> a
-    1446:1452:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1760 -> a
-    1453:1453:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2985:2985 -> a
-    1453:1453:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1760 -> a
-    1454:1525:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1770:1841 -> a
-    1526:1526:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1834:1834 -> a
-    1527:1602:int readStackMapFrame(int,boolean,boolean,com.android.tools.r8.org.objectweb.asm.Context):3045:3120 -> a
-    1527:1602:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1854 -> a
-    1603:1603:int readStackMapFrame(int,boolean,boolean,com.android.tools.r8.org.objectweb.asm.Context):3117:3117 -> a
-    1603:1603:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1854 -> a
-    1604:2004:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1863:2263 -> a
-    2005:2005:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2110:2110 -> a
-    2006:2006:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2109:2109 -> a
-    2007:2018:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2088:2099 -> a
-    2019:2019:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2091:2091 -> a
-    2020:2020:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2056:2056 -> a
-    2021:2226:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2054:2259 -> a
-    2227:2227:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2258:2258 -> a
-    2228:2231:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2118:2121 -> a
-    2232:2361:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2120:2249 -> a
-    2362:2377:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2225:2240 -> a
-    2378:2388:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2204:2214 -> a
-    2389:2399:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2150:2160 -> a
-    2400:2409:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2133:2142 -> a
-    2410:2410:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2049:2049 -> a
-    2411:2616:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2048:2253 -> a
-    2617:2617:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2027:2027 -> a
-    2618:2807:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2003:2192 -> a
-    2808:2808:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2187:2187 -> a
-    2809:2809:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2183:2183 -> a
-    2810:2810:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2179:2179 -> a
-    2811:3112:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1979:2280 -> a
-    3113:3142:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2279:2308 -> a
-    3143:3214:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2307:2378 -> a
-    3215:3244:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2377:2406 -> a
-    3245:3271:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2405:2431 -> a
-    3272:3272:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2475:2475 -> a
-    3273:3276:com.android.tools.r8.org.objectweb.asm.Label readLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2445:2448 -> a
-    3273:3276:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2476 -> a
-    3277:3277:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2476:2476 -> a
-    3278:3283:int getTypeAnnotationBytecodeOffset(int[],int):2603:2608 -> a
-    3284:3342:int readTypeAnnotationTarget(com.android.tools.r8.org.objectweb.asm.Context,int):2624:2682 -> a
-    3343:3389:int readTypeAnnotationTarget(com.android.tools.r8.org.objectweb.asm.Context,int):2641:2687 -> a
-    3390:3403:void readParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2710:2723 -> a
-    3404:3404:void readParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2722:2722 -> a
-    3405:3422:int readElementValues(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,boolean,char[]):2752:2769 -> a
-    3423:3429:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2791:2797 -> a
-    3430:3583:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2795:2948 -> a
-    3584:3591:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2836:2843 -> a
-    3592:3615:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2840:2863 -> a
-    3616:3694:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2862:2940 -> a
-    3695:3695:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2939:2939 -> a
-    3696:3733:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2878:2915 -> a
-    3734:3754:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2902:2922 -> a
-    3755:3766:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2921:2932 -> a
-    3767:3771:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2931:2935 -> a
-    3772:3777:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2894:2899 -> a
-    3778:3783:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2870:2875 -> a
-    3784:3786:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2828:2830 -> a
-    3787:3787:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2828:2828 -> a
-    3788:3789:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2822:2823 -> a
-    3790:3790:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2822:2822 -> a
-    3791:3791:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2818:2818 -> a
-    3792:3792:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2817:2817 -> a
-    3793:3794:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2809:2810 -> a
-    3795:3795:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2809:2809 -> a
-    3796:3797:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2804:2805 -> a
-    3798:3847:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2804:2853 -> a
-    3848:3848:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2852:2852 -> a
-    3849:3881:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3145:3177 -> a
-    3882:3882:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3173:3173 -> a
-    3883:3883:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3169:3169 -> a
-    3884:3884:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3166:3166 -> a
-    3885:3885:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3163:3163 -> a
-    3886:3886:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3160:3160 -> a
-    3887:3887:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3157:3157 -> a
-    3888:3888:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3154:3154 -> a
-    3889:3889:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3151:3151 -> a
-    3890:3890:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3148:3148 -> a
-    3891:3920:int getFirstAttributeOffset():3196:3225 -> a
-    3921:3927:com.android.tools.r8.org.objectweb.asm.Attribute readAttribute(com.android.tools.r8.org.objectweb.asm.Attribute[],java.lang.String,int,int,char[],int,com.android.tools.r8.org.objectweb.asm.Label[]):3296:3302 -> a
-    3928:3928:int getItem(int):3329:3329 -> a
-    3929:3945:java.lang.String readUtf(int,int,char[]):3458:3474 -> a
-    3946:3946:java.lang.String readStringish(int,char[]):3493:3493 -> a
-    3946:3946:java.lang.String readClass(int,char[]):3508 -> a
-    1:4:com.android.tools.r8.org.objectweb.asm.Label readLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2445:2448 -> b
-    1:4:com.android.tools.r8.org.objectweb.asm.Label createLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2461 -> b
-    5:5:com.android.tools.r8.org.objectweb.asm.Label createLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2462:2462 -> b
-    6:59:int[] readTypeAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2503:2556 -> b
-    60:112:int[] readTypeAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2519:2571 -> b
-    113:127:int[] readTypeAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2570:2584 -> b
-    128:128:int getItemCount():3315:3315 -> b
-    129:129:int readByte(int):3351:3351 -> b
-    130:159:java.lang.Object readConst(int,char[]):3587:3616 -> b
-    160:176:com.android.tools.r8.org.objectweb.asm.ConstantDynamic readConstantDynamic(int,char[]):3552:3568 -> b
-    160:176:java.lang.Object readConst(int,char[]):3614 -> b
-    177:187:java.lang.Object readConst(int,char[]):3602:3612 -> b
-    188:188:java.lang.Object readConst(int,char[]):3600:3600 -> b
-    189:189:java.lang.Object readConst(int,char[]):3598:3598 -> b
-    190:190:java.lang.Object readConst(int,char[]):3596:3596 -> b
-    191:191:java.lang.Object readConst(int,char[]):3594:3594 -> b
-    192:192:java.lang.Object readConst(int,char[]):3592:3592 -> b
-    193:193:java.lang.Object readConst(int,char[]):3590:3590 -> b
-    1:1:int getMaxStringLength():3340:3340 -> c
-    2:3:int readInt(int):3386:3387 -> c
-    4:8:java.lang.String readUTF8(int,char[]):3419:3423 -> c
-    1:2:long readLong(int):3401:3402 -> d
-    3:9:java.lang.String readUtf(int,char[]):3436:3442 -> d
-    1:2:short readShort(int):3374:3375 -> e
-    1:2:int readUnsignedShort(int):3362:3363 -> f
+    java.lang.Object[] cpInfoValues -> c
+    int[] cpInfoOffsets -> b
+    int[] bootstrapMethodOffsets -> d
+    int header -> f
+    int maxStringLength -> e
+    1:1:void <init>(byte[]):146:146 -> <init>
+    2:62:void <init>(byte[],int,boolean):170:230 -> <init>
+    2:62:void <init>(byte[],int,int):158 -> <init>
+    2:62:void <init>(byte[]):146 -> <init>
+    63:113:void <init>(byte[],int,boolean):211:261 -> <init>
+    63:113:void <init>(byte[],int,int):158 -> <init>
+    63:113:void <init>(byte[]):146 -> <init>
+    114:115:void <init>(byte[],int,boolean):175:176 -> <init>
+    114:115:void <init>(byte[],int,int):158 -> <init>
+    114:115:void <init>(byte[]):146 -> <init>
+    1:1:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391:391 -> a
+    2:116:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):412:526 -> a
+    2:116:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    117:123:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):525:531 -> a
+    117:123:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    124:124:void readModule(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):707:707 -> a
+    124:124:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):536 -> a
+    124:124:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    125:125:java.lang.String readStringish(int,char[]):3445:3445 -> a
+    125:125:java.lang.String readModule(int,char[]):3473 -> a
+    125:125:void readModule(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):711 -> a
+    125:125:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):536 -> a
+    125:125:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    126:129:void readModule(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):712:715 -> a
+    126:129:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):536 -> a
+    126:129:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    130:153:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):541:564 -> a
+    130:153:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    154:173:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):563:582 -> a
+    154:173:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    174:195:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):581:602 -> a
+    174:195:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    196:221:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):601:626 -> a
+    196:221:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    222:262:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):625:665 -> a
+    222:262:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    263:273:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):661:671 -> a
+    263:273:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    274:361:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):826:913 -> a
+    274:361:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):674 -> a
+    274:361:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    362:381:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):912:931 -> a
+    362:381:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):674 -> a
+    362:381:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    382:403:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):930:951 -> a
+    382:403:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):674 -> a
+    382:403:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    404:429:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):950:975 -> a
+    404:429:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):674 -> a
+    404:429:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    430:452:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):974:996 -> a
+    430:452:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):674 -> a
+    430:452:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    453:453:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):676:676 -> a
+    453:453:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    454:561:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1010:1117 -> a
+    454:561:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):679 -> a
+    454:561:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    562:599:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1113:1150 -> a
+    562:599:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):679 -> a
+    562:599:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    600:627:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1148:1175 -> a
+    600:627:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):679 -> a
+    600:627:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    628:647:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1174:1193 -> a
+    628:647:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):679 -> a
+    628:647:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    648:669:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1192:1213 -> a
+    648:669:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):679 -> a
+    648:669:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    670:695:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1212:1237 -> a
+    670:695:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):679 -> a
+    670:695:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    696:739:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1236:1279 -> a
+    696:739:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):679 -> a
+    696:739:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    740:740:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683:683 -> a
+    740:740:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391 -> a
+    741:1042:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1300:1601 -> a
+    1043:1096:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1503:1556 -> a
+    1097:1102:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1538:1543 -> a
+    1103:1374:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1482:1753 -> a
+    1375:1430:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2962:3017 -> a
+    1375:1430:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1755 -> a
+    1431:1449:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2995:3013 -> a
+    1431:1449:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1755 -> a
+    1450:1450:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2989:2989 -> a
+    1450:1450:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1755 -> a
+    1451:1457:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2986:2992 -> a
+    1451:1457:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1755 -> a
+    1458:1458:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2983:2983 -> a
+    1458:1458:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1755 -> a
+    1459:1530:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1765:1836 -> a
+    1531:1531:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1829:1829 -> a
+    1532:1607:int readStackMapFrame(int,boolean,boolean,com.android.tools.r8.org.objectweb.asm.Context):3043:3118 -> a
+    1532:1607:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1849 -> a
+    1608:1608:int readStackMapFrame(int,boolean,boolean,com.android.tools.r8.org.objectweb.asm.Context):3115:3115 -> a
+    1608:1608:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1849 -> a
+    1609:2012:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1858:2261 -> a
+    2013:2013:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2106:2106 -> a
+    2014:2014:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2105:2105 -> a
+    2015:2026:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2083:2094 -> a
+    2027:2027:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2086:2086 -> a
+    2028:2028:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2051:2051 -> a
+    2029:2237:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2049:2257 -> a
+    2238:2238:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2256:2256 -> a
+    2239:2242:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2115:2118 -> a
+    2243:2373:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2117:2247 -> a
+    2374:2389:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2223:2238 -> a
+    2390:2400:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2202:2212 -> a
+    2401:2411:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2147:2157 -> a
+    2412:2421:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2130:2139 -> a
+    2422:2422:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2044:2044 -> a
+    2423:2631:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2043:2251 -> a
+    2632:2632:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2022:2022 -> a
+    2633:2825:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1998:2190 -> a
+    2826:2827:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2184:2185 -> a
+    2828:2828:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2184:2184 -> a
+    2829:2829:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2180:2180 -> a
+    2830:2830:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2176:2176 -> a
+    2831:3135:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1974:2278 -> a
+    3136:3165:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2277:2306 -> a
+    3166:3237:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2305:2376 -> a
+    3238:3267:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2375:2404 -> a
+    3268:3294:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2403:2429 -> a
+    3295:3295:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2473:2473 -> a
+    3296:3299:com.android.tools.r8.org.objectweb.asm.Label readLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2443:2446 -> a
+    3296:3299:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2474 -> a
+    3300:3300:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2474:2474 -> a
+    3301:3306:int getTypeAnnotationBytecodeOffset(int[],int):2601:2606 -> a
+    3307:3365:int readTypeAnnotationTarget(com.android.tools.r8.org.objectweb.asm.Context,int):2622:2680 -> a
+    3366:3412:int readTypeAnnotationTarget(com.android.tools.r8.org.objectweb.asm.Context,int):2639:2685 -> a
+    3413:3426:void readParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2708:2721 -> a
+    3427:3427:void readParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2720:2720 -> a
+    3428:3445:int readElementValues(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,boolean,char[]):2750:2767 -> a
+    3446:3452:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2789:2795 -> a
+    3453:3606:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2793:2946 -> a
+    3607:3614:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2834:2841 -> a
+    3615:3638:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2838:2861 -> a
+    3639:3717:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2860:2938 -> a
+    3718:3718:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2937:2937 -> a
+    3719:3756:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2876:2913 -> a
+    3757:3777:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2900:2920 -> a
+    3778:3789:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2919:2930 -> a
+    3790:3794:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2929:2933 -> a
+    3795:3800:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2892:2897 -> a
+    3801:3806:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2868:2873 -> a
+    3807:3809:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2826:2828 -> a
+    3810:3810:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2826:2826 -> a
+    3811:3812:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2820:2821 -> a
+    3813:3813:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2820:2820 -> a
+    3814:3814:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2816:2816 -> a
+    3815:3815:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2815:2815 -> a
+    3816:3817:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2807:2808 -> a
+    3818:3818:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2807:2807 -> a
+    3819:3820:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2802:2803 -> a
+    3821:3870:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2802:2851 -> a
+    3871:3871:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2850:2850 -> a
+    3872:3904:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3143:3175 -> a
+    3905:3905:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3171:3171 -> a
+    3906:3906:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3167:3167 -> a
+    3907:3907:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3164:3164 -> a
+    3908:3908:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3161:3161 -> a
+    3909:3909:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3158:3158 -> a
+    3910:3910:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3155:3155 -> a
+    3911:3911:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3152:3152 -> a
+    3912:3912:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3149:3149 -> a
+    3913:3913:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3146:3146 -> a
+    3914:3943:int getFirstAttributeOffset():3188:3217 -> a
+    3944:3950:com.android.tools.r8.org.objectweb.asm.Attribute readAttribute(com.android.tools.r8.org.objectweb.asm.Attribute[],java.lang.String,int,int,char[],int,com.android.tools.r8.org.objectweb.asm.Label[]):3251:3257 -> a
+    3951:3951:int getItem(int):3283:3283 -> a
+    3952:3968:java.lang.String readUTF(int,int,char[]):3411:3427 -> a
+    3969:3969:java.lang.String readStringish(int,char[]):3445:3445 -> a
+    3969:3969:java.lang.String readClass(int,char[]):3459 -> a
+    1:4:com.android.tools.r8.org.objectweb.asm.Label readLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2443:2446 -> b
+    1:4:com.android.tools.r8.org.objectweb.asm.Label createLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2459 -> b
+    5:5:com.android.tools.r8.org.objectweb.asm.Label createLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2460:2460 -> b
+    6:59:int[] readTypeAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2501:2554 -> b
+    60:112:int[] readTypeAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2517:2569 -> b
+    113:127:int[] readTypeAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2568:2582 -> b
+    128:128:int getItemCount():3270:3270 -> b
+    129:129:int readByte(int):3305:3305 -> b
+    130:159:java.lang.Object readConst(int,char[]):3536:3565 -> b
+    160:177:com.android.tools.r8.org.objectweb.asm.ConstantDynamic readConstantDynamic(int,char[]):3501:3518 -> b
+    160:177:java.lang.Object readConst(int,char[]):3563 -> b
+    178:188:java.lang.Object readConst(int,char[]):3551:3561 -> b
+    189:189:java.lang.Object readConst(int,char[]):3549:3549 -> b
+    190:190:java.lang.Object readConst(int,char[]):3547:3547 -> b
+    191:191:java.lang.Object readConst(int,char[]):3545:3545 -> b
+    192:192:java.lang.Object readConst(int,char[]):3543:3543 -> b
+    193:193:java.lang.Object readConst(int,char[]):3541:3541 -> b
+    194:194:java.lang.Object readConst(int,char[]):3539:3539 -> b
+    1:1:int getMaxStringLength():3294:3294 -> c
+    2:3:int readInt(int):3340:3341 -> c
+    4:10:java.lang.String readUTF(int,char[]):3388:3394 -> c
+    1:2:long readLong(int):3355:3356 -> d
+    3:7:java.lang.String readUTF8(int,char[]):3371:3375 -> d
+    1:2:short readShort(int):3328:3329 -> e
+    1:2:int readUnsignedShort(int):3316:3317 -> f
 com.android.tools.r8.org.objectweb.asm.ClassVisitor -> a.a.a.a.m.a.a.d:
     com.android.tools.r8.org.objectweb.asm.ClassVisitor cv -> b
     int api -> a
-    1:6:void <init>(int,com.android.tools.r8.org.objectweb.asm.ClassVisitor):68:73 -> <init>
-    1:6:void <init>(int):57 -> <init>
+    1:9:void <init>(int,com.android.tools.r8.org.objectweb.asm.ClassVisitor):70:78 -> <init>
+    1:9:void <init>(int):58 -> <init>
     com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]) -> a
-    1:2:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):99:100 -> a
-    3:4:void visitSource(java.lang.String,java.lang.String):113:114 -> a
-    5:9:com.android.tools.r8.org.objectweb.asm.ModuleVisitor visitModule(java.lang.String,int,java.lang.String):129:133 -> a
-    10:10:com.android.tools.r8.org.objectweb.asm.ModuleVisitor visitModule(java.lang.String,int,java.lang.String):130:130 -> a
-    11:15:void visitNestHost(java.lang.String):149:153 -> a
-    16:16:void visitNestHost(java.lang.String):150:150 -> a
-    17:18:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):168:169 -> a
-    19:20:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):182:183 -> a
-    21:25:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):205:209 -> a
-    26:26:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):206:206 -> a
-    27:28:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):220:221 -> a
-    29:30:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):257:258 -> a
-    31:32:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):286:287 -> a
-    33:34:void visitEnd():325:326 -> a
-    1:5:void visitNestMember(java.lang.String):235:239 -> b
-    6:6:void visitNestMember(java.lang.String):236:236 -> b
+    1:2:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):104:105 -> a
+    3:4:void visitSource(java.lang.String,java.lang.String):118:119 -> a
+    5:9:com.android.tools.r8.org.objectweb.asm.ModuleVisitor visitModule(java.lang.String,int,java.lang.String):134:138 -> a
+    10:10:com.android.tools.r8.org.objectweb.asm.ModuleVisitor visitModule(java.lang.String,int,java.lang.String):135:135 -> a
+    11:15:void visitNestHostExperimental(java.lang.String):157:161 -> a
+    16:16:void visitNestHostExperimental(java.lang.String):158:158 -> a
+    17:18:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):176:177 -> a
+    19:20:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):190:191 -> a
+    21:25:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):213:217 -> a
+    26:26:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):214:214 -> a
+    27:28:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):228:229 -> a
+    29:30:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):269:270 -> a
+    31:32:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):298:299 -> a
+    33:34:void visitEnd():337:338 -> a
+    1:5:void visitNestMemberExperimental(java.lang.String):247:251 -> b
+    6:6:void visitNestMemberExperimental(java.lang.String):248:248 -> b
 com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> a.a.a.a.m.a.a.e:
     java.lang.Object[] bootstrapMethodArguments -> d
     java.lang.String name -> a
     java.lang.String descriptor -> b
     com.android.tools.r8.org.objectweb.asm.Handle bootstrapMethod -> c
-    1:5:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):67:71 -> <init>
-    1:8:boolean equals(java.lang.Object):155:162 -> equals
-    1:4:int hashCode():167:170 -> hashCode
-    1:7:java.lang.String toString():175:181 -> toString
+    1:5:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):69:73 -> <init>
+    1:8:boolean equals(java.lang.Object):119:126 -> equals
+    1:4:int hashCode():131:134 -> hashCode
+    1:7:java.lang.String toString():139:145 -> toString
 com.android.tools.r8.org.objectweb.asm.Context -> a.a.a.a.m.a.a.f:
     int currentFrameType -> n
     java.lang.String currentMethodDescriptor -> f
@@ -27839,12 +27540,12 @@
     1:1:void <init>():36:36 -> <init>
 com.android.tools.r8.org.objectweb.asm.FieldVisitor -> a.a.a.a.m.a.a.g:
     com.android.tools.r8.org.objectweb.asm.FieldVisitor fv -> a
-    1:6:void <init>(int,com.android.tools.r8.org.objectweb.asm.FieldVisitor):66:71 -> <init>
-    1:6:void <init>(int):55 -> <init>
+    1:9:void <init>(int,com.android.tools.r8.org.objectweb.asm.FieldVisitor):68:76 -> <init>
+    1:9:void <init>(int):56 -> <init>
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean) -> a
     void visitEnd() -> a
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
-    1:2:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):119:120 -> a
+    1:2:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):124:125 -> a
 com.android.tools.r8.org.objectweb.asm.Handle -> a.a.a.a.m.a.a.h:
     boolean isInterface -> e
     java.lang.String name -> c
@@ -27865,55 +27566,55 @@
     java.lang.Object info -> a
     short lineNumber -> c
     short flags -> b
+    1:1:void <clinit>():130:130 -> <clinit>
     1:1:void <init>():288:288 -> <init>
     1:13:void addLineNumber(int):334:346 -> a
     14:19:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor,boolean):357:362 -> a
     1:1:java.lang.String toString():619:619 -> toString
 com.android.tools.r8.org.objectweb.asm.MethodVisitor -> a.a.a.a.m.a.a.j:
-    int api -> h
-    com.android.tools.r8.org.objectweb.asm.MethodVisitor mv -> i
-    1:1:void <init>(int):69:69 -> <init>
-    2:7:void <init>(int,com.android.tools.r8.org.objectweb.asm.MethodVisitor):80:85 -> <init>
-    1:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():117:118 -> a
-    3:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):132:133 -> a
-    5:6:void visitAnnotableParameterCount(int,boolean):180:181 -> a
-    7:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):201:202 -> a
-    9:10:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):213:214 -> a
-    11:12:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):288:289 -> a
-    13:14:void visitInsn(int):312:313 -> a
-    15:16:void visitTypeInsn(int,java.lang.String):362:363 -> a
-    17:18:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):379:380 -> a
-    19:19:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):419:419 -> a
-    20:21:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):398:399 -> a
-    20:21:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):423 -> a
-    22:28:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):421:427 -> a
-    29:33:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):447:451 -> a
-    34:34:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):448:448 -> a
-    35:36:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):466:467 -> a
-    37:38:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):477:478 -> a
-    39:48:void visitLdcInsn(java.lang.Object):530:539 -> a
-    49:50:void visitIincInsn(int,int):550:551 -> a
-    51:52:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):566:567 -> a
-    53:54:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):580:581 -> a
-    55:56:void visitMultiANewArrayInsn(java.lang.String,int):592:593 -> a
-    57:61:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):618:622 -> a
-    62:62:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):619:619 -> a
-    63:64: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):644:645 -> a
-    65:66: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):696:697 -> a
-    67: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):729:733 -> a
-    72:72: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):730:730 -> a
-    1:5:void visitParameter(java.lang.String,int):100:104 -> b
-    6:6:void visitParameter(java.lang.String,int):101:101 -> b
-    7:8:void visitCode():220:221 -> b
-    9:10:void visitIntInsn(int,int):332:333 -> b
-    11:15:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):666:670 -> b
-    16:16:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):667:667 -> b
-    17:18:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):749:750 -> 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):156:160 -> 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):157:157 -> c
-    7:8:void visitMaxs(int,int):761:762 -> c
-    9:10:void visitEnd():771:772 -> c
-    1:2:void visitVarInsn(int,int):347:348 -> d
+    com.android.tools.r8.org.objectweb.asm.MethodVisitor mv -> b
+    int api -> a
+    1:1:void <init>(int):70:70 -> <init>
+    2:10:void <init>(int,com.android.tools.r8.org.objectweb.asm.MethodVisitor):82:90 -> <init>
+    1:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():122:123 -> a
+    3:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):137:138 -> a
+    5:6:void visitAnnotableParameterCount(int,boolean):185:186 -> a
+    7:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):206:207 -> a
+    9:10:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):218:219 -> a
+    11:12:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):293:294 -> a
+    13:14:void visitInsn(int):317:318 -> a
+    15:16:void visitTypeInsn(int,java.lang.String):367:368 -> a
+    17:18:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):384:385 -> a
+    19:23:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):430:434 -> a
+    24:30:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):432:438 -> a
+    31:35:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):458:462 -> a
+    36:36:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):459:459 -> a
+    37:38:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):477:478 -> a
+    39:40:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):488:489 -> a
+    41:50:void visitLdcInsn(java.lang.Object):541:550 -> a
+    51:52:void visitIincInsn(int,int):561:562 -> a
+    53:54:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):577:578 -> a
+    55:56:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):591:592 -> a
+    57:58:void visitMultiANewArrayInsn(java.lang.String,int):603:604 -> a
+    59:63: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
+    64:64: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
+    65:66: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
+    67:68: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
+    69:73: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
+    74:74: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):105:109 -> b
+    6:6:void visitParameter(java.lang.String,int):106:106 -> b
+    7:8:void visitCode():225:226 -> b
+    9:10:void visitIntInsn(int,int):337:338 -> b
+    11:17:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):403:409 -> b
+    18:22:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):677:681 -> b
+    23:23:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):678:678 -> b
+    24:25: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):161:165 -> 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):162:162 -> c
+    7:8:void visitMaxs(int,int):772:773 -> c
+    9:10:void visitEnd():782:783 -> c
+    1:2:void visitVarInsn(int,int):352:353 -> d
 com.android.tools.r8.org.objectweb.asm.Opcodes -> a.a.a.a.m.a.a.k:
     java.lang.Integer FLOAT -> c
     java.lang.Integer DOUBLE -> d
@@ -27922,7 +27623,7 @@
     java.lang.Integer UNINITIALIZED_THIS -> g
     java.lang.Integer TOP -> a
     java.lang.Integer INTEGER -> b
-    1:7:void <clinit>():376:382 -> <clinit>
+    1:7:void <clinit>():179:185 -> <clinit>
 com.android.tools.r8.org.objectweb.asm.Type -> a.a.a.a.m.a.a.l:
     com.android.tools.r8.org.objectweb.asm.Type FLOAT_TYPE -> k
     com.android.tools.r8.org.objectweb.asm.Type INT_TYPE -> j
@@ -27938,31 +27639,31 @@
     com.android.tools.r8.org.objectweb.asm.Type SHORT_TYPE -> i
     com.android.tools.r8.org.objectweb.asm.Type BYTE_TYPE -> h
     1:26:void <clinit>():85:110 -> <clinit>
-    1:5:void <init>(int,java.lang.String,int,int):159:163 -> <init>
-    1:28:com.android.tools.r8.org.objectweb.asm.Type[] getArgumentTypes(java.lang.String):302:329 -> a
-    29:55:com.android.tools.r8.org.objectweb.asm.Type getTypeInternal(java.lang.String,int,int):414:440 -> a
-    56:56:com.android.tools.r8.org.objectweb.asm.Type getTypeInternal(java.lang.String,int,int):434:434 -> a
-    57:57:com.android.tools.r8.org.objectweb.asm.Type getTypeInternal(java.lang.String,int,int):418:418 -> a
-    58:78:com.android.tools.r8.org.objectweb.asm.Type getTypeInternal(java.lang.String,int,int):416:436 -> a
-    79:79:com.android.tools.r8.org.objectweb.asm.Type getTypeInternal(java.lang.String,int,int):430:430 -> a
-    80:86:com.android.tools.r8.org.objectweb.asm.Type getTypeInternal(java.lang.String,int,int):426:432 -> a
-    87:105:com.android.tools.r8.org.objectweb.asm.Type getTypeInternal(java.lang.String,int,int):420:438 -> a
-    106:135:java.lang.String getClassName():455:484 -> a
-    136:136:java.lang.String getClassName():482:482 -> a
-    137:137:java.lang.String getClassName():475:475 -> a
-    138:139:com.android.tools.r8.org.objectweb.asm.Type getElementType():241:242 -> a
-    138:139:java.lang.String getClassName():475 -> a
-    140:144:java.lang.String getClassName():475:479 -> a
-    1:1:com.android.tools.r8.org.objectweb.asm.Type getMethodType(java.lang.String):264:264 -> b
-    2:7:java.lang.String getDescriptor():516:521 -> b
-    1:2:com.android.tools.r8.org.objectweb.asm.Type getObjectType(java.lang.String):252:253 -> c
-    3:3:int getDimensions():668:668 -> c
+    1:5:void <init>(int,java.lang.String,int,int):163:167 -> <init>
+    1:30:com.android.tools.r8.org.objectweb.asm.Type[] getArgumentTypes(java.lang.String):281:310 -> a
+    31:57:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String,int,int):416:442 -> a
+    58:58:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String,int,int):436:436 -> a
+    59:59:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String,int,int):420:420 -> a
+    60:80:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String,int,int):418:438 -> a
+    81:81:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String,int,int):432:432 -> a
+    82:88:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String,int,int):428:434 -> a
+    89:107:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String,int,int):422:440 -> a
+    108:137:java.lang.String getClassName():493:522 -> a
+    138:138:java.lang.String getClassName():520:520 -> a
+    139:139:java.lang.String getClassName():513:513 -> a
+    140:141:com.android.tools.r8.org.objectweb.asm.Type getElementType():482:483 -> a
+    140:141:java.lang.String getClassName():513 -> a
+    142:146:java.lang.String getClassName():513:517 -> a
+    1:1:com.android.tools.r8.org.objectweb.asm.Type getMethodType(java.lang.String):199:199 -> b
+    2:11:java.lang.String getDescriptor():580:589 -> b
+    1:2:com.android.tools.r8.org.objectweb.asm.Type getObjectType(java.lang.String):187:188 -> c
+    3:3:int getDimensions():469:469 -> c
     1:1:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String):177:177 -> d
-    2:2:java.lang.String getInternalName():496:496 -> d
-    1:1:int getSort():657:657 -> e
-    1:17:boolean equals(java.lang.Object):843:859 -> equals
-    1:4:int hashCode():873:876 -> hashCode
-    1:1:java.lang.String toString():889:889 -> toString
+    2:2:java.lang.String getInternalName():534:534 -> d
+    1:1:int getSort():458:458 -> e
+    1:17:boolean equals(java.lang.Object):858:874 -> equals
+    1:4:int hashCode():888:891 -> hashCode
+    1:1:java.lang.String toString():904:904 -> toString
 com.android.tools.r8.org.objectweb.asm.TypePath -> a.a.a.a.m.a.a.m:
     byte[] typePathContainer -> a
     int typePathOffset -> b
@@ -27991,44 +27692,44 @@
     1:1:int getTypeParameterBoundIndex():327:327 -> g
     1:1:int getTypeParameterIndex():315:315 -> h
 com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter -> a.a.a.a.m.a.a.a.b:
-    java.util.BitSet mainSubroutineInsns -> F
-    java.util.BitSet sharedSubroutineInsns -> H
-    java.util.Map subroutinesInsns -> G
+    java.util.BitSet mainSubroutineInsns -> y
+    java.util.Map subroutinesInsns -> z
+    java.util.BitSet sharedSubroutineInsns -> A
     1:1:void <init>(int,com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):129:129 -> <init>
-    1:1:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):101 -> <init>
-    2:67:void <init>(int,com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):65:130 -> <init>
-    2:67:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):101 -> <init>
-    68:69:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):102:103 -> <init>
+    1:1:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):100 -> <init>
+    2:68:void <init>(int,com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):64:130 -> <init>
+    2:68:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):100 -> <init>
+    69:70:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):101:102 -> <init>
     1:4:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):135:138 -> a
-    5:27:void findReachableInsns(int,java.util.BitSet,java.util.BitSet):231:253 -> a
-    28:36:void findReachableInsns(int,java.util.BitSet,java.util.BitSet):252:260 -> a
-    37:45:void findReachableInsns(int,java.util.BitSet,java.util.BitSet):259:267 -> a
+    5:28:void findReachableInsns(int,java.util.BitSet,java.util.BitSet):231:254 -> a
+    29:37:void findReachableInsns(int,java.util.BitSet,java.util.BitSet):253:261 -> a
+    38:46:void findReachableInsns(int,java.util.BitSet,java.util.BitSet):260:268 -> a
     1:20:void findSubroutineInsns(int,java.util.BitSet,java.util.BitSet):181:200 -> b
     1:1:void visitEnd():144:144 -> c
     2:8:void findSubroutinesInsns():157:163 -> c
     2:8:void visitEnd():146 -> c
-    9:18:void emitCode():294:303 -> c
+    9:18:void emitCode():295:304 -> c
     9:18:void visitEnd():147 -> c
-    19:23:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):332:336 -> c
-    19:23:void emitCode():304 -> c
+    19:23:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):333:337 -> c
+    19:23:void emitCode():305 -> c
     19:23:void visitEnd():147 -> c
-    24:24:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.getClonedLabel(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):538:538 -> c
-    24:24:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):337 -> c
-    24:24:void emitCode():304 -> c
+    24:24:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.getClonedLabel(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):539:539 -> c
+    24:24:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):338 -> c
+    24:24:void emitCode():305 -> c
     24:24:void visitEnd():147 -> c
-    25:43:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):339:357 -> c
-    25:43:void emitCode():304 -> c
+    25:43:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):340:358 -> c
+    25:43:void emitCode():305 -> c
     25:43:void visitEnd():147 -> c
-    44:55:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):355:366 -> c
-    44:55:void emitCode():304 -> c
+    44:55:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):356:367 -> c
+    44:55:void emitCode():305 -> c
     44:55:void visitEnd():147 -> c
-    56:90:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):363:397 -> c
-    56:90:void emitCode():304 -> c
+    56:90:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):364:398 -> c
+    56:90:void emitCode():305 -> c
     56:90:void visitEnd():147 -> c
-    91:102:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):395:406 -> c
-    91:102:void emitCode():304 -> c
+    91:102:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):396:407 -> c
+    91:102:void emitCode():305 -> c
     91:102:void visitEnd():147 -> c
-    103:105:void emitCode():307:309 -> c
+    103:105:void emitCode():308:310 -> c
     103:105:void visitEnd():147 -> c
     106:107:void visitEnd():149:150 -> c
 com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> a.a.a.a.m.a.a.a.a:
@@ -28037,17 +27738,17 @@
     java.util.BitSet subroutineInsns -> b
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode returnLabel -> d
     com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter this$0 -> e
-    1:5:void <init>(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter,com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.BitSet):446:450 -> <init>
-    6:29:void <init>(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter,com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.BitSet):449:472 -> <init>
-    1:1:com.android.tools.r8.org.objectweb.asm.tree.LabelNode getClonedLabel(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):538:538 -> a
-    1:1:com.android.tools.r8.org.objectweb.asm.tree.LabelNode getClonedLabelForJumpInsn(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):526:526 -> b
-    1:11:com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation findOwner(int):499:509 -> c
-    12:12:com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation findOwner(int):508:508 -> c
-    1:1:java.util.Set entrySet():545:545 -> entrySet
-    1:1:boolean equals(java.lang.Object):555:555 -> equals
-    1:1:com.android.tools.r8.org.objectweb.asm.tree.LabelNode get(java.lang.Object):550:550 -> get
-    1:1:java.lang.Object get(java.lang.Object):419 -> get
-    1:1:int hashCode():560:560 -> hashCode
+    1:5:void <init>(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter,com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.BitSet):447:451 -> <init>
+    6:29:void <init>(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter,com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.BitSet):450:473 -> <init>
+    1:1:com.android.tools.r8.org.objectweb.asm.tree.LabelNode getClonedLabel(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):539:539 -> a
+    1:1:com.android.tools.r8.org.objectweb.asm.tree.LabelNode getClonedLabelForJumpInsn(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):527:527 -> b
+    1:11:com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation findOwner(int):500:510 -> c
+    12:12:com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation findOwner(int):509:509 -> c
+    1:1:java.util.Set entrySet():546:546 -> entrySet
+    1:1:boolean equals(java.lang.Object):556:556 -> equals
+    1:1:com.android.tools.r8.org.objectweb.asm.tree.LabelNode get(java.lang.Object):551:551 -> get
+    1:1:java.lang.Object get(java.lang.Object):420 -> get
+    1:1:int hashCode():561:561 -> hashCode
 com.android.tools.r8.org.objectweb.asm.signature.SignatureReader -> a.a.a.a.m.a.a.b.a:
     java.lang.String signatureValue -> a
     1:2:void <init>(java.lang.String):49:50 -> <init>
@@ -28061,7 +27762,7 @@
     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 -> a.a.a.a.m.a.a.b.b:
-    1:3:void <init>(int):74:76 -> <init>
+    1:6:void <init>(int):75:80 -> <init>
     com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitArrayType() -> a
     void visitBaseType(char) -> a
     void visitClassType(java.lang.String) -> a
@@ -28100,44 +27801,44 @@
 com.android.tools.r8.org.objectweb.asm.tree.AnnotationNode -> a.a.a.a.m.a.a.c.b:
     java.util.List values -> c
     java.lang.String desc -> b
-    1:1:void com.android.tools.r8.org.objectweb.asm.AnnotationVisitor.<init>(int):56:56 -> <init>
-    1:1:void <init>(int,java.lang.String):77 -> <init>
-    2:2:void <init>(int,java.lang.String):78:78 -> <init>
-    3:3:void com.android.tools.r8.org.objectweb.asm.AnnotationVisitor.<init>(int):56:56 -> <init>
-    3:3:void <init>(int,java.lang.String):77 -> <init>
+    1:1:void com.android.tools.r8.org.objectweb.asm.AnnotationVisitor.<init>(int):57:57 -> <init>
+    1:1:void <init>(int,java.lang.String):78 -> <init>
+    2:2:void <init>(int,java.lang.String):79:79 -> <init>
+    3:3:void com.android.tools.r8.org.objectweb.asm.AnnotationVisitor.<init>(int):57:57 -> <init>
+    3:3:void <init>(int,java.lang.String):78 -> <init>
     3:3:void <init>(java.lang.String):63 -> <init>
-    4:4:void <init>(int,java.lang.String):78:78 -> <init>
+    4:4:void <init>(int,java.lang.String):79:79 -> <init>
     4:4:void <init>(java.lang.String):63 -> <init>
     5:6:void <init>(java.lang.String):64:65 -> <init>
-    7:8:void <init>(java.util.List):87:88 -> <init>
+    7:8:void <init>(java.util.List):88:89 -> <init>
     void visitEnd() -> a
-    1:8:void visit(java.lang.String,java.lang.Object):97:104 -> a
+    1:8:void visit(java.lang.String,java.lang.Object):98:105 -> a
     9:13:java.util.List com.android.tools.r8.org.objectweb.asm.tree.Util.asArrayList(byte[]):64:68 -> a
-    9:13:void visit(java.lang.String,java.lang.Object):104 -> a
-    14:16:void visit(java.lang.String,java.lang.Object):104:106 -> a
+    9:13:void visit(java.lang.String,java.lang.Object):105 -> a
+    14:16:void visit(java.lang.String,java.lang.Object):105:107 -> a
     17:21:java.util.List com.android.tools.r8.org.objectweb.asm.tree.Util.asArrayList(boolean[]):75:79 -> a
-    17:21:void visit(java.lang.String,java.lang.Object):106 -> a
-    22:24:void visit(java.lang.String,java.lang.Object):106:108 -> a
+    17:21:void visit(java.lang.String,java.lang.Object):107 -> a
+    22:24:void visit(java.lang.String,java.lang.Object):107:109 -> a
     25:29:java.util.List com.android.tools.r8.org.objectweb.asm.tree.Util.asArrayList(short[]):86:90 -> a
-    25:29:void visit(java.lang.String,java.lang.Object):108 -> a
-    30:32:void visit(java.lang.String,java.lang.Object):108:110 -> a
+    25:29:void visit(java.lang.String,java.lang.Object):109 -> a
+    30:32:void visit(java.lang.String,java.lang.Object):109:111 -> a
     33:37:java.util.List com.android.tools.r8.org.objectweb.asm.tree.Util.asArrayList(char[]):97:101 -> a
-    33:37:void visit(java.lang.String,java.lang.Object):110 -> a
-    38:42:void visit(java.lang.String,java.lang.Object):110:114 -> a
+    33:37:void visit(java.lang.String,java.lang.Object):111 -> a
+    38:42:void visit(java.lang.String,java.lang.Object):111:115 -> a
     43:47:java.util.List com.android.tools.r8.org.objectweb.asm.tree.Util.asArrayList(long[]):130:134 -> a
-    43:47:void visit(java.lang.String,java.lang.Object):114 -> a
-    48:50:void visit(java.lang.String,java.lang.Object):114:116 -> a
+    43:47:void visit(java.lang.String,java.lang.Object):115 -> a
+    48:50:void visit(java.lang.String,java.lang.Object):115:117 -> a
     51:55:java.util.List com.android.tools.r8.org.objectweb.asm.tree.Util.asArrayList(float[]):119:123 -> a
-    51:55:void visit(java.lang.String,java.lang.Object):116 -> a
-    56:58:void visit(java.lang.String,java.lang.Object):116:118 -> a
+    51:55:void visit(java.lang.String,java.lang.Object):117 -> a
+    56:58:void visit(java.lang.String,java.lang.Object):117:119 -> a
     59:63:java.util.List com.android.tools.r8.org.objectweb.asm.tree.Util.asArrayList(double[]):141:145 -> a
-    59:63:void visit(java.lang.String,java.lang.Object):118 -> a
-    64:66:void visit(java.lang.String,java.lang.Object):118:120 -> a
-    67:73:void visitEnum(java.lang.String,java.lang.String,java.lang.String):126:132 -> a
-    74:81:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):137:144 -> a
-    82:90:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):150:158 -> a
-    91:98:void accept(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor):189:196 -> a
-    99:115:void accept(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,java.lang.Object):210:226 -> a
+    59:63:void visit(java.lang.String,java.lang.Object):119 -> a
+    64:66:void visit(java.lang.String,java.lang.Object):119:121 -> a
+    67:73:void visitEnum(java.lang.String,java.lang.String,java.lang.String):127:133 -> a
+    74:81:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):138:145 -> a
+    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.FieldInsnNode -> a.a.a.a.m.a.a.c.c:
     java.lang.String owner -> g
     java.lang.String desc -> i
@@ -28184,16 +27885,16 @@
     2:8:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode get(int):93:99 -> a
     9:9:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode get(int):94:94 -> a
     10:13:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):142:145 -> a
-    14:24:void add(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):225:235 -> a
-    25:36:void insert(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):313:324 -> a
+    14:25:void add(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):225:236 -> a
+    26:37:void insert(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):314:325 -> a
     1:1:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode getLast():79:79 -> b
     2:5:int indexOf(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):130:133 -> b
-    6:17:void insertBefore(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):363:374 -> b
+    6:17:void insertBefore(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):364:375 -> b
     1:1:java.util.ListIterator iterator(int):166:166 -> c
     1:1:java.util.ListIterator iterator():155 -> c
     2:25:void set(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):193:216 -> c
-    26:49:void remove(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):411:434 -> c
-    1:6:void resetLabels():469:474 -> d
+    26:49:void remove(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):412:435 -> c
+    1:6:void resetLabels():470:475 -> d
     1:1:int size():61:61 -> e
     1:6:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode[] toArray():176:181 -> f
 com.android.tools.r8.org.objectweb.asm.tree.InsnList$InsnListIterator -> a.a.a.a.m.a.a.c.f:
@@ -28201,18 +27902,17 @@
     com.android.tools.r8.org.objectweb.asm.tree.InsnList this$0 -> d
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode previousInsn -> b
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode remove -> c
-    1:7:void <init>(com.android.tools.r8.org.objectweb.asm.tree.InsnList,int):488:494 -> <init>
-    1:9:void add(java.lang.Object):571:579 -> add
+    1:7:void <init>(com.android.tools.r8.org.objectweb.asm.tree.InsnList,int):489:495 -> <init>
+    1:9:void add(java.lang.Object):561:569 -> add
     1:1:boolean hasNext():500:500 -> hasNext
-    1:1:boolean hasPrevious():532:532 -> hasPrevious
-    1:7:java.lang.Object next():505:511 -> next
-    8:8:java.lang.Object next():506:506 -> next
-    1:7:int nextIndex():549:555 -> nextIndex
-    1:7:java.lang.Object previous():537:543 -> previous
-    8:8:java.lang.Object previous():538:538 -> previous
-    1:7:int previousIndex():560:566 -> previousIndex
-    1:10:void remove():517:526 -> remove
-    1:9:void set(java.lang.Object):584:592 -> set
+    1:1:boolean hasPrevious():529:529 -> hasPrevious
+    1:7:java.lang.Object next():504:510 -> next
+    8:8:java.lang.Object next():505:505 -> next
+    1:7:int nextIndex():541:547 -> nextIndex
+    1:4:java.lang.Object previous():533:536 -> previous
+    1:7:int previousIndex():551:557 -> previousIndex
+    1:10:void remove():515:524 -> remove
+    1:9:void set(java.lang.Object):573:581 -> set
 com.android.tools.r8.org.objectweb.asm.tree.InsnNode -> a.a.a.a.m.a.a.c.h:
     1:1:void <init>(int):55:55 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):65:66 -> a
@@ -28245,11 +27945,11 @@
 com.android.tools.r8.org.objectweb.asm.tree.LabelNode -> a.a.a.a.m.a.a.c.l:
     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
-    2:2:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):73:73 -> a
+    1:1:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):62:62 -> a
+    2:2:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):67:67 -> a
     int getType() -> d
-    1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():60:63 -> e
-    1:1:void resetLabel():77:77 -> f
+    1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():54:57 -> e
+    1:1:void resetLabel():71:71 -> f
 com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode -> a.a.a.a.m.a.a.c.m:
     java.lang.Object cst -> g
     1:2:void <init>(java.lang.Object):55:56 -> <init>
@@ -28270,10 +27970,10 @@
     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):115:118 -> <init>
+    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:4:void <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 -> <init>
-    1:10:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor,boolean):128:137 -> a
-    11:11:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor,boolean):136:136 -> a
+    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 -> a.a.a.a.m.a.a.c.p:
     int index -> f
     java.lang.String name -> a
@@ -28298,103 +27998,107 @@
     java.lang.String desc -> i
     java.lang.String name -> h
     boolean itf -> j
-    1:5:void <init>(int,java.lang.String,java.lang.String,java.lang.String,boolean):91:95 -> <init>
-    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
+    1:5:void <init>(int,java.lang.String,java.lang.String,java.lang.String,boolean):93:97 -> <init>
+    1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):117:118 -> a
+    3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):123:123 -> a
     int getType() -> d
 com.android.tools.r8.org.objectweb.asm.tree.MethodNode -> a.a.a.a.m.a.a.c.t:
-    java.util.List attrs -> r
-    java.util.List invisibleTypeAnnotations -> q
-    com.android.tools.r8.org.objectweb.asm.tree.InsnList instructions -> x
-    java.util.List visibleTypeAnnotations -> p
-    java.util.List invisibleAnnotations -> o
-    int access -> j
-    java.lang.String name -> k
-    java.lang.String desc -> l
-    java.lang.Object annotationDefault -> s
-    java.util.List tryCatchBlocks -> y
-    int maxLocals -> A
-    java.util.List localVariables -> B
-    java.util.List[] visibleParameterAnnotations -> u
-    int maxStack -> z
-    java.util.List[] invisibleParameterAnnotations -> w
-    java.util.List invisibleLocalVariableAnnotations -> D
-    java.util.List visibleLocalVariableAnnotations -> C
-    int invisibleAnnotableParameterCount -> v
-    boolean visited -> E
-    int visibleAnnotableParameterCount -> t
-    java.util.List visibleAnnotations -> n
-    java.util.List parameters -> m
-    1:1:void com.android.tools.r8.org.objectweb.asm.MethodVisitor.<init>(int):69:69 -> <init>
-    1:1:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):220 -> <init>
-    2:11:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):221:230 -> <init>
-    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():248:248 -> a
-    2:12:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):260:270 -> a
-    13:15:void visitAnnotableParameterCount(int,boolean):296:298 -> a
-    16:34:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):306:324 -> a
-    35:38:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):331:334 -> a
-    39:45:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):349:355 -> a
-    46:46:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):349:349 -> a
-    47:47:void visitInsn(int):360:360 -> a
-    48:48:void visitTypeInsn(int,java.lang.String):375:375 -> a
-    49:49:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):381:381 -> a
-    50:57:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):391:398 -> a
-    58:58:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):407:407 -> a
-    59:59:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):414:414 -> a
-    60:60:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):419:419 -> a
-    61:61:void visitLdcInsn(java.lang.Object):424:424 -> a
-    62:62:void visitIincInsn(int,int):429:429 -> a
-    63:63:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):435:435 -> a
-    64:64:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):440:440 -> a
-    65:65:void visitMultiANewArrayInsn(java.lang.String,int):445:445 -> a
-    66:66:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):452:452 -> a
-    67:67:int com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.getOpcode():137:137 -> a
-    67:67:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):453 -> a
-    68:81:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):454:467 -> a
-    82:86: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):475:479 -> a
-    87:87: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):478:478 -> a
-    88:93: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):509:514 -> a
-    94:94: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):512:512 -> a
-    95:107: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):526:538 -> a
-    108:110:com.android.tools.r8.org.objectweb.asm.tree.LabelNode[] getLabelNodes(com.android.tools.r8.org.objectweb.asm.Label[]):575:577 -> a
-    111:117:java.lang.Object[] getLabelNodes(java.lang.Object[]):583:589 -> a
-    118:120:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):693:695 -> a
-    121:121:void com.android.tools.r8.org.objectweb.asm.tree.ParameterNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:66 -> a
-    121:121:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):695 -> a
-    122:145:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):699:722 -> a
-    146:155:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):721:730 -> a
-    156:206:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):729:779 -> a
-    207:214:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.updateIndex(int):89:96 -> a
-    207:214:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):779 -> a
-    215:215:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):780:780 -> a
-    216:217:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):107:108 -> a
-    216:217:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):780 -> a
-    218:224:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):107:113 -> a
-    218:224:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):780 -> a
-    225:234:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):112:121 -> a
-    225:234:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):780 -> a
-    235:235:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):120:120 -> a
-    235:235:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):780 -> a
-    236:240:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):784:788 -> a
-    241:242:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):89:90 -> a
-    241:242:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):788 -> a
-    243:243:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):89:89 -> a
-    243:243:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):788 -> a
-    244:257:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):792:805 -> a
+    java.util.List tryCatchBlocks -> r
+    int invisibleAnnotableParameterCount -> o
+    int visibleAnnotableParameterCount -> m
+    java.util.List visibleLocalVariableAnnotations -> v
+    java.util.List localVariables -> u
+    com.android.tools.r8.org.objectweb.asm.tree.InsnList instructions -> q
+    java.util.List invisibleLocalVariableAnnotations -> w
+    boolean visited -> x
+    int access -> c
+    java.util.List[] visibleParameterAnnotations -> n
+    java.lang.Object annotationDefault -> l
+    java.util.List[] invisibleParameterAnnotations -> p
+    java.util.List parameters -> f
+    java.util.List invisibleTypeAnnotations -> j
+    java.util.List visibleTypeAnnotations -> i
+    java.util.List invisibleAnnotations -> h
+    int maxLocals -> t
+    java.util.List visibleAnnotations -> g
+    int maxStack -> s
+    java.lang.String desc -> e
+    java.lang.String name -> d
+    java.util.List attrs -> k
+    1:1:void com.android.tools.r8.org.objectweb.asm.MethodVisitor.<init>(int):70:70 -> <init>
+    1:1:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):222 -> <init>
+    2:11:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):223:232 -> <init>
+    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():250:250 -> a
+    2:12:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):262:272 -> a
+    13:15:void visitAnnotableParameterCount(int,boolean):298:300 -> a
+    16:34:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):308:326 -> a
+    35:38:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):333:336 -> a
+    39:45:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):351:357 -> a
+    46:46:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):351:351 -> a
+    47:47:void visitInsn(int):362:362 -> a
+    48:48:void visitTypeInsn(int,java.lang.String):377:377 -> a
+    49:49:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):383:383 -> a
+    50:54:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):405:409 -> a
+    55:55:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):418:418 -> a
+    56:56:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):425:425 -> a
+    57:57:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):430:430 -> a
+    58:58:void visitLdcInsn(java.lang.Object):435:435 -> a
+    59:59:void visitIincInsn(int,int):440:440 -> a
+    60:60:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):446:446 -> a
+    61:61:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):451:451 -> a
+    62:62:void visitMultiANewArrayInsn(java.lang.String,int):456:456 -> a
+    63:63:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):463:463 -> a
+    64:64:int com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.getOpcode():137:137 -> a
+    64:64:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):464 -> a
+    65:78:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):465:478 -> a
+    79:80: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):486:487 -> a
+    81: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):486:486 -> a
+    82:84: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):517:519 -> a
+    85: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):517:517 -> a
+    86: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):531:543 -> a
+    99:101:com.android.tools.r8.org.objectweb.asm.tree.LabelNode[] getLabelNodes(com.android.tools.r8.org.objectweb.asm.Label[]):580:582 -> a
+    102:108:java.lang.Object[] getLabelNodes(java.lang.Object[]):588:594 -> a
+    109:111:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):699:701 -> a
+    112:112:void com.android.tools.r8.org.objectweb.asm.tree.ParameterNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):67:67 -> a
+    112:112:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):701 -> a
+    113:136:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):705:728 -> a
+    137:146:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):727:736 -> a
+    147:197:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):735:785 -> a
+    198:205:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.updateIndex(int):87:94 -> a
+    198:205:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):785 -> a
+    206:206:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):786:786 -> a
+    207:208:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):105:106 -> a
+    207:208:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):786 -> a
+    209:215:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):105:111 -> a
+    209:215:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):786 -> a
+    216:225:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):110:119 -> a
+    216:225:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):786 -> a
+    226:226:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):118:118 -> a
+    226:226:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):786 -> a
+    227:231:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):790:794 -> a
+    232:233:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):89:90 -> a
+    232:233:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):794 -> a
+    234:234:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):89:89 -> a
+    234:234:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):794 -> a
+    235:248:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):798:811 -> a
     void visitCode() -> b
-    1:4:void visitParameter(java.lang.String,int):239:242 -> b
-    5:5:void visitIntInsn(int,int):365:365 -> b
-    6:17:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):485:496 -> b
-    18:18:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):545:545 -> b
-    19:22:com.android.tools.r8.org.objectweb.asm.tree.LabelNode getLabelNode(com.android.tools.r8.org.objectweb.asm.Label):568:571 -> b
+    1:4:void visitParameter(java.lang.String,int):241:244 -> b
+    5:5:void visitIntInsn(int,int):367:367 -> b
+    6:10:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):391:395 -> b
+    11:11:void com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode.<init>(int,java.lang.String,java.lang.String,java.lang.String):73:73 -> b
+    11:11:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):395 -> b
+    12:12:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):395:395 -> b
+    13:24:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):493:504 -> b
+    25:25:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):550:550 -> b
+    26:29:com.android.tools.r8.org.objectweb.asm.tree.LabelNode getLabelNode(com.android.tools.r8.org.objectweb.asm.Label):573:576 -> b
     void visitEnd() -> c
-    1:11:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):278:288 -> c
-    12:13:void visitMaxs(int,int):550:551 -> c
-    1:1:void visitVarInsn(int,int):370:370 -> d
+    1:11:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):280:290 -> c
+    12:13:void visitMaxs(int,int):555:556 -> c
+    1:1:void visitVarInsn(int,int):372:372 -> d
 com.android.tools.r8.org.objectweb.asm.tree.MethodNode$1 -> a.a.a.a.m.a.a.c.s:
     com.android.tools.r8.org.objectweb.asm.tree.MethodNode this$0 -> a
-    1:1:void <init>(com.android.tools.r8.org.objectweb.asm.tree.MethodNode,int):249:249 -> <init>
-    1:2:boolean add(java.lang.Object):252:253 -> add
+    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.MultiANewArrayInsnNode -> a.a.a.a.m.a.a.c.u:
     java.lang.String desc -> g
     int dims -> h
@@ -28405,7 +28109,7 @@
 com.android.tools.r8.org.objectweb.asm.tree.ParameterNode -> a.a.a.a.m.a.a.c.v:
     java.lang.String name -> a
     int access -> b
-    1:3:void <init>(java.lang.String,int):55:57 -> <init>
+    1:3:void <init>(java.lang.String,int):56:58 -> <init>
 com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode -> a.a.a.a.m.a.a.c.w:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> i
     int max -> h
@@ -28425,12 +28129,12 @@
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode handler -> c
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode end -> b
     java.lang.String type -> d
-    1:5:void <init>(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.lang.String):73:77 -> <init>
+    1:5:void <init>(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.lang.String):71:75 -> <init>
 com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> a.a.a.a.m.a.a.c.y:
     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):81:83 -> <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 -> a.a.a.a.m.a.a.c.z:
     java.lang.String desc -> g
     1:2:void <init>(int,java.lang.String):56:57 -> <init>
@@ -28453,8 +28157,8 @@
     java.lang.StringBuilder stringBuilder -> b
     java.lang.String[] OPCODES -> d
     int api -> a
-    1:224:void <clinit>():53:276 -> <clinit>
-    1:4:void <init>(int):323:326 -> <init>
+    1:224:void <clinit>():52:275 -> <clinit>
+    1:5:void <init>(int):330:334 -> <init>
     void visit(java.lang.String,java.lang.Object) -> a
     com.android.tools.r8.org.objectweb.asm.util.Printer visitAnnotation(java.lang.String,java.lang.String) -> a
     com.android.tools.r8.org.objectweb.asm.util.Printer visitArray(java.lang.String) -> a
@@ -28467,11 +28171,12 @@
     void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean) -> a
     com.android.tools.r8.org.objectweb.asm.util.Printer visitParameterAnnotation(int,java.lang.String,boolean) -> a
     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:1:java.util.List getText():1120:1120 -> a
-    2:2:void print(java.io.PrintWriter):1129:1129 -> a
-    3:7:void printList(java.io.PrintWriter,java.util.List):1140:1144 -> a
-    8:30:void appendString(java.lang.StringBuilder,java.lang.String):1156:1178 -> a
-    31:44:void appendString(java.lang.StringBuilder,java.lang.String):1168:1181 -> a
+    1:6:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):895:900 -> a
+    7:7:java.util.List getText():1147:1147 -> a
+    8:8:void print(java.io.PrintWriter):1156:1156 -> a
+    9:13:void printList(java.io.PrintWriter,java.util.List):1167:1171 -> a
+    14:36:void appendString(java.lang.StringBuilder,java.lang.String):1197:1219 -> a
+    37:50:void appendString(java.lang.StringBuilder,java.lang.String):1209:1222 -> a
     com.android.tools.r8.org.objectweb.asm.util.Printer visitAnnotationDefault() -> b
     void visitAnnotationEnd() -> c
     void visitCode() -> d
@@ -28484,139 +28189,153 @@
     java.lang.String tab3 -> h
     int access -> k
     java.util.Map labelNames -> j
-    java.util.List FRAME_TYPES -> m
-    1:2:void <clinit>():104:105 -> <clinit>
-    1:3:void <init>():135:137 -> <init>
-    4:4:void <init>(int):148:148 -> <init>
-    5:14:void <init>(int):108:117 -> <init>
-    1:3:void visit(java.lang.String,java.lang.Object):542:544 -> a
-    4:4:void visitString(java.lang.String):652:652 -> a
-    4:4:void visit(java.lang.String,java.lang.Object):544 -> a
-    5:6:void visit(java.lang.String,java.lang.Object):545:546 -> a
-    7:7:void visitType(com.android.tools.r8.org.objectweb.asm.Type):656:656 -> a
-    7:7:void visit(java.lang.String,java.lang.Object):546 -> a
-    8:9:void visit(java.lang.String,java.lang.Object):547:548 -> a
-    10:10:void visitByte(byte):644:644 -> a
-    10:10:void visit(java.lang.String,java.lang.Object):548 -> a
-    11:12:void visit(java.lang.String,java.lang.Object):549:550 -> a
-    13:13:void visitBoolean(boolean):648:648 -> a
-    13:13:void visit(java.lang.String,java.lang.Object):550 -> a
-    14:15:void visit(java.lang.String,java.lang.Object):551:552 -> a
-    16:16:void visitShort(short):640:640 -> a
-    16:16:void visit(java.lang.String,java.lang.Object):552 -> a
-    17:18:void visit(java.lang.String,java.lang.Object):553:554 -> a
-    19:19:void visitChar(char):636:636 -> a
-    19:19:void visit(java.lang.String,java.lang.Object):554 -> a
-    20:21:void visit(java.lang.String,java.lang.Object):555:556 -> a
-    22:22:void visitInt(int):620:620 -> a
-    22:22:void visit(java.lang.String,java.lang.Object):556 -> a
-    23:24:void visit(java.lang.String,java.lang.Object):557:558 -> a
-    25:25:void visitFloat(float):628:628 -> a
-    25:25:void visit(java.lang.String,java.lang.Object):558 -> a
-    26:27:void visit(java.lang.String,java.lang.Object):559:560 -> a
-    28:28:void visitLong(long):624:624 -> a
-    28:28:void visit(java.lang.String,java.lang.Object):560 -> a
-    29:30:void visit(java.lang.String,java.lang.Object):561:562 -> a
-    31:31:void visitDouble(double):632:632 -> a
-    31:31:void visit(java.lang.String,java.lang.Object):562 -> a
-    32:38:void visit(java.lang.String,java.lang.Object):563:569 -> a
-    39:39:void visitByte(byte):644:644 -> a
-    39:39:void visit(java.lang.String,java.lang.Object):569 -> a
-    40:44:void visit(java.lang.String,java.lang.Object):571:575 -> a
-    45:45:void visitBoolean(boolean):648:648 -> a
-    45:45:void visit(java.lang.String,java.lang.Object):575 -> a
-    46:50:void visit(java.lang.String,java.lang.Object):577:581 -> a
-    51:51:void visitShort(short):640:640 -> a
-    51:51:void visit(java.lang.String,java.lang.Object):581 -> a
-    52:56:void visit(java.lang.String,java.lang.Object):583:587 -> a
-    57:57:void visitChar(char):636:636 -> a
-    57:57:void visit(java.lang.String,java.lang.Object):587 -> a
-    58:62:void visit(java.lang.String,java.lang.Object):589:593 -> a
-    63:63:void visitInt(int):620:620 -> a
-    63:63:void visit(java.lang.String,java.lang.Object):593 -> a
-    64:68:void visit(java.lang.String,java.lang.Object):595:599 -> a
-    69:69:void visitLong(long):624:624 -> a
-    69:69:void visit(java.lang.String,java.lang.Object):599 -> a
-    70:74:void visit(java.lang.String,java.lang.Object):601:605 -> a
-    75:75:void visitFloat(float):628:628 -> a
-    75:75:void visit(java.lang.String,java.lang.Object):605 -> a
-    76:80:void visit(java.lang.String,java.lang.Object):607:611 -> a
-    81:81:void visitDouble(double):632:632 -> a
-    81:81:void visit(java.lang.String,java.lang.Object):611 -> a
-    82:84:void visit(java.lang.String,java.lang.Object):614:616 -> a
-    85:88:void visitEnum(java.lang.String,java.lang.String,java.lang.String):661:664 -> a
-    89:94:com.android.tools.r8.org.objectweb.asm.util.Textifier visitAnnotation(java.lang.String,java.lang.String):669:674 -> a
-    89:94:com.android.tools.r8.org.objectweb.asm.util.Printer visitAnnotation(java.lang.String,java.lang.String):51 -> a
-    95:98:com.android.tools.r8.org.objectweb.asm.util.Textifier visitArray(java.lang.String):679:682 -> a
-    95:98:com.android.tools.r8.org.objectweb.asm.util.Printer visitArray(java.lang.String):51 -> a
-    99:110:com.android.tools.r8.org.objectweb.asm.util.Textifier visitParameterAnnotation(int,java.lang.String,boolean):766:777 -> a
-    99:110:com.android.tools.r8.org.objectweb.asm.util.Printer visitParameterAnnotation(int,java.lang.String,boolean):51 -> a
-    111:139:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):797:825 -> a
-    140:141:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):821:822 -> a
-    142:142:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):818:818 -> a
-    143:143:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):815:815 -> a
-    144:146:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):810:812 -> a
-    147:172:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):803:828 -> a
-    173:182:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):885:894 -> a
-    183:204:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):903:924 -> a
-    205:205:void visitType(com.android.tools.r8.org.objectweb.asm.Type):656:656 -> a
-    205:205:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):926 -> a
-    206:217:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):928:939 -> a
-    218:229:com.android.tools.r8.org.objectweb.asm.util.Printer visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1053:1064 -> a
-    230:242: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):1075:1087 -> a
-    243:255:void appendJavaDeclaration(java.lang.String,java.lang.String):1307:1319 -> a
-    243:255: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):1088 -> a
-    256:256: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):1090:1090 -> a
-    257:275:com.android.tools.r8.org.objectweb.asm.util.Printer 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):1102:1120 -> a
-    276:281:com.android.tools.r8.org.objectweb.asm.util.Textifier visitAnnotation(java.lang.String,boolean):1161:1166 -> a
-    276:281:com.android.tools.r8.org.objectweb.asm.util.Textifier visitMethodAnnotation(java.lang.String,boolean):744 -> a
-    276:281:com.android.tools.r8.org.objectweb.asm.util.Printer visitMethodAnnotation(java.lang.String,boolean):51 -> a
-    282:282:void appendDescriptor(int,java.lang.String):1296:1296 -> a
-    283:283:void appendDescriptor(int,java.lang.String):1293:1293 -> a
-    284:292:void appendLabel(com.android.tools.r8.org.objectweb.asm.Label):1329:1337 -> a
-    293:330:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1346:1383 -> a
-    331:347:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1363:1379 -> a
-    348:356:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1367:1375 -> a
-    357:357:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1360:1360 -> a
-    358:358:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1357:1357 -> a
-    359:359:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1354:1354 -> a
-    360:407:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1351:1398 -> a
-    408:497:void appendTypeReference(int):1420:1509 -> a
-    498:500:void appendTypeReference(int):1504:1506 -> a
-    501:503:void appendTypeReference(int):1499:1501 -> a
-    504:506:void appendTypeReference(int):1494:1496 -> a
-    507:509:void appendTypeReference(int):1489:1491 -> a
-    510:510:void appendTypeReference(int):1486:1486 -> a
-    511:511:void appendTypeReference(int):1483:1483 -> a
-    512:512:void appendTypeReference(int):1480:1480 -> a
-    513:513:void appendTypeReference(int):1477:1477 -> a
-    514:514:void appendTypeReference(int):1474:1474 -> a
-    515:515:void appendTypeReference(int):1471:1471 -> a
-    516:516:void appendTypeReference(int):1468:1468 -> a
-    517:517:void appendTypeReference(int):1465:1465 -> a
-    518:518:void appendTypeReference(int):1462:1462 -> a
-    519:521:void appendTypeReference(int):1457:1459 -> a
-    522:522:void appendTypeReference(int):1454:1454 -> a
-    523:523:void appendTypeReference(int):1451:1451 -> a
-    524:524:void appendTypeReference(int):1448:1448 -> a
-    525:529:void appendTypeReference(int):1441:1445 -> a
-    530:534:void appendTypeReference(int):1434:1438 -> a
-    535:535:void appendTypeReference(int):1431:1431 -> a
-    536:538:void appendTypeReference(int):1426:1428 -> a
-    539:539:void appendTypeReference(int):1423:1423 -> a
-    540:552:void appendFrameTypes(int,java.lang.Object[]):1523:1535 -> a
-    1:2:com.android.tools.r8.org.objectweb.asm.util.Textifier visitAnnotationDefault():738:739 -> b
-    1:2:com.android.tools.r8.org.objectweb.asm.util.Printer visitAnnotationDefault():51 -> b
-    3:14:com.android.tools.r8.org.objectweb.asm.util.Textifier visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1182:1193 -> b
-    15:15:void maybeAppendComma(int):1410:1410 -> b
-    16:16:com.android.tools.r8.org.objectweb.asm.util.Textifier createTextifier():1561:1561 -> b
-    16:16:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1547 -> b
-    17:17:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1548:1548 -> b
-    18:18:java.util.List com.android.tools.r8.org.objectweb.asm.util.Printer.getText():1120:1120 -> b
-    18:18:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1548 -> b
-    19:21:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1548:1550 -> b
+    1:1:void <init>(int):125:125 -> <init>
+    1:1:void <init>():111 -> <init>
+    2:11:void <init>(int):84:93 -> <init>
+    2:11:void <init>():111 -> <init>
+    12:13:void <init>():112:113 -> <init>
+    1:3:void visit(java.lang.String,java.lang.Object):515:517 -> a
+    4:4:void visitString(java.lang.String):625:625 -> a
+    4:4:void visit(java.lang.String,java.lang.Object):517 -> a
+    5:6:void visit(java.lang.String,java.lang.Object):518:519 -> a
+    7:7:void visitType(com.android.tools.r8.org.objectweb.asm.Type):629:629 -> a
+    7:7:void visit(java.lang.String,java.lang.Object):519 -> a
+    8:9:void visit(java.lang.String,java.lang.Object):520:521 -> a
+    10:10:void visitByte(byte):617:617 -> a
+    10:10:void visit(java.lang.String,java.lang.Object):521 -> a
+    11:12:void visit(java.lang.String,java.lang.Object):522:523 -> a
+    13:13:void visitBoolean(boolean):621:621 -> a
+    13:13:void visit(java.lang.String,java.lang.Object):523 -> a
+    14:15:void visit(java.lang.String,java.lang.Object):524:525 -> a
+    16:16:void visitShort(short):613:613 -> a
+    16:16:void visit(java.lang.String,java.lang.Object):525 -> a
+    17:18:void visit(java.lang.String,java.lang.Object):526:527 -> a
+    19:19:void visitChar(char):609:609 -> a
+    19:19:void visit(java.lang.String,java.lang.Object):527 -> a
+    20:21:void visit(java.lang.String,java.lang.Object):528:529 -> a
+    22:22:void visitInt(int):593:593 -> a
+    22:22:void visit(java.lang.String,java.lang.Object):529 -> a
+    23:24:void visit(java.lang.String,java.lang.Object):530:531 -> a
+    25:25:void visitFloat(float):601:601 -> a
+    25:25:void visit(java.lang.String,java.lang.Object):531 -> a
+    26:27:void visit(java.lang.String,java.lang.Object):532:533 -> a
+    28:28:void visitLong(long):597:597 -> a
+    28:28:void visit(java.lang.String,java.lang.Object):533 -> a
+    29:30:void visit(java.lang.String,java.lang.Object):534:535 -> a
+    31:31:void visitDouble(double):605:605 -> a
+    31:31:void visit(java.lang.String,java.lang.Object):535 -> a
+    32:38:void visit(java.lang.String,java.lang.Object):536:542 -> a
+    39:39:void visitByte(byte):617:617 -> a
+    39:39:void visit(java.lang.String,java.lang.Object):542 -> a
+    40:44:void visit(java.lang.String,java.lang.Object):544:548 -> a
+    45:45:void visitBoolean(boolean):621:621 -> a
+    45:45:void visit(java.lang.String,java.lang.Object):548 -> a
+    46:50:void visit(java.lang.String,java.lang.Object):550:554 -> a
+    51:51:void visitShort(short):613:613 -> a
+    51:51:void visit(java.lang.String,java.lang.Object):554 -> a
+    52:56:void visit(java.lang.String,java.lang.Object):556:560 -> a
+    57:57:void visitChar(char):609:609 -> a
+    57:57:void visit(java.lang.String,java.lang.Object):560 -> a
+    58:62:void visit(java.lang.String,java.lang.Object):562:566 -> a
+    63:63:void visitInt(int):593:593 -> a
+    63:63:void visit(java.lang.String,java.lang.Object):566 -> a
+    64:68:void visit(java.lang.String,java.lang.Object):568:572 -> a
+    69:69:void visitLong(long):597:597 -> a
+    69:69:void visit(java.lang.String,java.lang.Object):572 -> a
+    70:74:void visit(java.lang.String,java.lang.Object):574:578 -> a
+    75:75:void visitFloat(float):601:601 -> a
+    75:75:void visit(java.lang.String,java.lang.Object):578 -> a
+    76:80:void visit(java.lang.String,java.lang.Object):580:584 -> a
+    81:81:void visitDouble(double):605:605 -> a
+    81:81:void visit(java.lang.String,java.lang.Object):584 -> a
+    82:84:void visit(java.lang.String,java.lang.Object):587:589 -> a
+    85:88:void visitEnum(java.lang.String,java.lang.String,java.lang.String):634:637 -> a
+    89:94:com.android.tools.r8.org.objectweb.asm.util.Textifier visitAnnotation(java.lang.String,java.lang.String):642:647 -> a
+    89:94:com.android.tools.r8.org.objectweb.asm.util.Printer visitAnnotation(java.lang.String,java.lang.String):47 -> a
+    95:98:com.android.tools.r8.org.objectweb.asm.util.Textifier visitArray(java.lang.String):652:655 -> a
+    95:98:com.android.tools.r8.org.objectweb.asm.util.Printer visitArray(java.lang.String):47 -> a
+    99:110:com.android.tools.r8.org.objectweb.asm.util.Textifier visitParameterAnnotation(int,java.lang.String,boolean):739:750 -> a
+    99:110:com.android.tools.r8.org.objectweb.asm.util.Printer visitParameterAnnotation(int,java.lang.String,boolean):47 -> a
+    111:139:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):782:810 -> a
+    140:141:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):806:807 -> a
+    142:142:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):803:803 -> a
+    143:143:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):800:800 -> a
+    144:146:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):795:797 -> a
+    147:172:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):788:813 -> a
+    173:177:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):868:872 -> a
+    178:178:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):882:882 -> a
+    179:179:void com.android.tools.r8.org.objectweb.asm.util.Printer.visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):924:924 -> a
+    179:179:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):883 -> a
+    180:185:void com.android.tools.r8.org.objectweb.asm.util.Printer.visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):922:927 -> a
+    180:185:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):883 -> a
+    186:186:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):886:886 -> a
+    187:209:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):913:935 -> a
+    210:210:void visitType(com.android.tools.r8.org.objectweb.asm.Type):629:629 -> a
+    210:210:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):937 -> a
+    211:222:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):939:950 -> a
+    223:234:com.android.tools.r8.org.objectweb.asm.util.Printer visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1064:1075 -> a
+    235:247: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):1086:1098 -> a
+    248:259:void appendJavaDeclaration(java.lang.String):1315:1326 -> a
+    248:259: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):1099 -> a
+    260:260: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):1101:1101 -> a
+    261:279:com.android.tools.r8.org.objectweb.asm.util.Printer 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):1113:1131 -> a
+    280:285:com.android.tools.r8.org.objectweb.asm.util.Textifier visitAnnotation(java.lang.String,boolean):1171:1176 -> a
+    280:285:com.android.tools.r8.org.objectweb.asm.util.Textifier visitMethodAnnotation(java.lang.String,boolean):717 -> a
+    280:285:com.android.tools.r8.org.objectweb.asm.util.Printer visitMethodAnnotation(java.lang.String,boolean):47 -> a
+    286:286:void appendDescriptor(int,java.lang.String):1305:1305 -> a
+    287:287:void appendDescriptor(int,java.lang.String):1302:1302 -> a
+    288:296:void appendLabel(com.android.tools.r8.org.objectweb.asm.Label):1336:1344 -> a
+    297:334:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1353:1390 -> a
+    335:351:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1370:1386 -> a
+    352:360:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1374:1382 -> a
+    361:361:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1367:1367 -> a
+    362:362:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1364:1364 -> a
+    363:363:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1361:1361 -> a
+    364:411:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1358:1405 -> a
+    412:501:void appendTypeReference(int):1427:1516 -> a
+    502:504:void appendTypeReference(int):1511:1513 -> a
+    505:507:void appendTypeReference(int):1506:1508 -> a
+    508:510:void appendTypeReference(int):1501:1503 -> a
+    511:513:void appendTypeReference(int):1496:1498 -> a
+    514:514:void appendTypeReference(int):1493:1493 -> a
+    515:515:void appendTypeReference(int):1490:1490 -> a
+    516:516:void appendTypeReference(int):1487:1487 -> a
+    517:517:void appendTypeReference(int):1484:1484 -> a
+    518:518:void appendTypeReference(int):1481:1481 -> a
+    519:519:void appendTypeReference(int):1478:1478 -> a
+    520:520:void appendTypeReference(int):1475:1475 -> a
+    521:521:void appendTypeReference(int):1472:1472 -> a
+    522:522:void appendTypeReference(int):1469:1469 -> a
+    523:525:void appendTypeReference(int):1464:1466 -> a
+    526:526:void appendTypeReference(int):1461:1461 -> a
+    527:527:void appendTypeReference(int):1458:1458 -> a
+    528:528:void appendTypeReference(int):1455:1455 -> a
+    529:533:void appendTypeReference(int):1448:1452 -> a
+    534:538:void appendTypeReference(int):1441:1445 -> a
+    539:539:void appendTypeReference(int):1438:1438 -> a
+    540:542:void appendTypeReference(int):1433:1435 -> a
+    543:543:void appendTypeReference(int):1430:1430 -> a
+    544:577:void appendFrameTypes(int,java.lang.Object[]):1530:1563 -> a
+    578:578:void appendFrameTypes(int,java.lang.Object[]):1560:1560 -> a
+    579:579:void appendFrameTypes(int,java.lang.Object[]):1557:1557 -> a
+    580:580:void appendFrameTypes(int,java.lang.Object[]):1554:1554 -> a
+    581:581:void appendFrameTypes(int,java.lang.Object[]):1551:1551 -> a
+    582:582:void appendFrameTypes(int,java.lang.Object[]):1548:1548 -> a
+    583:583:void appendFrameTypes(int,java.lang.Object[]):1545:1545 -> a
+    584:608:void appendFrameTypes(int,java.lang.Object[]):1542:1566 -> a
+    1:2:com.android.tools.r8.org.objectweb.asm.util.Textifier visitAnnotationDefault():711:712 -> b
+    1:2:com.android.tools.r8.org.objectweb.asm.util.Printer visitAnnotationDefault():47 -> b
+    3:12:void doVisitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):895:904 -> b
+    13:24:com.android.tools.r8.org.objectweb.asm.util.Textifier visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1192:1203 -> b
+    25:25:void maybeAppendComma(int):1417:1417 -> b
+    26:26:com.android.tools.r8.org.objectweb.asm.util.Textifier createTextifier():1592:1592 -> b
+    26:26:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1578 -> b
+    27:27:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1579:1579 -> b
+    28:28:java.util.List com.android.tools.r8.org.objectweb.asm.util.Printer.getText():1147:1147 -> b
+    28:28:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1579 -> b
+    29:31:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1579:1581 -> b
     void visitAnnotationEnd() -> c
-    1:4:void visitAnnotationValue(java.lang.String):691:694 -> c
+    1:4:void visitAnnotationValue(java.lang.String):664:667 -> c
     void visitCode() -> d
     void visitMethodEnd() -> e
 com.android.tools.r8.org.objectweb.asm.util.TraceAnnotationVisitor -> a.a.a.a.m.a.a.d.c:
@@ -28628,110 +28347,107 @@
     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 -> a.a.a.a.m.a.a.d.d:
-    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:2:void <init>(com.android.tools.r8.org.objectweb.asm.util.Printer):55 -> <init>
-    1:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):77:79 -> a
-    4:4:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):92:92 -> a
-    5:18:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):1202:1215 -> a
-    5:18:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMethodAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):782 -> a
-    5:18:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):92 -> a
-    19:19:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):93:93 -> a
-    20:21:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():98:99 -> a
-    22:22:void visitAnnotableParameterCount(int,boolean):104:104 -> a
-    23:27:com.android.tools.r8.org.objectweb.asm.util.Textifier com.android.tools.r8.org.objectweb.asm.util.Textifier.visitAnnotableParameterCount(int,boolean):755:759 -> a
-    23:27:com.android.tools.r8.org.objectweb.asm.util.Printer com.android.tools.r8.org.objectweb.asm.util.Textifier.visitAnnotableParameterCount(int,boolean):51 -> a
-    23:27:void visitAnnotableParameterCount(int,boolean):104 -> a
-    28:28:void visitAnnotableParameterCount(int,boolean):105:105 -> a
-    29:31:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):111:113 -> a
-    32:33:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):129:130 -> a
-    34:34:void visitInsn(int):135:135 -> a
-    35:37:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitInsn(int):833:835 -> a
-    35:37:void visitInsn(int):135 -> a
-    38:38:void visitInsn(int):136:136 -> a
-    39:39:void visitTypeInsn(int,java.lang.String):153:153 -> a
-    40:44:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitTypeInsn(int,java.lang.String):859:863 -> a
-    40:44:void visitTypeInsn(int,java.lang.String):153 -> a
-    45:45:void visitTypeInsn(int,java.lang.String):154:154 -> a
-    46:46:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):160:160 -> a
-    47:53:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):869:875 -> a
-    47:53:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):160 -> a
-    54:54:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):161:161 -> a
-    55:63:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):173:181 -> a
-    64:64:void com.android.tools.r8.org.objectweb.asm.util.Printer.visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):880:880 -> a
-    64:64:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):181 -> a
-    65:76:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):175:186 -> a
-    77:78:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):196:197 -> a
-    79:79:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):202:202 -> a
-    80:84:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):944:948 -> a
-    80:84:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):202 -> a
-    85:85:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):203:203 -> a
-    86:86:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):208:208 -> a
-    87:91:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLabel(com.android.tools.r8.org.objectweb.asm.Label):953:957 -> a
-    87:91:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):208 -> a
-    92:92:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):209:209 -> a
-    93:93:void visitLdcInsn(java.lang.Object):214:214 -> a
-    94:104:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLdcInsn(java.lang.Object):962:972 -> a
-    94:104:void visitLdcInsn(java.lang.Object):214 -> a
-    105:105:void visitLdcInsn(java.lang.Object):215:215 -> a
-    106:106:void visitIincInsn(int,int):220:220 -> a
-    107:115:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitIincInsn(int,int):977:985 -> a
-    107:115:void visitIincInsn(int,int):220 -> a
-    116:116:void visitIincInsn(int,int):221:221 -> a
-    117:117:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):227:227 -> a
-    118:128: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[]):991:1001 -> a
-    118:128:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):227 -> a
-    129:129:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):228:228 -> a
-    130:130:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):233:233 -> a
-    131:141: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[]):1006:1016 -> a
-    131:141:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):233 -> a
-    142:142:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):234:234 -> a
-    143:143:void visitMultiANewArrayInsn(java.lang.String,int):239:239 -> a
-    144:148:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMultiANewArrayInsn(java.lang.String,int):1021:1025 -> a
-    144:148:void visitMultiANewArrayInsn(java.lang.String,int):239 -> a
-    149:149:void visitMultiANewArrayInsn(java.lang.String,int):240:240 -> a
-    150:150: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
-    151:151: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):1031:1031 -> a
-    151:151:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):246 -> a
-    152:153: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
-    154:154: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
-    155:165: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):1037:1047 -> a
-    155:165: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
-    166:166: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
-    167:168: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:275 -> a
-    169:172: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:3:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitParameter(java.lang.String,int):729:730 -> b
-    2:3:void visitParameter(java.lang.String,int):71 -> b
-    4:40:void com.android.tools.r8.org.objectweb.asm.util.Textifier.appendAccess(int):1229:1265 -> b
-    4:40:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitParameter(java.lang.String,int):731 -> b
-    4:40:void visitParameter(java.lang.String,int):71 -> b
-    41:42:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitParameter(java.lang.String,int):732:733 -> b
-    41:42:void visitParameter(java.lang.String,int):71 -> b
-    43:43:void visitParameter(java.lang.String,int):72:72 -> b
-    44:45:void visitCode():118:119 -> b
-    46:46:void visitIntInsn(int,int):141:141 -> b
-    47:54:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitIntInsn(int,int):840:847 -> b
-    47:54:void visitIntInsn(int,int):141 -> b
-    55:55:void visitIntInsn(int,int):142:142 -> b
-    56:58:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):261:263 -> b
-    59:59:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):297:297 -> b
-    60:64:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):1125:1129 -> b
-    60:64:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):297 -> b
-    65:65:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):298:298 -> b
-    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):85:85 -> c
-    2:2:com.android.tools.r8.org.objectweb.asm.util.Printer com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMethodTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):750:750 -> c
-    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
-    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 visitMaxs(int,int):303:303 -> c
-    6:12:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMaxs(int,int):1134:1140 -> c
-    6:12:void visitMaxs(int,int):303 -> c
-    13:13:void visitMaxs(int,int):304:304 -> c
-    14:15:void visitEnd():309:310 -> c
-    1:1:void visitVarInsn(int,int):147:147 -> d
-    2:4:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitVarInsn(int,int):852:854 -> d
-    2:4:void visitVarInsn(int,int):147 -> d
-    5:5:void visitVarInsn(int,int):148:148 -> d
+    com.android.tools.r8.org.objectweb.asm.util.Printer p -> c
+    1:2:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.util.Printer):64:65 -> <init>
+    1:2:void <init>(com.android.tools.r8.org.objectweb.asm.util.Printer):54 -> <init>
+    1:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):76:78 -> a
+    4:4:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):91:91 -> a
+    5:17:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMethodAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):755:767 -> a
+    5:17:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):91 -> a
+    18:18:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):92:92 -> a
+    19:20:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():97:98 -> a
+    21:21:void visitAnnotableParameterCount(int,boolean):103:103 -> a
+    22:26:com.android.tools.r8.org.objectweb.asm.util.Textifier com.android.tools.r8.org.objectweb.asm.util.Textifier.visitAnnotableParameterCount(int,boolean):728:732 -> a
+    22:26:com.android.tools.r8.org.objectweb.asm.util.Printer com.android.tools.r8.org.objectweb.asm.util.Textifier.visitAnnotableParameterCount(int,boolean):47 -> a
+    22:26:void visitAnnotableParameterCount(int,boolean):103 -> a
+    27:27:void visitAnnotableParameterCount(int,boolean):104:104 -> a
+    28:30:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):110:112 -> a
+    31:32:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):128:129 -> a
+    33:33:void visitInsn(int):134:134 -> a
+    34:36:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitInsn(int):818:820 -> a
+    34:36:void visitInsn(int):134 -> a
+    37:37:void visitInsn(int):135:135 -> a
+    38:38:void visitTypeInsn(int,java.lang.String):152:152 -> a
+    39:43:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitTypeInsn(int,java.lang.String):844:848 -> a
+    39:43:void visitTypeInsn(int,java.lang.String):152 -> a
+    44:44:void visitTypeInsn(int,java.lang.String):153:153 -> a
+    45:45:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):159:159 -> a
+    46:52:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):854:860 -> a
+    46:52:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):159 -> a
+    53:53:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):160:160 -> a
+    54:60:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):185:191 -> a
+    61:62:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):201:202 -> a
+    63:63:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):207:207 -> a
+    64:68:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):955:959 -> a
+    64:68:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):207 -> a
+    69:69:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):208:208 -> a
+    70:70:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):213:213 -> a
+    71:75:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLabel(com.android.tools.r8.org.objectweb.asm.Label):964:968 -> a
+    71:75:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):213 -> a
+    76:76:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):214:214 -> a
+    77:77:void visitLdcInsn(java.lang.Object):219:219 -> a
+    78:88:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLdcInsn(java.lang.Object):973:983 -> a
+    78:88:void visitLdcInsn(java.lang.Object):219 -> a
+    89:89:void visitLdcInsn(java.lang.Object):220:220 -> a
+    90:90:void visitIincInsn(int,int):225:225 -> a
+    91:99:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitIincInsn(int,int):988:996 -> a
+    91:99:void visitIincInsn(int,int):225 -> a
+    100:100:void visitIincInsn(int,int):226:226 -> a
+    101:101:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):232:232 -> a
+    102:112: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[]):1002:1012 -> a
+    102:112:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):232 -> a
+    113:113:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):233:233 -> a
+    114:114:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):238:238 -> a
+    115:125: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[]):1017:1027 -> a
+    115:125:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):238 -> a
+    126:126:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):239:239 -> a
+    127:127:void visitMultiANewArrayInsn(java.lang.String,int):244:244 -> a
+    128:132:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMultiANewArrayInsn(java.lang.String,int):1032:1036 -> a
+    128:132:void visitMultiANewArrayInsn(java.lang.String,int):244 -> a
+    133:133:void visitMultiANewArrayInsn(java.lang.String,int):245:245 -> a
+    134:134:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):251:251 -> a
+    135:135: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):1042:1042 -> a
+    135:135:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):251 -> a
+    136:137:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):252:253 -> a
+    138:138: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):259:259 -> a
+    139:149: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):1048:1058 -> a
+    139:149: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):259 -> a
+    150:150: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):260:260 -> a
+    151:152: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):279:280 -> a
+    153:156: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):292:295 -> a
+    1:1:void visitParameter(java.lang.String,int):70:70 -> b
+    2:3:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitParameter(java.lang.String,int):702:703 -> b
+    2:3:void visitParameter(java.lang.String,int):70 -> b
+    4:40:void com.android.tools.r8.org.objectweb.asm.util.Textifier.appendAccess(int):1238:1274 -> b
+    4:40:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitParameter(java.lang.String,int):704 -> b
+    4:40:void visitParameter(java.lang.String,int):70 -> b
+    41:42:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitParameter(java.lang.String,int):705:706 -> b
+    41:42:void visitParameter(java.lang.String,int):70 -> b
+    43:43:void visitParameter(java.lang.String,int):71:71 -> b
+    44:45:void visitCode():117:118 -> b
+    46:46:void visitIntInsn(int,int):140:140 -> b
+    47:54:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitIntInsn(int,int):825:832 -> b
+    47:54:void visitIntInsn(int,int):140 -> b
+    55:55:void visitIntInsn(int,int):141:141 -> b
+    56:62:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):168:174 -> b
+    63:65:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):266:268 -> b
+    66:66:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):302:302 -> b
+    67:71:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):1136:1140 -> b
+    67:71:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):302 -> b
+    72:72:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):303:303 -> b
+    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):84:84 -> c
+    2:2:com.android.tools.r8.org.objectweb.asm.util.Printer com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMethodTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):723:723 -> c
+    2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):84 -> c
+    3:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):85:86 -> c
+    5:5:void visitMaxs(int,int):308:308 -> c
+    6:12:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMaxs(int,int):1145:1151 -> c
+    6:12:void visitMaxs(int,int):308 -> c
+    13:13:void visitMaxs(int,int):309:309 -> c
+    14:15:void visitEnd():314:315 -> c
+    1:1:void visitVarInsn(int,int):146:146 -> d
+    2:4:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitVarInsn(int,int):837:839 -> d
+    2:4:void visitVarInsn(int,int):146 -> d
+    5:5:void visitVarInsn(int,int):147:147 -> d
 com.android.tools.r8.org.objectweb.asm.util.TraceSignatureVisitor -> a.a.a.a.m.a.a.d.e:
     int arrayStack -> j
     java.lang.String separator -> k
@@ -28740,39 +28456,41 @@
     boolean formalTypeParameterVisited -> e
     boolean interfaceBoundVisited -> f
     boolean parameterTypeVisited -> g
-    java.util.Map BASE_TYPES -> l
     boolean interfaceVisited -> h
     boolean isInterface -> a
     java.lang.StringBuilder exceptions -> d
     java.lang.StringBuilder returnType -> c
-    1:11:void <clinit>():52:62 -> <clinit>
-    1:1:void <init>(int):112:112 -> <init>
-    2:12:void <init>(int):104:114 -> <init>
-    13:13:void <init>(java.lang.StringBuilder):118:118 -> <init>
-    14:30:void <init>(java.lang.StringBuilder):104:120 -> <init>
-    1:6:void visitBaseType(char):203:208 -> a
-    7:7:void visitBaseType(char):205:205 -> a
-    8:9:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitArrayType():220:221 -> a
-    10:21:void visitClassType(java.lang.String):227:238 -> a
-    1:3:void visitFormalTypeParameter(java.lang.String):125:127 -> b
-    4:5:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitClassBound():132:133 -> b
-    6:19:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitTypeArgument(char):266:279 -> b
-    1:8:void visitInnerClassType(java.lang.String):243:250 -> c
-    9:13:void visitEnd():285:289 -> c
-    1:6:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitExceptionType():193:198 -> d
-    7:9:void visitTypeVariable(java.lang.String):213:215 -> d
-    1:7:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitInterface():155:161 -> e
-    1:3:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitInterfaceBound():139:141 -> f
-    1:8:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitParameterType():167:174 -> g
-    1:9:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitReturnType():180:188 -> h
-    1:3:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitSuperclass():147:149 -> i
-    1:7:void visitTypeArgument():255:261 -> j
-    1:1:java.lang.String getDeclaration():300:300 -> k
-    1:1:java.lang.String getExceptions():318:318 -> l
-    1:1:java.lang.String getReturnType():309:309 -> m
-    1:3:void endFormals():324:326 -> n
-    1:6:void endType():335:340 -> o
-    1:1:void startType():331:331 -> p
+    1:1:void <init>(int):93:93 -> <init>
+    2:12:void <init>(int):85:95 -> <init>
+    13:13:void <init>(java.lang.StringBuilder):99:99 -> <init>
+    14:30:void <init>(java.lang.StringBuilder):85:101 -> <init>
+    1:1:void visitBaseType(char):213:213 -> a
+    2:2:void visitBaseType(char):195:195 -> a
+    3:18:void visitBaseType(char):186:201 -> a
+    19:37:void visitBaseType(char):192:210 -> a
+    38:38:void visitBaseType(char):204:204 -> a
+    39:65:void visitBaseType(char):189:215 -> a
+    66:67:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitArrayType():227:228 -> a
+    68:79:void visitClassType(java.lang.String):234:245 -> a
+    1:3:void visitFormalTypeParameter(java.lang.String):106:108 -> b
+    4:5:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitClassBound():113:114 -> b
+    6:19:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitTypeArgument(char):273:286 -> b
+    1:8:void visitInnerClassType(java.lang.String):250:257 -> c
+    9:13:void visitEnd():292:296 -> c
+    1:6:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitExceptionType():174:179 -> d
+    7:9:void visitTypeVariable(java.lang.String):220:222 -> d
+    1:7:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitInterface():136:142 -> e
+    1:3:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitInterfaceBound():120:122 -> f
+    1:8:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitParameterType():148:155 -> g
+    1:9:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitReturnType():161:169 -> h
+    1:3:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitSuperclass():128:130 -> i
+    1:7:void visitTypeArgument():262:268 -> j
+    1:1:java.lang.String getDeclaration():303:303 -> k
+    1:1:java.lang.String getExceptions():317:317 -> l
+    1:1:java.lang.String getReturnType():310:310 -> m
+    1:3:void endFormals():323:325 -> n
+    1:6:void endType():334:339 -> o
+    1:1:void startType():330:330 -> p
 com.android.tools.r8.origin.ArchiveEntryOrigin -> a.a.a.a.n.a:
     java.lang.String entryName -> e
     1:2:void <init>(java.lang.String,com.android.tools.r8.origin.Origin):18:19 -> <init>
@@ -28788,11 +28506,11 @@
     3:5:void <init>(com.android.tools.r8.origin.Origin):71:73 -> <init>
     java.lang.String part() -> a
     1:10:int compareTo(com.android.tools.r8.origin.Origin):130:139 -> a
-    1:1:java.util.List parts():83:83 -> b
+    1:1:com.android.tools.r8.origin.Origin parent():79:79 -> b
+    1:1:java.util.List buildParts(int):87 -> b
+    2:3:java.util.List buildParts(int):87:88 -> b
+    4:4:java.util.List parts():83:83 -> b
     1:1:com.android.tools.r8.origin.Origin root():58:58 -> c
-    2:2:com.android.tools.r8.origin.Origin parent():79:79 -> c
-    2:2:java.util.List buildParts(int):87 -> c
-    3:4:java.util.List buildParts(int):87:88 -> c
     1:1:int compareTo(java.lang.Object):26:26 -> compareTo
     1:1:com.android.tools.r8.origin.Origin unknown():62:62 -> d
     1:6:boolean equals(java.lang.Object):115:120 -> equals
@@ -28805,12 +28523,12 @@
 com.android.tools.r8.origin.Origin$1 -> a.a.a.a.n.b:
     1:1:void <init>():30:30 -> <init>
     java.lang.String part() -> a
-    1:1:java.util.List buildParts(int):38:38 -> c
+    1:1:java.util.List buildParts(int):38:38 -> b
     1:1:int compareTo(java.lang.Object):30:30 -> compareTo
 com.android.tools.r8.origin.Origin$2 -> a.a.a.a.n.c:
     1:1:void <init>():43:43 -> <init>
     java.lang.String part() -> a
-    1:2:java.util.List buildParts(int):51:52 -> c
+    1:2:java.util.List buildParts(int):51:52 -> b
     1:1:int compareTo(java.lang.Object):43:43 -> compareTo
 com.android.tools.r8.origin.PathOrigin -> a.a.a.a.n.e:
     java.nio.file.Path path -> e
@@ -28823,35 +28541,35 @@
     1:2:void <init>(java.lang.String,java.lang.Class):13:14 -> <init>
     1:1:java.lang.String part():20:20 -> a
 com.android.tools.r8.position.MethodPosition -> a.a.a.a.o.a:
-    com.android.tools.r8.graph.DexMethod method -> b
+    com.android.tools.r8.graph.DexMethod method -> a
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):20:21 -> <init>
-    1:1:java.lang.String toString():48:48 -> a
-    1:1:java.lang.String getDescription():53 -> a
     1:2:boolean equals(java.lang.Object):63:64 -> equals
+    1:1:java.lang.String toString():48:48 -> getDescription
+    1:1:java.lang.String getDescription():53 -> getDescription
     1:1:int hashCode():58:58 -> hashCode
     1:1:java.lang.String toString():48:48 -> toString
 com.android.tools.r8.position.Position -> a.a.a.a.o.c:
     com.android.tools.r8.position.Position UNKNOWN -> a
     1:1:void <clinit>():19:19 -> <clinit>
-    java.lang.String getDescription() -> a
 com.android.tools.r8.position.Position$1 -> a.a.a.a.o.b:
     1:1:void <init>():19:19 -> <init>
-    java.lang.String getDescription() -> a
 com.android.tools.r8.position.TextPosition -> a.a.a.a.o.d:
-    boolean $assertionsDisabled -> e
-    long offset -> b
-    int column -> d
-    int line -> c
+    long offset -> a
+    int line -> b
+    int column -> c
+    boolean $assertionsDisabled -> d
     1:1:void <clinit>():12:12 -> <clinit>
     1:7:void <init>(long,int,int):27:33 -> <init>
-    1:1:java.lang.String getDescription():62:62 -> a
     1:3:boolean equals(java.lang.Object):75:77 -> equals
+    1:1:java.lang.String getDescription():62:62 -> getDescription
     1:1:int hashCode():67:67 -> hashCode
     1:1:java.lang.String toString():57:57 -> toString
-com.android.tools.r8.shaking.AppInfoWithLiveness -> a.a.a.a.p.a:
+com.android.tools.r8.shaking.Enqueuer -> a.a.a.a.p.b:
+    1:1:void <clinit>():113:113 -> <clinit>
+com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness -> a.a.a.a.p.a:
     java.util.Map mayHaveSideEffects -> g
-    1:1:void <clinit>():48:48 -> <clinit>
-com.android.tools.r8.shaking.FilteredClassPath -> a.a.a.a.p.b:
+    1:1:void <clinit>():1984:1984 -> <clinit>
+com.android.tools.r8.shaking.FilteredClassPath -> a.a.a.a.p.c:
     java.nio.file.Path path -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList pattern -> b
     1:1:void <init>(java.nio.file.Path):31:31 -> <init>
@@ -28869,20 +28587,19 @@
     1:1:boolean isUnfiltered():119:119 -> toString
     1:1:java.lang.String toString():124 -> toString
     2:16:java.lang.String toString():125:139 -> toString
-com.android.tools.r8.shaking.MainDexClasses -> a.a.a.a.p.c:
+com.android.tools.r8.shaking.MainDexClasses -> a.a.a.a.p.d:
     java.util.Set classes -> c
     boolean $assertionsDisabled -> e
     java.util.Set roots -> a
     java.util.Set dependencies -> b
     com.android.tools.r8.shaking.MainDexClasses NONE -> d
-    1:3:void <clinit>():18:20 -> <clinit>
-    1:5:void <init>(java.util.Set,java.util.Set):70:74 -> <init>
-    1:1:java.util.Set getClasses():91:91 -> a
-com.android.tools.r8.shaking.RootSetBuilder -> a.a.a.a.p.e:
-    1:1:void <clinit>():61:61 -> <clinit>
-com.android.tools.r8.shaking.RootSetBuilder$RootSet -> a.a.a.a.p.d:
-    java.util.Set noObfuscation -> a
-    1:1:void <clinit>():1029:1029 -> <clinit>
+    1:3:void <clinit>():19:21 -> <clinit>
+    1:5:void <init>(java.util.Set,java.util.Set):71:75 -> <init>
+    1:1:java.util.Set getClasses():92:92 -> a
+com.android.tools.r8.shaking.RootSetBuilder -> a.a.a.a.p.f:
+    1:1:void <clinit>():62:62 -> <clinit>
+com.android.tools.r8.shaking.RootSetBuilder$RootSet -> a.a.a.a.p.e:
+    1:1:void <clinit>():1025:1025 -> <clinit>
 com.android.tools.r8.utils.AbortException -> a.a.a.a.q.a:
     1:1:void <init>():12:12 -> <init>
     2:2:void <init>(java.lang.String):17:17 -> <init>
@@ -28924,37 +28641,37 @@
     30:61:void <clinit>():11:42 -> <clinit>
     1:2:void <init>(java.lang.String,int,int):46:47 -> <init>
     1:1:int getLevel():51:51 -> a
-    1:1:java.lang.String getName():55:55 -> b
-    1:1:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):143:143 -> c
-    2:2:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):141:141 -> c
-    3:3:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):139:139 -> c
-    4:4:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):137:137 -> c
-    5:5:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):135:135 -> c
-    6:6:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):133:133 -> c
-    7:7:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):131:131 -> c
-    8:8:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):129:129 -> c
-    9:9:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):127:127 -> c
-    10:10:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):125:125 -> c
-    11:11:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):123:123 -> c
-    12:12:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):121:121 -> c
-    13:13:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):119:119 -> c
-    14:14:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):117:117 -> c
-    15:15:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):115:115 -> c
-    16:16:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):113:113 -> c
-    17:17:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):111:111 -> c
-    18:18:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):109:109 -> c
-    19:19:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):107:107 -> c
-    20:20:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):105:105 -> c
-    21:21:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):103:103 -> c
-    22:22:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):101:101 -> c
-    23:23:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):99:99 -> c
-    24:24:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):97:97 -> c
-    25:25:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):95:95 -> c
-    26:26:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):93:93 -> c
-    27:27:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):91:91 -> c
-    28:28:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):89:89 -> c
-    29:29:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):87:87 -> c
-    30:30:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):85:85 -> c
+    1:1:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):143:143 -> b
+    2:2:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):141:141 -> b
+    3:3:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):139:139 -> b
+    4:4:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):137:137 -> b
+    5:5:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):135:135 -> b
+    6:6:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):133:133 -> b
+    7:7:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):131:131 -> b
+    8:8:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):129:129 -> b
+    9:9:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):127:127 -> b
+    10:10:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):125:125 -> b
+    11:11:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):123:123 -> b
+    12:12:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):121:121 -> b
+    13:13:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):119:119 -> b
+    14:14:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):117:117 -> b
+    15:15:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):115:115 -> b
+    16:16:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):113:113 -> b
+    17:17:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):111:111 -> b
+    18:18:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):109:109 -> b
+    19:19:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):107:107 -> b
+    20:20:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):105:105 -> b
+    21:21:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):103:103 -> b
+    22:22:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):101:101 -> b
+    23:23:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):99:99 -> b
+    24:24:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):97:97 -> b
+    25:25:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):95:95 -> b
+    26:26:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):93:93 -> b
+    27:27:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):91:91 -> b
+    28:28:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):89:89 -> b
+    29:29:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):87:87 -> b
+    30:30:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):85:85 -> b
+    1:1:java.lang.String getName():55:55 -> getName
 com.android.tools.r8.utils.AndroidApp -> a.a.a.a.q.h:
     java.util.List mainDexClasses -> f
     java.util.List mainDexListResources -> e
@@ -29037,8 +28754,8 @@
     java.util.List val$finalDataResources -> b
     java.util.List val$finalProgramResources -> a
     1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder,java.util.List,java.util.List):664:664 -> <init>
-    1:1:java.util.Collection getProgramResources():667:667 -> a
-    1:2:com.android.tools.r8.DataResourceProvider getDataResourceProvider():672:673 -> b
+    1:2:com.android.tools.r8.DataResourceProvider getDataResourceProvider():672:673 -> a
+    1:1:java.util.Collection getProgramResources():667:667 -> b
 com.android.tools.r8.utils.AndroidApp$Builder$1$1 -> a.a.a.a.q.e:
     com.android.tools.r8.utils.AndroidApp$Builder$1 this$1 -> a
     boolean $assertionsDisabled -> b
@@ -29072,10 +28789,10 @@
     48:49:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:179 -> a
     50:50:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:178 -> a
     51:51:com.android.tools.r8.origin.Origin getOrigin():185:185 -> a
-    1:2:void open():45:46 -> b
-    3:9:java.util.zip.ZipOutputStream getStream(com.android.tools.r8.DiagnosticsHandler):90:96 -> b
-    10:12:void writeFileNow(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):153:155 -> b
-    1:6:java.util.zip.ZipOutputStream getStreamRaw():80:85 -> c
+    1:6:java.util.zip.ZipOutputStream getStreamRaw():80:85 -> b
+    7:13:java.util.zip.ZipOutputStream getStream(com.android.tools.r8.DiagnosticsHandler):90:96 -> b
+    14:16:void writeFileNow(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):153:155 -> b
+    1:2:void open():45:46 -> open
 com.android.tools.r8.utils.ArchiveBuilder$1 -> a.a.a.a.q.i:
 com.android.tools.r8.utils.ArchiveBuilder$DelayedData -> a.a.a.a.q.j:
     com.android.tools.r8.ByteDataView content -> b
@@ -29094,15 +28811,15 @@
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():35:35 -> <clinit>
     1:5:void <init>(com.android.tools.r8.shaking.FilteredClassPath,boolean):46:50 -> <init>
+    com.android.tools.r8.DataResourceProvider getDataResourceProvider() -> a
     1:1:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):84:84 -> a
-    2:4:java.util.Collection getProgramResources():99:101 -> a
-    5:10:void accept(com.android.tools.r8.DataResourceProvider$Visitor):112:117 -> a
-    11:11:boolean isProgramResourceName(java.lang.String):135:135 -> a
-    11:11:void accept(com.android.tools.r8.DataResourceProvider$Visitor):117 -> a
-    12:19:void accept(com.android.tools.r8.DataResourceProvider$Visitor):118:125 -> a
-    20:38:void accept(com.android.tools.r8.DataResourceProvider$Visitor):112:130 -> a
-    39:40:void accept(com.android.tools.r8.DataResourceProvider$Visitor):126:127 -> a
-    com.android.tools.r8.DataResourceProvider getDataResourceProvider() -> b
+    2:7:void accept(com.android.tools.r8.DataResourceProvider$Visitor):112:117 -> a
+    8:8:boolean isProgramResourceName(java.lang.String):135:135 -> a
+    8:8:void accept(com.android.tools.r8.DataResourceProvider$Visitor):117 -> a
+    9:16:void accept(com.android.tools.r8.DataResourceProvider$Visitor):118:125 -> a
+    17:35:void accept(com.android.tools.r8.DataResourceProvider$Visitor):112:130 -> a
+    36:37:void accept(com.android.tools.r8.DataResourceProvider$Visitor):126:127 -> a
+    1:3:java.util.Collection getProgramResources():99:101 -> b
     1:10:java.util.List readArchive():54:63 -> c
     11:12:boolean com.android.tools.r8.utils.ZipUtils.isDexFile(java.lang.String):99:100 -> c
     11:12:java.util.List readArchive():64 -> c
@@ -29218,28 +28935,28 @@
 com.android.tools.r8.utils.DescriptorUtils -> a.a.a.a.q.w:
     java.util.Map typeNameToLetterMap -> a
     boolean $assertionsDisabled -> b
-    1:17:void <clinit>():18:34 -> <clinit>
+    1:17:void <clinit>():17:33 -> <clinit>
     boolean isInvalidChar(char) -> a
-    1:12:java.lang.String internalToDescriptor(java.lang.String,boolean,boolean):40:51 -> a
-    13:17:java.lang.String internalToDescriptor(java.lang.String,boolean,boolean):50:54 -> a
-    18:24:java.lang.String descriptorToInternalName(java.lang.String):149:155 -> a
-    25:25:java.lang.String descriptorToInternalName(java.lang.String):153:153 -> a
-    26:26:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):168:168 -> a
-    27:27:java.lang.String primitiveDescriptorToJavaType(char):206:206 -> a
-    27:27:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):181 -> a
-    28:28:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):178:178 -> a
-    29:33:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):171:175 -> a
-    1:1:java.lang.String descriptorToJavaType(java.lang.String):139:139 -> b
-    1:1:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):259:259 -> c
-    2:28:boolean isClassDescriptor(java.lang.String):335:361 -> c
-    2:28:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):259 -> c
-    29:31:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):259:261 -> c
-    1:1:java.lang.String getUnqualifiedClassNameFromDescriptor(java.lang.String):217:217 -> d
-    2:3:java.lang.String getUnqualifiedClassNameFromBinaryName(java.lang.String):308:309 -> d
-    2:3:java.lang.String getUnqualifiedClassNameFromDescriptor(java.lang.String):217 -> d
-    1:8:java.lang.String guessTypeDescriptor(java.lang.String):416:423 -> e
-    9:9:java.lang.String guessTypeDescriptor(java.lang.String):421:421 -> e
-    1:2:java.lang.String javaTypeToDescriptor(java.lang.String):64:65 -> f
+    1:12:java.lang.String internalToDescriptor(java.lang.String,boolean,boolean):39:50 -> a
+    13:17:java.lang.String internalToDescriptor(java.lang.String,boolean,boolean):49:53 -> a
+    18:24:java.lang.String descriptorToInternalName(java.lang.String):148:154 -> a
+    25:25:java.lang.String descriptorToInternalName(java.lang.String):152:152 -> a
+    26:26:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):167:167 -> a
+    27:27:java.lang.String primitiveDescriptorToJavaType(char):205:205 -> a
+    27:27:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):180 -> a
+    28:28:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):177:177 -> a
+    29:33:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):170:174 -> a
+    1:1:java.lang.String descriptorToJavaType(java.lang.String):138:138 -> b
+    1:1:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):258:258 -> c
+    2:28:boolean isClassDescriptor(java.lang.String):310:336 -> c
+    2:28:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):258 -> c
+    29:31:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):258:260 -> c
+    1:1:java.lang.String getSimpleClassNameFromDescriptor(java.lang.String):216:216 -> d
+    2:6:java.lang.String getSimpleClassNameFromBinaryName(java.lang.String):302:306 -> d
+    2:6:java.lang.String getSimpleClassNameFromDescriptor(java.lang.String):216 -> d
+    1:8:java.lang.String guessTypeDescriptor(java.lang.String):391:398 -> e
+    9:9:java.lang.String guessTypeDescriptor(java.lang.String):396:396 -> e
+    1:2:java.lang.String javaTypeToDescriptor(java.lang.String):63:64 -> f
 com.android.tools.r8.utils.DexVersion -> a.a.a.a.q.x:
     byte[] dexVersionBytes -> b
     com.android.tools.r8.utils.DexVersion[] $VALUES -> g
@@ -29259,11 +28976,11 @@
     40:40:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):41:41 -> a
     1:1:int getIntValue():27:27 -> b
     2:2:boolean matchesApiLevel(com.android.tools.r8.utils.AndroidApiLevel):35:35 -> b
-    1:1:com.android.tools.r8.utils.DexVersion getDexVersion(int):88:88 -> c
-    2:2:com.android.tools.r8.utils.DexVersion getDexVersion(int):86:86 -> c
-    3:3:com.android.tools.r8.utils.DexVersion getDexVersion(int):84:84 -> c
-    4:4:com.android.tools.r8.utils.DexVersion getDexVersion(int):82:82 -> c
-    5:5:com.android.tools.r8.utils.DexVersion getDexVersion(int):80:80 -> c
+    3:3:com.android.tools.r8.utils.DexVersion getDexVersion(int):88:88 -> b
+    4:4:com.android.tools.r8.utils.DexVersion getDexVersion(int):86:86 -> b
+    5:5:com.android.tools.r8.utils.DexVersion getDexVersion(int):84:84 -> b
+    6:6:com.android.tools.r8.utils.DexVersion getDexVersion(int):82:82 -> b
+    7:7:com.android.tools.r8.utils.DexVersion getDexVersion(int):80:80 -> b
 com.android.tools.r8.utils.DirectoryBuilder -> a.a.a.a.q.y:
     com.android.tools.r8.origin.Origin origin -> b
     java.nio.file.Path root -> a
@@ -29272,7 +28989,6 @@
     1:6:void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):61:66 -> a
     7:7:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):73:73 -> a
     8:8:com.android.tools.r8.origin.Origin getOrigin():78:78 -> a
-    void open() -> b
 com.android.tools.r8.utils.EncodedValueUtils -> a.a.a.a.q.z:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():9:9 -> <clinit>
@@ -29308,7 +29024,7 @@
     17:17:java.lang.String com.android.tools.r8.utils.StringUtils.joinLines(java.lang.String[]):167 -> b
     17:17:java.lang.String getDiagnosticMessage():55 -> b
     18:18:java.lang.String getDiagnosticMessage():45:45 -> b
-    1:1:com.android.tools.r8.position.Position getPosition():38:38 -> c
+    1:1:com.android.tools.r8.position.Position getPosition():38:38 -> getPosition
 com.android.tools.r8.utils.ExceptionUtils -> a.a.a.a.q.C:
     1:14:void com.android.tools.r8.utils.ThreadUtils.awaitFutures(java.lang.Iterable):18:31 -> a
     15:25:void com.android.tools.r8.utils.ThreadUtils.awaitFutures(java.lang.Iterable):24:34 -> a
@@ -29367,140 +29083,134 @@
     1:1:void <clinit>():39:39 -> <clinit>
 com.android.tools.r8.utils.InternalOptions -> a.a.a.a.q.O:
     boolean enableClassStaticizer -> m
-    boolean enableMainDexListCheck -> P
+    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> L
+    boolean printCfg -> P
     boolean enableDevirtualization -> i
-    com.android.tools.r8.StringConsumer mainDexListConsumer -> ga
-    boolean enableDesugaring -> L
-    com.android.tools.r8.StringConsumer configurationConsumer -> ka
-    boolean debug -> X
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> ia
-    boolean enableNameReflectionOptimization -> q
-    java.util.Map warningInvalidDebugInfo -> ea
-    boolean $assertionsDisabled -> la
-    boolean skipReadingDexCode -> fa
-    boolean enableUninstantiatedTypeOptimization -> y
-    boolean enableInheritanceClassInDexDistributor -> ba
-    java.util.Set extensiveLoggingFilter -> F
+    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> ga
+    com.android.tools.r8.StringConsumer mainDexListConsumer -> ea
+    java.lang.String printCfgFile -> Q
+    com.android.tools.r8.StringConsumer configurationConsumer -> ia
+    boolean $assertionsDisabled -> ja
+    boolean enableCfFrontend -> T
+    boolean verbose -> y
+    boolean skipReadingDexCode -> da
+    boolean intermediate -> G
     boolean enableVerticalClassMerging -> h
-    int inliningControlFlowResolutionBlocksThreshold -> u
-    java.util.List methodsFilter -> G
-    boolean ignoreMainDexMissingClasses -> C
+    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> W
+    int inliningInstructionLimit -> q
+    boolean processCovariantReturnTypeAnnotations -> M
     com.android.tools.r8.DataResourceConsumer dataResourceConsumer -> d
-    boolean enableInitializedClassesAnalysis -> n
-    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> M
-    boolean intermediate -> I
+    boolean enableSideEffectAnalysis -> n
+    boolean enableLambdaMerging -> I
     boolean enableNonNullTracking -> j
-    int minApiLevel -> H
-    boolean disableAssertions -> U
-    java.util.List mainDexKeepRules -> Z
-    boolean enableSwitchMapRemoval -> v
-    boolean enableTreeShaking -> Q
-    com.android.tools.r8.dex.Marker marker -> E
-    java.lang.String printCfgFile -> T
-    java.util.Map warningInvalidParameterAnnotations -> da
-    int numberOfThreads -> z
+    boolean skipIR -> U
+    boolean enableValuePropagation -> v
+    java.util.Map warningInvalidParameterAnnotations -> ba
+    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> u
+    boolean minimalMainDex -> Y
+    boolean invalidDebugInfoFatal -> z
     boolean printTimes -> e
-    java.util.List logArgumentsFilter -> J
-    int classInliningInstructionLimit -> r
+    int inliningInstructionAllowance -> r
     com.android.tools.r8.ProgramConsumer programConsumer -> c
-    boolean hasMarker -> D
-    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> N
-    boolean enableSideEffectAnalysis -> o
-    com.android.tools.r8.StringConsumer proguardMapConsumer -> ha
+    boolean enableMainDexListCheck -> N
+    boolean enableNameReflectionOptimization -> o
+    com.android.tools.r8.StringConsumer usageInformationConsumer -> ha
+    boolean enableDesugaring -> J
     boolean enableInlining -> k
-    boolean enableCfFrontend -> V
-    com.android.tools.r8.StringConsumer usageInformationConsumer -> ja
+    com.android.tools.r8.StringConsumer proguardMapConsumer -> fa
+    boolean debug -> V
+    boolean enableUninstantiatedTypeOptimization -> w
     boolean enableMinification -> R
-    boolean minimalMainDex -> aa
+    java.util.Set extensiveLoggingFilter -> D
+    java.util.List methodsFilter -> E
+    boolean enableInheritanceClassInDexDistributor -> Z
     boolean passthroughDexCode -> f
-    boolean verbose -> A
-    int inliningInstructionLimit -> s
-    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> Y
-    boolean processCovariantReturnTypeAnnotations -> O
-    boolean enableServiceLoaderRewriting -> p
-    boolean enableLambdaMerging -> K
+    boolean ignoreMainDexMissingClasses -> A
+    int inliningControlFlowResolutionBlocksThreshold -> s
+    boolean enableTreeShaking -> O
     boolean enableClassInlining -> l
-    boolean skipIR -> W
-    boolean enableValuePropagation -> x
-    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> w
+    int minApiLevel -> F
+    java.util.List mainDexKeepRules -> X
+    com.android.tools.r8.dex.Marker marker -> C
     com.android.tools.r8.utils.Reporter reporter -> b
-    boolean printCfg -> S
+    boolean disableAssertions -> S
     com.android.tools.r8.graph.DexItemFactory itemFactory -> a
-    java.util.Map missingEnclosingMembers -> ca
+    boolean enableSwitchMapRemoval -> t
+    java.util.Map missingEnclosingMembers -> aa
+    java.util.Map warningInvalidDebugInfo -> ca
+    int numberOfThreads -> x
     boolean enableHorizontalClassMerging -> g
-    int inliningInstructionAllowance -> t
-    boolean invalidDebugInfoFatal -> B
+    java.util.List logArgumentsFilter -> H
+    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> K
+    boolean hasMarker -> B
+    int classInliningInstructionLimit -> p
     1:1:void <clinit>():43:43 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):79:79 -> <init>
-    2:116:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):64:178 -> <init>
-    117:125:java.util.Set getExtensiveLoggingFilter():324:332 -> <init>
-    117:125:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):248 -> <init>
-    126:126:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):248:248 -> <init>
-    127:135:java.util.Set getExtensiveFieldMinifierLoggingFilter():337:345 -> <init>
-    127:135:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):249 -> <init>
-    136:144:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():350:358 -> <init>
-    136:144:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):251 -> <init>
-    145:145:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):253:253 -> <init>
-    146:146:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():59:59 -> <init>
-    146:146:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):254 -> <init>
-    147:289:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):254:396 -> <init>
-    290:297:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):80:87 -> <init>
-    1:1:boolean hasConsumer():196:196 -> A
-    1:1:boolean hasMarker():182:182 -> B
-    boolean isGeneratingClassFiles() -> C
-    1:1:boolean isGeneratingDexIndexed():216:216 -> D
-    1:1:boolean isGeneratingDex():212 -> D
-    boolean isGeneratingDexFilePerClassFile() -> E
-    1:1:boolean isMinifying():287:287 -> F
-    1:1:boolean isShrinking():283:283 -> G
-    1:32:boolean printWarnings():467:498 -> H
-    33:71:boolean printWarnings():494:532 -> H
-    1:4:void signalFinishedToConsumers():240:243 -> I
-    1:1:boolean assertionsEnabled():433:433 -> a
-    2:5:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):438:441 -> a
-    6:10:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):446:450 -> a
-    11:17:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):455:461 -> a
-    18:18:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):456:456 -> a
-    19:19:java.util.List lambda$warningInvalidDebugInfo$2(com.android.tools.r8.origin.Origin):460:460 -> a
-    20:20:boolean hasMethodsFilter():541:541 -> a
-    20:20:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):546 -> a
-    21:22:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):550:551 -> a
-    23:24:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):626:627 -> a
-    1:1:java.util.List lambda$warningInvalidParameterAnnotations$1(com.android.tools.r8.origin.Origin):449:449 -> b
-    2:3:boolean canHaveArtInstanceOfVerifierBug():953:954 -> b
-    1:1:java.util.List lambda$warningMissingEnclosingMember$0(com.android.tools.r8.origin.Origin):440:440 -> c
-    2:2:boolean canHaveCmpLongBug():803:803 -> c
-    boolean canHaveIncorrectJoinForArrayOfInterfacesBug() -> d
-    1:1:boolean canLeaveStaticInterfaceMethodInvokes():655:655 -> e
-    1:1:boolean canUseConstantMethodHandle():639:639 -> f
-    1:1:boolean canUseConstantMethodType():643:643 -> g
-    1:1:boolean canUseDefaultAndStaticInterfaceMethods():651:651 -> h
-    1:2:boolean canUseFilledNewArrayOfObjects():712:713 -> i
-    1:1:boolean canUseInvokeCustom():647:647 -> j
-    1:1:boolean canUseInvokePolymorphic():635:635 -> k
-    1:1:boolean canUseInvokePolymorphicOnVarHandle():631:631 -> l
-    1:1:boolean canUseJava8Methods():663:663 -> m
-    1:1:boolean canUseLongCompareAndObjectsNonNull():686:686 -> n
-    1:2:boolean canUseMultidex():681:682 -> o
-    1:1:boolean canUseNotInstruction():748:748 -> p
-    1:4:boolean canUseParameterNameAnnotations():697:700 -> q
-    1:1:boolean canUsePrivateInterfaceMethods():667:667 -> r
-    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():721:722 -> s
-    1:1:boolean canUseSuppressedExceptions():690:690 -> t
-    1:1:boolean canUseTwrCloseResourceMethod():659:659 -> u
-    1:13:void disableGlobalOptimizations():112:124 -> v
-    1:1:com.android.tools.r8.DexFilePerClassFileConsumer getDexFilePerClassFileConsumer():232:232 -> w
-    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():200:200 -> x
-    2:2:boolean isGeneratingDexIndexed():216:216 -> x
-    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():201 -> x
-    3:9:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():202:208 -> x
-    1:2:com.android.tools.r8.dex.Marker getMarker():191:192 -> y
-    com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration() -> z
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):77:77 -> <init>
+    2:97:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):64:159 -> <init>
+    98:106:java.util.Set getExtensiveLoggingFilter():297:305 -> <init>
+    98:106:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):229 -> <init>
+    107:107:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):229:229 -> <init>
+    108:116:java.util.Set getExtensiveFieldMinifierLoggingFilter():310:318 -> <init>
+    108:116:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):230 -> <init>
+    117:125:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():323:331 -> <init>
+    117:125:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):232 -> <init>
+    126:126:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):234:234 -> <init>
+    127:127:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():59:59 -> <init>
+    127:127:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):235 -> <init>
+    128:262:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):235:369 -> <init>
+    263:266:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):78:81 -> <init>
+    boolean isGeneratingClassFiles() -> A
+    1:1:boolean isGeneratingDexIndexed():197:197 -> B
+    1:1:boolean isGeneratingDex():193 -> B
+    boolean isGeneratingDexFilePerClassFile() -> C
+    1:32:boolean printWarnings():440:471 -> D
+    33:71:boolean printWarnings():467:505 -> D
+    1:4:void signalFinishedToConsumers():221:224 -> E
+    1:1:boolean assertionsEnabled():406:406 -> a
+    2:5:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):411:414 -> a
+    6:10:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):419:423 -> a
+    11:17:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):428:434 -> a
+    18:18:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):429:429 -> a
+    19:19:java.util.List lambda$warningInvalidDebugInfo$2(com.android.tools.r8.origin.Origin):433:433 -> a
+    20:20:boolean hasMethodsFilter():514:514 -> a
+    20:20:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):519 -> a
+    21:22:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):523:524 -> a
+    23:24:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):597:598 -> a
+    1:1:java.util.List lambda$warningInvalidParameterAnnotations$1(com.android.tools.r8.origin.Origin):422:422 -> b
+    2:3:boolean canHaveArtInstanceOfVerifierBug():923:924 -> b
+    1:1:java.util.List lambda$warningMissingEnclosingMember$0(com.android.tools.r8.origin.Origin):413:413 -> c
+    2:2:boolean canHaveCmpLongBug():774:774 -> c
+    1:1:boolean canLeaveStaticInterfaceMethodInvokes():626:626 -> d
+    1:1:boolean canUseConstantMethodHandle():610:610 -> e
+    1:1:boolean canUseConstantMethodType():614:614 -> f
+    1:1:boolean canUseDefaultAndStaticInterfaceMethods():622:622 -> g
+    1:2:boolean canUseFilledNewArrayOfObjects():683:684 -> h
+    1:1:boolean canUseInvokeCustom():618:618 -> i
+    1:1:boolean canUseInvokePolymorphic():606:606 -> j
+    1:1:boolean canUseInvokePolymorphicOnVarHandle():602:602 -> k
+    1:1:boolean canUseJava8Methods():634:634 -> l
+    1:1:boolean canUseLongCompareAndObjectsNonNull():657:657 -> m
+    1:2:boolean canUseMultidex():652:653 -> n
+    1:1:boolean canUseNotInstruction():719:719 -> o
+    1:4:boolean canUseParameterNameAnnotations():668:671 -> p
+    1:1:boolean canUsePrivateInterfaceMethods():638:638 -> q
+    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():692:693 -> r
+    1:1:boolean canUseSuppressedExceptions():661:661 -> s
+    1:1:boolean canUseTwrCloseResourceMethod():630:630 -> t
+    1:1:com.android.tools.r8.DexFilePerClassFileConsumer getDexFilePerClassFileConsumer():213:213 -> u
+    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():181:181 -> v
+    2:2:boolean isGeneratingDexIndexed():197:197 -> v
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():182 -> v
+    3:9:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():183:189 -> v
+    1:2:com.android.tools.r8.dex.Marker getMarker():172:173 -> w
+    com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration() -> x
+    1:1:boolean hasConsumer():177:177 -> y
+    1:1:boolean hasMarker():163:163 -> z
 com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> a.a.a.a.q.J:
     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):368:371 -> <init>
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):341:344 -> <init>
 com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> a.a.a.a.q.K:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> a
@@ -29509,12 +29219,11 @@
     1:1:void <init>(java.lang.String,int):49:49 -> <init>
 com.android.tools.r8.utils.InternalOptions$OutlineOptions -> a.a.a.a.q.L:
     boolean enabled -> a
-    1:6:void <init>():573:578 -> <init>
+    1:6:void <init>():546:551 -> <init>
 com.android.tools.r8.utils.InternalOptions$TestingOptions -> a.a.a.a.q.M:
     java.util.Set validInliningReasons -> g
     boolean forceNameReflectionOptimization -> i
     boolean disallowLoadStoreOptimization -> j
-    boolean enableStatefulLambdaCreateInstanceMethod -> l
     boolean dontCreateMarkerInD8 -> e
     boolean forceJumboStringProcessing -> f
     boolean noLocalsTableOnInput -> h
@@ -29523,11 +29232,11 @@
     java.util.function.Consumer irModifier -> k
     boolean invertConditionals -> c
     boolean placeExceptionalBlocksLast -> d
-    1:24:void <init>():584:607 -> <init>
+    1:22:void <init>():557:578 -> <init>
 com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> a.a.a.a.q.N:
     com.android.tools.r8.graph.DexType type -> b
     int version -> a
-    1:3:void <init>(int,com.android.tools.r8.graph.DexType):380:382 -> <init>
+    1:3:void <init>(int,com.android.tools.r8.graph.DexType):353:355 -> <init>
 com.android.tools.r8.utils.InternalOutputMode -> a.a.a.a.q.P:
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> a
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> b
@@ -29543,13 +29252,20 @@
     1:4:java.lang.Object peekNext(java.util.ListIterator):20:23 -> a
     5:8:void removeIf(java.util.Iterator,java.util.function.Predicate):30:33 -> a
     1:3:java.lang.Object peekPrevious(java.util.ListIterator):13:15 -> b
-com.android.tools.r8.utils.LRUCacheTable -> a.a.a.a.q.S:
+com.android.tools.r8.utils.LRUCacheTable -> a.a.a.a.q.T:
     int columnCapacity -> b
     int rowCapacity -> a
     1:3:void <init>(int,int,float):31:33 -> <init>
+    1:1:java.util.Map lambda$put$0(java.lang.Object):46:46 -> a
+    2:3:java.lang.Object put(java.lang.Object,java.lang.Object,java.lang.Object):46:47 -> a
+    4:4:java.lang.Object get(java.lang.Object,java.lang.Object):55:55 -> a
     1:1:com.android.tools.r8.utils.LRUCacheTable create(int,int):37:37 -> b
     1:1:boolean removeEldestEntry(java.util.Map$Entry):42:42 -> removeEldestEntry
-com.android.tools.r8.utils.LebUtils -> a.a.a.a.q.T:
+com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> a.a.a.a.q.S:
+    int columnCapacity -> a
+    1:2:void <init>(int,float):17:18 -> <init>
+    1:1:boolean removeEldestEntry(java.util.Map$Entry):23:23 -> removeEldestEntry
+com.android.tools.r8.utils.LebUtils -> a.a.a.a.q.U:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:6:int parseSleb128(com.android.tools.r8.dex.BinaryReader):65:70 -> a
@@ -29559,13 +29275,13 @@
     7:16:byte[] encodeUleb128(int):32:41 -> b
     17:21:void putUleb128(com.android.tools.r8.dex.DexOutputBuffer,int):48:52 -> b
     1:1:int sizeAsUleb128(int):57:57 -> c
-com.android.tools.r8.utils.LibraryClassCollection -> a.a.a.a.q.U:
+com.android.tools.r8.utils.LibraryClassCollection -> a.a.a.a.q.V:
     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
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():34:34 -> b
     1:1:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.utils.LongInterval -> a.a.a.a.q.V:
+com.android.tools.r8.utils.LongInterval -> a.a.a.a.q.W:
     long max -> b
     long min -> a
     boolean $assertionsDisabled -> c
@@ -29580,7 +29296,7 @@
     1:2:boolean equals(java.lang.Object):66:67 -> equals
     1:1:int hashCode():58:58 -> hashCode
     1:1:java.lang.String toString():74:74 -> toString
-com.android.tools.r8.utils.MethodSignatureEquivalence -> a.a.a.a.q.W:
+com.android.tools.r8.utils.MethodSignatureEquivalence -> a.a.a.a.q.X:
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE -> b
     boolean ignoreName -> a
     1:3:void <clinit>():16:18 -> <clinit>
@@ -29592,14 +29308,14 @@
     7:10:int doHash(com.android.tools.r8.graph.DexMethod):45:48 -> a
     7:10:int doHash(java.lang.Object):14 -> a
     11:11:com.android.tools.r8.utils.MethodSignatureEquivalence get():28:28 -> a
-com.android.tools.r8.utils.OffOrAuto -> a.a.a.a.q.X:
+com.android.tools.r8.utils.OffOrAuto -> a.a.a.a.q.Y:
     com.android.tools.r8.utils.OffOrAuto Auto -> b
     com.android.tools.r8.utils.OffOrAuto Off -> a
     com.android.tools.r8.utils.OffOrAuto[] $VALUES -> c
     1:1:void <clinit>():11:11 -> <clinit>
     2:2:void <clinit>():10:10 -> <clinit>
     1:1:void <init>(java.lang.String,int):10:10 -> <init>
-com.android.tools.r8.utils.OneShotByteResource -> a.a.a.a.q.Y:
+com.android.tools.r8.utils.OneShotByteResource -> a.a.a.a.q.Z:
     com.android.tools.r8.origin.Origin origin -> a
     java.util.Set classDescriptors -> d
     boolean $assertionsDisabled -> e
@@ -29610,9 +29326,9 @@
     1:1:com.android.tools.r8.ProgramResource create(com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,byte[],java.util.Set):22:22 -> a
     2:2:com.android.tools.r8.origin.Origin getOrigin():36:36 -> a
     1:1:java.util.Set getClassDescriptors():54:54 -> b
-    1:1:com.android.tools.r8.ProgramResource$Kind getKind():41:41 -> c
-    1:3:java.io.InputStream getByteStream():46:48 -> d
-com.android.tools.r8.utils.OrderedMergingIterator -> a.a.a.a.q.Z:
+    1:3:java.io.InputStream getByteStream():46:48 -> getByteStream
+    1:1:com.android.tools.r8.ProgramResource$Kind getKind():41:41 -> getKind
+com.android.tools.r8.utils.OrderedMergingIterator -> a.a.a.a.q.aa:
     java.util.List other -> b
     java.util.List one -> a
     int otherIndex -> d
@@ -29635,13 +29351,12 @@
     17:17:com.android.tools.r8.graph.KeyedDexItem next():44 -> next
     18:25:com.android.tools.r8.graph.KeyedDexItem next():46:53 -> next
     26:26:com.android.tools.r8.graph.KeyedDexItem next():51:51 -> next
-com.android.tools.r8.utils.OutputBuilder -> a.a.a.a.q.aa:
+com.android.tools.r8.utils.OutputBuilder -> a.a.a.a.q.ba:
     void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler) -> a
     void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler) -> a
     void close(com.android.tools.r8.DiagnosticsHandler) -> a
     com.android.tools.r8.origin.Origin getOrigin() -> a
-    void open() -> b
-com.android.tools.r8.utils.Pair -> a.a.a.a.q.ba:
+com.android.tools.r8.utils.Pair -> a.a.a.a.q.ca:
     java.lang.Object second -> b
     java.lang.Object first -> a
     1:3:void <init>(java.lang.Object,java.lang.Object):23:25 -> <init>
@@ -29651,7 +29366,7 @@
     2:2:void setSecond(java.lang.Object):41:41 -> b
     1:1:boolean equals(java.lang.Object):51:51 -> equals
     1:1:int hashCode():46:46 -> hashCode
-com.android.tools.r8.utils.ProgramClassCollection -> a.a.a.a.q.ca:
+com.android.tools.r8.utils.ProgramClassCollection -> a.a.a.a.q.da:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(java.util.concurrent.ConcurrentHashMap):34:34 -> <init>
@@ -29667,7 +29382,7 @@
     21:21:com.android.tools.r8.graph.DexProgramClass resolveClassConflictImpl(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):67:67 -> a
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():54:54 -> b
     1:1:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.utils.Reporter -> a.a.a.a.q.ea:
+com.android.tools.r8.utils.Reporter -> a.a.a.a.q.fa:
     com.android.tools.r8.DiagnosticsHandler clientHandler -> a
     com.android.tools.r8.Diagnostic lastError -> c
     java.util.Collection suppressedExceptions -> d
@@ -29682,9 +29397,9 @@
     1:1:void warning(com.android.tools.r8.Diagnostic):38:38 -> b
     1:3:void error(com.android.tools.r8.Diagnostic):43:45 -> c
     1:3:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):71:73 -> d
-com.android.tools.r8.utils.Reporter$1 -> a.a.a.a.q.da:
+com.android.tools.r8.utils.Reporter$1 -> a.a.a.a.q.ea:
     1:1:void <init>():24:24 -> <init>
-com.android.tools.r8.utils.StringDiagnostic -> a.a.a.a.q.fa:
+com.android.tools.r8.utils.StringDiagnostic -> a.a.a.a.q.ga:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.Position position -> b
     java.lang.String message -> c
@@ -29693,8 +29408,8 @@
     3:6:void <init>(java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):35:38 -> <init>
     1:1:com.android.tools.r8.origin.Origin getOrigin():43:43 -> a
     1:1:java.lang.String getDiagnosticMessage():53:53 -> b
-    1:1:com.android.tools.r8.position.Position getPosition():48:48 -> c
-com.android.tools.r8.utils.StringUtils -> a.a.a.a.q.ha:
+    1:1:com.android.tools.r8.position.Position getPosition():48:48 -> getPosition
+com.android.tools.r8.utils.StringUtils -> a.a.a.a.q.ia:
     char[] IDENTIFIER_LETTERS -> c
     java.lang.String[] EMPTY_ARRAY -> a
     java.lang.String LINE_SEPARATOR -> b
@@ -29718,7 +29433,7 @@
     58:66:java.lang.String hexString(long,int,boolean):234:242 -> a
     58:66:java.lang.String hexString(long,int):230 -> a
     1:3:java.lang.StringBuilder appendRightPadded(java.lang.StringBuilder,java.lang.String,int):98:100 -> b
-com.android.tools.r8.utils.StringUtils$BraceType -> a.a.a.a.q.ga:
+com.android.tools.r8.utils.StringUtils$BraceType -> a.a.a.a.q.ha:
     com.android.tools.r8.utils.StringUtils$BraceType SQUARE -> b
     com.android.tools.r8.utils.StringUtils$BraceType TUBORG -> c
     com.android.tools.r8.utils.StringUtils$BraceType PARENS -> a
@@ -29727,14 +29442,14 @@
     1:4:void <clinit>():24:27 -> <clinit>
     5:5:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(java.lang.String,int):23:23 -> <init>
-com.android.tools.r8.utils.ThrowingConsumer -> a.a.a.a.q.ia:
-com.android.tools.r8.utils.Timing -> a.a.a.a.q.ka:
+com.android.tools.r8.utils.ThrowingConsumer -> a.a.a.a.q.ja:
+com.android.tools.r8.utils.Timing -> a.a.a.a.q.la:
     java.util.Stack stack -> a
     1:3:void <init>(java.lang.String):28:30 -> <init>
     1:10:void begin(java.lang.String):86:95 -> a
     11:12:void end():99:100 -> a
     1:4:void report():104:107 -> b
-com.android.tools.r8.utils.Timing$Node -> a.a.a.a.q.ja:
+com.android.tools.r8.utils.Timing$Node -> a.a.a.a.q.ka:
     java.util.Map children -> b
     boolean $assertionsDisabled -> e
     java.lang.String title -> a
@@ -29765,7 +29480,7 @@
     2:2:long duration():57:57 -> toString
     2:2:java.lang.String toString():62 -> toString
     3:3:java.lang.String toString():62:62 -> toString
-com.android.tools.r8.utils.VersionProperties -> a.a.a.a.q.la:
+com.android.tools.r8.utils.VersionProperties -> a.a.a.a.q.ma:
     com.android.tools.r8.utils.VersionProperties INSTANCE -> c
     java.lang.String sha -> a
     java.lang.String releaser -> b

compatproguard-master.jar

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

compatproguard-master.jar.map

diff --git a/compatproguard-master.jar.map b/compatproguard-master.jar.map
index 1a4776a..9106aa6 100644
--- a/compatproguard-master.jar.map
+++ b/compatproguard-master.jar.map
@@ -1,9 +1,8 @@
 # compiler: R8
-# compiler_version: 1.5.18-dev
+# compiler_version: 1.5.13-dev
 # compiler_hash: engineering
-# pg_map_id: fddf53e
+# pg_map_id: 0f45dc5
 com.android.tools.r8.ApiLevelException -> a.a.a.a.a:
-    boolean $assertionsDisabled -> c
     1:1:void <clinit>():10:10 -> <clinit>
     1:8:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):21:28 -> <init>
     1:8:void <init>(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):14 -> <init>
@@ -27,19 +26,19 @@
     3:19:void <init>(com.android.tools.r8.utils.AndroidApp$Builder):108:124 -> <init>
     3:19:void <init>(com.android.tools.r8.DiagnosticsHandler):119 -> <init>
     1:6:com.android.tools.r8.BaseCommand build():138:143 -> a
-    7:15:com.android.tools.r8.BaseCommand$Builder addMainDexListFiles(java.nio.file.Path[]):260:268 -> a
+    7:15:com.android.tools.r8.BaseCommand$Builder addMainDexListFiles(java.nio.file.Path[]):238:246 -> a
     16:16:com.android.tools.r8.BaseCommand$Builder com.android.tools.r8.R8Command$Builder.self():59:59 -> a
     16:16:com.android.tools.r8.BaseCommand$Builder com.android.tools.r8.R8Command$Builder.self():0 -> a
-    16:16:com.android.tools.r8.BaseCommand$Builder addMainDexListFiles(java.nio.file.Path[]):268 -> a
-    17:17:void setIgnoreDexInArchive(boolean):352:352 -> a
-    18:20:void guard(java.lang.Runnable):366:368 -> a
+    16:16:com.android.tools.r8.BaseCommand$Builder addMainDexListFiles(java.nio.file.Path[]):246 -> a
+    17:17:void setIgnoreDexInArchive(boolean):330:330 -> a
+    18:20:void guard(java.lang.Runnable):344:346 -> a
     1:1:com.android.tools.r8.utils.AndroidApp$Builder getAppBuilder():152:152 -> b
-    2:5:void lambda$addMainDexListFiles$11(java.nio.file.Path[]):262:265 -> b
-    6:6:void lambda$addMainDexListFiles$11(java.nio.file.Path[]):264:264 -> b
-    7:7:void lambda$setIgnoreDexInArchive$15(boolean):352:352 -> b
+    2:5:void lambda$addMainDexListFiles$7(java.nio.file.Path[]):240:243 -> b
+    6:6:void lambda$addMainDexListFiles$7(java.nio.file.Path[]):242:242 -> b
+    7:7:void lambda$setIgnoreDexInArchive$11(boolean):330:330 -> b
     1:1:com.android.tools.r8.utils.Reporter getReporter():162:162 -> c
-    1:1:boolean isPrintHelp():316:316 -> d
-    1:1:boolean isPrintVersion():327:327 -> e
+    1:1:boolean isPrintHelp():294:294 -> d
+    1:1:boolean isPrintVersion():305:305 -> e
     com.android.tools.r8.BaseCommand makeCommand() -> f
     void validate() -> g
 com.android.tools.r8.BaseCompilerCommand -> a.a.a.a.g:
@@ -114,14 +113,13 @@
     1:1:boolean isOptimizeMultidexForLinearAlloc():225:225 -> n
 com.android.tools.r8.BaseCompilerCommand$Builder$1 -> a.a.a.a.d:
     1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):307:307 -> <init>
-    boolean combineSyntheticClassesWithPrimaryClass() -> c
+    boolean combineSyntheticClassesWithPrimaryClass() -> b
 com.android.tools.r8.BaseCompilerCommand$Builder$2 -> a.a.a.a.e:
     1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):314:314 -> <init>
-    boolean combineSyntheticClassesWithPrimaryClass() -> c
+    boolean combineSyntheticClassesWithPrimaryClass() -> b
 com.android.tools.r8.BaseCompilerCommandParser -> a.a.a.a.h:
 com.android.tools.r8.ByteBufferProvider -> a.a.a.a.i:
     1:1:java.nio.ByteBuffer acquireByteBuffer(int):24:24 -> a
-    void releaseByteBuffer(java.nio.ByteBuffer) -> b
 com.android.tools.r8.ByteDataView -> a.a.a.a.j:
     byte[] buffer -> a
     int offset -> b
@@ -229,7 +227,7 @@
     19:34:void com.android.tools.r8.R8Command$Builder.validate():0 -> g
     com.android.tools.r8.R8Command$Builder com.android.tools.r8.R8Command$Builder.self() -> o
     1:7:com.android.tools.r8.R8Command com.android.tools.r8.R8Command$Builder.makeR8Command():359:365 -> p
-    8:8:void com.android.tools.r8.shaking.ProguardConfigurationParser.<init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):109:109 -> p
+    8:8:void com.android.tools.r8.shaking.ProguardConfigurationParser.<init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):107:107 -> p
     8:8:com.android.tools.r8.R8Command com.android.tools.r8.R8Command$Builder.makeR8Command():365 -> p
     9:103:com.android.tools.r8.R8Command com.android.tools.r8.R8Command$Builder.makeR8Command():367:461 -> p
 com.android.tools.r8.CompilationFailedException -> a.a.a.a.q:
@@ -252,7 +250,7 @@
     1:5:void <init>(java.lang.String,com.android.tools.r8.origin.Origin):35:39 -> <init>
     1:5:void <init>(java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.DataDirectoryResource$1):31 -> <init>
     1:1:com.android.tools.r8.origin.Origin getOrigin():44:44 -> a
-    1:1:java.lang.String getName():49:49 -> b
+    1:1:java.lang.String getName():49:49 -> getName
 com.android.tools.r8.DataDirectoryResource$ZipDataDirectoryResource -> a.a.a.a.u:
     java.util.zip.ZipFile zip -> a
     boolean $assertionsDisabled -> c
@@ -261,12 +259,11 @@
     1:5:void <init>(java.util.zip.ZipFile,java.util.zip.ZipEntry):57:61 -> <init>
     1:5:void <init>(java.util.zip.ZipFile,java.util.zip.ZipEntry,com.android.tools.r8.DataDirectoryResource$1):53 -> <init>
     1:1:com.android.tools.r8.origin.Origin getOrigin():66:66 -> a
-    1:1:java.lang.String getName():71:71 -> b
+    1:1:java.lang.String getName():71:71 -> getName
 com.android.tools.r8.DataEntryResource -> a.a.a.a.A:
     1:1:com.android.tools.r8.DataEntryResource fromBytes(byte[],java.lang.String,com.android.tools.r8.origin.Origin):26:26 -> a
     2:2:com.android.tools.r8.DataEntryResource fromZip(java.util.zip.ZipFile,java.util.zip.ZipEntry):35:35 -> a
     3:3:com.android.tools.r8.DataEntryResource withName(java.lang.String):39:39 -> a
-    java.io.InputStream getByteStream() -> c
 com.android.tools.r8.DataEntryResource$1 -> a.a.a.a.w:
 com.android.tools.r8.DataEntryResource$ByteDataEntryResource -> a.a.a.a.x:
     byte[] bytes -> a
@@ -274,16 +271,16 @@
     java.lang.String name -> b
     1:4:void <init>(byte[],java.lang.String,com.android.tools.r8.origin.Origin):48:51 -> <init>
     1:1:com.android.tools.r8.origin.Origin getOrigin():66:66 -> a
-    1:1:java.lang.String getName():61:61 -> b
-    1:1:java.io.InputStream getByteStream():56:56 -> c
+    1:1:java.io.InputStream getByteStream():56:56 -> getByteStream
+    1:1:java.lang.String getName():61:61 -> getName
 com.android.tools.r8.DataEntryResource$NestedDataEntryResource -> a.a.a.a.y:
     com.android.tools.r8.origin.Origin origin -> b
     com.android.tools.r8.DataEntryResource resource -> c
     java.lang.String name -> a
     1:4:void <init>(java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.DataEntryResource):141:144 -> <init>
     1:1:com.android.tools.r8.origin.Origin getOrigin():159:159 -> a
-    1:1:java.lang.String getName():154:154 -> b
-    1:1:java.io.InputStream getByteStream():149:149 -> c
+    1:1:java.io.InputStream getByteStream():149:149 -> getByteStream
+    1:1:java.lang.String getName():154:154 -> getName
 com.android.tools.r8.DataEntryResource$ZipDataEntryResource -> a.a.a.a.z:
     java.util.zip.ZipFile zip -> a
     boolean $assertionsDisabled -> c
@@ -292,13 +289,12 @@
     1:5:void <init>(java.util.zip.ZipFile,java.util.zip.ZipEntry):74:78 -> <init>
     1:5:void <init>(java.util.zip.ZipFile,java.util.zip.ZipEntry,com.android.tools.r8.DataEntryResource$1):70 -> <init>
     1:1:com.android.tools.r8.origin.Origin getOrigin():83:83 -> a
-    1:1:java.lang.String getName():88:88 -> b
-    1:3:java.io.InputStream getByteStream():94:96 -> c
-    4:4:com.android.tools.r8.origin.Origin getOrigin():83:83 -> c
-    4:4:java.io.InputStream getByteStream():96 -> c
-    5:5:java.io.InputStream getByteStream():96:96 -> c
+    1:3:java.io.InputStream getByteStream():94:96 -> getByteStream
+    4:4:com.android.tools.r8.origin.Origin getOrigin():83:83 -> getByteStream
+    4:4:java.io.InputStream getByteStream():96 -> getByteStream
+    5:5:java.io.InputStream getByteStream():96:96 -> getByteStream
+    1:1:java.lang.String getName():88:88 -> getName
 com.android.tools.r8.DataResource -> a.a.a.a.B:
-    java.lang.String getName() -> b
 com.android.tools.r8.DataResourceConsumer -> a.a.a.a.C:
     void accept(com.android.tools.r8.DataDirectoryResource,com.android.tools.r8.DiagnosticsHandler) -> a
     void accept(com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler) -> a
@@ -310,7 +306,7 @@
     void visit(com.android.tools.r8.DataEntryResource) -> a
 com.android.tools.r8.DexFilePerClassFileConsumer -> a.a.a.a.I:
     void accept(java.lang.String,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler) -> a
-    boolean combineSyntheticClassesWithPrimaryClass() -> c
+    boolean combineSyntheticClassesWithPrimaryClass() -> b
 com.android.tools.r8.DexFilePerClassFileConsumer$ArchiveConsumer -> a.a.a.a.F:
     boolean consumeDataResources -> c
     boolean $assertionsDisabled -> d
@@ -351,7 +347,7 @@
     1:1:com.android.tools.r8.DataResourceConsumer getDataResourceConsumer():108:108 -> a
     2:3:void accept(java.lang.String,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):117:118 -> a
     4:5:void finished(com.android.tools.r8.DiagnosticsHandler):133:134 -> a
-    1:4:boolean combineSyntheticClassesWithPrimaryClass():124:127 -> c
+    1:4:boolean combineSyntheticClassesWithPrimaryClass():124:127 -> b
 com.android.tools.r8.DexIndexedConsumer -> a.a.a.a.M:
     void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler) -> a
 com.android.tools.r8.DexIndexedConsumer$ArchiveConsumer -> a.a.a.a.J:
@@ -384,11 +380,11 @@
     10:10:void accept(com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):262:262 -> a
     11:12:void finished(com.android.tools.r8.DiagnosticsHandler):267:268 -> a
     13:13:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):286:286 -> a
-    1:5:void prepareDirectory():272:276 -> c
-    6:12:void deleteClassesDexFiles(java.nio.file.Path):280:286 -> c
-    6:12:void prepareDirectory():276 -> c
-    13:19:void deleteClassesDexFiles(java.nio.file.Path):280:286 -> c
-    13:19:void prepareDirectory():276 -> c
+    1:5:void prepareDirectory():272:276 -> b
+    6:12:void deleteClassesDexFiles(java.nio.file.Path):280:286 -> b
+    6:12:void prepareDirectory():276 -> b
+    13:19:void deleteClassesDexFiles(java.nio.file.Path):280:286 -> b
+    13:19:void prepareDirectory():276 -> b
 com.android.tools.r8.DexIndexedConsumer$ForwardingConsumer -> a.a.a.a.L:
     com.android.tools.r8.DexIndexedConsumer consumer -> a
     1:1:void <clinit>():82:82 -> <clinit>
@@ -401,7 +397,6 @@
 com.android.tools.r8.Diagnostic -> a.a.a.a.N:
     com.android.tools.r8.origin.Origin getOrigin() -> a
     java.lang.String getDiagnosticMessage() -> b
-    com.android.tools.r8.position.Position getPosition() -> c
 com.android.tools.r8.DiagnosticsHandler -> a.a.a.a.O:
     1:4:void info(com.android.tools.r8.Diagnostic):55:58 -> a
     1:6:void warning(com.android.tools.r8.Diagnostic):41:46 -> b
@@ -422,27 +417,7 @@
     java.lang.String outline9(java.lang.StringBuilder,int,java.lang.String) -> a
     java.lang.String outline3(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String) -> b
 com.android.tools.r8.InternalProgramOutputPathConsumer -> a.a.a.a.Q:
-com.android.tools.r8.OptionalBool -> a.a.a.a.V:
-    com.android.tools.r8.OptionalBool TRUE -> a
-    com.android.tools.r8.OptionalBool FALSE -> b
-    com.android.tools.r8.OptionalBool UNKNOWN -> c
-    1:27:void <clinit>():9:35 -> <clinit>
-    1:1:void <init>():56:56 -> <init>
-    1:1:void <init>(com.android.tools.r8.OptionalBool$1):7 -> <init>
-    boolean isFalse() -> a
-    1:1:com.android.tools.r8.OptionalBool of(boolean):49:49 -> a
-    1:1:boolean isPossiblyTrue():71:71 -> b
-    boolean isTrue() -> c
-    1:1:com.android.tools.r8.OptionalBool unknown():53:53 -> d
-com.android.tools.r8.OptionalBool$1 -> a.a.a.a.S:
-    1:1:void <init>():10:10 -> <init>
-    boolean isTrue() -> c
-com.android.tools.r8.OptionalBool$2 -> a.a.a.a.T:
-    1:1:void <init>():23:23 -> <init>
-    boolean isFalse() -> a
-com.android.tools.r8.OptionalBool$3 -> a.a.a.a.U:
-    1:1:void <init>():36:36 -> <init>
-com.android.tools.r8.OutputMode -> a.a.a.a.W:
+com.android.tools.r8.OutputMode -> a.a.a.a.S:
     com.android.tools.r8.OutputMode DexIndexed -> a
     com.android.tools.r8.OutputMode DexFilePerClassFile -> b
     com.android.tools.r8.OutputMode DexFilePerClass -> c
@@ -450,16 +425,14 @@
     1:16:void <clinit>():11:26 -> <clinit>
     17:17:void <clinit>():7:7 -> <clinit>
     1:1:void <init>(java.lang.String,int):8:8 -> <init>
-com.android.tools.r8.ProgramConsumer -> a.a.a.a.X:
+com.android.tools.r8.ProgramConsumer -> a.a.a.a.T:
     void finished(com.android.tools.r8.DiagnosticsHandler) -> a
     com.android.tools.r8.DataResourceConsumer getDataResourceConsumer() -> a
-com.android.tools.r8.ProgramResource -> a.a.a.a.ba:
+com.android.tools.r8.ProgramResource -> a.a.a.a.X:
     1:1:com.android.tools.r8.ProgramResource fromBytes(com.android.tools.r8.origin.Origin,com.android.tools.r8.ProgramResource$Kind,byte[],java.util.Set):52:52 -> a
-    java.io.InputStream getByteStream() -> c
-    com.android.tools.r8.ProgramResource$Kind getKind() -> d
-    java.util.Set getClassDescriptors() -> e
-com.android.tools.r8.ProgramResource$1 -> a.a.a.a.Y:
-com.android.tools.r8.ProgramResource$ByteResource -> a.a.a.a.Z:
+    java.util.Set getClassDescriptors() -> b
+com.android.tools.r8.ProgramResource$1 -> a.a.a.a.U:
+com.android.tools.r8.ProgramResource$ByteResource -> a.a.a.a.V:
     com.android.tools.r8.origin.Origin origin -> a
     java.util.Set classDescriptors -> d
     boolean $assertionsDisabled -> e
@@ -469,19 +442,19 @@
     1:6:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.ProgramResource$Kind,byte[],java.util.Set):118:123 -> <init>
     1:6:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.ProgramResource$Kind,byte[],java.util.Set,com.android.tools.r8.ProgramResource$1):112 -> <init>
     1:1:com.android.tools.r8.origin.Origin getOrigin():128:128 -> a
-    1:1:java.io.InputStream getByteStream():138:138 -> c
-    1:1:com.android.tools.r8.ProgramResource$Kind getKind():133:133 -> d
-    1:1:java.util.Set getClassDescriptors():143:143 -> e
-com.android.tools.r8.ProgramResource$Kind -> a.a.a.a.aa:
+    1:1:java.util.Set getClassDescriptors():143:143 -> b
+    1:1:java.io.InputStream getByteStream():138:138 -> getByteStream
+    1:1:com.android.tools.r8.ProgramResource$Kind getKind():133:133 -> getKind
+com.android.tools.r8.ProgramResource$Kind -> a.a.a.a.W:
     com.android.tools.r8.ProgramResource$Kind DEX -> b
     com.android.tools.r8.ProgramResource$Kind CF -> a
     1:3:void <clinit>():30:32 -> <clinit>
     4:4:void <clinit>():27:27 -> <clinit>
     1:1:void <init>(java.lang.String,int):28:28 -> <init>
-com.android.tools.r8.ProgramResourceProvider -> a.a.a.a.ca:
-    java.util.Collection getProgramResources() -> a
-    com.android.tools.r8.DataResourceProvider getDataResourceProvider() -> b
-com.android.tools.r8.R8 -> a.a.a.a.da:
+com.android.tools.r8.ProgramResourceProvider -> a.a.a.a.Y:
+    com.android.tools.r8.DataResourceProvider getDataResourceProvider() -> a
+    java.util.Collection getProgramResources() -> b
+com.android.tools.r8.R8 -> a.a.a.a.Z:
     com.android.tools.r8.utils.Timing timing -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> c
@@ -526,55 +499,55 @@
     40:42:void run(com.android.tools.r8.R8Command):145:147 -> a
     43:54:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.utils.InternalOptions):172:183 -> a
     55:58:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.lang.String,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,java.lang.String,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):200:203 -> a
-    59:59:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():236:236 -> a
+    59:59:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():217:217 -> a
     59:59:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.lang.String,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,java.lang.String,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):213 -> a
     60:75:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.lang.String,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,java.lang.String,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):213:228 -> a
     76:77:java.util.Set filterMissingClasses(java.util.Set,com.android.tools.r8.shaking.ProguardClassFilter):234:235 -> a
     78:78:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):255:255 -> a
     78:78:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):246 -> a
     79:79:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):248:248 -> a
-    80:102:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):259:281 -> a
-    103:128:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):280:305 -> a
-    129:135:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):303:309 -> a
-    136:136:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):307:307 -> a
-    137:149:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):306:318 -> a
-    150:152:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):317:319 -> a
-    153:166:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):313:326 -> a
-    167:167:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):324:324 -> a
-    168:194:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):323:349 -> a
-    195:223:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):345:373 -> a
-    224:269:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):363:408 -> a
-    270:292:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):407:429 -> a
-    293:313:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):426:446 -> a
-    314:329:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):442:457 -> a
-    330:339:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):454:463 -> a
-    340:352:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):460:472 -> a
-    353:361:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):470:478 -> a
-    362:409:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):475:522 -> a
-    410:414:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):518:522 -> a
-    415:457:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):516:558 -> a
-    458:485:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):557:584 -> a
-    486:486:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):582:582 -> a
-    487:502:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):581:596 -> a
-    503:503:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):594:594 -> a
-    504:515:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):591:602 -> a
-    516:549:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):601:634 -> a
-    550:622:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):633:705 -> a
-    623:631:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):670:678 -> a
-    632:650:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):674:692 -> a
-    651:669:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):687:705 -> a
-    670:670:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):615:615 -> a
-    671:671:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):501:501 -> a
-    672:1001:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):376:705 -> a
-    1002:1003:void lambda$run$2(com.android.tools.r8.graph.DexType):285:286 -> a
-    1004:1004:void lambda$run$2(com.android.tools.r8.graph.DexType):285:285 -> a
-    1005:1005:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):373:373 -> a
-    1006:1006:void lambda$run$4(java.lang.String):665:665 -> a
-    1007:1010:void computeKotlinInfoForProgramClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):712:715 -> a
-    1011:1020:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):720:729 -> a
-    1021:1022:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):723:724 -> a
+    80:103:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):259:282 -> a
+    104:129:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):281:306 -> a
+    130:136:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):304:310 -> a
+    137:137:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):308:308 -> a
+    138:150:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):307:319 -> a
+    151:159:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):318:326 -> a
+    160:160:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):324:324 -> a
+    161:187:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):323:349 -> a
+    188:198:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):345:355 -> a
+    199:219:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):354:374 -> a
+    220:241:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):364:385 -> a
+    242:281:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):384:423 -> a
+    282:304:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):420:442 -> a
+    305:315:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):438:448 -> a
+    316:323:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):447:454 -> a
+    324:333:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):451:460 -> a
+    334:342:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):458:466 -> a
+    343:383:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):463:503 -> a
+    384:388:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):499:503 -> a
+    389:431:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):497:539 -> a
+    432:460:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):538:566 -> a
+    461:461:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):564:564 -> a
+    462:478:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):563:579 -> a
+    479:479:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):577:577 -> a
+    480:491:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):574:585 -> a
+    492:525:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):584:617 -> a
+    526:598:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):616:688 -> a
+    599:607:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):653:661 -> a
+    608:626:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):657:675 -> a
+    627:645:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):670:688 -> a
+    646:646:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):598:598 -> a
+    647:647:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):485:485 -> a
+    648:959:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):377:688 -> a
+    960:961:void lambda$run$2(com.android.tools.r8.graph.DexType):286:287 -> a
+    962:962:void lambda$run$2(com.android.tools.r8.graph.DexType):286:286 -> a
+    963:963:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):374:374 -> a
+    964:964:void lambda$run$4(java.lang.String):648:648 -> a
+    965:968:void computeKotlinInfoForProgramClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):695:698 -> a
+    969:978:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):703:712 -> a
+    979:980:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):706:707 -> a
     boolean lambda$run$3(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.R8Command -> a.a.a.a.ha:
+com.android.tools.r8.R8Command -> a.a.a.a.da:
     boolean enableTreeShaking -> m
     boolean enableMinification -> n
     boolean disableVerticalClassMerging -> o
@@ -593,17 +566,14 @@
     16:27:void <init>(boolean,boolean):624:635 -> <init>
     16:27:void <init>(boolean,boolean,com.android.tools.r8.R8Command$1):52 -> <init>
     1:7:com.android.tools.r8.utils.InternalOptions getInternalOptions():650:656 -> i
-    8:8:boolean getEnableTreeShaking():640:640 -> i
-    8:8:com.android.tools.r8.utils.InternalOptions getInternalOptions():656 -> i
-    9:10:com.android.tools.r8.utils.InternalOptions getInternalOptions():656:657 -> i
-    11:11:boolean getEnableMinification():645:645 -> i
-    11:11:com.android.tools.r8.utils.InternalOptions getInternalOptions():657 -> i
-    12:12:com.android.tools.r8.utils.InternalOptions getInternalOptions():657:657 -> i
-    13:13:boolean getEnableTreeShaking():640:640 -> i
-    13:13:com.android.tools.r8.utils.InternalOptions getInternalOptions():661 -> i
-    14:109:com.android.tools.r8.utils.InternalOptions getInternalOptions():661:756 -> i
-com.android.tools.r8.R8Command$1 -> a.a.a.a.ea:
-com.android.tools.r8.R8Command$Builder$1 -> a.a.a.a.fa:
+    8:8:boolean getEnableMinification():645:645 -> i
+    8:8:com.android.tools.r8.utils.InternalOptions getInternalOptions():657 -> i
+    9:10:com.android.tools.r8.utils.InternalOptions getInternalOptions():657:658 -> i
+    11:11:boolean getEnableTreeShaking():640:640 -> i
+    11:11:com.android.tools.r8.utils.InternalOptions getInternalOptions():659 -> i
+    12:111:com.android.tools.r8.utils.InternalOptions getInternalOptions():659:758 -> i
+com.android.tools.r8.R8Command$1 -> a.a.a.a.aa:
+com.android.tools.r8.R8Command$Builder$1 -> a.a.a.a.ba:
     com.android.tools.r8.shaking.ProguardConfigurationParser val$parser -> a
     com.android.tools.r8.utils.Reporter val$reporter -> b
     1:1:void <init>(com.android.tools.r8.R8Command$Builder,com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.utils.Reporter):388:388 -> <init>
@@ -612,26 +582,26 @@
     7:15:void visit(com.android.tools.r8.DataEntryResource):397:405 -> a
     16:17:void visit(com.android.tools.r8.DataEntryResource):402:403 -> a
     18:18:void visit(com.android.tools.r8.DataEntryResource):402:402 -> a
-com.android.tools.r8.R8Command$Builder$DefaultR8DiagnosticsHandler -> a.a.a.a.ga:
+com.android.tools.r8.R8Command$Builder$DefaultR8DiagnosticsHandler -> a.a.a.a.ca:
     1:1:void <init>():62:62 -> <init>
     1:1:void <init>(com.android.tools.r8.R8Command$1):62 -> <init>
     1:6:void error(com.android.tools.r8.Diagnostic):66:71 -> c
     7:14:void error(com.android.tools.r8.Diagnostic):69:76 -> c
-com.android.tools.r8.R8CommandParser -> a.a.a.a.ia:
+com.android.tools.r8.R8CommandParser -> a.a.a.a.ea:
     java.lang.String USAGE_MESSAGE -> a
-    1:31:void <clinit>():18:48 -> <clinit>
-    32:32:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():59:59 -> <clinit>
-    32:32:void <clinit>():64 -> <clinit>
-    33:33:void <clinit>():64:64 -> <clinit>
-    34:34:void <clinit>():51:51 -> <clinit>
-    35:35:void <clinit>():49:49 -> <clinit>
-com.android.tools.r8.Resource -> a.a.a.a.ja:
+    1:30:void <clinit>():18:47 -> <clinit>
+    31:31:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():59:59 -> <clinit>
+    31:31:void <clinit>():63 -> <clinit>
+    32:32:void <clinit>():63:63 -> <clinit>
+    33:33:void <clinit>():50:50 -> <clinit>
+    34:34:void <clinit>():48:48 -> <clinit>
+com.android.tools.r8.Resource -> a.a.a.a.fa:
     com.android.tools.r8.origin.Origin getOrigin() -> a
-com.android.tools.r8.ResourceException -> a.a.a.a.ka:
+com.android.tools.r8.ResourceException -> a.a.a.a.ga:
     com.android.tools.r8.origin.Origin origin -> a
     1:2:void <init>(com.android.tools.r8.origin.Origin,java.lang.Throwable):25:26 -> <init>
     1:1:com.android.tools.r8.origin.Origin getOrigin():35:35 -> a
-com.android.tools.r8.StringConsumer$FileConsumer -> a.a.a.a.la:
+com.android.tools.r8.StringConsumer$FileConsumer -> a.a.a.a.ha:
     java.nio.charset.Charset encoding -> c
     java.nio.file.Path outputPath -> b
     1:1:void <clinit>():68:68 -> <clinit>
@@ -647,11 +617,11 @@
     20:20:void com.android.tools.r8.com.google.common.io.CharSink.write(java.lang.CharSequence):94 -> a
     20:20:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):109 -> a
     21:22:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):111:112 -> a
-com.android.tools.r8.StringConsumer$ForwardingConsumer -> a.a.a.a.ma:
+com.android.tools.r8.StringConsumer$ForwardingConsumer -> a.a.a.a.ia:
     com.android.tools.r8.StringConsumer consumer -> a
     1:2:void <init>(com.android.tools.r8.StringConsumer):55:56 -> <init>
     1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):61:62 -> a
-com.android.tools.r8.StringConsumer$StreamConsumer -> a.a.a.a.na:
+com.android.tools.r8.StringConsumer$StreamConsumer -> a.a.a.a.ja:
     java.nio.charset.Charset encoding -> d
     com.android.tools.r8.origin.Origin origin -> b
     java.io.OutputStream outputStream -> c
@@ -660,11 +630,11 @@
     2:2:void <init>(com.android.tools.r8.origin.Origin,java.io.OutputStream,com.android.tools.r8.StringConsumer):137:137 -> <init>
     3:14:void <init>(com.android.tools.r8.origin.Origin,java.io.OutputStream,com.android.tools.r8.StringConsumer):128:139 -> <init>
     1:10:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):150:159 -> a
-com.android.tools.r8.StringResource -> a.a.a.a.qa:
+com.android.tools.r8.StringResource -> a.a.a.a.ma:
     1:1:com.android.tools.r8.StringResource fromFile(java.nio.file.Path):37:37 -> a
     2:2:com.android.tools.r8.StringResource fromFile(java.nio.file.Path,java.nio.charset.Charset):49:49 -> a
-com.android.tools.r8.StringResource$1 -> a.a.a.a.oa:
-com.android.tools.r8.StringResource$FileResource -> a.a.a.a.pa:
+com.android.tools.r8.StringResource$1 -> a.a.a.a.ka:
+com.android.tools.r8.StringResource$FileResource -> a.a.a.a.la:
     java.nio.charset.Charset charset -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.nio.file.Path file -> a
@@ -674,7 +644,7 @@
     1:6:void <init>(java.nio.file.Path,java.nio.charset.Charset,com.android.tools.r8.StringResource$1):82 -> <init>
     1:1:com.android.tools.r8.origin.Origin getOrigin():97:97 -> a
     1:3:java.lang.String getString():103:105 -> b
-com.android.tools.r8.Version -> a.a.a.a.ra:
+com.android.tools.r8.Version -> a.a.a.a.na:
     boolean com.android.tools.r8.utils.NumberUtils.is16Bit(long) -> a
     1:1:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoBufUtilKt.getExtensionOrNull(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):12:12 -> a
     2:5:java.util.Set com.android.tools.r8.utils.CollectionUtils.mergeSets(java.util.Collection,java.util.Collection):13:16 -> a
@@ -741,113 +711,113 @@
     24:24:int lambda$computeLocalsAtLabels$1(com.android.tools.r8.graph.CfCode$LocalVariableInfo,com.android.tools.r8.graph.CfCode$LocalVariableInfo):207:207 -> a
     25:26:java.util.List getSortedLocalVariables(com.android.tools.r8.graph.CfCode):214:215 -> a
     27:28:void print(java.lang.String):236:237 -> a
-    27:28:void print(com.android.tools.r8.cf.code.CfNop):241 -> a
-    29:58:void print(com.android.tools.r8.cf.code.CfStackInstruction):245:274 -> a
-    59:60:void print(java.lang.String):236:237 -> a
-    59:60:void print(com.android.tools.r8.cf.code.CfStackInstruction):271 -> a
-    61:62:void print(java.lang.String):236:237 -> a
-    61:62:void print(com.android.tools.r8.cf.code.CfStackInstruction):268 -> a
-    63:64:void print(java.lang.String):236:237 -> a
-    63:64:void print(com.android.tools.r8.cf.code.CfStackInstruction):265 -> a
-    65:66:void print(java.lang.String):236:237 -> a
-    65:66:void print(com.android.tools.r8.cf.code.CfStackInstruction):262 -> a
+    27:28:void print(com.android.tools.r8.cf.code.CfArrayLength):479 -> a
+    29:30:void print(java.lang.String):236:237 -> a
+    29:30:void print(com.android.tools.r8.cf.code.CfConstNull):283 -> a
+    31:32:void print(java.lang.String):236:237 -> a
+    31:32:void print(com.android.tools.r8.cf.code.CfNop):241 -> a
+    33:34:void print(java.lang.String):236:237 -> a
+    33:34:void print(com.android.tools.r8.cf.code.CfReturnVoid):314 -> a
+    35:36:void print(java.lang.String):236:237 -> a
+    35:36:void print(com.android.tools.r8.cf.code.CfThrow):279 -> a
+    37:66:void print(com.android.tools.r8.cf.code.CfStackInstruction):245:274 -> a
     67:68:void print(java.lang.String):236:237 -> a
-    67:68:void print(com.android.tools.r8.cf.code.CfStackInstruction):259 -> a
+    67:68:void print(com.android.tools.r8.cf.code.CfStackInstruction):271 -> a
     69:70:void print(java.lang.String):236:237 -> a
-    69:70:void print(com.android.tools.r8.cf.code.CfStackInstruction):256 -> a
+    69:70:void print(com.android.tools.r8.cf.code.CfStackInstruction):268 -> a
     71:72:void print(java.lang.String):236:237 -> a
-    71:72:void print(com.android.tools.r8.cf.code.CfStackInstruction):253 -> a
+    71:72:void print(com.android.tools.r8.cf.code.CfStackInstruction):265 -> a
     73:74:void print(java.lang.String):236:237 -> a
-    73:74:void print(com.android.tools.r8.cf.code.CfStackInstruction):250 -> a
+    73:74:void print(com.android.tools.r8.cf.code.CfStackInstruction):262 -> a
     75:76:void print(java.lang.String):236:237 -> a
-    75:76:void print(com.android.tools.r8.cf.code.CfStackInstruction):247 -> a
-    77:93:void print(com.android.tools.r8.cf.code.CfConstNumber):287:303 -> a
-    94:94:void print(com.android.tools.r8.cf.code.CfConstNumber):300:300 -> a
-    95:95:void print(com.android.tools.r8.cf.code.CfConstNumber):297:297 -> a
-    96:96:void print(com.android.tools.r8.cf.code.CfConstNumber):294:294 -> a
-    97:97:void print(com.android.tools.r8.cf.code.CfConstNumber):291:291 -> a
-    98:100:void print(com.android.tools.r8.cf.code.CfConstClass):308:310 -> a
-    101:101:void print(com.android.tools.r8.cf.code.CfReturn):318:318 -> a
-    102:102:void print(com.android.tools.r8.cf.code.CfMonitor):322:322 -> a
-    103:104:void print(java.lang.String):236:237 -> a
-    103:104:void print(com.android.tools.r8.cf.code.CfMonitor):322 -> a
-    105:105:void print(com.android.tools.r8.cf.code.CfArithmeticBinop):326:326 -> a
-    106:106:void print(com.android.tools.r8.cf.code.CfCmp):330:330 -> a
-    107:107:void print(com.android.tools.r8.cf.code.CfLogicalBinop):334:334 -> a
-    108:108:void print(com.android.tools.r8.cf.code.CfNeg):338:338 -> a
-    109:109:void print(com.android.tools.r8.cf.code.CfNumberConversion):342:342 -> a
-    110:111:void print(com.android.tools.r8.cf.code.CfConstString):346:347 -> a
-    112:113:void print(com.android.tools.r8.cf.code.CfDexItemBasedConstString):351:352 -> a
-    114:115:void print(com.android.tools.r8.cf.code.CfArrayLoad):356:357 -> a
-    116:117:void print(com.android.tools.r8.cf.code.CfArrayStore):361:362 -> a
-    118:120:void print(com.android.tools.r8.cf.code.CfInvoke):366:368 -> a
-    121:124:void print(com.android.tools.r8.cf.code.CfInvokeDynamic):372:375 -> a
-    125:144:void print(com.android.tools.r8.cf.code.CfFrame):379:398 -> a
-    145:148:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):402:405 -> a
-    149:152:void appendType(com.android.tools.r8.graph.DexType):688:691 -> a
-    149:152:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):405 -> a
-    153:153:void appendType(com.android.tools.r8.graph.DexType):689:689 -> a
-    153:153:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):405 -> a
-    154:154:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):407:407 -> a
-    155:157:void print(com.android.tools.r8.cf.code.CfInstanceOf):412:414 -> a
-    158:160:void print(com.android.tools.r8.cf.code.CfCheckCast):418:420 -> a
-    161:176:void print(com.android.tools.r8.cf.code.CfFieldInstruction):424:439 -> a
-    177:177:void print(com.android.tools.r8.cf.code.CfFieldInstruction):430:430 -> a
-    178:187:void print(com.android.tools.r8.cf.code.CfFieldInstruction):427:436 -> a
-    188:196:void print(com.android.tools.r8.cf.code.CfFieldInstruction):433:441 -> a
-    197:202:void appendField(com.android.tools.r8.graph.DexField):709:714 -> a
-    197:202:void print(com.android.tools.r8.cf.code.CfFieldInstruction):441 -> a
-    203:204:void print(com.android.tools.r8.cf.code.CfFieldInstruction):442:443 -> a
-    205:209:void appendDescriptor(com.android.tools.r8.graph.DexType):680:684 -> a
-    205:209:void print(com.android.tools.r8.cf.code.CfFieldInstruction):443 -> a
-    210:212:void print(com.android.tools.r8.cf.code.CfNew):447:449 -> a
-    213:226:void print(com.android.tools.r8.cf.code.CfNewArray):453:466 -> a
-    227:230:void print(com.android.tools.r8.cf.code.CfMultiANewArray):472:475 -> a
-    231:241:void print(com.android.tools.r8.cf.code.CfLabel):483:493 -> a
-    242:242:void print(com.android.tools.r8.cf.code.CfLabel):491:491 -> a
-    243:243:void print(com.android.tools.r8.cf.code.CfLabel):489:489 -> a
-    244:248:void print(com.android.tools.r8.cf.code.CfPosition):498:502 -> a
-    249:250:void print(com.android.tools.r8.cf.code.CfGoto):507:508 -> a
-    251:255:void print(com.android.tools.r8.cf.code.CfIf):516:520 -> a
-    256:256:java.lang.String ifPostfix(com.android.tools.r8.ir.code.If$Type):512:512 -> a
-    256:256:void print(com.android.tools.r8.cf.code.CfIf):520 -> a
-    257:259:void print(com.android.tools.r8.cf.code.CfIf):520:522 -> a
-    260:263:void print(com.android.tools.r8.cf.code.CfIfCmp):526:529 -> a
+    75:76:void print(com.android.tools.r8.cf.code.CfStackInstruction):259 -> a
+    77:78:void print(java.lang.String):236:237 -> a
+    77:78:void print(com.android.tools.r8.cf.code.CfStackInstruction):256 -> a
+    79:80:void print(java.lang.String):236:237 -> a
+    79:80:void print(com.android.tools.r8.cf.code.CfStackInstruction):253 -> a
+    81:82:void print(java.lang.String):236:237 -> a
+    81:82:void print(com.android.tools.r8.cf.code.CfStackInstruction):250 -> a
+    83:84:void print(java.lang.String):236:237 -> a
+    83:84:void print(com.android.tools.r8.cf.code.CfStackInstruction):247 -> a
+    85:101:void print(com.android.tools.r8.cf.code.CfConstNumber):287:303 -> a
+    102:102:void print(com.android.tools.r8.cf.code.CfConstNumber):300:300 -> a
+    103:103:void print(com.android.tools.r8.cf.code.CfConstNumber):297:297 -> a
+    104:104:void print(com.android.tools.r8.cf.code.CfConstNumber):294:294 -> a
+    105:105:void print(com.android.tools.r8.cf.code.CfConstNumber):291:291 -> a
+    106:108:void print(com.android.tools.r8.cf.code.CfConstClass):308:310 -> a
+    109:109:void print(com.android.tools.r8.cf.code.CfReturn):318:318 -> a
+    110:110:void print(com.android.tools.r8.cf.code.CfMonitor):322:322 -> a
+    111:112:void print(java.lang.String):236:237 -> a
+    111:112:void print(com.android.tools.r8.cf.code.CfMonitor):322 -> a
+    113:113:void print(com.android.tools.r8.cf.code.CfArithmeticBinop):326:326 -> a
+    114:114:void print(com.android.tools.r8.cf.code.CfCmp):330:330 -> a
+    115:115:void print(com.android.tools.r8.cf.code.CfLogicalBinop):334:334 -> a
+    116:116:void print(com.android.tools.r8.cf.code.CfNeg):338:338 -> a
+    117:117:void print(com.android.tools.r8.cf.code.CfNumberConversion):342:342 -> a
+    118:119:void print(com.android.tools.r8.cf.code.CfConstString):346:347 -> a
+    120:121:void print(com.android.tools.r8.cf.code.CfDexItemBasedConstString):351:352 -> a
+    122:123:void print(com.android.tools.r8.cf.code.CfArrayLoad):356:357 -> a
+    124:125:void print(com.android.tools.r8.cf.code.CfArrayStore):361:362 -> a
+    126:128:void print(com.android.tools.r8.cf.code.CfInvoke):366:368 -> a
+    129:132:void print(com.android.tools.r8.cf.code.CfInvokeDynamic):372:375 -> a
+    133:152:void print(com.android.tools.r8.cf.code.CfFrame):379:398 -> a
+    153:156:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):402:405 -> a
+    157:160:void appendType(com.android.tools.r8.graph.DexType):688:691 -> a
+    157:160:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):405 -> a
+    161:161:void appendType(com.android.tools.r8.graph.DexType):689:689 -> a
+    161:161:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):405 -> a
+    162:162:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):407:407 -> a
+    163:165:void print(com.android.tools.r8.cf.code.CfInstanceOf):412:414 -> a
+    166:168:void print(com.android.tools.r8.cf.code.CfCheckCast):418:420 -> a
+    169:184:void print(com.android.tools.r8.cf.code.CfFieldInstruction):424:439 -> a
+    185:185:void print(com.android.tools.r8.cf.code.CfFieldInstruction):430:430 -> a
+    186:195:void print(com.android.tools.r8.cf.code.CfFieldInstruction):427:436 -> a
+    196:204:void print(com.android.tools.r8.cf.code.CfFieldInstruction):433:441 -> a
+    205:210:void appendField(com.android.tools.r8.graph.DexField):709:714 -> a
+    205:210:void print(com.android.tools.r8.cf.code.CfFieldInstruction):441 -> a
+    211:212:void print(com.android.tools.r8.cf.code.CfFieldInstruction):442:443 -> a
+    213:217:void appendDescriptor(com.android.tools.r8.graph.DexType):680:684 -> a
+    213:217:void print(com.android.tools.r8.cf.code.CfFieldInstruction):443 -> a
+    218:220:void print(com.android.tools.r8.cf.code.CfNew):447:449 -> a
+    221:234:void print(com.android.tools.r8.cf.code.CfNewArray):453:466 -> a
+    235:238:void print(com.android.tools.r8.cf.code.CfMultiANewArray):472:475 -> a
+    239:249:void print(com.android.tools.r8.cf.code.CfLabel):483:493 -> a
+    250:250:void print(com.android.tools.r8.cf.code.CfLabel):491:491 -> a
+    251:251:void print(com.android.tools.r8.cf.code.CfLabel):489:489 -> a
+    252:256:void print(com.android.tools.r8.cf.code.CfPosition):498:502 -> a
+    257:258:void print(com.android.tools.r8.cf.code.CfGoto):507:508 -> a
+    259:263:void print(com.android.tools.r8.cf.code.CfIf):516:520 -> a
     264:264:java.lang.String ifPostfix(com.android.tools.r8.ir.code.If$Type):512:512 -> a
-    264:264:void print(com.android.tools.r8.cf.code.CfIfCmp):529 -> a
-    265:267:void print(com.android.tools.r8.cf.code.CfIfCmp):529:531 -> a
-    268:285:void print(com.android.tools.r8.cf.code.CfSwitch):535:552 -> a
-    286:286:void print(com.android.tools.r8.cf.code.CfLoad):556:556 -> a
-    287:287:void print(com.android.tools.r8.cf.code.CfStore):560:560 -> a
-    288:293:void print(com.android.tools.r8.cf.code.CfIinc):564:569 -> a
-    294:295:void printPrefixed(com.android.tools.r8.ir.code.ValueType,java.lang.String,int):573:574 -> a
-    296:308:char typePrefix(com.android.tools.r8.ir.code.ValueType):578:590 -> a
-    309:328:char typePrefix(com.android.tools.r8.ir.code.MemberType):595:614 -> a
-    329:331:void print(com.android.tools.r8.cf.code.CfConstMethodHandle):637:639 -> a
-    332:334:void print(com.android.tools.r8.cf.code.CfConstMethodType):643:645 -> a
-    335:335:void appendComment(java.lang.String):676:676 -> a
-    336:344:void appendClass(com.android.tools.r8.graph.DexType):696:704 -> a
-    345:345:void appendClass(com.android.tools.r8.graph.DexType):703:703 -> a
-    346:346:void appendClass(com.android.tools.r8.graph.DexType):702:702 -> a
-    347:350:void appendMethod(com.android.tools.r8.graph.DexMethod):718:721 -> a
-    351:358:java.lang.String com.android.tools.r8.naming.MemberNaming$MethodSignature.toDescriptor():325:332 -> a
-    351:358:void appendMethod(com.android.tools.r8.graph.DexMethod):721 -> a
-    359:363:void appendMethod(com.android.tools.r8.graph.DexMethod):721:725 -> a
-    364:364:java.lang.String opcodeName(int):729:729 -> a
+    264:264:void print(com.android.tools.r8.cf.code.CfIf):520 -> a
+    265:267:void print(com.android.tools.r8.cf.code.CfIf):520:522 -> a
+    268:271:void print(com.android.tools.r8.cf.code.CfIfCmp):526:529 -> a
+    272:272:java.lang.String ifPostfix(com.android.tools.r8.ir.code.If$Type):512:512 -> a
+    272:272:void print(com.android.tools.r8.cf.code.CfIfCmp):529 -> a
+    273:275:void print(com.android.tools.r8.cf.code.CfIfCmp):529:531 -> a
+    276:293:void print(com.android.tools.r8.cf.code.CfSwitch):535:552 -> a
+    294:294:void print(com.android.tools.r8.cf.code.CfLoad):556:556 -> a
+    295:295:void print(com.android.tools.r8.cf.code.CfStore):560:560 -> a
+    296:301:void print(com.android.tools.r8.cf.code.CfIinc):564:569 -> a
+    302:303:void printPrefixed(com.android.tools.r8.ir.code.ValueType,java.lang.String,int):573:574 -> a
+    304:316:char typePrefix(com.android.tools.r8.ir.code.ValueType):578:590 -> a
+    317:336:char typePrefix(com.android.tools.r8.ir.code.MemberType):595:614 -> a
+    337:339:void print(com.android.tools.r8.cf.code.CfConstMethodHandle):637:639 -> a
+    340:342:void print(com.android.tools.r8.cf.code.CfConstMethodType):643:645 -> a
+    343:345:void indent():665:667 -> a
+    346:346:void appendComment(java.lang.String):676:676 -> a
+    347:355:void appendClass(com.android.tools.r8.graph.DexType):696:704 -> a
+    356:356:void appendClass(com.android.tools.r8.graph.DexType):703:703 -> a
+    357:357:void appendClass(com.android.tools.r8.graph.DexType):702:702 -> a
+    358:361:void appendMethod(com.android.tools.r8.graph.DexMethod):718:721 -> a
+    362:369:java.lang.String com.android.tools.r8.naming.MemberNaming$MethodSignature.toDescriptor():320:327 -> a
+    362:369:void appendMethod(com.android.tools.r8.graph.DexMethod):721 -> a
+    370:374:void appendMethod(com.android.tools.r8.graph.DexMethod):721:725 -> a
+    375:375:java.lang.String opcodeName(int):729:729 -> a
     1:13:int lambda$getSortedLocalVariables$2(com.android.tools.r8.graph.CfCode$LocalVariableInfo,com.android.tools.r8.graph.CfCode$LocalVariableInfo):218:230 -> b
     14:15:void print(java.lang.String):236:237 -> b
-    16:17:void print(java.lang.String):236:237 -> b
-    16:17:void print(com.android.tools.r8.cf.code.CfThrow):279 -> b
-    18:18:java.lang.String getLabel(com.android.tools.r8.cf.code.CfLabel):649:649 -> b
-    1:2:void print(java.lang.String):236:237 -> c
-    1:2:void print(com.android.tools.r8.cf.code.CfConstNull):283 -> c
-    1:2:void print(java.lang.String):236:237 -> d
-    1:2:void print(com.android.tools.r8.cf.code.CfReturnVoid):314 -> d
-    1:2:void print(java.lang.String):236:237 -> e
-    1:2:void print(com.android.tools.r8.cf.code.CfArrayLength):479 -> e
-    1:3:void indent():665:667 -> f
-    1:2:void instructionIndex():659:660 -> g
-    1:2:void newline():653:654 -> h
+    16:16:java.lang.String getLabel(com.android.tools.r8.cf.code.CfLabel):649:649 -> b
+    17:18:void instructionIndex():659:660 -> b
+    1:2:void newline():653:654 -> c
     1:1:java.lang.String toString():734:734 -> toString
 com.android.tools.r8.cf.CfRegisterAllocator -> a.a.a.a.a.c:
     boolean $assertionsDisabled -> n
@@ -867,9 +837,9 @@
     1:1:void <clinit>():59:59 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.cf.TypeVerificationHelper):117:117 -> <init>
     2:29:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.cf.TypeVerificationHelper):93:120 -> <init>
-    1:1:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):130:130 -> a
+    1:1:int registersUsed():125:125 -> a
     2:6:int getRegisterForValue(com.android.tools.r8.ir.code.Value):134:138 -> a
-    7:7:com.android.tools.r8.utils.InternalOptions options():148:148 -> a
+    7:7:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):143:143 -> a
     8:29:int getNextFreeRegister(boolean):267:288 -> a
     30:33:void freeRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):292:295 -> a
     34:34:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):353:353 -> a
@@ -901,8 +871,8 @@
     174:179:void addNewBlockToShareIdenticalSuffix(com.android.tools.r8.ir.code.BasicBlock,int,java.util.List):570:575 -> a
     180:191:void updateFirstRegisterMapByJoiningTheSecond(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):582:593 -> a
     192:201:void updateFirstStackByJoiningTheSecond(java.util.List,java.util.List):600:609 -> a
-    1:1:int registersUsed():125:125 -> b
-    2:2:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):143:143 -> b
+    1:1:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):130:130 -> b
+    2:2:com.android.tools.r8.utils.InternalOptions options():148:148 -> b
     3:6:void takeRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):300:303 -> b
     7:18:com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry lambda$getTypesAtBlockEntry$0(com.android.tools.r8.ir.code.BasicBlock):370:381 -> b
     19:30:void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):387:398 -> b
@@ -1034,13 +1004,13 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):116:116 -> <init>
     2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):111:124 -> <init>
     1:13:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):128:140 -> a
-    14:14:boolean com.android.tools.r8.graph.DexType.isByteType():193:193 -> a
+    14:14:boolean com.android.tools.r8.graph.DexType.isByteType():435:435 -> a
     14:14:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):141 -> a
-    15:15:boolean com.android.tools.r8.graph.DexType.isCharType():197:197 -> a
+    15:15:boolean com.android.tools.r8.graph.DexType.isCharType():439:439 -> a
     15:15:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):142 -> a
-    16:16:boolean com.android.tools.r8.graph.DexType.isShortType():201:201 -> a
+    16:16:boolean com.android.tools.r8.graph.DexType.isShortType():443:443 -> a
     16:16:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):143 -> a
-    17:17:boolean com.android.tools.r8.graph.DexType.isIntType():205:205 -> a
+    17:17:boolean com.android.tools.r8.graph.DexType.isIntType():447:447 -> a
     17:17:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):144 -> a
     18:23:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):140:145 -> a
     24:27:com.android.tools.r8.graph.DexType getDexType(com.android.tools.r8.ir.code.Value):149:152 -> a
@@ -1075,7 +1045,7 @@
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.cf.TypeVerificationHelper$1):42 -> <init>
     1:1:com.android.tools.r8.graph.DexType getDexType():52:52 -> a
     1:1:java.lang.String toString():57:57 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():118:118 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():360:360 -> toString
     2:2:java.lang.String toString():57 -> toString
 com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo -> a.a.a.a.a.i:
     com.android.tools.r8.ir.code.NewInstance newInstance -> a
@@ -1379,7 +1349,7 @@
     boolean isInitialized() -> c
     1:1:boolean isWide():112:112 -> g
     1:1:java.lang.String toString():86:86 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():118:118 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():360:360 -> toString
     2:2:java.lang.String toString():86 -> toString
 com.android.tools.r8.cf.code.CfFrame$Top -> a.a.a.a.a.a.s:
     com.android.tools.r8.cf.code.CfFrame$Top SINGLETON -> a
@@ -4090,39 +4060,20 @@
     12:18:void com.android.tools.r8.code.Format4rcc.appendRegisterRange(java.lang.StringBuilder):115:121 -> a
     12:18:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):68 -> a
     12:18:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
-    19:21:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):69:71 -> a
-    19:21:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
-    22:22:java.lang.String com.android.tools.r8.graph.DexMethod.toSmaliString():161:161 -> a
-    22:22:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):71 -> a
-    22:22:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
-    23:23:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():113:113 -> a
-    23:23:java.lang.String com.android.tools.r8.graph.DexMethod.toSmaliString():161 -> a
-    23:23:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):71 -> a
-    23:23:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
-    24:24:java.lang.String com.android.tools.r8.graph.DexMethod.toSmaliString():161:161 -> a
-    24:24:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):71 -> a
-    24:24:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
-    25:25:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():95:95 -> a
-    25:25:java.lang.String com.android.tools.r8.graph.DexMethod.toSmaliString():161 -> a
-    25:25:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):71 -> a
-    25:25:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
-    26:26:java.lang.String com.android.tools.r8.graph.DexMethod.toSmaliString():161:161 -> a
-    26:26:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):71 -> a
-    26:26:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
-    27:32:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):71:76 -> a
-    27:32:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
-    33:33:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():95:95 -> a
-    33:33:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):76 -> a
-    33:33:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
-    34:38:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):76:80 -> a
-    34:38:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
-    39:39:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):98:98 -> a
-    39:39:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
-    40:41:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):45:46 -> a
-    40:41:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):98 -> a
-    40:41:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
-    42:42:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):99:99 -> a
-    42:42:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
+    19:26:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):69:76 -> a
+    19:26:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
+    27:27:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():95:95 -> a
+    27:27:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):76 -> a
+    27:27:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
+    28:32:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):76:80 -> a
+    28:32:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
+    33:33:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):98:98 -> a
+    33:33:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
+    34:35:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):45:46 -> a
+    34:35:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):98 -> a
+    34:35:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
+    36:36:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):99:99 -> a
+    36:36:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
     boolean canThrow() -> d
     1:5:boolean com.android.tools.r8.code.Format4rcc.equals(java.lang.Object):58:62 -> equals
     1:5:boolean com.android.tools.r8.code.Format4rcc.equals(java.lang.Object):0 -> equals
@@ -5559,8 +5510,7 @@
     boolean matches(char) -> a
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.none():117:117 -> negate
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher negate():1209 -> negate
-    2:2:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.none():117:117 -> negate
-    2:2:com.android.tools.r8.com.google.common.base.CharMatcher negate():1209 -> negate
+    2:2:com.android.tools.r8.com.google.common.base.CharMatcher negate():1209:1209 -> negate
     2:2:java.util.function.Predicate negate():1117 -> negate
 com.android.tools.r8.com.google.common.base.CharMatcher$Ascii -> a.a.a.a.c.a.a.a.c:
     com.android.tools.r8.com.google.common.base.CharMatcher$Ascii INSTANCE -> b
@@ -5682,10 +5632,7 @@
     1:3:void <clinit>():1326:1328 -> <clinit>
     1:1:void <init>():1331:1331 -> <init>
     1:1:boolean matches(char):1336:1336 -> a
-com.android.tools.r8.com.google.common.base.CommonPattern -> a.a.a.a.c.a.a.a.u:
-    1:1:void <init>():25:25 -> <init>
-    com.android.tools.r8.com.google.common.base.CommonMatcher matcher(java.lang.CharSequence) -> a
-com.android.tools.r8.com.google.common.base.Equivalence -> a.a.a.a.c.a.a.a.z:
+com.android.tools.r8.com.google.common.base.Equivalence -> a.a.a.a.c.a.a.a.y:
     1:1:void <init>():41:41 -> <init>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
     int doHash(java.lang.Object) -> a
@@ -5695,20 +5642,20 @@
     3:3:com.android.tools.r8.com.google.common.base.Equivalence identity():336:336 -> b
     1:1:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(java.lang.Object):162:162 -> c
     1:1:boolean test(java.lang.Object,java.lang.Object):78:78 -> test
-com.android.tools.r8.com.google.common.base.Equivalence$1 -> a.a.a.a.c.a.a.a.v:
-com.android.tools.r8.com.google.common.base.Equivalence$Equals -> a.a.a.a.c.a.a.a.w:
+com.android.tools.r8.com.google.common.base.Equivalence$1 -> a.a.a.a.c.a.a.a.u:
+com.android.tools.r8.com.google.common.base.Equivalence$Equals -> a.a.a.a.c.a.a.a.v:
     com.android.tools.r8.com.google.common.base.Equivalence$Equals INSTANCE -> a
     1:1:void <clinit>():341:341 -> <clinit>
     1:1:void <init>():339:339 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):345:345 -> a
     2:2:int doHash(java.lang.Object):350:350 -> a
-com.android.tools.r8.com.google.common.base.Equivalence$Identity -> a.a.a.a.c.a.a.a.x:
+com.android.tools.r8.com.google.common.base.Equivalence$Identity -> a.a.a.a.c.a.a.a.w:
     com.android.tools.r8.com.google.common.base.Equivalence$Identity INSTANCE -> a
     1:1:void <clinit>():362:362 -> <clinit>
     1:1:void <init>():360:360 -> <init>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
     1:1:int doHash(java.lang.Object):371:371 -> a
-com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> a.a.a.a.c.a.a.a.y:
+com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> a.a.a.a.c.a.a.a.x:
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> a
     java.lang.Object reference -> b
     1:3:void <init>(com.android.tools.r8.com.google.common.base.Equivalence,java.lang.Object):187:189 -> <init>
@@ -5716,28 +5663,12 @@
     4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
     4:4:void <init>(com.android.tools.r8.com.google.common.base.Equivalence,java.lang.Object):188 -> <init>
     4:4:void <init>(com.android.tools.r8.com.google.common.base.Equivalence,java.lang.Object,com.android.tools.r8.com.google.common.base.Equivalence$1):183 -> <init>
-    1:1:java.lang.Object get():195:195 -> a
     1:11:boolean equals(java.lang.Object):208:218 -> equals
+    1:1:java.lang.Object get():195:195 -> get
     1:1:int hashCode():229:229 -> hashCode
     1:1:java.lang.String toString():238:238 -> toString
-com.android.tools.r8.com.google.common.base.Function -> a.a.a.a.c.a.a.a.A:
-com.android.tools.r8.com.google.common.base.JdkPattern -> a.a.a.a.c.a.a.a.C:
-    java.util.regex.Pattern pattern -> a
-    1:2:void <init>(java.util.regex.Pattern):29:30 -> <init>
-    3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
-    3:3:void <init>(java.util.regex.Pattern):30 -> <init>
-    1:1:com.android.tools.r8.com.google.common.base.CommonMatcher matcher(java.lang.CharSequence):35:35 -> a
-    1:4:boolean equals(java.lang.Object):60:63 -> equals
-    1:1:int hashCode():55:55 -> hashCode
-    1:1:java.lang.String toString():50:50 -> toString
-com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> a.a.a.a.c.a.a.a.B:
-    java.util.regex.Matcher matcher -> a
-    1:1:void com.android.tools.r8.com.google.common.base.CommonMatcher.<init>():25:25 -> <init>
-    1:1:void <init>(java.util.regex.Matcher):69 -> <init>
-    2:2:void <init>(java.util.regex.Matcher):70:70 -> <init>
-    3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
-    3:3:void <init>(java.util.regex.Matcher):70 -> <init>
-com.android.tools.r8.com.google.common.base.MoreObjects -> a.a.a.a.c.a.a.a.G:
+com.android.tools.r8.com.google.common.base.Function -> a.a.a.a.c.a.a.a.z:
+com.android.tools.r8.com.google.common.base.MoreObjects -> a.a.a.a.c.a.a.a.D:
     1:1:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.alwaysFalse():62:62 -> a
     2:6:com.android.tools.r8.com.google.common.base.Supplier com.android.tools.r8.com.google.common.base.Suppliers.memoize(com.android.tools.r8.com.google.common.base.Supplier):97:101 -> a
     7:7:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean):121:121 -> a
@@ -5781,8 +5712,8 @@
     5:5:java.lang.Object firstNonNull(java.lang.Object,java.lang.Object):56 -> b
     6:6:int com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndex(int,int,java.lang.String):1241:1241 -> b
     6:6:int com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndex(int,int):1223 -> b
-com.android.tools.r8.com.google.common.base.MoreObjects$1 -> a.a.a.a.c.a.a.a.D:
-com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper -> a.a.a.a.c.a.a.a.F:
+com.android.tools.r8.com.google.common.base.MoreObjects$1 -> a.a.a.a.c.a.a.a.A:
+com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper -> a.a.a.a.c.a.a.a.C:
     com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder holderTail -> c
     com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder holderHead -> b
     java.lang.String className -> a
@@ -5804,37 +5735,21 @@
     4:4:com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper addHolder(java.lang.String,java.lang.Object):372 -> b
     1:20:java.lang.String toString():331:350 -> toString
     21:39:java.lang.String toString():336:354 -> toString
-com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder -> a.a.a.a.c.a.a.a.E:
+com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder -> a.a.a.a.c.a.a.a.B:
     com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder next -> c
     java.lang.Object value -> b
     java.lang.String name -> a
     1:1:void <init>():376:376 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.common.base.MoreObjects$1):376 -> <init>
-com.android.tools.r8.com.google.common.base.Optional -> a.a.a.a.c.a.a.a.H:
+com.android.tools.r8.com.google.common.base.Optional -> a.a.a.a.c.a.a.a.E:
     1:1:void <init>():150:150 -> <init>
     java.lang.Object or(java.lang.Object) -> a
     1:1:com.android.tools.r8.com.google.common.base.Optional com.android.tools.r8.com.google.common.base.Absent.withType():33:33 -> a
     1:1:com.android.tools.r8.com.google.common.base.Optional absent():93 -> a
-com.android.tools.r8.com.google.common.base.Platform -> a.a.a.a.c.a.a.a.K:
-    com.android.tools.r8.com.google.common.base.PatternCompiler patternCompiler -> b
-    java.util.logging.Logger logger -> a
-    1:1:void <clinit>():35:35 -> <clinit>
-    2:16:com.android.tools.r8.com.google.common.base.PatternCompiler loadPatternCompiler():74:88 -> <clinit>
-    2:16:void <clinit>():36 -> <clinit>
-    17:17:void <clinit>():36:36 -> <clinit>
-    1:1:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):66:66 -> a
-    2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    2:2:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):65 -> a
-    3:3:void logPatternCompilerError(java.util.ServiceConfigurationError):92:92 -> a
-com.android.tools.r8.com.google.common.base.Platform$1 -> a.a.a.a.c.a.a.a.I:
-com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> a.a.a.a.c.a.a.a.J:
-    1:1:void <init>():95:95 -> <init>
-    1:1:void <init>(com.android.tools.r8.com.google.common.base.Platform$1):95 -> <init>
-    1:1:com.android.tools.r8.com.google.common.base.CommonPattern compile(java.lang.String):98:98 -> a
-com.android.tools.r8.com.google.common.base.Predicate -> a.a.a.a.c.a.a.a.L:
+com.android.tools.r8.com.google.common.base.Predicate -> a.a.a.a.c.a.a.a.F:
     1:1:boolean test(java.lang.Object):80:80 -> test
-com.android.tools.r8.com.google.common.base.Predicates$1 -> a.a.a.a.c.a.a.a.M:
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> a.a.a.a.c.a.a.a.S:
+com.android.tools.r8.com.google.common.base.Predicates$1 -> a.a.a.a.c.a.a.a.G:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> a.a.a.a.c.a.a.a.L:
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate NOT_NULL -> d
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate ALWAYS_FALSE -> b
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate IS_NULL -> c
@@ -5844,30 +5759,16 @@
     1:1:void <init>(java.lang.String,int):281:281 -> <init>
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.base.Predicates$1):281 -> <init>
     com.android.tools.r8.com.google.common.base.Predicate withNarrowedType() -> a
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> a.a.a.a.c.a.a.a.N:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> a.a.a.a.c.a.a.a.H:
     1:1:void <init>(java.lang.String,int):283:283 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> a.a.a.a.c.a.a.a.O:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> a.a.a.a.c.a.a.a.I:
     1:1:void <init>(java.lang.String,int):295:295 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> a.a.a.a.c.a.a.a.P:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> a.a.a.a.c.a.a.a.J:
     1:1:void <init>(java.lang.String,int):307:307 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> a.a.a.a.c.a.a.a.Q:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> a.a.a.a.c.a.a.a.K:
     1:1:void <init>(java.lang.String,int):319:319 -> <init>
-com.android.tools.r8.com.google.common.base.Splitter -> a.a.a.a.c.a.a.a.U:
-    1:1:void <init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy):100:100 -> <init>
-    2:2:void <init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy,boolean,com.android.tools.r8.com.google.common.base.CharMatcher,int):103:103 -> <init>
-    2:2:void <init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy):100 -> <init>
-    1:1:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252:252 -> a
-    2:2:com.android.tools.r8.com.google.common.base.Splitter on(com.android.tools.r8.com.google.common.base.CommonPattern):214:214 -> a
-    2:2:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252 -> a
-    3:3:boolean com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher.matches():75:75 -> a
-    3:3:com.android.tools.r8.com.google.common.base.Splitter on(com.android.tools.r8.com.google.common.base.CommonPattern):214 -> a
-    3:3:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252 -> a
-    4:9:com.android.tools.r8.com.google.common.base.Splitter on(com.android.tools.r8.com.google.common.base.CommonPattern):213:218 -> a
-    4:9:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252 -> a
-com.android.tools.r8.com.google.common.base.Splitter$3 -> a.a.a.a.c.a.a.a.T:
-    1:1:void <init>(com.android.tools.r8.com.google.common.base.CommonPattern):219:219 -> <init>
-com.android.tools.r8.com.google.common.base.Supplier -> a.a.a.a.c.a.a.a.V:
-com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> a.a.a.a.c.a.a.a.W:
+com.android.tools.r8.com.google.common.base.Supplier -> a.a.a.a.c.a.a.a.M:
+com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> a.a.a.a.c.a.a.a.N:
     com.android.tools.r8.com.google.common.base.Supplier delegate -> a
     java.lang.Object value -> c
     boolean initialized -> b
@@ -5876,7 +5777,7 @@
     3:3:void <init>(com.android.tools.r8.com.google.common.base.Supplier):115 -> <init>
     1:11:java.lang.Object get():121:131 -> get
     1:1:java.lang.String toString():136:136 -> toString
-com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> a.a.a.a.c.a.a.a.X:
+com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> a.a.a.a.c.a.a.a.O:
     com.android.tools.r8.com.google.common.base.Supplier delegate -> a
     java.lang.Object value -> c
     boolean initialized -> b
@@ -5885,7 +5786,7 @@
     3:3:void <init>(com.android.tools.r8.com.google.common.base.Supplier):151 -> <init>
     1:13:java.lang.Object get():157:169 -> get
     1:1:java.lang.String toString():174:174 -> toString
-com.android.tools.r8.com.google.common.base.Throwables -> a.a.a.a.c.a.a.a.Y:
+com.android.tools.r8.com.google.common.base.Throwables -> a.a.a.a.c.a.a.a.P:
     java.lang.Object jla -> a
     1:3:java.lang.Object getJLA():482:484 -> <clinit>
     1:3:void <clinit>():452 -> <clinit>
@@ -5929,8 +5830,8 @@
     com.android.tools.r8.com.google.common.collect.AbstractIterator$State state -> a
     1:1:void <init>():68:68 -> <init>
     2:2:void <init>():65:65 -> <init>
-    java.lang.Object computeNext() -> e
-    1:1:java.lang.Object endOfData():125:125 -> f
+    java.lang.Object computeNext() -> d
+    1:1:java.lang.Object endOfData():125:125 -> e
     1:2:boolean hasNext():132:133 -> hasNext
     3:6:boolean tryToComputeNext():144:147 -> hasNext
     3:6:boolean hasNext():140 -> hasNext
@@ -5965,34 +5866,34 @@
     15:15:java.util.List com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.wrapList(java.lang.Object,java.util.List,com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection):331:331 -> a
     16:21:void com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.removeValuesForKey(java.lang.Object):1145:1150 -> a
     16:21:void com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.access$400(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object):91 -> a
-    22:22:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entries():1240:1240 -> a
-    22:22:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entries():0 -> a
-    23:26:java.util.Spliterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.lambda$entrySpliterator$1(java.util.Map$Entry):1266:1269 -> a
-    27:27:java.util.Spliterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.lambda$entrySpliterator$1(java.util.Map$Entry):1268:1268 -> a
+    22:25:java.util.Spliterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.lambda$entrySpliterator$1(java.util.Map$Entry):1266:1269 -> a
+    26:26:java.util.Spliterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.lambda$entrySpliterator$1(java.util.Map$Entry):1268:1268 -> a
+    27:32:java.util.Map com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.createAsMap():1284:1289 -> a
+    27:32:java.util.Map com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.createAsMap():0 -> a
+    1:1:java.util.Map asMap():117:117 -> asMap
     1:1:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.access$200(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap):91:91 -> b
-    2:2:java.util.Map asMap():117:117 -> b
-    3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.lambda$null$0(java.lang.Object,java.lang.Object):1269:1269 -> b
+    2:2:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.lambda$null$0(java.lang.Object,java.lang.Object):1269:1269 -> b
     1:1:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.access$208(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap):91:91 -> c
+    2:7:java.util.Set com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.createKeySet():932:937 -> c
+    2:7:java.util.Set com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.createKeySet():0 -> c
     1:5:void com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.clear():288:292 -> clear
     1:5:void com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.clear():0 -> clear
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.containsKey(java.lang.Object):185:185 -> containsKey
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.containsKey(java.lang.Object):0 -> containsKey
     1:1:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.access$210(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap):91:91 -> d
-    2:7:java.util.Map com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.createAsMap():1284:1289 -> d
-    2:7:java.util.Map com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.createAsMap():0 -> d
+    1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entryIterator():1253:1253 -> e
+    1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entryIterator():0 -> e
+    1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entries():1240:1240 -> entries
+    1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entries():0 -> entries
     1:1:boolean equals(java.lang.Object):129:129 -> equals
-    1:6:java.util.Set com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.createKeySet():932:937 -> f
-    1:6:java.util.Set com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.createKeySet():0 -> f
+    java.util.Spliterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entrySpliterator() -> f
+    java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.createCollection() -> g
     1:1:java.util.Collection get(java.lang.Object):35:35 -> get
     2:6:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.get(java.lang.Object):304:308 -> get
     2:6:java.util.List get(java.lang.Object):67 -> get
     7:7:java.util.List get(java.lang.Object):67:67 -> get
-    1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entryIterator():1253:1253 -> h
-    1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entryIterator():0 -> h
-    java.util.Spliterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entrySpliterator() -> i
-    java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.createCollection() -> j
-    1:10:java.util.Spliterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entrySpliterator():1263:1272 -> k
-    11:11:java.util.Spliterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entrySpliterator():1263:1263 -> k
+    1:10:java.util.Spliterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entrySpliterator():1263:1272 -> h
+    11:11:java.util.Spliterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.entrySpliterator():1263:1263 -> h
     1:12:boolean com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.put(java.lang.Object,java.lang.Object):192:203 -> put
     1:12:boolean put(java.lang.Object,java.lang.Object):106 -> put
     1:1:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.size():180:180 -> size
@@ -6021,8 +5922,8 @@
     1:5:void com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$Itr.remove():1187:1191 -> remove
     1:5:void com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$Itr.remove():0 -> remove
 com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap -> a.a.a.a.c.a.a.b.h:
-    java.util.Map submap -> d
-    com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> e
+    java.util.Map submap -> b
+    com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.Map):1301:1302 -> <init>
     1:2:java.util.Map$Entry wrapEntry(java.util.Map$Entry):1377:1378 -> a
     1:2:void clear():1369:1370 -> clear
@@ -6104,7 +6005,7 @@
     1:2:java.lang.Object next():960:961 -> next
     1:5:void remove():966:970 -> remove
 com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$NavigableAsMap -> a.a.a.a.c.a.a.b.k:
-    com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> h
+    com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> f
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.NavigableMap):1500:1501 -> <init>
     1:8:java.util.Map$Entry pollAsMapEntry(java.util.Iterator):1576:1583 -> a
     9:18:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.unmodifiableCollectionSubclass(java.util.Collection):272:281 -> a
@@ -6205,8 +6106,8 @@
 com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$RandomAccessWrappedList -> a.a.a.a.c.a.a.b.m:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object,java.util.List,com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection):926:926 -> <init>
 com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$SortedAsMap -> a.a.a.a.c.a.a.b.n:
-    com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> g
-    java.util.SortedSet sortedKeySet -> f
+    java.util.SortedSet sortedKeySet -> d
+    com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> e
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.SortedMap):1444:1445 -> <init>
     1:1:java.util.Comparator comparator():1454:1454 -> comparator
     1:1:java.lang.Object firstKey():1459:1459 -> firstKey
@@ -6275,7 +6176,7 @@
     9:9:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection):469:469 -> <init>
     10:10:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection,java.util.Iterator):472:472 -> <init>
     11:18:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection,java.util.Iterator):466:473 -> <init>
-    1:3:void validateIterator():481:483 -> e
+    1:3:void validateIterator():481:483 -> d
     1:2:boolean hasNext():489:490 -> hasNext
     1:2:java.lang.Object next():495:496 -> next
     1:3:void remove():501:503 -> remove
@@ -6312,9 +6213,9 @@
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedList):872:872 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedList,int):874:875 -> <init>
     1:5:void add(java.lang.Object):909:913 -> add
-    1:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection$WrappedIterator.getDelegateIterator():507:508 -> f
-    1:2:java.util.ListIterator getDelegateListIterator():879 -> f
-    3:3:java.util.ListIterator getDelegateListIterator():879:879 -> f
+    1:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection$WrappedIterator.getDelegateIterator():507:508 -> e
+    1:2:java.util.ListIterator getDelegateListIterator():879 -> e
+    3:3:java.util.ListIterator getDelegateListIterator():879:879 -> e
     1:1:boolean hasPrevious():884:884 -> hasPrevious
     1:1:int nextIndex():894:894 -> nextIndex
     1:1:java.lang.Object previous():889:889 -> previous
@@ -6395,11 +6296,11 @@
     java.util.Map$Entry val$mapEntry -> a
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$1 this$1 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$1,java.util.Map$Entry):99:99 -> <init>
-    1:3:int getCount():107:109 -> a
-    4:4:java.lang.Object getElement():102:102 -> a
-    4:4:int getCount():109 -> a
-    5:10:int getCount():109:114 -> a
-    1:1:java.lang.Object getElement():102:102 -> b
+    1:3:int getCount():107:109 -> getCount
+    4:4:java.lang.Object getElement():102:102 -> getCount
+    4:4:int getCount():109 -> getCount
+    5:10:int getCount():109:114 -> getCount
+    1:1:java.lang.Object getElement():102:102 -> getElement
 com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$MapBasedMultisetIterator -> a.a.a.a.c.a.a.b.y:
     java.util.Map$Entry currentEntry -> b
     java.util.Iterator entryIterator -> a
@@ -6423,24 +6324,24 @@
     java.util.Set keySet -> b
     com.android.tools.r8.com.google.common.collect.Multiset keys -> c
     1:1:void <init>():40:40 -> <init>
+    java.util.Map createAsMap() -> a
     1:2:boolean containsEntry(java.lang.Object,java.lang.Object):59:60 -> a
     3:8:boolean putAll(java.lang.Object,java.lang.Iterable):82:87 -> a
     9:9:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     9:9:boolean putAll(java.lang.Object,java.lang.Iterable):79 -> a
-    10:11:java.util.Collection entries():114:115 -> a
-    1:2:java.util.Map asMap():240:241 -> b
-    1:2:com.android.tools.r8.com.google.common.collect.Multiset keys():180:181 -> c
-    java.util.Map createAsMap() -> d
-    1:1:java.util.Collection createEntries():122:122 -> e
+    1:2:java.util.Map asMap():240:241 -> asMap
+    1:1:java.util.Collection createEntries():122:122 -> b
+    1:1:java.util.Set createKeySet():173:173 -> c
+    1:1:com.android.tools.r8.com.google.common.collect.Multiset createKeys():185:185 -> d
+    java.util.Iterator entryIterator() -> e
+    1:2:java.util.Collection entries():114:115 -> entries
     1:3:boolean com.android.tools.r8.com.google.common.collect.Multimaps.equalsImpl(com.android.tools.r8.com.google.common.collect.Multimap,java.lang.Object):2220:2222 -> equals
     1:3:boolean equals(java.lang.Object):250 -> equals
-    1:1:java.util.Set createKeySet():173:173 -> f
-    1:1:com.android.tools.r8.com.google.common.collect.Multiset createKeys():185:185 -> g
-    java.util.Iterator entryIterator() -> h
+    java.util.Spliterator entrySpliterator() -> f
     1:1:int hashCode():263:263 -> hashCode
-    java.util.Spliterator entrySpliterator() -> i
     1:1:boolean isEmpty():43:43 -> isEmpty
     1:2:java.util.Set keySet():168:169 -> keySet
+    1:2:com.android.tools.r8.com.google.common.collect.Multiset keys():180:181 -> keys
     1:2:boolean remove(java.lang.Object,java.lang.Object):66:67 -> remove
     1:1:java.lang.String toString():274:274 -> toString
 com.android.tools.r8.com.google.common.collect.AbstractMultimap$1 -> a.a.a.a.c.a.a.b.A:
@@ -6480,9 +6381,10 @@
     java.util.Set elementSet -> a
     java.util.Set entrySet -> b
     1:1:void <init>():47:47 -> <init>
-    int remove(java.lang.Object,int) -> a
-    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):966:970 -> a
-    1:5:boolean setCount(java.lang.Object,int,int):115 -> a
+    1:9:int com.android.tools.r8.com.google.common.collect.Multisets.setCountImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.lang.Object,int):948:956 -> a
+    1:9:int setCount(java.lang.Object,int):109 -> a
+    10:14: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):966:970 -> a
+    10:14:boolean setCount(java.lang.Object,int,int):115 -> a
     1:1:boolean add(java.lang.Object):84:84 -> add
     1:4:boolean com.android.tools.r8.com.google.common.collect.Multisets.addAllImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.util.Collection):905:908 -> addAll
     1:4:boolean addAll(java.util.Collection):129 -> addAll
@@ -6492,10 +6394,9 @@
     6:10:boolean com.android.tools.r8.com.google.common.collect.Multisets.addAllImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.util.Collection):910:914 -> addAll
     6:10:boolean addAll(java.util.Collection):129 -> addAll
     int count(java.lang.Object) -> b
-    1:1:int add(java.lang.Object,int):91:91 -> b
-    1:1:java.util.Set createEntrySet():212:212 -> c
-    2:10:int com.android.tools.r8.com.google.common.collect.Multisets.setCountImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.lang.Object,int):948:956 -> c
-    2:10:int setCount(java.lang.Object,int):109 -> c
+    int remove(java.lang.Object,int) -> b
+    1:1:int add(java.lang.Object,int):91:91 -> c
+    2:2:java.util.Set createEntrySet():212:212 -> c
     int distinctElements() -> e
     1:3:java.util.Set entrySet():186:188 -> entrySet
     1:1:boolean equals(java.lang.Object):226:226 -> equals
@@ -6599,26 +6500,26 @@
     2:2:void <init>():112 -> <init>
     3:3:void <init>():113:113 -> <init>
     1:1:boolean containsEntry(java.lang.Object,java.lang.Object):65:65 -> a
-    2:2:java.util.Collection entries():65:65 -> a
-    3:8:boolean com.android.tools.r8.com.google.common.collect.AbstractMultimap.putAll(java.lang.Object,java.lang.Iterable):82:87 -> a
-    3:8:boolean putAll(java.lang.Object,java.lang.Iterable):65 -> a
-    9:9:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    9:9:boolean com.android.tools.r8.com.google.common.collect.AbstractMultimap.putAll(java.lang.Object,java.lang.Iterable):79 -> a
-    9:9:boolean putAll(java.lang.Object,java.lang.Iterable):65 -> a
-    1:1:java.util.Map asMap():65:65 -> b
-    1:1:com.android.tools.r8.com.google.common.collect.Multiset keys():65:65 -> c
+    2:7:boolean com.android.tools.r8.com.google.common.collect.AbstractMultimap.putAll(java.lang.Object,java.lang.Iterable):82:87 -> a
+    2:7:boolean putAll(java.lang.Object,java.lang.Iterable):65 -> a
+    8:8:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    8:8:boolean com.android.tools.r8.com.google.common.collect.AbstractMultimap.putAll(java.lang.Object,java.lang.Iterable):79 -> a
+    8:8:boolean putAll(java.lang.Object,java.lang.Iterable):65 -> a
+    1:1:java.util.Map asMap():65:65 -> asMap
     1:1:void clear():65:65 -> clear
     1:1:boolean containsKey(java.lang.Object):65:65 -> containsKey
+    1:1:java.util.Collection entries():65:65 -> entries
     1:1:boolean equals(java.lang.Object):65:65 -> equals
+    1:1:java.util.List createCollection():137:137 -> g
+    1:1:java.util.Collection createCollection():65 -> g
     1:1:java.util.List get(java.lang.Object):65:65 -> get
+    1:1:com.android.tools.r8.com.google.common.collect.ArrayListMultimap create():80:80 -> h
     1:1:int com.android.tools.r8.com.google.common.collect.AbstractMultimap.hashCode():263:263 -> hashCode
     1:1:int hashCode():65 -> hashCode
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractMultimap.isEmpty():43:43 -> isEmpty
     1:1:boolean isEmpty():65 -> isEmpty
-    1:1:java.util.List createCollection():137:137 -> j
-    1:1:java.util.Collection createCollection():65 -> j
-    1:1:com.android.tools.r8.com.google.common.collect.ArrayListMultimap create():80:80 -> k
     1:1:java.util.Set keySet():65:65 -> keySet
+    1:1:com.android.tools.r8.com.google.common.collect.Multiset keys():65:65 -> keys
     1:1:boolean put(java.lang.Object,java.lang.Object):65:65 -> put
     1:2:boolean com.android.tools.r8.com.google.common.collect.AbstractMultimap.remove(java.lang.Object,java.lang.Object):66:67 -> remove
     1:2:boolean remove(java.lang.Object,java.lang.Object):65 -> remove
@@ -6772,131 +6673,121 @@
     257:257:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
     258:258:void com.android.tools.r8.com.google.common.base.Preconditions.checkState(boolean,java.lang.Object):459:459 -> a
     258:258:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):65 -> a
-    259:259:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator,java.util.Iterator):503:503 -> a
-    260:260:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.consumingForArray(java.lang.Object[]):471:471 -> a
-    260:260:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator,java.util.Iterator):503 -> a
-    261:261:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator):578:578 -> a
-    261:261:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator,java.util.Iterator):503 -> a
-    262:262:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    262:262:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator,java.util.Iterator):502 -> a
-    263:263:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    263:263:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator,java.util.Iterator):501 -> a
-    264:264:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627:627 -> a
-    265:268:int com.android.tools.r8.com.google.common.collect.Iterators.indexOf(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):796:799 -> a
-    265:268:boolean com.android.tools.r8.com.google.common.collect.Iterators.any(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):688 -> a
-    265:268:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627 -> a
-    269:269:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.find(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):669:669 -> a
-    270:272:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.find(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):745:747 -> a
-    270:272:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.find(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):669 -> a
-    273:273:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    273:273:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.find(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):744 -> a
-    273:273:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.find(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):669 -> a
-    274:274:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    274:274:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.find(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):743 -> a
-    274:274:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.find(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):669 -> a
-    275:275: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):817:817 -> a
-    276:276:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    276:276: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):816 -> a
-    277:284:java.util.List com.android.tools.r8.com.google.common.collect.Lists.reverse(java.util.List):840:847 -> a
-    285:297:boolean com.android.tools.r8.com.google.common.collect.Multisets.equalsImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.lang.Object):880:892 -> a
-    298:301:com.android.tools.r8.com.google.common.collect.Sets$SetView com.android.tools.r8.com.google.common.collect.Sets.difference(java.util.Set,java.util.Set):911:914 -> a
-    302:303:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.limit(java.util.Iterator,int):951:952 -> a
-    304:304:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    304:304:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.limit(java.util.Iterator,int):950 -> a
-    305:307:void com.android.tools.r8.com.google.common.collect.Iterators.clear(java.util.Iterator):1033:1035 -> a
-    308:308:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    308:308:void com.android.tools.r8.com.google.common.collect.Iterators.clear(java.util.Iterator):1032 -> a
-    309:314: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):1085:1090 -> a
-    315:315:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.emptyListIterator():90:90 -> a
-    315:315: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):1092 -> a
-    316:316: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):1094:1094 -> a
-    317:317:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.singletonIterator(java.lang.Object):1104:1104 -> a
-    318:318:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Multisets.lambda$spliteratorImpl$2(com.android.tools.r8.com.google.common.collect.Multiset$Entry):1126:1126 -> a
-    319:321:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.Multisets.copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1159:1161 -> a
-    322:323:int com.android.tools.r8.com.google.common.collect.Sets.hashCodeImpl(java.util.Set):1770:1771 -> a
-    324:328:boolean com.android.tools.r8.com.google.common.collect.Sets.equalsImpl(java.util.Set,java.lang.Object):1786:1790 -> a
-    329:332:java.util.NavigableSet com.android.tools.r8.com.google.common.collect.Sets.unmodifiableNavigableSet(java.util.NavigableSet):1817:1820 -> a
-    333:344:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):1988:1999 -> a
-    345:347:boolean com.android.tools.r8.com.google.common.collect.Iterators.removeAll(java.util.Iterator,java.util.Collection):208:210 -> a
-    345:347:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):1999 -> a
-    348:348:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):2001:2001 -> a
-    349:350:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Iterator):1980:1981 -> a
-    349:350:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):2001 -> a
-    351:351:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    351:351:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):1987 -> a
-    352:352:boolean com.android.tools.r8.com.google.common.collect.Maps.safeContainsKey(java.util.Map,java.lang.Object):3721:3721 -> a
-    353:353:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    353:353:boolean com.android.tools.r8.com.google.common.collect.Maps.safeContainsKey(java.util.Map,java.lang.Object):3719 -> a
-    354:359:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.Maps.indexMap(java.util.Collection):4375:4380 -> a
-    354:359:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1668 -> a
-    360:367:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1669:1676 -> a
+    259:259:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627:627 -> a
+    260:263:int com.android.tools.r8.com.google.common.collect.Iterators.indexOf(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):796:799 -> a
+    260:263:boolean com.android.tools.r8.com.google.common.collect.Iterators.any(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):688 -> a
+    260:263:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627 -> a
+    264:264:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.find(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):669:669 -> a
+    265:267:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.find(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):745:747 -> a
+    265:267:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.find(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):669 -> a
+    268:268:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    268:268:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.find(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):744 -> a
+    268:268:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.find(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):669 -> a
+    269:269:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    269:269:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.find(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):743 -> a
+    269:269:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.find(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):669 -> a
+    270:270: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):817:817 -> a
+    271:271:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    271:271: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):816 -> a
+    272:279:java.util.List com.android.tools.r8.com.google.common.collect.Lists.reverse(java.util.List):840:847 -> a
+    280:292:boolean com.android.tools.r8.com.google.common.collect.Multisets.equalsImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.lang.Object):880:892 -> a
+    293:296:com.android.tools.r8.com.google.common.collect.Sets$SetView com.android.tools.r8.com.google.common.collect.Sets.difference(java.util.Set,java.util.Set):911:914 -> a
+    297:298:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.limit(java.util.Iterator,int):951:952 -> a
+    299:299:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    299:299:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.limit(java.util.Iterator,int):950 -> a
+    300:302:void com.android.tools.r8.com.google.common.collect.Iterators.clear(java.util.Iterator):1033:1035 -> a
+    303:303:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    303:303:void com.android.tools.r8.com.google.common.collect.Iterators.clear(java.util.Iterator):1032 -> a
+    304:309: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):1085:1090 -> a
+    310:310:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.emptyListIterator():90:90 -> a
+    310:310: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):1092 -> a
+    311:311: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):1094:1094 -> a
+    312:312:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.singletonIterator(java.lang.Object):1104:1104 -> a
+    313:313:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Multisets.lambda$spliteratorImpl$2(com.android.tools.r8.com.google.common.collect.Multiset$Entry):1126:1126 -> a
+    314:316:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.Multisets.copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1159:1161 -> a
+    317:318:int com.android.tools.r8.com.google.common.collect.Sets.hashCodeImpl(java.util.Set):1770:1771 -> a
+    319:323:boolean com.android.tools.r8.com.google.common.collect.Sets.equalsImpl(java.util.Set,java.lang.Object):1786:1790 -> a
+    324:327:java.util.NavigableSet com.android.tools.r8.com.google.common.collect.Sets.unmodifiableNavigableSet(java.util.NavigableSet):1817:1820 -> a
+    328:339:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):1988:1999 -> a
+    340:342:boolean com.android.tools.r8.com.google.common.collect.Iterators.removeAll(java.util.Iterator,java.util.Collection):208:210 -> a
+    340:342:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):1999 -> a
+    343:343:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):2001:2001 -> a
+    344:345:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Iterator):1980:1981 -> a
+    344:345:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):2001 -> a
+    346:346:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    346:346:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):1987 -> a
+    347:347:boolean com.android.tools.r8.com.google.common.collect.Maps.safeContainsKey(java.util.Map,java.lang.Object):3721:3721 -> a
+    348:348:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    348:348:boolean com.android.tools.r8.com.google.common.collect.Maps.safeContainsKey(java.util.Map,java.lang.Object):3719 -> a
+    349:354:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.Maps.indexMap(java.util.Collection):4375:4380 -> a
+    349:354:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1668 -> a
+    355:362:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1669:1676 -> a
     1:1:int com.android.tools.r8.com.google.common.collect.Hashing.smearedHash(java.lang.Object):54:54 -> b
-    2:2:com.android.tools.r8.com.google.common.base.Function com.android.tools.r8.com.google.common.collect.Maps.keyFunction():111:111 -> b
-    2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.Maps.keyIterator(java.util.Iterator):120 -> b
-    3:3: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):817:817 -> b
-    3:3:java.util.Iterator com.android.tools.r8.com.google.common.collect.Maps.keyIterator(java.util.Iterator):120 -> b
-    4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
-    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):816 -> b
-    4:4:java.util.Iterator com.android.tools.r8.com.google.common.collect.Maps.keyIterator(java.util.Iterator):120 -> b
-    5:5:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getOnlyElement(java.lang.Iterable):266:266 -> b
-    6:20:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getOnlyElement(java.util.Iterator):314:328 -> b
-    6:20:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getOnlyElement(java.lang.Iterable):266 -> b
-    21:21:java.util.HashMap com.android.tools.r8.com.google.common.collect.Maps.newHashMapWithExpectedSize(int):300:300 -> b
-    22:22:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.newConcurrentHashSet():310:310 -> b
-    23:23:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):575:575 -> b
-    24:24:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
-    24:24:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):574 -> b
-    25:25:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
-    25:25:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):573 -> b
-    26:29:com.android.tools.r8.com.google.common.collect.Sets$SetView com.android.tools.r8.com.google.common.collect.Sets.intersection(java.util.Set,java.util.Set):839:842 -> b
-    30:30:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[]):1054:1054 -> b
-    31:38:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Multisets.spliteratorImpl(com.android.tools.r8.com.google.common.collect.Multiset):1123:1130 -> b
-    39:39:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Multisets.spliteratorImpl(com.android.tools.r8.com.google.common.collect.Multiset):1124:1124 -> b
-    40:40:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.immutableEntry(java.lang.Object,java.lang.Object):1421:1421 -> b
-    41:41:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeGet(java.util.Map,java.lang.Object):3706:3706 -> b
-    42:42:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
-    42:42:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeGet(java.util.Map,java.lang.Object):3704 -> b
-    1:1:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList():88:88 -> c
-    1:1:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.util.Iterator):164 -> c
-    2:2:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.util.Iterator):165:165 -> c
-    3:3:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):114:114 -> c
-    4:7:int com.android.tools.r8.com.google.common.collect.Lists.computeArrayListCapacity(int):122:125 -> c
-    4:7:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):114 -> c
-    8:9:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):115:116 -> c
-    10:10:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> c
-    10:10:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):112 -> c
-    11:11:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Iterable):148:148 -> c
-    12:12:java.util.Collection cast(java.lang.Iterable):377:377 -> c
-    12:12:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Iterable):149 -> c
-    13:14:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Iterable):149:150 -> c
-    15:15:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> c
-    15:15:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Iterable):146 -> c
-    16:16:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet():218:218 -> c
-    17:17:java.util.LinkedHashMap com.android.tools.r8.com.google.common.collect.Maps.newLinkedHashMapWithExpectedSize(int):377:377 -> c
-    18:21:com.android.tools.r8.com.google.common.collect.Sets$SetView com.android.tools.r8.com.google.common.collect.Sets.union(java.util.Set,java.util.Set):741:744 -> c
-    22:22:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeRemove(java.util.Map,java.lang.Object):3736:3736 -> c
-    23:23:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> c
-    23:23:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeRemove(java.util.Map,java.lang.Object):3734 -> c
+    2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getOnlyElement(java.lang.Iterable):266:266 -> b
+    3:3:java.util.HashMap com.android.tools.r8.com.google.common.collect.Maps.newHashMapWithExpectedSize(int):300:300 -> b
+    4:4:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.newConcurrentHashSet():310:310 -> b
+    5:19:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getOnlyElement(java.util.Iterator):314:328 -> b
+    20:20:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):575:575 -> b
+    21:21:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
+    21:21:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):574 -> b
+    22:22:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
+    22:22:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):573 -> b
+    23:26:com.android.tools.r8.com.google.common.collect.Sets$SetView com.android.tools.r8.com.google.common.collect.Sets.intersection(java.util.Set,java.util.Set):839:842 -> b
+    27:27:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[]):1054:1054 -> b
+    28:35:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Multisets.spliteratorImpl(com.android.tools.r8.com.google.common.collect.Multiset):1123:1130 -> b
+    36:36:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Multisets.spliteratorImpl(com.android.tools.r8.com.google.common.collect.Multiset):1124:1124 -> b
+    37:37:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.immutableEntry(java.lang.Object,java.lang.Object):1421:1421 -> b
+    38:38:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeGet(java.util.Map,java.lang.Object):3706:3706 -> b
+    39:39:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
+    39:39:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeGet(java.util.Map,java.lang.Object):3704 -> b
+    1:1:com.android.tools.r8.com.google.common.base.Function com.android.tools.r8.com.google.common.collect.Maps.keyFunction():111:111 -> c
+    1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.Maps.keyIterator(java.util.Iterator):120 -> c
+    2:2: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):817:817 -> c
+    2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.Maps.keyIterator(java.util.Iterator):120 -> c
+    3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> c
+    3:3: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):816 -> c
+    3:3:java.util.Iterator com.android.tools.r8.com.google.common.collect.Maps.keyIterator(java.util.Iterator):120 -> c
+    4:4:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):114:114 -> c
+    5:8:int com.android.tools.r8.com.google.common.collect.Lists.computeArrayListCapacity(int):122:125 -> c
+    5:8:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):114 -> c
+    9:10:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):115:116 -> c
+    11:11:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> c
+    11:11:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):112 -> c
+    12:12:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Iterable):148:148 -> c
+    13:13:java.util.Collection cast(java.lang.Iterable):377:377 -> c
+    13:13:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Iterable):149 -> c
+    14:15:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Iterable):149:150 -> c
+    16:16:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> c
+    16:16:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Iterable):146 -> c
+    17:17:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet():218:218 -> c
+    18:18:java.util.LinkedHashMap com.android.tools.r8.com.google.common.collect.Maps.newLinkedHashMapWithExpectedSize(int):377:377 -> c
+    19:22:com.android.tools.r8.com.google.common.collect.Sets$SetView com.android.tools.r8.com.google.common.collect.Sets.union(java.util.Set,java.util.Set):741:744 -> c
+    23:23:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeRemove(java.util.Map,java.lang.Object):3736:3736 -> c
+    24:24:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> c
+    24:24:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeRemove(java.util.Map,java.lang.Object):3734 -> c
     1:1:int com.android.tools.r8.com.google.common.collect.Hashing.smear(int):50:50 -> d
-    2:2:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.lang.Iterable):275:275 -> d
-    3:3:java.util.Collection cast(java.lang.Iterable):377:377 -> d
-    3:3:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.lang.Iterable):276 -> d
-    4:5:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.lang.Iterable):276:277 -> d
-    6:7:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.util.Iterator):293:294 -> d
-    6:7:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.lang.Iterable):277 -> d
-    8:8:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> d
-    9:11:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.pollNext(java.util.Iterator):1017:1019 -> d
+    2:2:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList():88:88 -> d
+    2:2:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.util.Iterator):164 -> d
+    3:3:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.util.Iterator):165:165 -> d
+    4:4:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.lang.Iterable):275:275 -> d
+    5:5:java.util.Collection cast(java.lang.Iterable):377:377 -> d
+    5:5:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.lang.Iterable):276 -> d
+    6:7:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.lang.Iterable):276:277 -> d
+    8:9:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.util.Iterator):293:294 -> d
+    8:9:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.lang.Iterable):277 -> d
+    10:10:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> d
     1:3:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.stream(java.lang.Iterable):62:64 -> e
-    4:4:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.stream(java.util.Iterator):82:82 -> e
-    5:5:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.newIdentityHashSet():466:466 -> e
-    1:6:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.unmodifiableIterator(java.util.Iterator):132:137 -> f
-    7:7:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> f
-    7:7:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.unmodifiableIterator(java.util.Iterator):131 -> f
-    8:10:java.util.Collection com.android.tools.r8.com.google.common.collect.Iterables.castOrCopyToCollection(java.lang.Iterable):318:320 -> f
-    8:10:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable):309 -> f
-    11:11:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable):309:309 -> f
-    12:12:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet():347:347 -> f
+    4:4:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.newIdentityHashSet():466:466 -> e
+    5:7:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.pollNext(java.util.Iterator):1017:1019 -> e
+    1:1:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.stream(java.util.Iterator):82:82 -> f
+    2:4:java.util.Collection com.android.tools.r8.com.google.common.collect.Iterables.castOrCopyToCollection(java.lang.Iterable):318:320 -> f
+    2:4:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable):309 -> f
+    5:5:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable):309:309 -> f
+    6:6:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet():347:347 -> f
     1:1:com.android.tools.r8.com.google.common.base.Function com.android.tools.r8.com.google.common.collect.Maps.valueFunction():116:116 -> g
+    2:7:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.unmodifiableIterator(java.util.Iterator):132:137 -> g
+    8:8:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> g
+    8:8:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.unmodifiableIterator(java.util.Iterator):131 -> g
 com.android.tools.r8.com.google.common.collect.ComparatorOrdering -> a.a.a.a.c.a.a.b.S:
     java.util.Comparator comparator -> a
     1:2:void <init>(java.util.Comparator):31:32 -> <init>
@@ -6909,12 +6800,12 @@
 com.android.tools.r8.com.google.common.collect.Count -> a.a.a.a.c.a.a.b.T:
     int value -> a
     1:2:void <init>(int):30:31 -> <init>
-    1:1:int get():35:35 -> a
-    2:2:void add(int):39:39 -> a
+    1:1:void add(int):39:39 -> a
     1:1:int addAndGet(int):43:43 -> b
     1:2:int getAndSet(int):51:52 -> c
     1:1:void set(int):47:47 -> d
     1:1:boolean equals(java.lang.Object):63:63 -> equals
+    1:1:int get():35:35 -> get
     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 -> a.a.a.a.c.a.a.b.U:
@@ -7024,17 +6915,17 @@
     1:2:boolean com.android.tools.r8.com.google.common.collect.StandardTable.containsValue(java.lang.Object):106 -> c
     1:2:boolean containsValue(java.lang.Object):133 -> c
     1:1:java.util.Map rowMap():55:55 -> d
-    1:2:int com.android.tools.r8.com.google.common.collect.StandardTable.size():122:123 -> e
-    1:2:int size():55 -> e
+    1:1:com.android.tools.r8.com.google.common.collect.HashBasedTable create():76:76 -> e
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractTable.equals(java.lang.Object):228:228 -> equals
     1:1:boolean equals(java.lang.Object):143 -> equals
-    1:1:com.android.tools.r8.com.google.common.collect.HashBasedTable create():76:76 -> f
-    1:1:boolean com.android.tools.r8.com.google.common.collect.StandardTable.isEmpty():116:116 -> g
-    1:1:boolean isEmpty():55 -> g
-    1:1:java.util.Set com.android.tools.r8.com.google.common.collect.StandardTable.rowKeySet():625:625 -> h
-    1:1:java.util.Set rowKeySet():55 -> h
+    1:1:java.util.Set com.android.tools.r8.com.google.common.collect.StandardTable.rowKeySet():625:625 -> f
+    1:1:java.util.Set rowKeySet():55 -> f
     1:1:int com.android.tools.r8.com.google.common.collect.AbstractTable.hashCode():233:233 -> hashCode
     1:1:int hashCode():55 -> hashCode
+    1:1:boolean com.android.tools.r8.com.google.common.collect.StandardTable.isEmpty():116:116 -> isEmpty
+    1:1:boolean isEmpty():55 -> isEmpty
+    1:2:int com.android.tools.r8.com.google.common.collect.StandardTable.size():122:123 -> size
+    1:2:int size():55 -> size
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.AbstractTable.toString():241:241 -> toString
     1:1:java.lang.String toString():55 -> toString
 com.android.tools.r8.com.google.common.collect.HashBasedTable$Factory -> a.a.a.a.c.a.a.b.da:
@@ -7246,12 +7137,12 @@
     2:4:void <init>():70 -> <init>
     1:1:java.util.Map com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.access$000(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset):48:48 -> a
     2:2:long com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.access$102(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset,long):48:48 -> a
-    3:22:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.remove(java.lang.Object,int):247:266 -> a
-    3:22:int remove(java.lang.Object,int):33 -> a
-    23:23:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.getAndSet(com.android.tools.r8.com.google.common.collect.Count,int):299:299 -> a
-    24:28: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):966:970 -> a
-    24:28:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.setCount(java.lang.Object,int,int):115 -> a
-    24:28:boolean setCount(java.lang.Object,int,int):33 -> a
+    3:19:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.setCount(java.lang.Object,int):274:290 -> a
+    3:19:int setCount(java.lang.Object,int):33 -> a
+    20:20:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.getAndSet(com.android.tools.r8.com.google.common.collect.Count,int):299:299 -> a
+    21:25: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):966:970 -> a
+    21:25:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.setCount(java.lang.Object,int,int):115 -> a
+    21:25:boolean setCount(java.lang.Object,int,int):33 -> a
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.add(java.lang.Object):84:84 -> add
     1:1:boolean add(java.lang.Object):33 -> add
     1:4:boolean com.android.tools.r8.com.google.common.collect.Multisets.addAllImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.util.Collection):905:908 -> addAll
@@ -7267,11 +7158,11 @@
     1:1:long com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.access$100(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset):48:48 -> b
     2:3:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.count(java.lang.Object):208:209 -> b
     2:3:int count(java.lang.Object):33 -> b
-    4:18:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.add(java.lang.Object,int):225:239 -> b
-    4:18:int add(java.lang.Object,int):33 -> b
+    4:23:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.remove(java.lang.Object,int):247:266 -> b
+    4:23:int remove(java.lang.Object,int):33 -> b
     1:1:long com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.access$110(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset):48:48 -> c
-    2:18:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.setCount(java.lang.Object,int):274:290 -> c
-    2:18:int setCount(java.lang.Object,int):33 -> c
+    2:16:int com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.add(java.lang.Object,int):225:239 -> c
+    2:16:int add(java.lang.Object,int):33 -> c
     1:5:void com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.clear():136:140 -> clear
     1:5:void clear():33 -> clear
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.contains(java.lang.Object):62:62 -> contains
@@ -7424,9 +7315,11 @@
     int hashCode -> d
     1:2:void <init>(java.util.EnumSet):58:59 -> <init>
     1:7:com.android.tools.r8.com.google.common.collect.ImmutableSet asImmutable(java.util.EnumSet):38:44 -> a
-    8:8:com.android.tools.r8.com.google.common.collect.ImmutableSet asImmutable(java.util.EnumSet):42:42 -> a
-    9:9:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():74:74 -> a
-    9:9:com.android.tools.r8.com.google.common.collect.ImmutableSet asImmutable(java.util.EnumSet):40 -> a
+    8:8:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getOnlyElement(java.lang.Iterable):266:266 -> a
+    8:8:com.android.tools.r8.com.google.common.collect.ImmutableSet asImmutable(java.util.EnumSet):42 -> a
+    9:9:com.android.tools.r8.com.google.common.collect.ImmutableSet asImmutable(java.util.EnumSet):42:42 -> a
+    10:10:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():74:74 -> a
+    10:10:com.android.tools.r8.com.google.common.collect.ImmutableSet asImmutable(java.util.EnumSet):40 -> a
     1:1:boolean contains(java.lang.Object):89:89 -> contains
     1:4:boolean containsAll(java.util.Collection):94:97 -> containsAll
     boolean isPartialView() -> e
@@ -7554,9 +7447,9 @@
     com.android.tools.r8.com.google.common.collect.ImmutableList forwardList -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):604:605 -> <init>
     1:1:boolean contains(java.lang.Object):623:623 -> contains
-    1:1:int reverseIndex(int):609:609 -> e
+    1:1:int reverseIndex(int):609:609 -> d
+    1:1:int reversePosition(int):613:613 -> e
     2:2:boolean isPartialView():657:657 -> e
-    1:1:int reversePosition(int):613:613 -> f
     1:2:java.lang.Object get(int):646:647 -> get
     3:3:int reverseIndex(int):609:609 -> get
     3:3:java.lang.Object get(int):647 -> get
@@ -7752,8 +7645,10 @@
     3:3:void forEach(java.util.function.Consumer):65 -> forEach
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():73:73 -> h
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():55:55 -> iterator
-    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():55:55 -> iterator
-    2:2:java.util.Iterator iterator():39 -> iterator
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[]):1054:1054 -> iterator
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():55 -> iterator
+    3:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():55:55 -> iterator
+    3:3:java.util.Iterator iterator():39 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():50:50 -> l
     1:1:java.util.Spliterator spliterator():60:60 -> spliterator
 com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> a.a.a.a.c.a.a.b.Qa:
@@ -7808,39 +7703,39 @@
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):354:356 -> <init>
     1:1:boolean containsEntry(java.lang.Object,java.lang.Object):67:67 -> a
     2:2:boolean putAll(java.lang.Object,java.lang.Iterable):440:440 -> a
-    3:3:com.android.tools.r8.com.google.common.collect.ImmutableCollection entries():528:528 -> a
-    3:3:java.util.Collection entries():67 -> a
+    3:3:java.util.Map createAsMap():520:520 -> a
     4:7:java.util.Spliterator lambda$entrySpliterator$1(java.util.Map$Entry):608:611 -> a
     8:8:java.util.Spliterator lambda$entrySpliterator$1(java.util.Map$Entry):610:610 -> a
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap asMap():515:515 -> b
-    1:1:java.util.Map asMap():67 -> b
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap asMap():515:515 -> asMap
+    1:1:java.util.Map asMap():67 -> asMap
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createEntries():533:533 -> b
+    1:1:java.util.Collection createEntries():67 -> b
     2:2:java.util.Map$Entry lambda$null$0(java.lang.Object,java.lang.Object):611:611 -> b
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMultiset keys():632:632 -> c
-    1:1:com.android.tools.r8.com.google.common.collect.Multiset keys():67 -> c
     1:1:void clear():396:396 -> clear
     1:1:boolean containsKey(java.lang.Object):483:483 -> containsKey
-    1:1:java.util.Map createAsMap():520:520 -> d
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createEntries():533:533 -> e
-    1:1:java.util.Collection createEntries():67 -> e
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMultiset createKeys():637:637 -> d
+    1:1:com.android.tools.r8.com.google.common.collect.Multiset createKeys():67 -> d
+    1:1:java.util.Iterator entryIterator():67:67 -> e
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator():595:595 -> e
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection entries():528:528 -> entries
+    1:1:java.util.Collection entries():67 -> entries
     1:1:boolean equals(java.lang.Object):67:67 -> equals
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMultiset createKeys():637:637 -> g
-    1:1:com.android.tools.r8.com.google.common.collect.Multiset createKeys():67 -> g
-    1:1:java.util.Iterator entryIterator():67:67 -> h
-    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator():595:595 -> h
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap asMap():515:515 -> f
+    1:1:java.util.Spliterator entrySpliterator():606 -> f
+    2:2:java.util.Spliterator entrySpliterator():606:606 -> f
+    3:3:int size():493:493 -> f
+    3:3:java.util.Spliterator entrySpliterator():614 -> f
+    4:4:java.util.Spliterator entrySpliterator():605:605 -> f
+    1:1:boolean isPartialView():476:476 -> g
     1:1:int com.android.tools.r8.com.google.common.collect.AbstractMultimap.hashCode():263:263 -> hashCode
     1:1:int hashCode():67 -> hashCode
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap asMap():515:515 -> i
-    1:1:java.util.Spliterator entrySpliterator():606 -> i
-    2:2:java.util.Spliterator entrySpliterator():606:606 -> i
-    3:3:int size():493:493 -> i
-    3:3:java.util.Spliterator entrySpliterator():614 -> i
-    4:4:java.util.Spliterator entrySpliterator():605:605 -> i
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractMultimap.isEmpty():43:43 -> isEmpty
     1:1:boolean isEmpty():67 -> isEmpty
-    1:1:boolean isPartialView():476:476 -> j
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet keySet():504:504 -> keySet
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet keySet():504:504 -> keySet
     2:2:java.util.Set keySet():67 -> keySet
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMultiset keys():632:632 -> keys
+    1:1:com.android.tools.r8.com.google.common.collect.Multiset keys():67 -> keys
     1:1:boolean put(java.lang.Object,java.lang.Object):427:427 -> put
     1:1:boolean remove(java.lang.Object,java.lang.Object):466:466 -> remove
     1:1:int size():493:493 -> size
@@ -7907,10 +7802,10 @@
     1:1:boolean contains(java.lang.Object):645:645 -> contains
     2:2:boolean com.android.tools.r8.com.google.common.collect.ImmutableMultimap.containsKey(java.lang.Object):483:483 -> contains
     2:2:boolean contains(java.lang.Object):645 -> contains
+    1:2:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):666:667 -> d
+    3:3:com.android.tools.r8.com.google.common.collect.Multiset$Entry com.android.tools.r8.com.google.common.collect.Multisets.immutableEntry(java.lang.Object,int):251:251 -> d
+    3:3:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):667 -> d
     boolean isPartialView() -> e
-    1:2:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):666:667 -> e
-    3:3:com.android.tools.r8.com.google.common.collect.Multiset$Entry com.android.tools.r8.com.google.common.collect.Multisets.immutableEntry(java.lang.Object,int):251:251 -> e
-    3:3:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):667 -> e
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():656:656 -> f
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMultimap.keySet():504:504 -> f
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():656 -> f
@@ -7927,10 +7822,10 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableMultiset of():101:101 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableMultiset copyFromEntries(java.util.Collection):217 -> a
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableMultiset copyFromEntries(java.util.Collection):219:219 -> a
-    4:4:int remove(java.lang.Object,int):299:299 -> a
+    4:4:int setCount(java.lang.Object,int):312:312 -> a
     5:5:boolean setCount(java.lang.Object,int,int):325:325 -> a
     6:8:int copyIntoArray(java.lang.Object[],int):331:333 -> a
-    1:1:int add(java.lang.Object,int):286:286 -> b
+    1:1:int remove(java.lang.Object,int):299:299 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList asList():267:267 -> c
     2:8:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableCollection.asList():311:317 -> c
     2:8:com.android.tools.r8.com.google.common.collect.ImmutableList asList():268 -> c
@@ -7939,9 +7834,9 @@
     10:10:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableCollection.asList():313:313 -> c
     10:10:com.android.tools.r8.com.google.common.collect.ImmutableList asList():268 -> c
     11:11:com.android.tools.r8.com.google.common.collect.ImmutableList asList():268:268 -> c
-    12:12:int setCount(java.lang.Object,int):312:312 -> c
+    12:12:int add(java.lang.Object,int):286:286 -> c
     1:1:boolean contains(java.lang.Object):273:273 -> contains
-    com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int) -> e
+    com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int) -> d
     1:1:java.util.Set entrySet():53:53 -> entrySet
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet():362:362 -> entrySet
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():367:367 -> entrySet
@@ -7981,22 +7876,21 @@
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet of(java.lang.Object,java.lang.Object):92:92 -> a
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet of(java.lang.Object,java.lang.Object,java.lang.Object):101:101 -> a
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableSet of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):110:110 -> a
-    6:6:com.android.tools.r8.com.google.common.collect.ImmutableSet of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):119:119 -> a
-    7:15:com.android.tools.r8.com.google.common.collect.ImmutableSet of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object[]):132:140 -> a
-    16:23:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.util.Collection):259:266 -> a
-    24:24:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOfEnumSet(java.util.EnumSet):329:329 -> a
-    24:24:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.util.Collection):266 -> a
-    25:26:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.util.Collection):268:269 -> a
-    27:33:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.lang.Object[]):317:323 -> a
-    34:34:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.lang.Object[]):321:321 -> a
-    35:35:com.android.tools.r8.com.google.common.collect.ImmutableSet of():74:74 -> a
-    35:35:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.lang.Object[]):319 -> a
+    6:14:com.android.tools.r8.com.google.common.collect.ImmutableSet of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object[]):132:140 -> a
+    15:22:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.util.Collection):259:266 -> a
+    23:23:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOfEnumSet(java.util.EnumSet):329:329 -> a
+    23:23:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.util.Collection):266 -> a
+    24:25:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.util.Collection):268:269 -> a
+    26:32:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.lang.Object[]):317:323 -> a
+    33:33:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.lang.Object[]):321:321 -> a
+    34:34:com.android.tools.r8.com.google.common.collect.ImmutableSet of():74:74 -> a
+    34:34:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.lang.Object[]):319 -> a
     1:36:com.android.tools.r8.com.google.common.collect.ImmutableSet construct(int,java.lang.Object[]):169:204 -> b
     37:38:com.android.tools.r8.com.google.common.collect.ImmutableSet construct(int,java.lang.Object[]):164:165 -> b
     39:39:com.android.tools.r8.com.google.common.collect.ImmutableSet of():74:74 -> b
     39:39:com.android.tools.r8.com.google.common.collect.ImmutableSet construct(int,java.lang.Object[]):161 -> b
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableList asList():368:369 -> c
-    1:9:int chooseTableSize(int):229:237 -> e
+    1:9:int chooseTableSize(int):229:237 -> d
     1:7:boolean equals(java.lang.Object):343:349 -> equals
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder builder():445:445 -> g
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():373:373 -> h
@@ -8067,19 +7961,15 @@
     1:2:void <init>(java.util.Comparator):564:565 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableSortedSet headSetImpl(java.lang.Object,boolean) -> a
     1:4:com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet emptySet(java.util.Comparator):86:89 -> a
-    5:5:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():81:81 -> a
-    5:5:com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet emptySet(java.util.Comparator):89 -> a
-    6:6:com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet emptySet(java.util.Comparator):89:89 -> a
-    7:18:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet copyOf(java.util.Comparator,java.lang.Iterable):311:322 -> a
-    7:18:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet copyOf(java.util.Comparator,java.util.Collection):345 -> a
-    19:19:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    19:19:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet copyOf(java.util.Comparator,java.lang.Iterable):310 -> a
-    19:19:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet copyOf(java.util.Comparator,java.util.Collection):345 -> a
-    20:20:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet construct(java.util.Comparator,int,java.lang.Object[]):390:390 -> a
-    21:21:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[],int):225:225 -> a
-    21:21:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet construct(java.util.Comparator,int,java.lang.Object[]):392 -> a
-    22:33:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet construct(java.util.Comparator,int,java.lang.Object[]):393:404 -> a
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder orderedBy(java.util.Comparator):416:416 -> b
+    5:16:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet copyOf(java.util.Comparator,java.lang.Iterable):311:322 -> a
+    5:16:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet copyOf(java.util.Comparator,java.util.Collection):345 -> a
+    17:17:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    17:17:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet copyOf(java.util.Comparator,java.lang.Iterable):310 -> a
+    17:17:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet copyOf(java.util.Comparator,java.util.Collection):345 -> a
+    18:18:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet construct(java.util.Comparator,int,java.lang.Object[]):390:390 -> a
+    19:19:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[],int):225:225 -> a
+    19:19:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet construct(java.util.Comparator,int,java.lang.Object[]):392 -> a
+    20:31:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet construct(java.util.Comparator,int,java.lang.Object[]):393:404 -> a
     1:1:java.util.Comparator comparator():577:577 -> comparator
     1:4:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet descendingSet():762:765 -> descendingSet
     1:4:java.util.NavigableSet descendingSet():63 -> descendingSet
@@ -8165,25 +8055,16 @@
     1:1:boolean hasNext():425:425 -> hasNext
     1:7:java.lang.Object next():430:436 -> next
     1:1:void remove():441:441 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$3 -> a.a.a.a.c.a.a.b.nb:
-    java.lang.Object[] val$elements -> b
-    int index -> a
-    1:2:void <init>(java.lang.Object[]):471:472 -> <init>
-    1:1:boolean hasNext():476:476 -> hasNext
-    1:1:boolean hasNext():476:476 -> next
-    1:1:java.lang.Object next():481 -> next
-    2:4:java.lang.Object next():484:486 -> next
-    5:5:java.lang.Object next():482:482 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$5 -> a.a.a.a.c.a.a.b.ob:
+com.android.tools.r8.com.google.common.collect.Iterators$5 -> a.a.a.a.c.a.a.b.nb:
     java.util.Iterator val$unfiltered -> c
     com.android.tools.r8.com.google.common.base.Predicate val$retainIfTrue -> d
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):659:659 -> <init>
-    1:7:java.lang.Object computeNext():662:668 -> e
-com.android.tools.r8.com.google.common.collect.Iterators$6 -> a.a.a.a.c.a.a.b.pb:
+    1:7:java.lang.Object computeNext():662:668 -> d
+com.android.tools.r8.com.google.common.collect.Iterators$6 -> a.a.a.a.c.a.a.b.ob:
     com.android.tools.r8.com.google.common.base.Function val$function -> b
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):817:817 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):820:820 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$7 -> a.a.a.a.c.a.a.b.qb:
+com.android.tools.r8.com.google.common.collect.Iterators$7 -> a.a.a.a.c.a.a.b.pb:
     java.util.Iterator val$iterator -> c
     int val$limitSize -> b
     int count -> a
@@ -8194,21 +8075,21 @@
     2:3:java.lang.Object next():965:966 -> next
     4:4:java.lang.Object next():963:963 -> next
     1:1:void remove():971:971 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$9 -> a.a.a.a.c.a.a.b.rb:
+com.android.tools.r8.com.google.common.collect.Iterators$9 -> a.a.a.a.c.a.a.b.qb:
     java.lang.Object val$value -> b
     boolean done -> a
     1:1:void <init>(java.lang.Object):1104:1104 -> <init>
     1:1:boolean hasNext():1109:1109 -> hasNext
     1:5:java.lang.Object next():1114:1118 -> next
     6:6:java.lang.Object next():1115:1115 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> a.a.a.a.c.a.a.b.sb:
+com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> a.a.a.a.c.a.a.b.rb:
     com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator EMPTY -> e
     java.lang.Object[] array -> c
     int offset -> d
     1:1:void <clinit>():1058:1058 -> <clinit>
     1:3:void <init>(java.lang.Object[],int,int,int):1065:1067 -> <init>
     1:1:java.lang.Object get(int):1072:1072 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> a.a.a.a.c.a.a.b.tb:
+com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> a.a.a.a.c.a.a.b.sb:
     java.util.Deque metaIterators -> d
     java.util.Iterator topMetaIterator -> c
     java.util.Iterator iterator -> b
@@ -8234,17 +8115,17 @@
     12:38:java.lang.Object next():1423 -> next
     39:42:java.lang.Object next():1424:1427 -> next
     1:3:void remove():1433:1435 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> a.a.a.a.c.a.a.b.ub:
+com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> a.a.a.a.c.a.a.b.tb:
     com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator INSTANCE -> a
     1:1:void <clinit>():98:98 -> <clinit>
     2:2:void <clinit>():97:97 -> <clinit>
     1:1:void <init>(java.lang.String,int):97:97 -> <init>
     1:1:java.lang.Object next():107:107 -> next
     1:1:void remove():112:112 -> remove
-com.android.tools.r8.com.google.common.collect.ListMultimap -> a.a.a.a.c.a.a.b.vb:
-com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> a.a.a.a.c.a.a.b.wb:
+com.android.tools.r8.com.google.common.collect.ListMultimap -> a.a.a.a.c.a.a.b.ub:
+com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> a.a.a.a.c.a.a.b.vb:
     1:1:void <init>(java.util.List):991:991 -> <init>
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> a.a.a.a.c.a.a.b.yb:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> a.a.a.a.c.a.a.b.xb:
     java.util.List forwardList -> a
     1:2:void <init>(java.util.List):854:855 -> <init>
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
@@ -8257,7 +8138,7 @@
     4:4:void add(int,java.lang.Object):876:876 -> add
     1:1:java.util.List getForwardList():859:859 -> c
     1:1:void clear():881:881 -> clear
-    1:2:int reverseIndex(int):863:864 -> e
+    1:2:int reverseIndex(int):863:864 -> d
     1:1:java.lang.Object get(int):901:901 -> get
     1:1:java.util.Iterator iterator():917:917 -> iterator
     1:2:int reversePosition(int):869:870 -> listIterator
@@ -8283,7 +8164,7 @@
     5:6:int reversePosition(int):869:870 -> subList
     5:6:java.util.List subList(int,int):912 -> subList
     7:7:java.util.List subList(int,int):912:912 -> subList
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> a.a.a.a.c.a.a.b.xb:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> a.a.a.a.c.a.a.b.wb:
     com.android.tools.r8.com.google.common.collect.Lists$ReverseList this$0 -> c
     java.util.ListIterator val$forwardIterator -> b
     boolean canRemoveOrSet -> a
@@ -8304,7 +8185,7 @@
     1:1:int previousIndex():970 -> previousIndex
     1:3:void remove():975:977 -> remove
     1:2:void set(java.lang.Object):982:983 -> set
-com.android.tools.r8.com.google.common.collect.MapMaker -> a.a.a.a.c.a.a.b.zb:
+com.android.tools.r8.com.google.common.collect.MapMaker -> a.a.a.a.c.a.a.b.yb:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength valueStrength -> e
     com.android.tools.r8.com.google.common.base.Equivalence keyEquivalence -> f
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength keyStrength -> d
@@ -8328,17 +8209,15 @@
     7:7:com.android.tools.r8.com.google.common.collect.MapMaker setValueStrength(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength):254 -> d
     7:7:com.android.tools.r8.com.google.common.collect.MapMaker weakValues():239 -> d
     1:17:java.lang.String toString():290:306 -> toString
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap -> a.a.a.a.c.a.a.b.ic:
-    java.util.Set keySet -> g
-    java.util.Set entrySet -> i
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap -> a.a.a.a.c.a.a.b.hc:
+    java.util.Set entrySet -> g
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntryHelper entryHelper -> f
+    com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference UNSET_WEAK_VALUE_REFERENCE -> h
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment[] segments -> c
-    com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference UNSET_WEAK_VALUE_REFERENCE -> j
     int concurrencyLevel -> d
     com.android.tools.r8.com.google.common.base.Equivalence keyEquivalence -> e
     int segmentShift -> b
     int segmentMask -> a
-    java.util.Collection values -> h
     1:1:void <clinit>():1023:1023 -> <clinit>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMaker,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntryHelper):160:160 -> <init>
     2:2:int com.android.tools.r8.com.google.common.collect.MapMaker.getConcurrencyLevel():186:186 -> <init>
@@ -8477,31 +8356,30 @@
     127:127:java.lang.Object replace(java.lang.Object,java.lang.Object):2497 -> replace
     1:6:int size():2361:2366 -> size
     1:2:java.util.Collection values():2522:2523 -> values
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$1 -> a.a.a.a.c.a.a.b.Ab:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$1 -> a.a.a.a.c.a.a.b.zb:
     1:1:void <init>():1024:1024 -> <init>
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getEntry() -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference copyFor(java.lang.ref.ReferenceQueue,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry):1024:1024 -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$AbstractStrongKeyEntry -> a.a.a.a.c.a.a.b.Bb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$AbstractStrongKeyEntry -> a.a.a.a.c.a.a.b.Ab:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry next -> c
     java.lang.Object key -> a
     int hash -> b
     1:4:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry):360:363 -> <init>
-    1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getNext():378:378 -> a
-    1:1:int getHash():373:373 -> b
+    1:1:int getHash():373:373 -> a
+    1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getNext():378:378 -> b
     1:1:java.lang.Object getKey():368:368 -> getKey
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$AbstractWeakKeyEntry -> a.a.a.a.c.a.a.b.Cb:
-    com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry next -> b
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$AbstractWeakKeyEntry -> a.a.a.a.c.a.a.b.Bb:
     int hash -> a
     1:3:void <init>(java.lang.ref.ReferenceQueue,java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry):671:673 -> <init>
-    1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getNext():688:688 -> a
-    1:1:int getHash():683:683 -> b
+    1:1:int getHash():683:683 -> a
+    1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getNext():688:688 -> b
     1:1:java.lang.Object getKey():678:678 -> getKey
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$DummyInternalEntry -> a.a.a.a.c.a.a.b.Db:
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$EntryIterator -> a.a.a.a.c.a.a.b.Eb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$DummyInternalEntry -> a.a.a.a.c.a.a.b.Cb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$EntryIterator -> a.a.a.a.c.a.a.b.Db:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2711:2711 -> <init>
     1:1:java.util.Map$Entry next():2715:2715 -> next
     1:1:java.lang.Object next():2711 -> next
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$EntrySet -> a.a.a.a.c.a.a.b.Fb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$EntrySet -> a.a.a.a.c.a.a.b.Eb:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2796:2796 -> <init>
     1:1:void clear():2840:2840 -> clear
@@ -8510,7 +8388,7 @@
     1:1:java.util.Iterator iterator():2800:2800 -> iterator
     1:6:boolean remove(java.lang.Object):2820:2825 -> remove
     1:1:int size():2830:2830 -> size
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$HashIterator -> a.a.a.a.c.a.a.b.Gb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$HashIterator -> a.a.a.a.c.a.a.b.Fb:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry nextEntry -> e
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment currentSegment -> c
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap this$0 -> h
@@ -8521,32 +8399,32 @@
     int nextSegmentIndex -> a
     1:4:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2546:2549 -> <init>
     1:11:boolean advanceTo(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry):2612:2622 -> a
-    1:16:void advance():2556:2571 -> e
-    1:6:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry nextEntry():2632:2637 -> f
-    7:7:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry nextEntry():2633:2633 -> f
-    1:3:boolean nextInChain():2582:2584 -> g
-    4:4:boolean nextInChain():2583:2583 -> g
-    1:3:boolean nextInTable():2596:2598 -> h
+    1:16:void advance():2556:2571 -> d
+    1:6:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry nextEntry():2632:2637 -> e
+    7:7:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry nextEntry():2633:2633 -> e
+    1:3:boolean nextInChain():2582:2584 -> f
+    4:4:boolean nextInChain():2583:2583 -> f
+    1:3:boolean nextInTable():2596:2598 -> g
     1:1:boolean hasNext():2628:2628 -> hasNext
     1:2:void remove():2642:2643 -> remove
     3:3:java.lang.Object com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry.getKey():2679:2679 -> remove
     3:3:void remove():2643 -> remove
     4:5:void remove():2643:2644 -> remove
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry -> a.a.a.a.c.a.a.b.Hb:
-    com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getNext() -> a
-    int getHash() -> b
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntryHelper -> a.a.a.a.c.a.a.b.Ib:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry -> a.a.a.a.c.a.a.b.Gb:
+    int getHash() -> a
+    com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getNext() -> b
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntryHelper -> a.a.a.a.c.a.a.b.Hb:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry copy(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry) -> a
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry newEntry(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment,java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry) -> a
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int) -> a
     void setValue(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry,java.lang.Object) -> a
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength valueStrength() -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$KeyIterator -> a.a.a.a.c.a.a.b.Jb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$KeyIterator -> a.a.a.a.c.a.a.b.Ib:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2648:2648 -> <init>
     1:1:java.lang.Object next():2652:2652 -> next
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry.getKey():2679:2679 -> next
     2:2:java.lang.Object next():2652 -> next
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$KeySet -> a.a.a.a.c.a.a.b.Kb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$KeySet -> a.a.a.a.c.a.a.b.Jb:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2720:2720 -> <init>
     1:1:void clear():2749:2749 -> clear
@@ -8555,12 +8433,12 @@
     1:1:java.util.Iterator iterator():2724:2724 -> iterator
     1:1:boolean remove(java.lang.Object):2744:2744 -> remove
     1:1:int size():2729:2729 -> size
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$SafeToArraySet -> a.a.a.a.c.a.a.b.Lb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$SafeToArraySet -> a.a.a.a.c.a.a.b.Kb:
     1:1:void <init>():2844:2844 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$1):2844 -> <init>
     1:1:java.lang.Object[] toArray():2850:2850 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):2855:2855 -> toArray
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment -> a.a.a.a.c.a.a.b.Mb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment -> a.a.a.a.c.a.a.b.Lb:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap map -> a
     java.util.concurrent.atomic.AtomicInteger readCount -> g
     int maxSegmentSize -> f
@@ -8624,7 +8502,7 @@
     1:6:void runLockedCleanup():2015:2020 -> e
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment self() -> f
     1:5:void tryDrainReferenceQueues():1367:1371 -> g
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength -> a.a.a.a.c.a.a.b.Pb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength -> a.a.a.a.c.a.a.b.Ob:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength STRONG -> a
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength WEAK -> b
     1:8:void <clinit>():257:264 -> <clinit>
@@ -8632,20 +8510,20 @@
     1:1:void <init>(java.lang.String,int):256:256 -> <init>
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$1):256 -> <init>
     com.android.tools.r8.com.google.common.base.Equivalence defaultEquivalence() -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength$1 -> a.a.a.a.c.a.a.b.Nb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength$1 -> a.a.a.a.c.a.a.b.Mb:
     1:1:void <init>(java.lang.String,int):257:257 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.Equivalence defaultEquivalence():260:260 -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength$2 -> a.a.a.a.c.a.a.b.Ob:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength$2 -> a.a.a.a.c.a.a.b.Nb:
     1:1:void <init>(java.lang.String,int):264:264 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.Equivalence defaultEquivalence():267:267 -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry -> a.a.a.a.c.a.a.b.Rb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry -> a.a.a.a.c.a.a.b.Qb:
     java.lang.Object value -> d
     1:1:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry):411:411 -> <init>
     2:2:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry):408:408 -> <init>
     1:1:void setValue(java.lang.Object):421:421 -> a
     2:4:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry copy(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry):425:427 -> a
     1:1:java.lang.Object getValue():417:417 -> getValue
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry$Helper -> a.a.a.a.c.a.a.b.Qb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry$Helper -> a.a.a.a.c.a.a.b.Pb:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry$Helper INSTANCE -> a
     1:1:void <clinit>():435:435 -> <clinit>
     1:1:void <init>():432:432 -> <init>
@@ -8662,10 +8540,10 @@
     8:8:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueSegment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):459:459 -> a
     8:8:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):432 -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry$Helper instance():439:439 -> b
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueSegment -> a.a.a.a.c.a.a.b.Sb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueSegment -> a.a.a.a.c.a.a.b.Rb:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2035:2035 -> <init>
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment self() -> f
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry -> a.a.a.a.c.a.a.b.Ub:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry -> a.a.a.a.c.a.a.b.Tb:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference valueReference -> d
     1:1:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry):497:497 -> <init>
     2:2:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference com.android.tools.r8.com.google.common.collect.MapMakerInternalMap.unsetWeakValueReference():401:401 -> <init>
@@ -8675,7 +8553,7 @@
     6:8:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry copy(java.lang.ref.ReferenceQueue,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry):520:522 -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference getValueReference():528:528 -> c
     1:1:java.lang.Object getValue():502:502 -> getValue
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry$Helper -> a.a.a.a.c.a.a.b.Tb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry$Helper -> a.a.a.a.c.a.a.b.Sb:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry$Helper INSTANCE -> a
     1:1:void <clinit>():535:535 -> <clinit>
     1:1:void <init>():532:532 -> <init>
@@ -8692,7 +8570,7 @@
     11:11:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueSegment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):558:558 -> a
     11:11:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):532 -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry$Helper instance():539:539 -> b
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueSegment -> a.a.a.a.c.a.a.b.Vb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueSegment -> a.a.a.a.c.a.a.b.Ub:
     java.lang.ref.ReferenceQueue queueForValues -> h
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2060:2060 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2053:2053 -> <init>
@@ -8700,13 +8578,13 @@
     1:1:void maybeClearReferenceQueues():2112:2112 -> b
     1:1:void maybeDrainReferenceQueues():2107:2107 -> c
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment self() -> f
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongValueEntry -> a.a.a.a.c.a.a.b.Wb:
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$ValueIterator -> a.a.a.a.c.a.a.b.Xb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongValueEntry -> a.a.a.a.c.a.a.b.Vb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$ValueIterator -> a.a.a.a.c.a.a.b.Wb:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2656:2656 -> <init>
     1:1:java.lang.Object next():2660:2660 -> next
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry.getValue():2684:2684 -> next
     2:2:java.lang.Object next():2660 -> next
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Values -> a.a.a.a.c.a.a.b.Yb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Values -> a.a.a.a.c.a.a.b.Xb:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2754:2754 -> <init>
     1:1:void clear():2778:2778 -> clear
@@ -8716,8 +8594,8 @@
     1:1:int size():2763:2763 -> size
     1:1:java.lang.Object[] toArray():2786:2786 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):2791:2791 -> toArray
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry -> a.a.a.a.c.a.a.b._b:
-    java.lang.Object value -> c
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry -> a.a.a.a.c.a.a.b.Zb:
+    java.lang.Object value -> b
     1:1:void <init>(java.lang.ref.ReferenceQueue,java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry):780:780 -> <init>
     2:2:void <init>(java.lang.ref.ReferenceQueue,java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry):776:776 -> <init>
     1:1:void setValue(java.lang.Object):790:790 -> a
@@ -8726,7 +8604,7 @@
     3:3:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry copy(java.lang.ref.ReferenceQueue,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry):796 -> a
     4:5:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry copy(java.lang.ref.ReferenceQueue,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry):796:797 -> a
     1:1:java.lang.Object getValue():786:786 -> getValue
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry$Helper -> a.a.a.a.c.a.a.b.Zb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry$Helper -> a.a.a.a.c.a.a.b.Yb:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry$Helper INSTANCE -> a
     1:1:void <clinit>():805:805 -> <clinit>
     1:1:void <init>():802:802 -> <init>
@@ -8746,7 +8624,7 @@
     9:9:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueSegment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):828:828 -> a
     9:9:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):802 -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry$Helper instance():809:809 -> b
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueSegment -> a.a.a.a.c.a.a.b.ac:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueSegment -> a.a.a.a.c.a.a.b._b:
     java.lang.ref.ReferenceQueue queueForKeys -> h
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2149:2149 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2142:2142 -> <init>
@@ -8754,8 +8632,8 @@
     1:1:void maybeClearReferenceQueues():2175:2175 -> b
     1:1:void maybeDrainReferenceQueues():2170:2170 -> c
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment self() -> f
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry -> a.a.a.a.c.a.a.b.cc:
-    com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference valueReference -> c
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry -> a.a.a.a.c.a.a.b.bc:
+    com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference valueReference -> b
     1:1:void <init>(java.lang.ref.ReferenceQueue,java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry):869:869 -> <init>
     2:2:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference com.android.tools.r8.com.google.common.collect.MapMakerInternalMap.unsetWeakValueReference():401:401 -> <init>
     2:2:void <init>(java.lang.ref.ReferenceQueue,java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry):865 -> <init>
@@ -8767,7 +8645,7 @@
     5:9:void setValue(java.lang.Object,java.lang.ref.ReferenceQueue):893:897 -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference getValueReference():902:902 -> c
     1:1:java.lang.Object getValue():874:874 -> getValue
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry$Helper -> a.a.a.a.c.a.a.b.bc:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry$Helper -> a.a.a.a.c.a.a.b.ac:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry$Helper INSTANCE -> a
     1:1:void <clinit>():909:909 -> <clinit>
     1:1:void <init>():906:906 -> <init>
@@ -8787,7 +8665,7 @@
     12:12:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueSegment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):931:931 -> a
     12:12:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):906 -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry$Helper instance():913:913 -> b
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueSegment -> a.a.a.a.c.a.a.b.dc:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueSegment -> a.a.a.a.c.a.a.b.cc:
     java.lang.ref.ReferenceQueue queueForKeys -> h
     java.lang.ref.ReferenceQueue queueForValues -> i
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2189:2189 -> <init>
@@ -8797,17 +8675,17 @@
     2:2:void maybeClearReferenceQueues():2247:2247 -> b
     1:2:void maybeDrainReferenceQueues():2241:2242 -> c
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment self() -> f
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueEntry -> a.a.a.a.c.a.a.b.ec:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueEntry -> a.a.a.a.c.a.a.b.dc:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference getValueReference() -> c
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference -> a.a.a.a.c.a.a.b.fc:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference -> a.a.a.a.c.a.a.b.ec:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference copyFor(java.lang.ref.ReferenceQueue,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry) -> a
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getEntry() -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReferenceImpl -> a.a.a.a.c.a.a.b.gc:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReferenceImpl -> a.a.a.a.c.a.a.b.fc:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry entry -> a
     1:2:void <init>(java.lang.ref.ReferenceQueue,java.lang.Object,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry):1051:1052 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getEntry():1057:1057 -> a
     2:2:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference copyFor(java.lang.ref.ReferenceQueue,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry):1062:1062 -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry -> a.a.a.a.c.a.a.b.hc:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry -> a.a.a.a.c.a.a.b.gc:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap this$0 -> c
     java.lang.Object value -> b
     java.lang.Object key -> a
@@ -8817,17 +8695,17 @@
     1:1:java.lang.Object getValue():2684:2684 -> getValue
     1:1:int hashCode():2700:2700 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):2705:2706 -> setValue
-com.android.tools.r8.com.google.common.collect.Maps$1 -> a.a.a.a.c.a.a.b.jc:
+com.android.tools.r8.com.google.common.collect.Maps$1 -> a.a.a.a.c.a.a.b.ic:
     com.android.tools.r8.com.google.common.base.Function val$function -> b
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):993:993 -> <init>
     1:1:java.util.Map$Entry transform(java.lang.Object):996:996 -> a
     1:1:java.lang.Object transform(java.lang.Object):993 -> a
-com.android.tools.r8.com.google.common.collect.Maps$5 -> a.a.a.a.c.a.a.b.kc:
+com.android.tools.r8.com.google.common.collect.Maps$5 -> a.a.a.a.c.a.a.b.jc:
     java.util.Map$Entry val$entry -> a
     1:1:void <init>(java.util.Map$Entry):1447:1447 -> <init>
     1:1:java.lang.Object getKey():1450:1450 -> getKey
     1:1:java.lang.Object getValue():1455:1455 -> getValue
-com.android.tools.r8.com.google.common.collect.Maps$6 -> a.a.a.a.c.a.a.b.lc:
+com.android.tools.r8.com.google.common.collect.Maps$6 -> a.a.a.a.c.a.a.b.kc:
     java.util.Iterator val$entryIterator -> a
     1:1:void <init>(java.util.Iterator):1462:1462 -> <init>
     1:1:boolean hasNext():1465:1465 -> hasNext
@@ -8840,24 +8718,24 @@
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.unmodifiableEntry(java.util.Map$Entry):1446 -> next
     3:3:java.util.Map$Entry next():1470 -> next
     3:3:java.lang.Object next():1462 -> next
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> a.a.a.a.c.a.a.b.oc:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> a.a.a.a.c.a.a.b.nc:
     com.android.tools.r8.com.google.common.collect.Maps$EntryFunction VALUE -> b
     com.android.tools.r8.com.google.common.collect.Maps$EntryFunction KEY -> a
     1:8:void <clinit>():93:100 -> <clinit>
     9:9:void <clinit>():92:92 -> <clinit>
     1:1:void <init>(java.lang.String,int):92:92 -> <init>
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.collect.Maps$1):92 -> <init>
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> a.a.a.a.c.a.a.b.mc:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> a.a.a.a.c.a.a.b.lc:
     1:1:void <init>(java.lang.String,int):93:93 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):93:93 -> apply
     2:2:java.lang.Object apply(java.util.Map$Entry):97:97 -> apply
     2:2:java.lang.Object apply(java.lang.Object):93 -> apply
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> a.a.a.a.c.a.a.b.nc:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> a.a.a.a.c.a.a.b.mc:
     1:1:void <init>(java.lang.String,int):100:100 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):100:100 -> apply
     2:2:java.lang.Object apply(java.util.Map$Entry):104:104 -> apply
     2:2:java.lang.Object apply(java.lang.Object):100 -> apply
-com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> a.a.a.a.c.a.a.b.pc:
+com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> a.a.a.a.c.a.a.b.oc:
     1:1:void <init>():4112:4112 -> <init>
     java.util.Map map() -> c
     1:1:void clear():4122:4122 -> clear
@@ -8879,13 +8757,13 @@
     4:4:boolean retainAll(java.util.Collection):4166 -> retainAll
     5:11:boolean retainAll(java.util.Collection):4167:4173 -> retainAll
     1:1:int size():4117:4117 -> size
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> a.a.a.a.c.a.a.b.rc:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> a.a.a.a.c.a.a.b.qc:
     1:1:void <init>():3653:3653 -> <init>
     1:1:java.util.Set entrySet():3666:3666 -> entrySet
     java.util.Iterator entryIterator() -> h
     1:1:java.util.Spliterator entrySpliterator():3661:3661 -> i
     2:2:java.util.Spliterator entrySpliterator():3660:3660 -> i
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> a.a.a.a.c.a.a.b.qc:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> a.a.a.a.c.a.a.b.pc:
     com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap):3666:3666 -> <init>
     1:1:java.util.Map map():3669:3669 -> c
@@ -8894,7 +8772,7 @@
     2:2:void forEach(java.util.function.Consumer):3684 -> forEach
     1:1:java.util.Iterator iterator():3674:3674 -> iterator
     1:1:java.util.Spliterator spliterator():3679:3679 -> spliterator
-com.android.tools.r8.com.google.common.collect.Maps$KeySet -> a.a.a.a.c.a.a.b.sc:
+com.android.tools.r8.com.google.common.collect.Maps$KeySet -> a.a.a.a.c.a.a.b.rc:
     java.util.Map map -> a
     1:2:void <init>(java.util.Map):3839:3840 -> <init>
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
@@ -8926,7 +8804,7 @@
     1:1:java.util.Map map():3844:3844 -> size
     1:1:int size():3861 -> size
     2:2:int size():3861:3861 -> size
-com.android.tools.r8.com.google.common.collect.Maps$Values -> a.a.a.a.c.a.a.b.tc:
+com.android.tools.r8.com.google.common.collect.Maps$Values -> a.a.a.a.c.a.a.b.sc:
     java.util.Map map -> a
     1:2:void <init>(java.util.Map):4026:4027 -> <init>
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
@@ -8979,10 +8857,8 @@
     1:1:java.util.Map map():4031:4031 -> size
     1:1:int size():4093 -> size
     2:2:int size():4093:4093 -> size
-com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap -> a.a.a.a.c.a.a.b.uc:
-    java.util.Collection values -> c
+com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap -> a.a.a.a.c.a.a.b.tc:
     java.util.Set entrySet -> a
-    java.util.Set keySet -> b
     1:1:void <init>():3612:3612 -> <init>
     1:2:java.util.Set entrySet():3624:3625 -> entrySet
     java.util.Set createEntrySet() -> h
@@ -8992,32 +8868,29 @@
     2:2:java.util.Collection createValues():3649:3649 -> values
     2:2:java.util.Collection values():3645 -> values
     3:3:java.util.Collection values():3645:3645 -> values
-com.android.tools.r8.com.google.common.collect.Multimap -> a.a.a.a.c.a.a.b.vc:
+com.android.tools.r8.com.google.common.collect.Multimap -> a.a.a.a.c.a.a.b.uc:
     boolean containsEntry(java.lang.Object,java.lang.Object) -> a
-    java.util.Collection entries() -> a
     boolean putAll(java.lang.Object,java.lang.Iterable) -> a
-    java.util.Map asMap() -> b
-    com.android.tools.r8.com.google.common.collect.Multiset keys() -> c
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$2 -> a.a.a.a.c.a.a.b.wc:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$2 -> a.a.a.a.c.a.a.b.vc:
     int val$expectedKeys -> a
     1:1:void <init>(int):127:127 -> <init>
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier -> a.a.a.a.c.a.a.b.xc:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier -> a.a.a.a.c.a.a.b.wc:
     int expectedValuesPerKey -> a
     1:2:void <init>(int):193:194 -> <init>
     1:1:java.util.List get():199:199 -> get
     1:1:java.lang.Object get():190 -> get
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder -> a.a.a.a.c.a.a.b.yc:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder -> a.a.a.a.c.a.a.b.xc:
     1:1:void com.android.tools.r8.com.google.common.collect.MultimapBuilder.<init>():77:77 -> <init>
     1:1:void com.android.tools.r8.com.google.common.collect.MultimapBuilder.<init>(com.android.tools.r8.com.google.common.collect.MultimapBuilder$1):71 -> <init>
     1:1:void <init>():438 -> <init>
     com.android.tools.r8.com.google.common.collect.ListMultimap build() -> a
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys com.android.tools.r8.com.google.common.collect.MultimapBuilder.linkedHashKeys(int):126:127 -> b
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys com.android.tools.r8.com.google.common.collect.MultimapBuilder.linkedHashKeys():113 -> b
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys -> a.a.a.a.c.a.a.b.Ac:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys -> a.a.a.a.c.a.a.b.zc:
     1:1:void <init>():282:282 -> <init>
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder arrayListValues(int):300:301 -> a
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder arrayListValues():290 -> a
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys$1 -> a.a.a.a.c.a.a.b.zc:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys$1 -> a.a.a.a.c.a.a.b.yc:
     com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys this$0 -> b
     int val$expectedValuesPerKey -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys,int):301:301 -> <init>
@@ -9027,22 +8900,22 @@
     4:4:com.android.tools.r8.com.google.common.collect.ListMultimap build():305:305 -> a
     5:5:com.android.tools.r8.com.google.common.collect.ListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.newListMultimap(java.util.Map,com.android.tools.r8.com.google.common.base.Supplier):294:294 -> a
     5:5:com.android.tools.r8.com.google.common.collect.ListMultimap build():304 -> a
-com.android.tools.r8.com.google.common.collect.Multimaps$CustomListMultimap -> a.a.a.a.c.a.a.b.Bc:
+com.android.tools.r8.com.google.common.collect.Multimaps$CustomListMultimap -> a.a.a.a.c.a.a.b.Ac:
     com.android.tools.r8.com.google.common.base.Supplier factory -> g
     1:2:void <init>(java.util.Map,com.android.tools.r8.com.google.common.base.Supplier):301:302 -> <init>
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
     3:3:void <init>(java.util.Map,com.android.tools.r8.com.google.common.base.Supplier):302 -> <init>
-    1:1:java.util.List createCollection():307:307 -> j
-    1:1:java.util.Collection createCollection():297 -> j
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> a.a.a.a.c.a.a.b.Fc:
+    1:1:java.util.List createCollection():307:307 -> g
+    1:1:java.util.Collection createCollection():297 -> g
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> a.a.a.a.c.a.a.b.Ec:
     com.android.tools.r8.com.google.common.collect.Multimap multimap -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multimap):1645:1646 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.util.Map$Entry):1678:1678 -> a
-    2:2:int remove(java.lang.Object,int):1755:1755 -> a
-    3:4:int count(java.lang.Object):1749:1750 -> a
-    3:4:int remove(java.lang.Object,int):1757 -> a
-    5:18:int remove(java.lang.Object,int):1760:1773 -> a
     1:2:int count(java.lang.Object):1749:1750 -> b
+    3:3:int remove(java.lang.Object,int):1755:1755 -> b
+    4:5:int count(java.lang.Object):1749:1750 -> b
+    4:5:int remove(java.lang.Object,int):1757 -> b
+    6:19:int remove(java.lang.Object,int):1760:1773 -> b
     1:1:java.util.Set createEntrySet():1688:1688 -> c
     1:1:void clear():1781:1781 -> clear
     1:1:boolean contains(java.lang.Object):1739:1739 -> contains
@@ -9054,75 +8927,71 @@
     1:2:java.util.Iterator entryIterator():1651:1652 -> g
     1:1:java.util.Iterator iterator():1744:1744 -> iterator
     1:1:java.util.Spliterator spliterator():1672:1672 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> a.a.a.a.c.a.a.b.Dc:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> a.a.a.a.c.a.a.b.Cc:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys,java.util.Iterator):1652:1652 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):1652:1652 -> a
     2:2:com.android.tools.r8.com.google.common.collect.Multiset$Entry transform(java.util.Map$Entry):1655:1655 -> a
     2:2:java.lang.Object transform(java.lang.Object):1652 -> a
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> a.a.a.a.c.a.a.b.Cc:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> a.a.a.a.c.a.a.b.Bc:
     java.util.Map$Entry val$backingEntry -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1,java.util.Map$Entry):1655:1655 -> <init>
-    1:1:int getCount():1663:1663 -> a
-    1:1:java.lang.Object getElement():1658:1658 -> b
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$KeysEntrySet -> a.a.a.a.c.a.a.b.Ec:
+    1:1:int getCount():1663:1663 -> getCount
+    1:1:java.lang.Object getElement():1658:1658 -> getElement
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$KeysEntrySet -> a.a.a.a.c.a.a.b.Dc:
     com.android.tools.r8.com.google.common.collect.Multimaps$Keys this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys):1692:1692 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Multiset multiset():1695:1695 -> c
     1:4:boolean contains(java.lang.Object):1715:1718 -> contains
     1:1:boolean isEmpty():1710:1710 -> isEmpty
     1:1:java.util.Iterator iterator():1700:1700 -> iterator
-    2:3:java.util.Iterator com.android.tools.r8.com.google.common.collect.Multimaps$Keys.entryIterator():1651:1652 -> iterator
-    2:3:java.util.Iterator iterator():1700 -> iterator
     1:5:boolean remove(java.lang.Object):1725:1729 -> remove
     1:1:int size():1705:1705 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.Multimaps$Keys.distinctElements():1683:1683 -> size
     2:2:int size():1705 -> size
-com.android.tools.r8.com.google.common.collect.Multiset -> a.a.a.a.c.a.a.b.Hc:
-    int remove(java.lang.Object,int) -> a
+com.android.tools.r8.com.google.common.collect.Multiset -> a.a.a.a.c.a.a.b.Gc:
+    int setCount(java.lang.Object,int) -> a
     boolean setCount(java.lang.Object,int,int) -> a
     1:4:void lambda$forEach$1(java.util.function.Consumer,com.android.tools.r8.com.google.common.collect.Multiset$Entry):494:497 -> a
-    int add(java.lang.Object,int) -> b
     int count(java.lang.Object) -> b
-    int setCount(java.lang.Object,int) -> c
+    int remove(java.lang.Object,int) -> b
+    int add(java.lang.Object,int) -> c
     java.util.Set elementSet() -> f
     1:2:void forEach(java.util.function.Consumer):491:492 -> forEach
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> forEach
     3:3:void forEach(java.util.function.Consumer):490 -> forEach
     1:1:java.util.Spliterator spliterator():504:504 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multiset$Entry -> a.a.a.a.c.a.a.b.Gc:
-    int getCount() -> a
-    java.lang.Object getElement() -> b
-com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> a.a.a.a.c.a.a.b.Ic:
+com.android.tools.r8.com.google.common.collect.Multiset$Entry -> a.a.a.a.c.a.a.b.Fc:
+com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> a.a.a.a.c.a.a.b.Hc:
     1:1:void <init>():833:833 -> <init>
     1:4:boolean equals(java.lang.Object):840:843 -> equals
     1:2:int hashCode():854:855 -> hashCode
     1:3:java.lang.String toString():867:869 -> toString
-com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> a.a.a.a.c.a.a.b.Jc:
+com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> a.a.a.a.c.a.a.b.Ic:
     com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount INSTANCE -> a
     1:1:void <clinit>():1165:1165 -> <clinit>
     1:1:void <init>():1164:1164 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1164:1164 -> compare
     2:2:int compare(com.android.tools.r8.com.google.common.collect.Multiset$Entry,com.android.tools.r8.com.google.common.collect.Multiset$Entry):1168:1168 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1164 -> compare
-com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1 -> a.a.a.a.c.a.a.b.Kc:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1 -> a.a.a.a.c.a.a.b.Jc:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multisets$ElementSet,java.util.Iterator):1002:1002 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):1002:1002 -> a
     2:2:java.lang.Object transform(com.android.tools.r8.com.google.common.collect.Multiset$Entry):1005:1005 -> a
     2:2:java.lang.Object transform(java.lang.Object):1002 -> a
-com.android.tools.r8.com.google.common.collect.Multisets$EntrySet -> a.a.a.a.c.a.a.b.Lc:
+com.android.tools.r8.com.google.common.collect.Multisets$EntrySet -> a.a.a.a.c.a.a.b.Kc:
     1:1:void <init>():1021:1021 -> <init>
     com.android.tools.r8.com.google.common.collect.Multiset multiset() -> c
     1:1:void clear():1061:1061 -> clear
     1:11:boolean contains(java.lang.Object):1026:1036 -> contains
     1:9:boolean remove(java.lang.Object):1045:1053 -> remove
-com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> a.a.a.a.c.a.a.b.Mc:
+com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> a.a.a.a.c.a.a.b.Lc:
     java.lang.Object element -> a
     int count -> b
     1:4:void <init>(java.lang.Object,int):258:261 -> <init>
-    1:1:int getCount():272:272 -> a
-    1:1:java.lang.Object getElement():267:267 -> b
-    com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket() -> c
-com.android.tools.r8.com.google.common.collect.NaturalOrdering -> a.a.a.a.c.a.a.b.Nc:
+    com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket() -> a
+    1:1:int getCount():272:272 -> getCount
+    1:1:java.lang.Object getElement():267:267 -> getElement
+com.android.tools.r8.com.google.common.collect.NaturalOrdering -> a.a.a.a.c.a.a.b.Mc:
     com.android.tools.r8.com.google.common.collect.NaturalOrdering INSTANCE -> a
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>():73:73 -> <init>
@@ -9135,7 +9004,7 @@
     4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> compare
     4:4:int compare(java.lang.Comparable,java.lang.Comparable):35 -> compare
     4:4:int compare(java.lang.Object,java.lang.Object):25 -> compare
-com.android.tools.r8.com.google.common.collect.Ordering -> a.a.a.a.c.a.a.b.Oc:
+com.android.tools.r8.com.google.common.collect.Ordering -> a.a.a.a.c.a.a.b.Nc:
     1:1:void <init>():390:390 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Ordering natural():161:161 -> a
     2:2:com.android.tools.r8.com.google.common.collect.Ordering from(java.util.Comparator):181:181 -> a
@@ -9143,7 +9012,7 @@
     1:1:com.android.tools.r8.com.google.common.base.Function com.android.tools.r8.com.google.common.collect.Maps.keyFunction():111:111 -> b
     1:1:com.android.tools.r8.com.google.common.collect.Ordering onKeys():452 -> b
     2:2:com.android.tools.r8.com.google.common.collect.Ordering onKeys():452:452 -> b
-com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> a.a.a.a.c.a.a.b.Pc:
+com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> a.a.a.a.c.a.a.b.Oc:
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegate -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList delegateList -> c
     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>
@@ -9158,7 +9027,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator listIterator(int):56:56 -> listIterator
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator listIterator(int):56:56 -> listIterator
     2:2:java.util.ListIterator listIterator(int):29 -> listIterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> a.a.a.a.c.a.a.b.Uc:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> a.a.a.a.c.a.a.b.Tc:
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> j
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] keyTable -> e
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap EMPTY -> k
@@ -9196,8 +9065,8 @@
     boolean isHashCodeFast() -> l
     boolean isPartialView() -> m
     1:1:int size():179:179 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> a.a.a.a.c.a.a.b.Qc:
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> a.a.a.a.c.a.a.b.Tc:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> a.a.a.a.c.a.a.b.Pc:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> a.a.a.a.c.a.a.b.Sc:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap this$0 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap):195:195 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap,com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1):195 -> <init>
@@ -9220,7 +9089,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():204:204 -> size
     1:1:int size():199 -> size
     2:2:int size():199:199 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> a.a.a.a.c.a.a.b.Sc:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> a.a.a.a.c.a.a.b.Rc:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse this$1 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse):240:240 -> <init>
     1:1:void forEach(java.util.function.Consumer):263:263 -> forEach
@@ -9231,13 +9100,13 @@
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():258:258 -> iterator
     2:2:java.util.Iterator iterator():239 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():243:243 -> l
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> a.a.a.a.c.a.a.b.Rc:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> a.a.a.a.c.a.a.b.Qc:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet this$2 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet):268:268 -> <init>
     1:2:java.util.Map$Entry get(int):271:272 -> get
     1:2:java.lang.Object get(int):268 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():277:277 -> j
-com.android.tools.r8.com.google.common.collect.RegularImmutableList -> a.a.a.a.c.a.a.b.Vc:
+com.android.tools.r8.com.google.common.collect.RegularImmutableList -> a.a.a.a.c.a.a.b.Uc:
     java.lang.Object[] array -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList EMPTY -> c
     1:1:void <clinit>():31:31 -> <clinit>
@@ -9250,7 +9119,7 @@
     2:2:java.util.ListIterator listIterator(int):28 -> listIterator
     1:1:int size():42:42 -> size
     1:1:java.util.Spliterator spliterator():73:73 -> spliterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> a.a.a.a.c.a.a.b.Yc:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> a.a.a.a.c.a.a.b.Xc:
     com.android.tools.r8.com.google.common.collect.ImmutableMap EMPTY -> h
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] table -> f
     java.util.Map$Entry[] entries -> e
@@ -9287,20 +9156,20 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():229:229 -> k
     boolean isPartialView() -> m
     1:1:int size():159:159 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> a.a.a.a.c.a.a.b.Wc:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> a.a.a.a.c.a.a.b.Vc:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):181:182 -> <init>
     1:1:boolean contains(java.lang.Object):192:192 -> contains
     boolean isPartialView() -> e
     1:1:java.lang.Object get(int):187:187 -> get
     1:1:int size():202:202 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> a.a.a.a.c.a.a.b.Xc:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> a.a.a.a.c.a.a.b.Wc:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):236:237 -> <init>
     boolean isPartialView() -> e
     1:1:java.lang.Object get(int):242:242 -> get
     1:1:int size():247:247 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> a.a.a.a.c.a.a.b.bd:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> a.a.a.a.c.a.a.b.ad:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset EMPTY -> i
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] hashTable -> e
     int size -> f
@@ -9312,15 +9181,15 @@
     1:1:com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] access$100(com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset):36:36 -> a
     1:11:int count(java.lang.Object):117:127 -> b
     12:12:int count(java.lang.Object):125:125 -> b
+    1:1:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):170:170 -> d
     boolean isPartialView() -> e
-    1:1:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):170:170 -> e
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():140:141 -> f
     3:4:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():140:141 -> f
     3:4:java.util.Set elementSet():34 -> f
     1:1:int hashCode():175:175 -> hashCode
     1:1:int size():135:135 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> a.a.a.a.c.a.a.b.Zc:
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> a.a.a.a.c.a.a.b._c:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> a.a.a.a.c.a.a.b.Yc:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> a.a.a.a.c.a.a.b.Zc:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset):145:145 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset,com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1):145 -> <init>
@@ -9328,11 +9197,11 @@
     boolean isPartialView() -> e
     1:1:java.lang.Object get(int):149:149 -> get
     1:1:int size():164:164 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> a.a.a.a.c.a.a.b.ad:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> a.a.a.a.c.a.a.b._c:
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket -> c
     1:2:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry):100:101 -> <init>
-    1:1:com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket():106:106 -> c
-com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> a.a.a.a.c.a.a.b.cd:
+    1:1:com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket():106:106 -> a
+com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> a.a.a.a.c.a.a.b.bd:
     java.lang.Object[] table -> d
     com.android.tools.r8.com.google.common.collect.RegularImmutableSet EMPTY -> g
     java.lang.Object[] elements -> c
@@ -9347,11 +9216,13 @@
     1:1:int hashCode():100:100 -> hashCode
     boolean isHashCodeFast() -> i
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():74:74 -> iterator
-    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():74:74 -> iterator
-    2:2:java.util.Iterator iterator():30 -> iterator
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[]):1054:1054 -> iterator
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():74 -> iterator
+    3:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():74:74 -> iterator
+    3:3: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.RegularImmutableSortedSet -> a.a.a.a.c.a.a.b.dd:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet -> a.a.a.a.c.a.a.b.cd:
     com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet NATURAL_EMPTY_SET -> f
     com.android.tools.r8.com.google.common.collect.ImmutableList elements -> e
     1:2:void <clinit>():44:45 -> <clinit>
@@ -9432,7 +9303,7 @@
     1:1:java.util.Comparator unsafeComparator():273:273 -> m
     1:1:int size():77:77 -> size
     1:1:java.util.Spliterator spliterator():67:67 -> spliterator
-com.android.tools.r8.com.google.common.collect.Sets$1 -> a.a.a.a.c.a.a.b.fd:
+com.android.tools.r8.com.google.common.collect.Sets$1 -> a.a.a.a.c.a.a.b.ed:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
     1:1:void <init>(java.util.Set,java.util.Set):744:744 -> <init>
@@ -9444,13 +9315,13 @@
     1:1:java.util.stream.Stream parallelStream():790:790 -> parallelStream
     1:3:int size():747:749 -> size
     1:1:java.util.stream.Stream stream():785:785 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$1$1 -> a.a.a.a.c.a.a.b.ed:
+com.android.tools.r8.com.google.common.collect.Sets$1$1 -> a.a.a.a.c.a.a.b.dd:
     java.util.Iterator itr2 -> d
     java.util.Iterator itr1 -> c
     com.android.tools.r8.com.google.common.collect.Sets$1 this$0 -> e
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.Sets$1):763:765 -> <init>
-    1:10:java.lang.Object computeNext():769:778 -> e
-com.android.tools.r8.com.google.common.collect.Sets$2 -> a.a.a.a.c.a.a.b.hd:
+    1:10:java.lang.Object computeNext():769:778 -> d
+com.android.tools.r8.com.google.common.collect.Sets$2 -> a.a.a.a.c.a.a.b.gd:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
     1:1:void <init>(java.util.Set,java.util.Set):842:842 -> <init>
@@ -9462,12 +9333,12 @@
     1:1:java.util.stream.Stream parallelStream():868:868 -> parallelStream
     1:2:int size():874:875 -> size
     1:1:java.util.stream.Stream stream():863:863 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$2$1 -> a.a.a.a.c.a.a.b.gd:
+com.android.tools.r8.com.google.common.collect.Sets$2$1 -> a.a.a.a.c.a.a.b.fd:
     java.util.Iterator itr -> c
     com.android.tools.r8.com.google.common.collect.Sets$2 this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$2):845:846 -> <init>
-    1:7:java.lang.Object computeNext():850:856 -> e
-com.android.tools.r8.com.google.common.collect.Sets$3 -> a.a.a.a.c.a.a.b.jd:
+    1:7:java.lang.Object computeNext():850:856 -> d
+com.android.tools.r8.com.google.common.collect.Sets$3 -> a.a.a.a.c.a.a.b.id:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
     1:1:void <init>(java.util.Set,java.util.Set):914:914 -> <init>
@@ -9480,12 +9351,12 @@
     1:1:java.util.stream.Stream parallelStream():939:939 -> parallelStream
     1:2:int size():945:946 -> size
     1:1:java.util.stream.Stream stream():934:934 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$3$1 -> a.a.a.a.c.a.a.b.id:
+com.android.tools.r8.com.google.common.collect.Sets$3$1 -> a.a.a.a.c.a.a.b.hd:
     java.util.Iterator itr -> c
     com.android.tools.r8.com.google.common.collect.Sets$3 this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$3):917:918 -> <init>
-    1:7:java.lang.Object computeNext():921:927 -> e
-com.android.tools.r8.com.google.common.collect.Sets$5 -> a.a.a.a.c.a.a.b.nd:
+    1:7:java.lang.Object computeNext():921:927 -> d
+com.android.tools.r8.com.google.common.collect.Sets$5 -> a.a.a.a.c.a.a.b.md:
     com.android.tools.r8.com.google.common.collect.ImmutableMap val$index -> b
     int val$size -> a
     1:1:void <init>(int,com.android.tools.r8.com.google.common.collect.ImmutableMap):1676:1676 -> <init>
@@ -9493,31 +9364,31 @@
     1:1:java.util.Iterator iterator():1688:1688 -> iterator
     1:1:int size():1755:1755 -> size
     1:1:java.lang.String toString():1760:1760 -> toString
-com.android.tools.r8.com.google.common.collect.Sets$5$1 -> a.a.a.a.c.a.a.b.md:
+com.android.tools.r8.com.google.common.collect.Sets$5$1 -> a.a.a.a.c.a.a.b.ld:
     java.util.BitSet bits -> c
     com.android.tools.r8.com.google.common.collect.Sets$5 this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5):1688:1689 -> <init>
-    1:29:java.util.Set computeNext():1693:1721 -> e
-    1:29:java.lang.Object computeNext():1688 -> e
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> a.a.a.a.c.a.a.b.ld:
+    1:29:java.util.Set computeNext():1693:1721 -> d
+    1:29:java.lang.Object computeNext():1688 -> d
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> a.a.a.a.c.a.a.b.kd:
     com.android.tools.r8.com.google.common.collect.Sets$5$1 this$1 -> b
     java.util.BitSet val$copy -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5$1,java.util.BitSet):1721:1721 -> <init>
     1:2:boolean contains(java.lang.Object):1724:1725 -> contains
     1:1:java.util.Iterator iterator():1730:1730 -> iterator
     1:1:int size():1746:1746 -> size
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> a.a.a.a.c.a.a.b.kd:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> a.a.a.a.c.a.a.b.jd:
     com.android.tools.r8.com.google.common.collect.Sets$5$1$1 this$2 -> d
     int i -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5$1$1):1730:1731 -> <init>
-    1:5:java.lang.Object computeNext():1735:1739 -> e
-com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> a.a.a.a.c.a.a.b.od:
+    1:5:java.lang.Object computeNext():1735:1739 -> d
+com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> a.a.a.a.c.a.a.b.nd:
     1:1:void <init>():77:77 -> <init>
     1:1:boolean removeAll(java.util.Collection):80:80 -> removeAll
     1:1:boolean retainAll(java.util.Collection):85:85 -> retainAll
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> retainAll
     2:2:boolean retainAll(java.util.Collection):85 -> retainAll
-com.android.tools.r8.com.google.common.collect.Sets$SetView -> a.a.a.a.c.a.a.b.pd:
+com.android.tools.r8.com.google.common.collect.Sets$SetView -> a.a.a.a.c.a.a.b.od:
     1:1:void <init>():600:600 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Sets$1):599 -> <init>
     1:1:boolean add(java.lang.Object):640:640 -> add
@@ -9527,7 +9398,7 @@
     1:1:boolean removeAll(java.util.Collection):679:679 -> removeAll
     1:1:boolean removeIf(java.util.function.Predicate):692:692 -> removeIf
     1:1:boolean retainAll(java.util.Collection):705:705 -> retainAll
-com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet -> a.a.a.a.c.a.a.b.qd:
+com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet -> a.a.a.a.c.a.a.b.pd:
     java.util.SortedSet unmodifiableDelegate -> b
     java.util.NavigableSet delegate -> a
     com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet descendingSet -> c
@@ -9557,7 +9428,7 @@
     1:2:java.util.NavigableSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):1910:1911 -> subSet
     3:3:java.util.NavigableSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):1910:1910 -> subSet
     1:1:java.util.NavigableSet tailSet(java.lang.Object,boolean):1921:1921 -> tailSet
-com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> a.a.a.a.c.a.a.b.rd:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> a.a.a.a.c.a.a.b.qd:
     java.lang.Object singleValue -> f
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> g
     java.lang.Object singleKey -> e
@@ -9575,7 +9446,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():85:85 -> i
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():90:90 -> j
     boolean isPartialView() -> m
-com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> a.a.a.a.c.a.a.b.sd:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> a.a.a.a.c.a.a.b.rd:
     java.lang.Object element -> b
     1:2:void <init>(java.lang.Object):37:38 -> <init>
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
@@ -9583,8 +9454,10 @@
     boolean isPartialView() -> e
     1:2:java.lang.Object get(int):43:44 -> get
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():49:49 -> iterator
-    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():49:49 -> iterator
-    2:2:java.util.Iterator iterator():31 -> iterator
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.singletonIterator(java.lang.Object):1104:1104 -> iterator
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():49 -> iterator
+    3:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():49:49 -> iterator
+    3:3:java.util.Iterator iterator():31 -> iterator
     1:1:java.util.Spliterator spliterator():54:54 -> spliterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):64:64 -> subList
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():81:81 -> subList
@@ -9595,7 +9468,7 @@
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):65 -> subList
     4:4:java.util.List subList(int,int):31 -> subList
     1:1:java.lang.String toString():70:70 -> toString
-com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> a.a.a.a.c.a.a.b.td:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> a.a.a.a.c.a.a.b.sd:
     java.lang.Object element -> c
     int cachedHashCode -> d
     1:2:void <init>(java.lang.Object):44:45 -> <init>
@@ -9609,11 +9482,13 @@
     1:3:int hashCode():88:90 -> hashCode
     1:1:boolean isHashCodeFast():97:97 -> i
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():66:66 -> iterator
-    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():66:66 -> iterator
-    2:2:java.util.Iterator iterator():29 -> iterator
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.singletonIterator(java.lang.Object):1104:1104 -> iterator
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():66 -> iterator
+    3:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():66:66 -> iterator
+    3:3:java.util.Iterator iterator():29 -> iterator
     1:1:java.lang.String toString():102:102 -> toString
-com.android.tools.r8.com.google.common.collect.SortedIterable -> a.a.a.a.c.a.a.b.ud:
-com.android.tools.r8.com.google.common.collect.StandardTable -> a.a.a.a.c.a.a.b.Dd:
+com.android.tools.r8.com.google.common.collect.SortedIterable -> a.a.a.a.c.a.a.b.td:
+com.android.tools.r8.com.google.common.collect.StandardTable -> a.a.a.a.c.a.a.b.Cd:
     java.util.Map backingMap -> b
     java.util.Map rowMap -> d
     com.android.tools.r8.com.google.common.base.Supplier factory -> c
@@ -9633,9 +9508,8 @@
     2:2:java.util.Map createRowMap():771:771 -> d
     2:2:java.util.Map rowMap():767 -> d
     3:3:java.util.Map rowMap():767:767 -> d
-    int size() -> e
-com.android.tools.r8.com.google.common.collect.StandardTable$1 -> a.a.a.a.c.a.a.b.vd:
-com.android.tools.r8.com.google.common.collect.StandardTable$CellIterator -> a.a.a.a.c.a.a.b.wd:
+com.android.tools.r8.com.google.common.collect.StandardTable$1 -> a.a.a.a.c.a.a.b.ud:
+com.android.tools.r8.com.google.common.collect.StandardTable$CellIterator -> a.a.a.a.c.a.a.b.vd:
     java.util.Map$Entry rowEntry -> b
     java.util.Iterator columnIterator -> c
     java.util.Iterator rowIterator -> a
@@ -9651,7 +9525,7 @@
     1:6:com.android.tools.r8.com.google.common.collect.Table$Cell next():251:256 -> next
     1:6:java.lang.Object next():239 -> next
     1:3:void remove():261:263 -> remove
-com.android.tools.r8.com.google.common.collect.StandardTable$Row -> a.a.a.a.c.a.a.b.zd:
+com.android.tools.r8.com.google.common.collect.StandardTable$Row -> a.a.a.a.c.a.a.b.yd:
     java.util.Map backingRowMap -> b
     java.lang.Object rowKey -> a
     com.android.tools.r8.com.google.common.collect.StandardTable this$0 -> c
@@ -9679,7 +9553,7 @@
     6:6:java.lang.Object put(java.lang.Object,java.lang.Object):328 -> put
     1:6:java.lang.Object remove(java.lang.Object):338:343 -> remove
     1:2:int size():358:359 -> size
-com.android.tools.r8.com.google.common.collect.StandardTable$Row$1 -> a.a.a.a.c.a.a.b.xd:
+com.android.tools.r8.com.google.common.collect.StandardTable$Row$1 -> a.a.a.a.c.a.a.b.wd:
     com.android.tools.r8.com.google.common.collect.StandardTable$Row this$1 -> b
     java.util.Iterator val$iterator -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.StandardTable$Row,java.util.Iterator):369:369 -> <init>
@@ -9687,7 +9561,7 @@
     1:1:java.util.Map$Entry next():377:377 -> next
     1:1:java.lang.Object next():369 -> next
     1:2:void remove():382:383 -> remove
-com.android.tools.r8.com.google.common.collect.StandardTable$Row$2 -> a.a.a.a.c.a.a.b.yd:
+com.android.tools.r8.com.google.common.collect.StandardTable$Row$2 -> a.a.a.a.c.a.a.b.xd:
     java.util.Map$Entry val$entry -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.StandardTable$Row,java.util.Map$Entry):398:398 -> <init>
     1:2:boolean com.android.tools.r8.com.google.common.collect.ForwardingMapEntry.standardEquals(java.lang.Object):96:97 -> equals
@@ -9719,8 +9593,8 @@
     2:2:java.lang.Object setValue(java.lang.Object):406 -> setValue
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> setValue
     3:3:java.lang.Object setValue(java.lang.Object):406 -> setValue
-com.android.tools.r8.com.google.common.collect.StandardTable$RowMap -> a.a.a.a.c.a.a.b.Cd:
-    com.android.tools.r8.com.google.common.collect.StandardTable this$0 -> d
+com.android.tools.r8.com.google.common.collect.StandardTable$RowMap -> a.a.a.a.c.a.a.b.Bd:
+    com.android.tools.r8.com.google.common.collect.StandardTable this$0 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.StandardTable):775:775 -> <init>
     1:1:boolean containsKey(java.lang.Object):778:778 -> containsKey
     1:1:java.util.Map get(java.lang.Object):785:785 -> get
@@ -9728,7 +9602,7 @@
     1:1:java.util.Set createEntrySet():795:795 -> h
     1:1:java.util.Map remove(java.lang.Object):790:790 -> remove
     1:1:java.lang.Object remove(java.lang.Object):774 -> remove
-com.android.tools.r8.com.google.common.collect.StandardTable$RowMap$EntrySet -> a.a.a.a.c.a.a.b.Bd:
+com.android.tools.r8.com.google.common.collect.StandardTable$RowMap$EntrySet -> a.a.a.a.c.a.a.b.Ad:
     com.android.tools.r8.com.google.common.collect.StandardTable com.android.tools.r8.com.google.common.collect.StandardTable$TableSet.this$0 -> a
     com.android.tools.r8.com.google.common.collect.StandardTable$RowMap this$1 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.StandardTable$RowMap):799:799 -> <init>
@@ -9745,26 +9619,26 @@
     3:3:java.util.Iterator iterator():802 -> iterator
     1:5:boolean remove(java.lang.Object):830:834 -> remove
     1:1:int size():814:814 -> size
-com.android.tools.r8.com.google.common.collect.StandardTable$RowMap$EntrySet$1 -> a.a.a.a.c.a.a.b.Ad:
+com.android.tools.r8.com.google.common.collect.StandardTable$RowMap$EntrySet$1 -> a.a.a.a.c.a.a.b.zd:
     com.android.tools.r8.com.google.common.collect.StandardTable$RowMap$EntrySet this$2 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.StandardTable$RowMap$EntrySet):804:804 -> <init>
     1:1:java.util.Map apply(java.lang.Object):807:807 -> apply
     1:1:java.lang.Object apply(java.lang.Object):804 -> apply
-com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> a.a.a.a.c.a.a.b.Ed:
+com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> a.a.a.a.c.a.a.b.Dd:
     com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex val$function -> d
     java.lang.Object holder -> c
     1:2:void <init>(java.util.Spliterator,long,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):369:370 -> <init>
     1:1:void accept(java.lang.Object):375:375 -> accept
     1:6:boolean tryAdvance(java.util.function.Consumer):380:385 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$2 -> a.a.a.a.c.a.a.b.Fd:
+com.android.tools.r8.com.google.common.collect.Streams$2 -> a.a.a.a.c.a.a.b.Ed:
     java.util.Iterator val$fromIterator -> b
     long index -> a
     com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex val$function -> c
     1:2:void <init>(long,int,java.util.Iterator,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):352:353 -> <init>
     1:2:boolean tryAdvance(java.util.function.Consumer):357:358 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> a.a.a.a.c.a.a.b.Gd:
+com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> a.a.a.a.c.a.a.b.Fd:
     java.lang.Object apply(java.lang.Object,long) -> a
-com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> a.a.a.a.c.a.a.b.Hd:
+com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> a.a.a.a.c.a.a.b.Gd:
     long index -> b
     java.util.Spliterator fromSpliterator -> a
     1:3:void <init>(java.util.Spliterator,long):419:421 -> <init>
@@ -9778,32 +9652,33 @@
     6:6:java.util.Spliterator trySplit():413 -> trySplit
     7:7:com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator trySplit():434:434 -> trySplit
     7:7:java.util.Spliterator trySplit():413 -> trySplit
-com.android.tools.r8.com.google.common.collect.Table -> a.a.a.a.c.a.a.b.Jd:
-com.android.tools.r8.com.google.common.collect.Table$Cell -> a.a.a.a.c.a.a.b.Id:
-com.android.tools.r8.com.google.common.collect.Tables -> a.a.a.a.c.a.a.b.Nd:
+com.android.tools.r8.com.google.common.collect.Table -> a.a.a.a.c.a.a.b.Id:
+com.android.tools.r8.com.google.common.collect.Table$Cell -> a.a.a.a.c.a.a.b.Hd:
+com.android.tools.r8.com.google.common.collect.Tables -> a.a.a.a.c.a.a.b.Md:
     1:1:void <clinit>():697:697 -> <clinit>
     1:1:com.android.tools.r8.com.google.common.collect.Table$Cell immutableCell(java.lang.Object,java.lang.Object,java.lang.Object):152:152 -> a
     2:4:boolean equalsImpl(com.android.tools.r8.com.google.common.collect.Table,java.lang.Object):741:743 -> a
-com.android.tools.r8.com.google.common.collect.Tables$1 -> a.a.a.a.c.a.a.b.Kd:
+com.android.tools.r8.com.google.common.collect.Tables$1 -> a.a.a.a.c.a.a.b.Jd:
+    1:1:void <init>():698:698 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):698:698 -> apply
     2:2:java.util.Map apply(java.util.Map):701:701 -> apply
     2:2:java.lang.Object apply(java.lang.Object):698 -> apply
-com.android.tools.r8.com.google.common.collect.Tables$AbstractCell -> a.a.a.a.c.a.a.b.Ld:
+com.android.tools.r8.com.google.common.collect.Tables$AbstractCell -> a.a.a.a.c.a.a.b.Kd:
     1:1:void <init>():186:186 -> <init>
     1:5:boolean equals(java.lang.Object):193:197 -> equals
     1:1:int hashCode():204:204 -> hashCode
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):76:76 -> hashCode
     2:2:int hashCode():204 -> hashCode
     1:1:java.lang.String toString():209:209 -> toString
-com.android.tools.r8.com.google.common.collect.Tables$ImmutableCell -> a.a.a.a.c.a.a.b.Md:
+com.android.tools.r8.com.google.common.collect.Tables$ImmutableCell -> a.a.a.a.c.a.a.b.Ld:
     java.lang.Object columnKey -> b
     java.lang.Object value -> c
     java.lang.Object rowKey -> a
     1:4:void <init>(java.lang.Object,java.lang.Object,java.lang.Object):160:163 -> <init>
     1:1:java.lang.Object getColumnKey():173:173 -> a
     1:1:java.lang.Object getRowKey():168:168 -> b
-    1:1:java.lang.Object getValue():178:178 -> c
-com.android.tools.r8.com.google.common.collect.TransformedIterator -> a.a.a.a.c.a.a.b.Od:
+    1:1:java.lang.Object getValue():178:178 -> getValue
+com.android.tools.r8.com.google.common.collect.TransformedIterator -> a.a.a.a.c.a.a.b.Nd:
     java.util.Iterator backingIterator -> a
     1:2:void <init>(java.util.Iterator):35:36 -> <init>
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
@@ -9812,10 +9687,10 @@
     1:1:boolean hasNext():43:43 -> hasNext
     1:1:java.lang.Object next():48:48 -> next
     1:1:void remove():53:53 -> remove
-com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> a.a.a.a.c.a.a.b.Pd:
+com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> a.a.a.a.c.a.a.b.Od:
     1:1:void <init>():35:35 -> <init>
     1:1:void remove():46:46 -> remove
-com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> a.a.a.a.c.a.a.b.Qd:
+com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> a.a.a.a.c.a.a.b.Pd:
     1:1:void <init>():33:33 -> <init>
     1:1:void add(java.lang.Object):44:44 -> add
     1:1:void set(java.lang.Object):56:56 -> set
@@ -9998,54 +9873,13 @@
     1:1:void write(byte[]):603 -> write
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> write
     2:2:void write(byte[],int,int):609 -> write
-com.android.tools.r8.com.google.common.io.CharSequenceReader -> a.a.a.a.c.a.a.d.k:
-    java.lang.CharSequence seq -> a
-    int pos -> b
-    int mark -> c
-    1:2:void <init>(java.lang.CharSequence):43:44 -> <init>
-    3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
-    3:3:void <init>(java.lang.CharSequence):44 -> <init>
-    1:2:void checkOpen():48:49 -> a
-    1:1:boolean hasRemaining():54:54 -> b
-    1:1:int remaining():58:58 -> c
-    1:1:void close():130:130 -> close
-    1:3:void mark(int):117:119 -> mark
-    1:7:int read(java.nio.CharBuffer):64:70 -> read
-    8:8:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> read
-    8:8:int read(java.nio.CharBuffer):63 -> read
-    9:10:int read():77:78 -> read
-    11:18:int read(char[],int,int):83:90 -> read
-    1:1:boolean ready():106:106 -> ready
-    1:2:void reset():124:125 -> reset
-    1:4:long skip(long):97:100 -> skip
-com.android.tools.r8.com.google.common.io.CharSink -> a.a.a.a.c.a.a.d.l:
+com.android.tools.r8.com.google.common.io.CharSink -> a.a.a.a.c.a.a.d.k:
     1:1:void <init>():58:58 -> <init>
     java.io.Writer openStream() -> a
-com.android.tools.r8.com.google.common.io.CharSource -> a.a.a.a.c.a.a.d.o:
-    1:1:void <init>():76:76 -> <init>
-    java.io.Reader openStream() -> a
-    1:1:com.android.tools.r8.com.google.common.io.CharSource wrap(java.lang.CharSequence):479:479 -> a
-com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> a.a.a.a.c.a.a.d.m:
-    java.lang.CharSequence seq -> a
-    1:1:void <clinit>():525:525 -> <clinit>
-    1:2:void <init>(java.lang.CharSequence):529:530 -> <init>
-    3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
-    3:3:void <init>(java.lang.CharSequence):530 -> <init>
-    1:1:java.io.Reader openStream():535:535 -> a
-    1:1:java.lang.String toString():609:609 -> toString
-    2:20:java.lang.String com.android.tools.r8.com.google.common.base.Ascii.truncate(java.lang.CharSequence,int,java.lang.String):553:571 -> toString
-    2:20:java.lang.String toString():609 -> toString
-    21:21:java.lang.String toString():609:609 -> toString
-    22:22:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> toString
-    22:22:java.lang.String com.android.tools.r8.com.google.common.base.Ascii.truncate(java.lang.CharSequence,int,java.lang.String):546 -> toString
-    22:22:java.lang.String toString():609 -> toString
-com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> a.a.a.a.c.a.a.d.n:
-    1:1:void <init>(java.lang.String):630:630 -> <init>
-    1:1:java.io.Reader openStream():635:635 -> a
-com.android.tools.r8.com.google.common.io.Closeables -> a.a.a.a.c.a.a.d.p:
+com.android.tools.r8.com.google.common.io.Closeables -> a.a.a.a.c.a.a.d.l:
     java.util.logging.Logger logger -> a
     1:1:void <clinit>():37:37 -> <clinit>
-com.android.tools.r8.com.google.common.io.Closer -> a.a.a.a.c.a.a.d.t:
+com.android.tools.r8.com.google.common.io.Closer -> a.a.a.a.c.a.a.d.p:
     com.android.tools.r8.com.google.common.io.Closer$Suppressor suppressor -> a
     java.util.Deque stack -> b
     java.lang.Throwable thrown -> c
@@ -10063,12 +9897,12 @@
     6:6:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     6:6:java.lang.RuntimeException rethrow(java.lang.Throwable):148 -> a
     1:19:void close():210:228 -> close
-com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> a.a.a.a.c.a.a.d.q:
+com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> a.a.a.a.c.a.a.d.m:
     com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor INSTANCE -> a
     1:1:void <clinit>():251:251 -> <clinit>
     1:1:void <init>():249:249 -> <init>
     1:1:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):256:256 -> a
-com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> a.a.a.a.c.a.a.d.r:
+com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> a.a.a.a.c.a.a.d.n:
     com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor INSTANCE -> a
     java.lang.reflect.Method addSuppressed -> b
     1:1:void <clinit>():268:268 -> <clinit>
@@ -10079,20 +9913,20 @@
     1:1:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):291:291 -> a
     2:2:void com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor.suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):256:256 -> a
     2:2:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):294 -> a
-com.android.tools.r8.com.google.common.io.Closer$Suppressor -> a.a.a.a.c.a.a.d.s:
+com.android.tools.r8.com.google.common.io.Closer$Suppressor -> a.a.a.a.c.a.a.d.o:
     void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable) -> a
-com.android.tools.r8.com.google.common.io.FileWriteMode -> a.a.a.a.c.a.a.d.u:
+com.android.tools.r8.com.google.common.io.FileWriteMode -> a.a.a.a.c.a.a.d.q:
     com.android.tools.r8.com.google.common.io.FileWriteMode APPEND -> a
     1:1:void <clinit>():28:28 -> <clinit>
     2:2:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(java.lang.String,int):26:26 -> <init>
-com.android.tools.r8.com.google.common.io.Files -> a.a.a.a.c.a.a.d.x:
+com.android.tools.r8.com.google.common.io.Files -> a.a.a.a.c.a.a.d.t:
     1:1:com.android.tools.r8.com.google.common.io.ByteSink asByteSink(java.io.File,com.android.tools.r8.com.google.common.io.FileWriteMode[]):199:199 -> a
     1:1:com.android.tools.r8.com.google.common.io.CharSink asCharSink(java.io.File,java.nio.charset.Charset,com.android.tools.r8.com.google.common.io.FileWriteMode[]):242 -> a
     2:2:com.android.tools.r8.com.google.common.io.CharSink com.android.tools.r8.com.google.common.io.ByteSink.asCharSink(java.nio.charset.Charset):60:60 -> a
     2:2:com.android.tools.r8.com.google.common.io.CharSink asCharSink(java.io.File,java.nio.charset.Charset,com.android.tools.r8.com.google.common.io.FileWriteMode[]):242 -> a
-com.android.tools.r8.com.google.common.io.Files$1 -> a.a.a.a.c.a.a.d.v:
-com.android.tools.r8.com.google.common.io.Files$FileByteSink -> a.a.a.a.c.a.a.d.w:
+com.android.tools.r8.com.google.common.io.Files$1 -> a.a.a.a.c.a.a.d.r:
+com.android.tools.r8.com.google.common.io.Files$FileByteSink -> a.a.a.a.c.a.a.d.s:
     java.io.File file -> a
     com.android.tools.r8.com.google.common.collect.ImmutableSet modes -> b
     1:3:void <init>(java.io.File,com.android.tools.r8.com.google.common.io.FileWriteMode[]):207:209 -> <init>
@@ -10103,7 +9937,7 @@
     1:1:java.io.FileOutputStream openStream():214:214 -> a
     1:1:java.io.OutputStream openStream():202 -> a
     1:1:java.lang.String toString():219:219 -> toString
-com.android.tools.r8.com.google.common.io.LineProcessor -> a.a.a.a.c.a.a.d.y:
+com.android.tools.r8.com.google.common.io.LineProcessor -> a.a.a.a.c.a.a.d.u:
 com.android.tools.r8.com.google.common.math.IntMath -> a.a.a.a.c.a.a.e.b:
     int[] biggestBinomials -> a
     1:474:void <clinit>():202:675 -> <clinit>
@@ -10241,12 +10075,11 @@
     1:1:java.lang.String toString():68:68 -> toString
 com.android.tools.r8.com.google.gson.internal.LinkedTreeMap -> a.a.a.a.c.a.b.a.i:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node header -> e
-    java.util.Comparator NATURAL_ORDER -> h
-    boolean $assertionsDisabled -> i
-    com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet keySet -> g
+    java.util.Comparator NATURAL_ORDER -> g
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node root -> b
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet entrySet -> f
     int modCount -> d
+    boolean $assertionsDisabled -> h
     int size -> c
     java.util.Comparator comparator -> a
     1:3:void <clinit>():38:40 -> <clinit>
@@ -10319,9 +10152,9 @@
     int expectedModCount -> c
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):531:531 -> <init>
     2:4:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):527:529 -> <init>
-    1:9:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():539:547 -> e
-    10:10:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():544:544 -> e
-    11:11:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():541:541 -> e
+    1:9:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():539:547 -> d
+    10:10:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():544:544 -> d
+    11:11:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():541:541 -> d
     1:1:boolean hasNext():535:535 -> hasNext
     1:6:void remove():551:556 -> remove
     7:7:void remove():552:552 -> remove
@@ -10861,9 +10694,9 @@
     97:107:void write(java.util.concurrent.ExecutorService):285:295 -> a
     108:108:void lambda$write$0(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):226:226 -> a
     109:116:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):240:247 -> a
-    117:117:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():228:228 -> a
+    117:117:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():209:209 -> a
     117:117:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):247 -> a
-    118:118:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():228:228 -> a
+    118:118:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():209:209 -> a
     118:118:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):248 -> a
     119:122:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):250:253 -> a
     123:123:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):252:252 -> a
@@ -11071,199 +10904,176 @@
     19:21:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):129:131 -> <init>
     22:25:void com.android.tools.r8.dex.DexReader.setByteOrder():83:86 -> <init>
     22:25:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):132 -> <init>
-    26:48:com.android.tools.r8.dex.DexSection[] parseMap():741:763 -> <init>
+    26:48:com.android.tools.r8.dex.DexSection[] parseMap():736:758 -> <init>
     26:48:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):133 -> <init>
     49:49:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> <init>
     49:49:int com.android.tools.r8.dex.BinaryReader.end():0 -> <init>
-    49:49:com.android.tools.r8.dex.DexSection[] parseMap():763 -> <init>
+    49:49:com.android.tools.r8.dex.DexSection[] parseMap():758 -> <init>
     49:49:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):133 -> <init>
-    50:50:com.android.tools.r8.dex.DexSection[] parseMap():763:763 -> <init>
+    50:50:com.android.tools.r8.dex.DexSection[] parseMap():758:758 -> <init>
     50:50:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):133 -> <init>
     51:51:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):133:133 -> <init>
-    52:59:void parseStringIDs():718:725 -> <init>
+    52:59:void parseStringIDs():713:720 -> <init>
     52:59:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):134 -> <init>
     60:60:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):135:135 -> <init>
     61:61:void com.android.tools.r8.dex.DexReader.setByteOrder():89:89 -> <init>
     61:61:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):132 -> <init>
     1:16:void ensureCodesInited():140:155 -> a
-    1:16:void addClassDefsTo(java.util.function.Consumer):617 -> a
-    17:29:com.android.tools.r8.graph.DexCode parseCodeItem():768:780 -> a
+    1:16:void addClassDefsTo(java.util.function.Consumer):612 -> a
+    17:29:com.android.tools.r8.graph.DexCode parseCodeItem():763:775 -> a
     17:29:void ensureCodesInited():156 -> a
-    17:29:void addClassDefsTo(java.util.function.Consumer):617 -> a
+    17:29:void addClassDefsTo(java.util.function.Consumer):612 -> a
     30:30:short com.android.tools.r8.dex.BinaryReader.getShort():68:68 -> a
     30:30:short com.android.tools.r8.dex.BinaryReader.getShort():0 -> a
-    30:30:com.android.tools.r8.graph.DexCode parseCodeItem():780 -> a
+    30:30:com.android.tools.r8.graph.DexCode parseCodeItem():775 -> a
     30:30:void ensureCodesInited():156 -> a
-    30:30:void addClassDefsTo(java.util.function.Consumer):617 -> a
-    31:72:com.android.tools.r8.graph.DexCode parseCodeItem():780:821 -> a
+    30:30:void addClassDefsTo(java.util.function.Consumer):612 -> a
+    31:72:com.android.tools.r8.graph.DexCode parseCodeItem():775:816 -> a
     31:72:void ensureCodesInited():156 -> a
-    31:72:void addClassDefsTo(java.util.function.Consumer):617 -> a
+    31:72:void addClassDefsTo(java.util.function.Consumer):612 -> a
     73:73:void com.android.tools.r8.graph.DexCode$Try.setHandlerIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):467:467 -> a
-    73:73:com.android.tools.r8.graph.DexCode parseCodeItem():822 -> a
+    73:73:com.android.tools.r8.graph.DexCode parseCodeItem():817 -> a
     73:73:void ensureCodesInited():156 -> a
-    73:73:void addClassDefsTo(java.util.function.Consumer):617 -> a
-    74:80:com.android.tools.r8.graph.DexCode parseCodeItem():827:833 -> a
+    73:73:void addClassDefsTo(java.util.function.Consumer):612 -> a
+    74:80:com.android.tools.r8.graph.DexCode parseCodeItem():822:828 -> a
     74:80:void ensureCodesInited():156 -> a
-    74:80:void addClassDefsTo(java.util.function.Consumer):617 -> a
+    74:80:void addClassDefsTo(java.util.function.Consumer):612 -> a
     81:81:void ensureCodesInited():157:157 -> a
-    81:81:void addClassDefsTo(java.util.function.Consumer):617 -> a
-    82:105:void addClassDefsTo(java.util.function.Consumer):618:641 -> a
+    81:81:void addClassDefsTo(java.util.function.Consumer):612 -> a
+    82:105:void addClassDefsTo(java.util.function.Consumer):613:636 -> a
     106:106:int com.android.tools.r8.dex.BinaryReader.getInt():78:78 -> a
     106:106:int com.android.tools.r8.dex.BinaryReader.getInt():0 -> a
-    106:106:void addClassDefsTo(java.util.function.Consumer):641 -> a
-    107:109:void addClassDefsTo(java.util.function.Consumer):641:643 -> a
+    106:106:void addClassDefsTo(java.util.function.Consumer):636 -> a
+    107:109:void addClassDefsTo(java.util.function.Consumer):636:638 -> a
     110:110:int com.android.tools.r8.dex.BinaryReader.getInt():78:78 -> a
     110:110:int com.android.tools.r8.dex.BinaryReader.getInt():0 -> a
-    110:110:void addClassDefsTo(java.util.function.Consumer):643 -> a
-    111:145:void addClassDefsTo(java.util.function.Consumer):643:677 -> a
-    146:182:void addClassDefsTo(java.util.function.Consumer):676:712 -> a
-    183:199:void addClassDefsTo(java.util.function.Consumer):697:713 -> a
-    200:200:void addClassDefsTo(java.util.function.Consumer):659:659 -> a
+    110:110:void addClassDefsTo(java.util.function.Consumer):638 -> a
+    111:145:void addClassDefsTo(java.util.function.Consumer):638:672 -> a
+    146:182:void addClassDefsTo(java.util.function.Consumer):671:707 -> a
+    183:199:void addClassDefsTo(java.util.function.Consumer):692:708 -> a
+    200:200:void addClassDefsTo(java.util.function.Consumer):654:654 -> a
     201:206:java.lang.Object cacheAt(int,java.util.function.Supplier):394:399 -> a
     207:207:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
     207:207:void com.android.tools.r8.dex.BinaryReader.position(int):0 -> a
     207:207:java.lang.Object cacheAt(int,java.util.function.Supplier):399 -> a
     208:211:java.lang.Object cacheAt(int,java.util.function.Supplier):400:403 -> a
     212:212:com.android.tools.r8.graph.DexAnnotation annotationAt(int):416:416 -> a
-    213:228:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):572:587 -> a
-    229:246:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):594:611 -> a
-    247:249:void populateStrings():848:850 -> a
-    247:249:void populateIndexTables():838 -> a
-    250:259:com.android.tools.r8.graph.DexString stringAt(int):1062:1071 -> a
-    250:259:void populateStrings():850 -> a
-    250:259:void populateIndexTables():838 -> a
-    260:260:void populateStrings():850:850 -> a
-    260:260:void populateIndexTables():838 -> a
-    261:262:void populateTypes():871:872 -> a
-    261:262:void populateIndexTables():839 -> a
-    263:282:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):885:904 -> a
-    263:282:void populateTypes():872 -> a
-    263:282:void populateIndexTables():839 -> a
-    283:283:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):899:899 -> a
-    283:283:void populateTypes():872 -> a
-    283:283:void populateIndexTables():839 -> a
-    284:286:void populateTypes():873:875 -> a
-    284:286:void populateIndexTables():839 -> a
-    287:293:com.android.tools.r8.graph.DexType typeAt(int):1075:1081 -> a
-    287:293:void populateTypes():875 -> a
-    287:293:void populateIndexTables():839 -> a
-    294:294:void populateTypes():875:875 -> a
-    294:294:void populateIndexTables():839 -> a
-    295:296:void populateFields():913:914 -> a
-    295:296:void populateIndexTables():840 -> a
-    297:332:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):929:964 -> a
-    297:332:void populateFields():914 -> a
-    297:332:void populateIndexTables():840 -> a
-    333:343:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):961:971 -> a
-    333:343:void populateFields():914 -> a
-    333:343:void populateIndexTables():840 -> a
-    344:348:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):968:972 -> a
-    344:348:void populateFields():914 -> a
-    344:348:void populateIndexTables():840 -> a
-    349:349:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):957:957 -> a
-    349:349:void populateFields():914 -> a
-    349:349:void populateIndexTables():840 -> a
-    350:352:void populateFields():915:917 -> a
-    350:352:void populateIndexTables():840 -> a
-    353:365:com.android.tools.r8.graph.DexField fieldAt(int):1085:1097 -> a
-    353:365:void populateFields():917 -> a
-    353:365:void populateIndexTables():840 -> a
-    366:366:void populateFields():917:917 -> a
-    366:366:void populateIndexTables():840 -> a
-    367:370:void populateProtos():983:986 -> a
-    367:370:void populateIndexTables():841 -> a
-    371:383:com.android.tools.r8.graph.DexProto protoAt(int):1158:1170 -> a
-    371:383:void populateProtos():986 -> a
-    371:383:void populateIndexTables():841 -> a
-    384:384:void populateProtos():986:986 -> a
-    384:384:void populateIndexTables():841 -> a
-    385:386:void populateMethods():991:992 -> a
-    385:386:void populateIndexTables():842 -> a
-    387:422:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1008:1043 -> a
-    387:422:void populateMethods():992 -> a
-    387:422:void populateIndexTables():842 -> a
-    423:433:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1040:1050 -> a
-    423:433:void populateMethods():992 -> a
-    423:433:void populateIndexTables():842 -> a
-    434:438:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1047:1051 -> a
-    434:438:void populateMethods():992 -> a
-    434:438:void populateIndexTables():842 -> a
-    439:439:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1036:1036 -> a
-    439:439:void populateMethods():992 -> a
-    439:439:void populateIndexTables():842 -> a
-    440:442:void populateMethods():993:995 -> a
-    440:442:void populateIndexTables():842 -> a
-    443:455:com.android.tools.r8.graph.DexMethod methodAt(int):1174:1186 -> a
-    443:455:void populateMethods():995 -> a
-    443:455:void populateIndexTables():842 -> a
-    456:456:com.android.tools.r8.graph.DexMethod methodAt(int):1183:1183 -> a
-    456:456:void populateMethods():995 -> a
-    456:456:void populateIndexTables():842 -> a
-    457:457:void populateMethods():995:995 -> a
-    457:457:void populateIndexTables():842 -> a
-    458:461:void populateMethodHandles():855:858 -> a
-    458:461:void populateIndexTables():843 -> a
-    462:489:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1101:1128 -> a
-    462:489:void populateMethodHandles():858 -> a
-    462:489:void populateIndexTables():843 -> a
-    490:490:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1124:1124 -> a
-    490:490:void populateMethodHandles():858 -> a
-    490:490:void populateIndexTables():843 -> a
-    491:507:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1116:1132 -> a
-    491:507:void populateMethodHandles():858 -> a
-    491:507:void populateIndexTables():843 -> a
-    508:508:void populateMethodHandles():858:858 -> a
-    508:508:void populateIndexTables():843 -> a
-    509:512:void populateCallSites():863:866 -> a
-    509:512:void populateIndexTables():844 -> a
-    513:530:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1137:1154 -> a
-    513:530:void populateCallSites():866 -> a
-    513:530:void populateIndexTables():844 -> a
-    531:531:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1149:1149 -> a
-    531:531:void populateCallSites():866 -> a
-    531:531:void populateIndexTables():844 -> a
-    532:532:void populateCallSites():866:866 -> a
-    532:532:void populateIndexTables():844 -> a
+    213:228:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):567:582 -> a
+    229:246:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):589:606 -> a
+    247:249:void populateStrings():843:845 -> a
+    247:249:void populateIndexTables():833 -> a
+    250:259:com.android.tools.r8.graph.DexString stringAt(int):960:969 -> a
+    250:259:void populateStrings():845 -> a
+    250:259:void populateIndexTables():833 -> a
+    260:260:void populateStrings():845:845 -> a
+    260:260:void populateIndexTables():833 -> a
+    261:264:void populateTypes():866:869 -> a
+    261:264:void populateIndexTables():834 -> a
+    265:271:com.android.tools.r8.graph.DexType typeAt(int):973:979 -> a
+    265:271:void populateTypes():869 -> a
+    265:271:void populateIndexTables():834 -> a
+    272:272:void populateTypes():869:869 -> a
+    272:272:void populateIndexTables():834 -> a
+    273:274:void populateFields():874:875 -> a
+    273:274:void populateIndexTables():835 -> a
+    275:310:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):890:925 -> a
+    275:310:void populateFields():875 -> a
+    275:310:void populateIndexTables():835 -> a
+    311:321:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):922:932 -> a
+    311:321:void populateFields():875 -> a
+    311:321:void populateIndexTables():835 -> a
+    322:326:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):929:933 -> a
+    322:326:void populateFields():875 -> a
+    322:326:void populateIndexTables():835 -> a
+    327:327:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):918:918 -> a
+    327:327:void populateFields():875 -> a
+    327:327:void populateIndexTables():835 -> a
+    328:330:void populateFields():876:878 -> a
+    328:330:void populateIndexTables():835 -> a
+    331:343:com.android.tools.r8.graph.DexField fieldAt(int):983:995 -> a
+    331:343:void populateFields():878 -> a
+    331:343:void populateIndexTables():835 -> a
+    344:344:void populateFields():878:878 -> a
+    344:344:void populateIndexTables():835 -> a
+    345:348:void populateProtos():944:947 -> a
+    345:348:void populateIndexTables():836 -> a
+    349:361:com.android.tools.r8.graph.DexProto protoAt(int):1055:1067 -> a
+    349:361:void populateProtos():947 -> a
+    349:361:void populateIndexTables():836 -> a
+    362:362:void populateProtos():947:947 -> a
+    362:362:void populateIndexTables():836 -> a
+    363:366:void populateMethods():952:955 -> a
+    363:366:void populateIndexTables():837 -> a
+    367:379:com.android.tools.r8.graph.DexMethod methodAt(int):1071:1083 -> a
+    367:379:void populateMethods():955 -> a
+    367:379:void populateIndexTables():837 -> a
+    380:380:com.android.tools.r8.graph.DexMethod methodAt(int):1080:1080 -> a
+    380:380:void populateMethods():955 -> a
+    380:380:void populateIndexTables():837 -> a
+    381:381:void populateMethods():955:955 -> a
+    381:381:void populateIndexTables():837 -> a
+    382:385:void populateMethodHandles():850:853 -> a
+    382:385:void populateIndexTables():838 -> a
+    386:413:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):999:1026 -> a
+    386:413:void populateMethodHandles():853 -> a
+    386:413:void populateIndexTables():838 -> a
+    414:414:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1022:1022 -> a
+    414:414:void populateMethodHandles():853 -> a
+    414:414:void populateIndexTables():838 -> a
+    415:431:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1014:1030 -> a
+    415:431:void populateMethodHandles():853 -> a
+    415:431:void populateIndexTables():838 -> a
+    432:432:void populateMethodHandles():853:853 -> a
+    432:432:void populateIndexTables():838 -> a
+    433:436:void populateCallSites():858:861 -> a
+    433:436:void populateIndexTables():839 -> a
+    437:454:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1034:1051 -> a
+    437:454:void populateCallSites():861 -> a
+    437:454:void populateIndexTables():839 -> a
+    455:455:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1046:1046 -> a
+    455:455:void populateCallSites():861 -> a
+    455:455:void populateIndexTables():839 -> a
+    456:456:void populateCallSites():861:861 -> a
+    456:456:void populateIndexTables():839 -> a
     1:2:com.android.tools.r8.graph.DexAnnotation parseAnnotation():411:412 -> b
-    3:3:com.android.tools.r8.graph.DexAnnotationSet annotationSetAt(int):441:441 -> b
+    3:3:com.android.tools.r8.graph.DexAnnotationSet annotationSetAt(int):436:436 -> b
     4:6:java.lang.Object cacheAt(int,java.util.function.Supplier,java.util.function.Supplier):385:387 -> b
-    4:6:com.android.tools.r8.graph.DexAnnotationSet annotationSetAt(int):441 -> b
-    7:7:com.android.tools.r8.graph.DexAnnotationSet annotationSetAt(int):441:441 -> b
+    4:6:com.android.tools.r8.graph.DexAnnotationSet annotationSetAt(int):436 -> b
+    7:7:com.android.tools.r8.graph.DexAnnotationSet annotationSetAt(int):436:436 -> b
     1:1:com.android.tools.r8.graph.ParameterAnnotationsList annotationSetRefListAt(int):344:344 -> c
-    2:16:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():423:437 -> c
-    17:18:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():434:435 -> c
+    2:11:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():423:432 -> c
     1:10:com.android.tools.r8.graph.ParameterAnnotationsList parseAnnotationSetRefList():348:357 -> d
     11:11:void com.android.tools.r8.graph.ParameterAnnotationsList.<init>(com.android.tools.r8.graph.DexAnnotationSet[]):54:54 -> d
     11:11:com.android.tools.r8.graph.ParameterAnnotationsList parseAnnotationSetRefList():357 -> d
-    12:12:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):445:445 -> d
+    12:12:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):440:440 -> d
     13:15:java.lang.Object cacheAt(int,java.util.function.Supplier,java.util.function.Supplier):385:387 -> d
-    13:15:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):445 -> d
-    16:16:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):445:445 -> d
-    1:4:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():450:453 -> e
+    13:15:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):440 -> d
+    16:16:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):440:440 -> d
+    1:4:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():445:448 -> e
     5:18:com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[] parseFieldAnnotations(int):305:318 -> e
-    5:18:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():454 -> e
+    5:18:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():449 -> e
     19:32:com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[] parseMethodAnnotations(int):326:339 -> e
-    19:32:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():455 -> e
+    19:32:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():450 -> e
     33:48:com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[] parseParameterAnnotations(int):364:379 -> e
-    33:48:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():456 -> e
-    49:50:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():457:458 -> e
-    51:51:com.android.tools.r8.graph.DexDebugInfo debugInfoAt(int):465:465 -> e
+    33:48:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():451 -> e
+    49:50:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():452:453 -> e
+    51:51:com.android.tools.r8.graph.DexDebugInfo debugInfoAt(int):460:460 -> e
     1:1:com.android.tools.r8.graph.DexEncodedArray encodedArrayAt(int):298:298 -> f
-    2:66:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():469:533 -> f
-    67:69:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():527:529 -> f
-    70:70:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():523:523 -> f
-    71:71:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():519:519 -> f
-    72:72:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():515:515 -> f
-    73:73:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():511:511 -> f
-    74:82:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():499:507 -> f
-    83:83:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():503:503 -> f
-    84:90:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():488:494 -> f
-    91:91:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():491:491 -> f
-    92:92:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():485:485 -> f
-    93:145:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():482:534 -> f
-    146:205:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():479:538 -> f
+    2:66:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():464:528 -> f
+    67:69:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():522:524 -> f
+    70:70:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():518:518 -> f
+    71:71:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():514:514 -> f
+    72:72:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():510:510 -> f
+    73:73:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():506:506 -> f
+    74:82:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():494:502 -> f
+    83:83:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():498:498 -> f
+    84:90:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():483:489 -> f
+    91:91:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():486:486 -> f
+    92:92:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():480:480 -> f
+    93:145:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():477:529 -> f
+    146:205:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():474:533 -> f
     1:9:com.android.tools.r8.graph.DexEncodedAnnotation parseEncodedAnnotation():272:280 -> g
-    10:16:com.android.tools.r8.dex.DexSection lookupSection(int):730:736 -> g
+    10:16:com.android.tools.r8.dex.DexSection lookupSection(int):725:731 -> g
     1:3:com.android.tools.r8.graph.DexTypeList typeListAt(int):171:173 -> h
     4:4:com.android.tools.r8.graph.DexEncodedArray parseEncodedArray():294:294 -> h
     1:4:com.android.tools.r8.graph.DexValue[] parseEncodedArrayValues():284:287 -> i
@@ -11301,49 +11111,49 @@
     com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[] NO_FIELD_ANNOTATIONS -> f
     com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[] methods -> c
     com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[] parameters -> d
-    1:11:void <clinit>():1191:1201 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[]):1213:1217 -> <init>
-    1:1:com.android.tools.r8.dex.DexParser$AnnotationsDirectory empty():1221:1221 -> a
+    1:11:void <clinit>():1088:1098 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[]):1110:1114 -> <init>
+    1:1:com.android.tools.r8.dex.DexParser$AnnotationsDirectory empty():1118:1118 -> a
 com.android.tools.r8.dex.DexParser$AttributesAndAnnotations -> a.a.a.a.d.m:
     com.android.tools.r8.graph.EnclosingMethodAttribute enclosingMethodAttribute -> b
     java.util.List lazyAnnotations -> d
     com.android.tools.r8.graph.DexAnnotationSet originalAnnotations -> a
     java.util.List innerClasses -> c
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():1225:1225 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1251:1251 -> <init>
-    2:32:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1228:1258 -> <init>
+    1:1:void <clinit>():1122:1122 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1148:1148 -> <init>
+    2:32:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1125:1155 -> <init>
     33:33:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):99:99 -> <init>
-    33:33:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1259 -> <init>
-    34:35:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1260:1261 -> <init>
+    33:33:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1156 -> <init>
+    34:35:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1157:1158 -> <init>
     36:36:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingMethodAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):104:104 -> <init>
-    36:36:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1262 -> <init>
-    37:47:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1263:1273 -> <init>
-    48:48:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1272:1272 -> <init>
+    36:36:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1159 -> <init>
+    37:47:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1160:1170 -> <init>
+    48:48:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1169:1169 -> <init>
     49:49:boolean com.android.tools.r8.graph.DexAnnotation.isMemberClassesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):113:113 -> <init>
-    49:49:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1274 -> <init>
-    50:55:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1275:1280 -> <init>
-    56:57:void copyAnnotation(com.android.tools.r8.graph.DexAnnotation):1340:1341 -> <init>
-    56:57:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1283 -> <init>
-    58:87:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1288:1317 -> <init>
-    88:103:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1312:1327 -> <init>
-    104:104:com.android.tools.r8.graph.InnerClassAttribute com.android.tools.r8.graph.InnerClassAttribute.createUnknownNamedInnerClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):30:30 -> <init>
-    104:104:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1327 -> <init>
-    105:105:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1327:1327 -> <init>
-    1:7:com.android.tools.r8.graph.DexAnnotationSet getAnnotations():1233:1239 -> a
-    8:10:void ensureAnnotations(int):1333:1335 -> a
-    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():1247:1247 -> b
-    1:1:java.util.List getInnerClasses():1243:1243 -> c
+    49:49:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1171 -> <init>
+    50:55:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1172:1177 -> <init>
+    56:57:void copyAnnotation(com.android.tools.r8.graph.DexAnnotation):1237:1238 -> <init>
+    56:57:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1180 -> <init>
+    58:87:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1185:1214 -> <init>
+    88:103:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1209:1224 -> <init>
+    104:104:com.android.tools.r8.graph.InnerClassAttribute com.android.tools.r8.graph.InnerClassAttribute.createUnknownNamedInnerClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):29:29 -> <init>
+    104:104:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1224 -> <init>
+    105:105:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1224:1224 -> <init>
+    1:7:com.android.tools.r8.graph.DexAnnotationSet getAnnotations():1130:1136 -> a
+    8:10:void ensureAnnotations(int):1230:1232 -> a
+    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():1144:1144 -> b
+    1:1:java.util.List getInnerClasses():1140:1140 -> c
 com.android.tools.r8.dex.DexParser$MemberAnnotationIterator -> a.a.a.a.d.n:
     java.util.function.Supplier emptyValue -> c
     com.android.tools.r8.graph.DexMemberAnnotation[] annotations -> b
     int index -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier):548:548 -> <init>
-    1:1:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier,com.android.tools.r8.dex.DexParser$1):541 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier):543:550 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier,com.android.tools.r8.dex.DexParser$1):541 -> <init>
-    1:7:com.android.tools.r8.graph.DexItem getNextFor(com.android.tools.r8.graph.Descriptor):560:566 -> a
-    8:8:com.android.tools.r8.graph.DexItem getNextFor(com.android.tools.r8.graph.Descriptor):564:564 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier):543:543 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier,com.android.tools.r8.dex.DexParser$1):536 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier):538:545 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier,com.android.tools.r8.dex.DexParser$1):536 -> <init>
+    1:7:com.android.tools.r8.graph.DexItem getNextFor(com.android.tools.r8.graph.Descriptor):555:561 -> a
+    8:8:com.android.tools.r8.graph.DexItem getNextFor(com.android.tools.r8.graph.Descriptor):559:559 -> a
 com.android.tools.r8.dex.DexReader -> a.a.a.a.d.p:
     com.android.tools.r8.origin.Origin com.android.tools.r8.dex.BinaryReader.origin -> a
     com.android.tools.r8.dex.CompatByteBuffer com.android.tools.r8.dex.BinaryReader.buffer -> b
@@ -11478,22 +11288,19 @@
     165:170:void writeTypeList(com.android.tools.r8.graph.DexTypeList):500:505 -> a
     171:173:void writeStringData(com.android.tools.r8.graph.DexString):510:512 -> a
     174:174:com.android.tools.r8.graph.DexType lambda$writeAnnotationSet$2(com.android.tools.r8.graph.DexAnnotation):525:525 -> a
-    175:175:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):525:525 -> a
-    176:176:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    176:176:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):526 -> a
-    177:184:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):526:533 -> a
-    185:194:void writeAnnotationSetRefList(com.android.tools.r8.graph.ParameterAnnotationsList):538:547 -> a
-    195:197:void writeMemberAnnotations(java.util.List,java.util.function.ToIntFunction):553:555 -> a
-    198:210:void writeAnnotationDirectory(com.android.tools.r8.graph.DexAnnotationDirectory):560:572 -> a
-    211:211:int lambda$writeAnnotationDirectory$3(com.android.tools.r8.graph.DexEncodedField):569:569 -> a
-    212:219:void writeEncodedFields(java.util.List):577:584 -> a
-    220:236:void writeEncodedMethods(java.util.List,boolean):589:605 -> a
-    237:243:void addStaticFieldValues(com.android.tools.r8.graph.DexProgramClass):625:631 -> a
-    244:251:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):636:643 -> a
-    252:270:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):640:658 -> a
-    271:273:void writeCallSite(com.android.tools.r8.graph.DexCallSite):662:664 -> a
-    274:280:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):668:674 -> a
-    281:284:int writeMapItem(int,int,int):685:688 -> a
+    175:182:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):525:532 -> a
+    183:192:void writeAnnotationSetRefList(com.android.tools.r8.graph.ParameterAnnotationsList):537:546 -> a
+    193:195:void writeMemberAnnotations(java.util.List,java.util.function.ToIntFunction):552:554 -> a
+    196:208:void writeAnnotationDirectory(com.android.tools.r8.graph.DexAnnotationDirectory):559:571 -> a
+    209:209:int lambda$writeAnnotationDirectory$3(com.android.tools.r8.graph.DexEncodedField):568:568 -> a
+    210:217:void writeEncodedFields(java.util.List):576:583 -> a
+    218:234:void writeEncodedMethods(java.util.List,boolean):588:604 -> a
+    235:241:void addStaticFieldValues(com.android.tools.r8.graph.DexProgramClass):624:630 -> a
+    242:249:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):635:642 -> a
+    250:268:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):639:657 -> a
+    269:271:void writeCallSite(com.android.tools.r8.graph.DexCallSite):661:663 -> a
+    272:278:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):667:673 -> a
+    279:282:int writeMapItem(int,int,int):684:687 -> a
     1:7:void checkInterfaceMethods():225:231 -> b
     1:7:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():155 -> b
     8:18:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():157:167 -> b
@@ -11510,77 +11317,77 @@
     34:40:int sizeOfCodeItems(java.lang.Iterable):356 -> b
     34:40:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():167 -> b
     41:73:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():167:199 -> b
-    74:79:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):693:698 -> b
+    74:79:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):692:697 -> b
     74:79:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    80:83:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):697:700 -> b
+    80:83:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):696:699 -> b
     80:83:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    84:87:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):699:702 -> b
+    84:87:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):698:701 -> b
     84:87:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    88:91:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):701:704 -> b
+    88:91:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):700:703 -> b
     88:91:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    92:95:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):703:706 -> b
+    92:95:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):702:705 -> b
     92:95:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    96:99:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):705:708 -> b
+    96:99:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):704:707 -> b
     96:99:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    100:103:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):707:710 -> b
+    100:103:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):706:709 -> b
     100:103:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    104:107:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):709:712 -> b
+    104:107:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):708:711 -> b
     104:107:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    108:111:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):711:714 -> b
+    108:111:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):710:713 -> b
     108:111:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    112:115:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):713:716 -> b
+    112:115:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):712:715 -> b
     112:115:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    116:119:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):715:718 -> b
+    116:119:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):714:717 -> b
     116:119:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    120:123:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):717:720 -> b
+    120:123:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):716:719 -> b
     120:123:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    124:127:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):719:722 -> b
+    124:127:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):718:721 -> b
     124:127:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    128:131:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):721:724 -> b
+    128:131:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):720:723 -> b
     128:131:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    132:135:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):723:726 -> b
+    132:135:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):722:725 -> b
     132:135:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    136:139:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):725:728 -> b
+    136:139:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):724:727 -> b
     136:139:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    140:144:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):727:731 -> b
+    140:144:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):726:730 -> b
     140:144:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    145:150:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):729:734 -> b
+    145:150:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):728:733 -> b
     145:150:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    151:157:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):732:738 -> b
+    151:157:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):731:737 -> b
     151:157:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
     158:167:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():201:210 -> b
     168:170:void writeFixedSectionItems(com.android.tools.r8.graph.DexProgramClass[],int,java.util.function.Consumer):331:333 -> b
     168:170:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():210 -> b
     171:173:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():211:213 -> b
     174:174:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():212:212 -> b
-    175:180:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):742:747 -> b
+    175:180:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):741:746 -> b
     175:180:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():216 -> b
-    181:214:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):744:777 -> b
+    181:214:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):743:776 -> b
     181:214:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():216 -> b
-    215:217:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):782:784 -> b
+    215:217:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):781:783 -> b
     215:217:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():217 -> b
-    218:220:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):783:785 -> b
+    218:220:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):782:784 -> b
     218:220:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():217 -> b
-    221:223:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):792:794 -> b
+    221:223:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):791:793 -> b
     221:223:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():218 -> b
-    224:227:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):793:796 -> b
+    224:227:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):792:795 -> b
     224:227:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():218 -> b
     228:228:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():221:221 -> b
-    229:229:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):787:787 -> b
+    229:229:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):786:786 -> b
     229:229:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():217 -> b
     230:230:void writeStringItem(com.android.tools.r8.graph.DexString):393:393 -> b
     231:236:void writeAnnotation(com.android.tools.r8.graph.DexAnnotation):516:521 -> b
-    237:237:int lambda$writeAnnotationDirectory$4(com.android.tools.r8.graph.DexEncodedMethod):571:571 -> b
-    238:248:void writeClassData(com.android.tools.r8.graph.DexProgramClass):611:621 -> b
+    237:237:int lambda$writeAnnotationDirectory$4(com.android.tools.r8.graph.DexEncodedMethod):570:570 -> b
+    238:248:void writeClassData(com.android.tools.r8.graph.DexProgramClass):610:620 -> b
     1:4:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):430:433 -> c
     5:9:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):432:436 -> c
     10:14:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):435:439 -> c
-    15:15:int lambda$writeAnnotationDirectory$5(com.android.tools.r8.graph.DexEncodedMethod):573:573 -> c
-    16:17:void checkThatInvokeCustomIsAllowed():1330:1331 -> c
+    15:15:int lambda$writeAnnotationDirectory$5(com.android.tools.r8.graph.DexEncodedMethod):572:572 -> c
+    16:17:void checkThatInvokeCustomIsAllowed():1329:1330 -> c
     1:15:java.util.List sortDexCodesByClassName():286:300 -> d
 com.android.tools.r8.dex.FileWriter$1 -> a.a.a.a.d.r:
     int[] $SwitchMap$com$android$tools$r8$graph$DexMethodHandle$MethodHandleType -> a
-    1:1:void <clinit>():638:638 -> <clinit>
+    1:1:void <clinit>():637:637 -> <clinit>
 com.android.tools.r8.dex.FileWriter$ByteBufferResult -> a.a.a.a.d.s:
     com.android.tools.r8.dex.CompatByteBuffer buffer -> a
     int length -> b
@@ -11609,39 +11416,39 @@
     int encodedArrarysOffset -> s
     int annotationSetRefListsOffset -> p
     int annotationDirectoriesOffset -> q
-    1:1:void <clinit>():804:804 -> <clinit>
-    1:1:void <init>(int,int,int,int,int,int,int,int,int):836:836 -> <init>
-    2:35:void <init>(int,int,int,int,int,int,int,int,int):820:853 -> <init>
+    1:1:void <clinit>():803:803 -> <clinit>
+    1:1:void <init>(int,int,int,int,int,int,int,int,int):835:835 -> <init>
+    2:35:void <init>(int,int,int,int,int,int,int,int,int):819:852 -> <init>
     void alreadySetOffset(int) -> a
-    1:10:com.android.tools.r8.dex.FileWriter$Layout from(com.android.tools.r8.graph.ObjectToOffsetMapping):858:867 -> a
-    11:11:boolean isValidOffset(int,boolean):877:877 -> a
-    12:13:int getAnnotationDirectoriesOffset():955:956 -> a
-    1:2:int getAnnotationSetRefListsOffset():945:946 -> b
-    3:4:void setAnnotationDirectoriesOffset(int):960:961 -> b
-    1:2:int getAnnotationSetsOffset():931:932 -> c
-    3:4:void setAnnotationSetRefListsOffset(int):950:951 -> c
-    1:2:int getAnnotationsOffset():921:922 -> d
-    3:4:void setAnnotationSetsOffset(int):940:941 -> d
-    1:2:void setAnnotationsOffset(int):926:927 -> e
-    3:4:int getClassDataOffset():965:966 -> e
-    1:2:int getCodesOffset():881:882 -> f
-    3:4:void setClassDataOffset(int):970:971 -> f
-    1:2:void setCodesOffset(int):886:887 -> g
-    3:3:int getEndOfFile():993:993 -> g
-    3:3:int getDataSectionSize():871 -> g
-    4:5:int getDataSectionSize():871:872 -> g
-    1:2:int getDebugInfosOffset():891:892 -> h
-    3:4:void setDebugInfosOffset(int):896:897 -> h
-    1:2:int getEncodedArrarysOffset():975:976 -> i
-    3:4:void setEncodedArrarysOffset(int):980:981 -> i
-    1:1:int getEndOfFile():993:993 -> j
-    2:2:void setEndOfFile(int):997:997 -> j
-    1:1:int getMapOffset():985:985 -> k
-    2:2:void setMapOffset(int):989:989 -> k
-    1:2:int getStringDataOffsets():911:912 -> l
-    3:4:void setStringDataOffsets(int):916:917 -> l
-    1:2:int getTypeListsOffset():901:902 -> m
-    3:4:void setTypeListsOffset(int):906:907 -> m
+    1:10:com.android.tools.r8.dex.FileWriter$Layout from(com.android.tools.r8.graph.ObjectToOffsetMapping):857:866 -> a
+    11:11:boolean isValidOffset(int,boolean):876:876 -> a
+    12:13:int getAnnotationDirectoriesOffset():954:955 -> a
+    1:2:int getAnnotationSetRefListsOffset():944:945 -> b
+    3:4:void setAnnotationDirectoriesOffset(int):959:960 -> b
+    1:2:int getAnnotationSetsOffset():930:931 -> c
+    3:4:void setAnnotationSetRefListsOffset(int):949:950 -> c
+    1:2:int getAnnotationsOffset():920:921 -> d
+    3:4:void setAnnotationSetsOffset(int):939:940 -> d
+    1:2:void setAnnotationsOffset(int):925:926 -> e
+    3:4:int getClassDataOffset():964:965 -> e
+    1:2:int getCodesOffset():880:881 -> f
+    3:4:void setClassDataOffset(int):969:970 -> f
+    1:2:void setCodesOffset(int):885:886 -> g
+    3:3:int getEndOfFile():992:992 -> g
+    3:3:int getDataSectionSize():870 -> g
+    4:5:int getDataSectionSize():870:871 -> g
+    1:2:int getDebugInfosOffset():890:891 -> h
+    3:4:void setDebugInfosOffset(int):895:896 -> h
+    1:2:int getEncodedArrarysOffset():974:975 -> i
+    3:4:void setEncodedArrarysOffset(int):979:980 -> i
+    1:1:int getEndOfFile():992:992 -> j
+    2:2:void setEndOfFile(int):996:996 -> j
+    1:1:int getMapOffset():984:984 -> k
+    2:2:void setMapOffset(int):988:988 -> k
+    1:2:int getStringDataOffsets():910:911 -> l
+    3:4:void setStringDataOffsets(int):915:916 -> l
+    1:2:int getTypeListsOffset():900:901 -> m
+    3:4:void setTypeListsOffset(int):905:906 -> m
 com.android.tools.r8.dex.FileWriter$MixedSectionOffsets -> a.a.a.a.d.u:
     boolean $assertionsDisabled -> n
     int minApiLevel -> m
@@ -11657,102 +11464,102 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap classesWithData -> j
     java.util.Map clazzToAnnotationDirectory -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap encodedArrays -> k
-    1:1:void <clinit>():1009:1009 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping):1045:1045 -> <init>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.dex.FileWriter$1):1009 -> <init>
-    2:33:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping):1016:1047 -> <init>
-    2:33:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.dex.FileWriter$1):1009 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$100(com.android.tools.r8.dex.FileWriter$MixedSectionOffsets):1009:1009 -> a
-    2:3:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,java.lang.Object):1051:1052 -> a
-    4:4:boolean add(com.android.tools.r8.graph.DexProgramClass):1068:1068 -> a
-    5:5:boolean add(com.android.tools.r8.graph.DexEncodedArray):1073:1073 -> a
-    6:9:boolean add(com.android.tools.r8.graph.DexAnnotationSet):1080:1083 -> a
-    10:10:void visit(com.android.tools.r8.graph.DexEncodedMethod):1088:1088 -> a
-    11:11:boolean add(com.android.tools.r8.graph.DexCode):1093:1093 -> a
-    12:13:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1059:1060 -> a
-    12:13:boolean add(com.android.tools.r8.graph.DexCode):1093 -> a
-    14:14:boolean add(com.android.tools.r8.graph.DexDebugInfo):1098:1098 -> a
-    15:18:boolean add(com.android.tools.r8.graph.DexTypeList):1103:1106 -> a
-    19:22:boolean add(com.android.tools.r8.graph.ParameterAnnotationsList):1111:1114 -> a
-    23:23:boolean add(com.android.tools.r8.graph.DexAnnotation):1119:1119 -> a
-    24:26:boolean setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory):1125:1127 -> a
-    27:27:boolean add(com.android.tools.r8.graph.DexString):1131:1131 -> a
-    28:29:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1059:1060 -> a
-    28:29:boolean add(com.android.tools.r8.graph.DexString):1131 -> a
-    30:30:java.util.Collection getAnnotationDirectories():1167:1167 -> a
+    1:1:void <clinit>():1008:1008 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping):1044:1044 -> <init>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.dex.FileWriter$1):1008 -> <init>
+    2:33:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping):1015:1046 -> <init>
+    2:33:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.dex.FileWriter$1):1008 -> <init>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$100(com.android.tools.r8.dex.FileWriter$MixedSectionOffsets):1008:1008 -> a
+    2:3:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,java.lang.Object):1050:1051 -> a
+    4:4:boolean add(com.android.tools.r8.graph.DexProgramClass):1067:1067 -> a
+    5:5:boolean add(com.android.tools.r8.graph.DexEncodedArray):1072:1072 -> a
+    6:9:boolean add(com.android.tools.r8.graph.DexAnnotationSet):1079:1082 -> a
+    10:10:void visit(com.android.tools.r8.graph.DexEncodedMethod):1087:1087 -> a
+    11:11:boolean add(com.android.tools.r8.graph.DexCode):1092:1092 -> a
+    12:13:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1058:1059 -> a
+    12:13:boolean add(com.android.tools.r8.graph.DexCode):1092 -> a
+    14:14:boolean add(com.android.tools.r8.graph.DexDebugInfo):1097:1097 -> a
+    15:18:boolean add(com.android.tools.r8.graph.DexTypeList):1102:1105 -> a
+    19:22:boolean add(com.android.tools.r8.graph.ParameterAnnotationsList):1110:1113 -> a
+    23:23:boolean add(com.android.tools.r8.graph.DexAnnotation):1118:1118 -> a
+    24:26:boolean setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory):1124:1126 -> a
+    27:27:boolean add(com.android.tools.r8.graph.DexString):1130:1130 -> a
+    28:29:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1058:1059 -> a
+    28:29:boolean add(com.android.tools.r8.graph.DexString):1130 -> a
+    30:30:java.util.Collection getAnnotationDirectories():1166:1166 -> a
     31:31:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.keySet():87:87 -> a
-    31:31:java.util.Collection getAnnotationDirectories():1167 -> a
-    32:33:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1178:1179 -> a
-    34:35:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1187:1188 -> a
-    36:37:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1250:1251 -> a
-    38:39:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1255:1256 -> a
-    40:40:void setOffsetFor(com.android.tools.r8.graph.DexDebugInfo,int):1260:1260 -> a
-    41:41:void setOffsetFor(com.android.tools.r8.graph.DexCode,int):1264:1264 -> a
-    42:43:void setOffsetFor(com.android.tools.r8.graph.DexTypeList,int):1268:1269 -> a
-    44:44:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1273:1273 -> a
-    45:45:void setOffsetFor(com.android.tools.r8.graph.DexAnnotation,int):1277:1277 -> a
-    46:47:void setOffsetFor(com.android.tools.r8.graph.DexAnnotationSet,int):1283:1284 -> a
-    48:48:void setOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexAnnotationDirectory,int):1288:1288 -> a
-    49:49:void setOffsetFor(com.android.tools.r8.graph.DexProgramClass,int):1292:1292 -> a
-    50:50:void setOffsetFor(com.android.tools.r8.graph.DexEncodedArray,int):1296:1296 -> a
-    51:52:void setOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList,int):1300:1301 -> a
-    1:1:java.util.Collection getAnnotationSetRefLists():1159:1159 -> b
+    31:31:java.util.Collection getAnnotationDirectories():1166 -> a
+    32:33:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1177:1178 -> a
+    34:35:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1186:1187 -> a
+    36:37:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1249:1250 -> a
+    38:39:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1254:1255 -> a
+    40:40:void setOffsetFor(com.android.tools.r8.graph.DexDebugInfo,int):1259:1259 -> a
+    41:41:void setOffsetFor(com.android.tools.r8.graph.DexCode,int):1263:1263 -> a
+    42:43:void setOffsetFor(com.android.tools.r8.graph.DexTypeList,int):1267:1268 -> a
+    44:44:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1272:1272 -> a
+    45:45:void setOffsetFor(com.android.tools.r8.graph.DexAnnotation,int):1276:1276 -> a
+    46:47:void setOffsetFor(com.android.tools.r8.graph.DexAnnotationSet,int):1282:1283 -> a
+    48:48:void setOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexAnnotationDirectory,int):1287:1287 -> a
+    49:49:void setOffsetFor(com.android.tools.r8.graph.DexProgramClass,int):1291:1291 -> a
+    50:50:void setOffsetFor(com.android.tools.r8.graph.DexEncodedArray,int):1295:1295 -> a
+    51:52:void setOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList,int):1299:1300 -> a
+    1:1:java.util.Collection getAnnotationSetRefLists():1158:1158 -> b
     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 -> b
-    2:2:java.util.Collection getAnnotationSetRefLists():1159 -> b
-    3:3:int getOffsetFor(com.android.tools.r8.graph.DexString):1193:1193 -> b
-    4:7:int getOffsetFor(com.android.tools.r8.graph.DexTypeList):1197:1200 -> b
-    8:8:int getOffsetFor(com.android.tools.r8.graph.DexProgramClass):1204:1204 -> b
-    9:9:int getOffsetFor(com.android.tools.r8.graph.DexEncodedArray):1208:1208 -> b
-    10:10:int getOffsetFor(com.android.tools.r8.graph.DexDebugInfo):1212:1212 -> b
-    11:11:int getOffsetFor(com.android.tools.r8.graph.DexAnnotation):1226:1226 -> b
-    12:15:int getOffsetFor(com.android.tools.r8.graph.DexAnnotationSet):1232:1235 -> b
-    16:19:int getOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList):1239:1242 -> b
-    20:20:int getOffsetFor(com.android.tools.r8.graph.DexCode):1246:1246 -> b
-    1:1:java.util.Collection getAnnotationSets():1155:1155 -> c
+    2:2:java.util.Collection getAnnotationSetRefLists():1158 -> b
+    3:3:int getOffsetFor(com.android.tools.r8.graph.DexString):1192:1192 -> b
+    4:7:int getOffsetFor(com.android.tools.r8.graph.DexTypeList):1196:1199 -> b
+    8:8:int getOffsetFor(com.android.tools.r8.graph.DexProgramClass):1203:1203 -> b
+    9:9:int getOffsetFor(com.android.tools.r8.graph.DexEncodedArray):1207:1207 -> b
+    10:10:int getOffsetFor(com.android.tools.r8.graph.DexDebugInfo):1211:1211 -> b
+    11:11:int getOffsetFor(com.android.tools.r8.graph.DexAnnotation):1225:1225 -> b
+    12:15:int getOffsetFor(com.android.tools.r8.graph.DexAnnotationSet):1231:1234 -> b
+    16:19:int getOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList):1238:1241 -> b
+    20:20:int getOffsetFor(com.android.tools.r8.graph.DexCode):1245:1245 -> b
+    1:1:java.util.Collection getAnnotationSets():1154:1154 -> 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 getAnnotationSets():1155 -> c
-    3:7:int getOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexProgramClass):1217:1221 -> c
-    1:1:java.util.Collection getAnnotations():1151:1151 -> d
+    2:2:java.util.Collection getAnnotationSets():1154 -> c
+    3:7:int getOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexProgramClass):1216:1220 -> c
+    1:1:java.util.Collection getAnnotations():1150:1150 -> d
     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 -> d
-    2:2:java.util.Collection getAnnotations():1151 -> d
-    1:1:java.util.Collection getClassesWithData():1163:1163 -> e
+    2:2:java.util.Collection getAnnotations():1150 -> d
+    1:1:java.util.Collection getClassesWithData():1162:1162 -> e
     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 -> e
-    2:2:java.util.Collection getClassesWithData():1163 -> e
-    1:1:java.util.Collection getCodes():1135:1135 -> f
-    1:1:java.util.Collection getDebugInfos():1139:1139 -> g
+    2:2:java.util.Collection getClassesWithData():1162 -> e
+    1:1:java.util.Collection getCodes():1134:1134 -> f
+    1:1:java.util.Collection getDebugInfos():1138:1138 -> g
     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 -> g
-    2:2:java.util.Collection getDebugInfos():1139 -> g
-    1:1:java.util.Collection getEncodedArrays():1171:1171 -> h
+    2:2:java.util.Collection getDebugInfos():1138 -> g
+    1:1:java.util.Collection getEncodedArrays():1170:1170 -> h
     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 -> h
-    2:2:java.util.Collection getEncodedArrays():1171 -> h
-    1:1:java.util.Collection getStringData():1147:1147 -> i
-    1:1:java.util.Collection getTypeLists():1143:1143 -> j
+    2:2:java.util.Collection getEncodedArrays():1170 -> h
+    1:1:java.util.Collection getStringData():1146:1146 -> i
+    1:1:java.util.Collection getTypeLists():1142:1142 -> j
     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 -> j
-    2:2:java.util.Collection getTypeLists():1143 -> j
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap createObject2IntMap():1034:1035 -> k
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1040:1040 -> l
+    2:2:java.util.Collection getTypeLists():1142 -> j
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap createObject2IntMap():1033:1034 -> k
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1039:1039 -> l
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.<init>():176:176 -> l
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1040 -> l
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1041:1041 -> l
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1039 -> l
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1040:1040 -> l
 com.android.tools.r8.dex.FileWriter$ProgramClassDependencyCollector -> a.a.a.a.d.v:
     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[]):1309:1310 -> <init>
-    3:7:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1307:1311 -> <init>
+    1:2:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1308:1309 -> <init>
+    3:7:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1306:1310 -> <init>
     void visit(com.android.tools.r8.graph.DexType) -> a
-    1:4:void visit(com.android.tools.r8.graph.DexClass):1322:1325 -> a
+    1:4:void visit(com.android.tools.r8.graph.DexClass):1321:1324 -> a
 com.android.tools.r8.dex.IndexedItemCollection -> a.a.a.a.d.x:
     boolean addCallSite(com.android.tools.r8.graph.DexCallSite) -> a
     boolean addClass(com.android.tools.r8.graph.DexProgramClass) -> a
+    boolean addField(com.android.tools.r8.graph.DexField) -> a
+    boolean addMethod(com.android.tools.r8.graph.DexMethod) -> a
     boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle) -> a
     boolean addProto(com.android.tools.r8.graph.DexProto) -> a
     boolean addString(com.android.tools.r8.graph.DexString) -> a
-    1:1:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):103:103 -> a
-    2:2:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):107:107 -> a
-    3:3:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):111:111 -> a
-    boolean addField(com.android.tools.r8.graph.DexField) -> b
-    boolean addMethod(com.android.tools.r8.graph.DexMethod) -> b
-    boolean addType(com.android.tools.r8.graph.DexType) -> b
+    boolean addType(com.android.tools.r8.graph.DexType) -> a
+    1:1:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):103:103 -> b
+    2:2:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):107:107 -> b
+    3:3:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):111:111 -> b
 com.android.tools.r8.dex.InheritanceClassInDexDistributor -> a.a.a.a.d.B:
     com.android.tools.r8.dex.VirtualFile mainDex -> b
     com.android.tools.r8.dex.InheritanceClassInDexDistributor$DirectSubClassesInfo directSubClasses -> i
@@ -11792,7 +11599,7 @@
     102:102:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):447 -> a
     103:106:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):450:453 -> a
     107:107:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):442:442 -> a
-    108:108:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():628:628 -> a
+    108:108:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():624:624 -> a
     108:108:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):443 -> a
     109:121:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):443:455 -> a
     122:122:void lambda$updateGroupsNumberOfIds$5(com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup):540:540 -> a
@@ -11823,7 +11630,7 @@
     108:108:void markDexFull(com.android.tools.r8.dex.VirtualFile):716:716 -> b
     108:108:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):643 -> b
     109:109:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):637:637 -> b
-    110:110:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():628:628 -> b
+    110:110:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():624:624 -> b
     110:110:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):638 -> b
     111:121:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):638:648 -> b
     122:146:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):630:654 -> b
@@ -12461,21 +12268,21 @@
     1:1:java.util.Set access$1400(com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction):523:523 -> a
     2:5:boolean maybeInsert(com.android.tools.r8.graph.DexItem,java.util.Set,java.util.Set):544:547 -> a
     6:6:boolean addClass(com.android.tools.r8.graph.DexProgramClass):557:557 -> a
-    7:7:boolean addString(com.android.tools.r8.graph.DexString):572:572 -> a
-    8:8:boolean addProto(com.android.tools.r8.graph.DexProto):577:577 -> a
-    9:9:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):587:587 -> a
-    10:10:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):592:592 -> a
-    11:11:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):597:597 -> a
-    12:13:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):602:603 -> a
-    14:14:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):608:608 -> a
-    15:19:void commitItemsIn(java.util.Set,java.util.function.Function):620:624 -> a
-    20:21:void lambda$commitItemsIn$0(java.util.function.Function,com.android.tools.r8.graph.DexItem):621:622 -> a
-    22:27:void abort():639:644 -> a
+    7:7:boolean addField(com.android.tools.r8.graph.DexField):562:562 -> a
+    8:8:boolean addMethod(com.android.tools.r8.graph.DexMethod):567:567 -> a
+    9:9:boolean addString(com.android.tools.r8.graph.DexString):572:572 -> a
+    10:10:boolean addProto(com.android.tools.r8.graph.DexProto):577:577 -> a
+    11:11:boolean addType(com.android.tools.r8.graph.DexType):582:582 -> a
+    12:12:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):587:587 -> a
+    13:13:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):592:592 -> a
+    14:18:void commitItemsIn(java.util.Set,java.util.function.Function):620:624 -> a
+    19:20:void lambda$commitItemsIn$0(java.util.function.Function,com.android.tools.r8.graph.DexItem):621:622 -> a
+    21:26:void abort():639:644 -> a
     1:1:void addClassAndDependencies(com.android.tools.r8.graph.DexProgramClass):552:552 -> b
-    2:2:boolean addField(com.android.tools.r8.graph.DexField):562:562 -> b
-    3:3:boolean addMethod(com.android.tools.r8.graph.DexMethod):567:567 -> b
-    4:4:boolean addType(com.android.tools.r8.graph.DexType):582:582 -> b
-    5:12:void commit():628:635 -> b
+    2:2:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):597:597 -> b
+    3:4:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):602:603 -> b
+    5:5:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):608:608 -> b
+    6:13:void commit():628:635 -> b
     1:1:int getNumberOfClasses():653:653 -> c
     1:1:int getNumberOfFields():616:616 -> d
     1:1:int getNumberOfMethods():612:612 -> e
@@ -12536,19 +12343,19 @@
     2:13:void <init>(com.android.tools.r8.naming.NamingLens):439:450 -> <init>
     1:1:java.util.Set access$100(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):435:435 -> a
     2:2:boolean addClass(com.android.tools.r8.graph.DexProgramClass):456:456 -> a
-    3:3:boolean addString(com.android.tools.r8.graph.DexString):471:471 -> a
-    4:4:boolean addProto(com.android.tools.r8.graph.DexProto):476:476 -> a
-    5:5:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):486:486 -> a
-    6:6:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):491:491 -> a
-    7:7:int getNumberOfFields():499:499 -> a
-    8:8:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):508:508 -> a
-    9:10:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):513:514 -> a
-    11:11:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):519:519 -> a
+    3:3:boolean addField(com.android.tools.r8.graph.DexField):461:461 -> a
+    4:4:boolean addMethod(com.android.tools.r8.graph.DexMethod):466:466 -> a
+    5:5:boolean addString(com.android.tools.r8.graph.DexString):471:471 -> a
+    6:6:boolean addProto(com.android.tools.r8.graph.DexProto):476:476 -> a
+    7:7:boolean addType(com.android.tools.r8.graph.DexType):481:481 -> a
+    8:8:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):486:486 -> a
+    9:9:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):491:491 -> a
+    10:10:int getNumberOfFields():499:499 -> a
     1:1:java.util.Set access$200(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):435:435 -> b
-    2:2:boolean addField(com.android.tools.r8.graph.DexField):461:461 -> b
-    3:3:boolean addMethod(com.android.tools.r8.graph.DexMethod):466:466 -> b
-    4:4:boolean addType(com.android.tools.r8.graph.DexType):481:481 -> b
-    5:5:int getNumberOfMethods():495:495 -> b
+    2:2:int getNumberOfMethods():495:495 -> b
+    3:3:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):508:508 -> b
+    4:5:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):513:514 -> b
+    6:6:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):519:519 -> b
     1:1:java.util.Set access$300(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):435:435 -> c
     1:1:java.util.Set access$400(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):435:435 -> d
     1:1:java.util.Set access$500(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):435:435 -> e
@@ -12569,7 +12376,7 @@
     9:11:void <init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):37:39 -> <init>
     1:1:com.android.tools.r8.origin.Origin getOrigin():44:44 -> a
     1:1:java.lang.String getDiagnosticMessage():54:54 -> b
-    1:1:com.android.tools.r8.position.Position getPosition():49:49 -> c
+    1:1:com.android.tools.r8.position.Position getPosition():49:49 -> getPosition
 com.android.tools.r8.errors.DexFileOverflowDiagnostic -> a.a.a.a.e.b:
     long numOfMethods -> b
     long numOfFields -> c
@@ -12595,8 +12402,7 @@
     19:19:long getNumberOfFields():34:34 -> b
     19:19:java.lang.String getDiagnosticMessage():92 -> b
     20:24:java.lang.String getDiagnosticMessage():92:96 -> b
-    com.android.tools.r8.position.Position getPosition() -> c
-    1:1:boolean hasMainDexSpecification():54:54 -> d
+    1:1:boolean hasMainDexSpecification():54:54 -> c
 com.android.tools.r8.errors.InternalCompilerError -> a.a.a.a.e.c:
     1:1:void <init>():14:14 -> <init>
     2:2:void <init>(java.lang.String):18:18 -> <init>
@@ -12767,300 +12573,216 @@
     2:15:void <init>(com.android.tools.r8.graph.DexApplication):23:36 -> <init>
     16:16:void <init>(com.android.tools.r8.graph.AppInfo):39:39 -> <init>
     17:34:void <init>(com.android.tools.r8.graph.AppInfo):23:40 -> <init>
-    35:35:boolean isObsolete():52:52 -> <init>
+    35:35:boolean isObsolete():48:48 -> <init>
     35:35:void <init>(com.android.tools.r8.graph.AppInfo):40 -> <init>
     36:40:void <init>(com.android.tools.r8.graph.AppInfo):40:44 -> <init>
     void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
-    1:1:void copyMetadataFromPrevious(com.android.tools.r8.graph.AppInfo):48:48 -> a
-    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getKey():72:72 -> a
-    2:2:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):96 -> a
-    3:3:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):96:96 -> a
-    4:5:com.android.tools.r8.graph.DexItemFactory dexItemFactory():75:76 -> a
-    6:9:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):80:83 -> a
-    10:18:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):113:121 -> a
-    19:25:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):126:132 -> a
-    26:31:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):143:148 -> a
-    32:33:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):155:156 -> a
-    34:38:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):241:245 -> a
-    39:41:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):327:329 -> a
-    42:62:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):328:348 -> a
-    63:86:com.android.tools.r8.graph.DexEncodedMethod resolveMethodStep3Helper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfo$MultiResultBuilder):385:408 -> a
-    87:90:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):461:464 -> a
-    91:93:com.android.tools.r8.graph.DexEncodedMethod dispatchDirectInvoke(com.android.tools.r8.graph.AppInfo$ResolutionResult):543:545 -> a
-    94:98:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):557:561 -> a
-    99:99:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():754:754 -> a
-    99:99:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):95 -> a
-    100:100:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):95:95 -> a
-    1:2:com.android.tools.r8.graph.DexApplication app():69:70 -> b
-    3:6:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod):228:231 -> b
-    7:8:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):259:260 -> b
-    9:14:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):280:285 -> b
-    9:14:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):261 -> b
-    15:21:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):263:269 -> b
-    22:30:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):364:372 -> b
-    31:34:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):474:477 -> b
-    35:36:com.android.tools.r8.graph.DexEncodedField resolveField(com.android.tools.r8.graph.DexField):485:486 -> b
-    37:39:com.android.tools.r8.graph.DexEncodedMethod dispatchStaticInvoke(com.android.tools.r8.graph.AppInfo$ResolutionResult):529:531 -> b
-    40:41:boolean isInMainDexList(com.android.tools.r8.graph.DexType):593:594 -> b
-    1:1:boolean checkIfObsolete():64:64 -> c
-    2:2:boolean isObsolete():52:52 -> c
-    2:2:boolean checkIfObsolete():64 -> c
-    3:3:boolean checkIfObsolete():64:64 -> c
-    4:6:com.android.tools.r8.origin.Origin originFor(com.android.tools.r8.graph.DexType):136:138 -> c
-    7:10:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod):180:183 -> c
-    11:23:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):301:313 -> c
-    24:24:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):305:305 -> c
-    25:44:com.android.tools.r8.graph.DexEncodedField resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):496:515 -> c
-    1:7:java.util.Map computeDefinitions(com.android.tools.r8.graph.DexType):92:98 -> d
-    8:9:java.lang.Iterable classes():102:103 -> d
-    10:35:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):426:451 -> d
-    36:36:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):432:432 -> d
-    1:2:java.lang.Iterable classesWithDeterministicOrder():107:108 -> e
-    3:9:java.util.Map getDefinitions(com.android.tools.r8.graph.DexType):160:166 -> e
-    1:2:java.util.Collection getSynthesizedClassesForSanityCheck():87:88 -> f
-    1:1:boolean hasLiveness():578:578 -> g
+    1:2:com.android.tools.r8.graph.DexItemFactory dexItemFactory():71:72 -> a
+    3:3:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getKey():72:72 -> a
+    3:3:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):92 -> a
+    4:4:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):92:92 -> a
+    5:8:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):76:79 -> a
+    9:17:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):109:117 -> a
+    18:24:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):122:128 -> a
+    25:30:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):139:144 -> a
+    31:32:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):151:152 -> a
+    33:37:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):237:241 -> a
+    38:40:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):323:325 -> a
+    41:61:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):324:344 -> a
+    62:85:com.android.tools.r8.graph.DexEncodedMethod resolveMethodStep3Helper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfo$MultiResultBuilder):381:404 -> a
+    86:89:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):457:460 -> a
+    90:92:com.android.tools.r8.graph.DexEncodedMethod dispatchDirectInvoke(com.android.tools.r8.graph.AppInfo$ResolutionResult):539:541 -> a
+    93:97:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):553:557 -> a
+    98:98:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():725:725 -> a
+    98:98:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):91 -> a
+    99:99:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):91:91 -> a
+    1:2:com.android.tools.r8.graph.DexApplication app():65:66 -> b
+    3:6:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod):224:227 -> b
+    7:8:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):255:256 -> b
+    9:14:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):276:281 -> b
+    9:14:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):257 -> b
+    15:21:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):259:265 -> b
+    22:30:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):360:368 -> b
+    31:34:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):470:473 -> b
+    35:36:com.android.tools.r8.graph.DexEncodedField resolveField(com.android.tools.r8.graph.DexField):481:482 -> b
+    37:39:com.android.tools.r8.graph.DexEncodedMethod dispatchStaticInvoke(com.android.tools.r8.graph.AppInfo$ResolutionResult):525:527 -> b
+    40:41:boolean isInMainDexList(com.android.tools.r8.graph.DexType):589:590 -> b
+    1:1:boolean checkIfObsolete():60:60 -> c
+    2:2:boolean isObsolete():48:48 -> c
+    2:2:boolean checkIfObsolete():60 -> c
+    3:3:boolean checkIfObsolete():60:60 -> c
+    4:6:com.android.tools.r8.origin.Origin originFor(com.android.tools.r8.graph.DexType):132:134 -> c
+    7:10:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod):176:179 -> c
+    11:23:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):297:309 -> c
+    24:24:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):301:301 -> c
+    25:44:com.android.tools.r8.graph.DexEncodedField resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):492:511 -> c
+    1:7:java.util.Map computeDefinitions(com.android.tools.r8.graph.DexType):88:94 -> d
+    8:9:java.lang.Iterable classes():98:99 -> d
+    10:35:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):422:447 -> d
+    36:36:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):428:428 -> d
+    1:2:java.lang.Iterable classesWithDeterministicOrder():103:104 -> e
+    3:9:java.util.Map getDefinitions(com.android.tools.r8.graph.DexType):156:162 -> e
+    1:2:java.util.Collection getSynthesizedClassesForSanityCheck():83:84 -> f
+    1:1:boolean hasLiveness():574:574 -> g
     boolean hasSubtyping() -> h
-    1:1:boolean isObsolete():52:52 -> i
-    1:1:void markObsolete():56:56 -> j
-    1:1:void unsetObsolete():60:60 -> k
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():583:583 -> l
+    1:1:boolean isObsolete():48:48 -> i
+    1:1:void markObsolete():52:52 -> j
+    1:1:void unsetObsolete():56:56 -> k
+    1:1:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness withLiveness():579:579 -> l
     com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping() -> m
 com.android.tools.r8.graph.AppInfo$1 -> a.a.a.a.g.b:
 com.android.tools.r8.graph.AppInfo$EmptyResult -> a.a.a.a.g.c:
     com.android.tools.r8.graph.AppInfo$EmptyResult SINGLETON -> a
-    1:1:void <clinit>():675:675 -> <clinit>
-    1:1:void <init>():677:677 -> <init>
+    1:1:void <clinit>():671:671 -> <clinit>
+    1:1:void <init>():673:673 -> <init>
+    com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> a
     void forEachTarget(java.util.function.Consumer) -> a
-    boolean hasSingleTarget() -> a
-    com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> b
-    com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve() -> c
-    1:1:java.util.List asListOfTargets():702:702 -> d
-    1:1:com.android.tools.r8.graph.AppInfo$EmptyResult get():682:682 -> e
-    1:1:com.android.tools.r8.graph.AppInfo$EmptyResult access$000():673 -> e
+    1:1:java.util.List asListOfTargets():698:698 -> b
+    boolean hasSingleTarget() -> c
+    com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve() -> d
+    1:1:com.android.tools.r8.graph.AppInfo$EmptyResult get():678:678 -> e
+    1:1:com.android.tools.r8.graph.AppInfo$EmptyResult access$000():669 -> e
 com.android.tools.r8.graph.AppInfo$MultiResult -> a.a.a.a.g.d:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList methods -> a
-    1:1:void <clinit>():636:636 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):640:642 -> <init>
-    1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.graph.AppInfo$1):636 -> <init>
-    boolean hasSingleTarget() -> a
-    1:1:void forEachTarget(java.util.function.Consumer):669:669 -> a
-    com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve():648:648 -> c
-    1:1:java.util.List asListOfTargets():664:664 -> d
+    1:1:void <clinit>():632:632 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):636:638 -> <init>
+    1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.graph.AppInfo$1):632 -> <init>
+    com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> a
+    1:1:void forEachTarget(java.util.function.Consumer):665:665 -> a
+    1:1:java.util.List asListOfTargets():660:660 -> b
+    boolean hasSingleTarget() -> c
+    1:1:com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve():644:644 -> d
 com.android.tools.r8.graph.AppInfo$MultiResultBuilder -> a.a.a.a.g.e:
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder builder -> a
     com.android.tools.r8.graph.DexEncodedMethod singleResult -> b
-    1:1:void <init>():610:610 -> <init>
-    1:1:void <init>(com.android.tools.r8.graph.AppInfo$1):610 -> <init>
-    1:8:void add(com.android.tools.r8.graph.DexEncodedMethod):616:623 -> a
-    9:12:com.android.tools.r8.graph.AppInfo$ResolutionResult build():628:631 -> a
+    1:1:void <init>():606:606 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppInfo$1):606 -> <init>
+    1:8:void add(com.android.tools.r8.graph.DexEncodedMethod):612:619 -> a
+    9:12:com.android.tools.r8.graph.AppInfo$ResolutionResult build():624:627 -> a
 com.android.tools.r8.graph.AppInfo$ResolutionResult -> a.a.a.a.g.f:
+    com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> a
     void forEachTarget(java.util.function.Consumer) -> a
-    boolean hasSingleTarget() -> a
-    com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> b
-    com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve() -> c
-    java.util.List asListOfTargets() -> d
-com.android.tools.r8.graph.AppInfoWithSubtyping -> a.a.a.a.g.i:
+    java.util.List asListOfTargets() -> b
+    boolean hasSingleTarget() -> c
+    com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve() -> d
+com.android.tools.r8.graph.AppInfoWithSubtyping -> a.a.a.a.g.h:
     java.util.Set missingClasses -> g
-    java.util.Set NO_DIRECT_SUBTYPE -> j
-    boolean $assertionsDisabled -> k
-    java.util.Map typeInfo -> i
+    boolean $assertionsDisabled -> i
     java.util.Map subtypeMap -> h
-    1:8:void <clinit>():25:32 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication):121:121 -> <init>
-    2:14:void <init>(com.android.tools.r8.graph.DexApplication):112:124 -> <init>
-    15:15:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):128:128 -> <init>
-    16:36:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):112:132 -> <init>
-    1:24:void populateAllSuperTypes(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):174:197 -> a
-    25:33:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):203:211 -> a
-    34:68:boolean validateLevelsAreCorrect(java.util.function.Function,com.android.tools.r8.graph.DexItemFactory):216:250 -> a
-    34:68:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):211 -> a
-    69:70:void lambda$lookupVirtualTargets$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):285:286 -> a
-    71:76:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):310:315 -> a
-    77:77:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():628:628 -> a
-    77:77:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):316 -> a
-    78:78:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):316:316 -> a
-    79:98:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppInfo.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):197:216 -> a
-    79:98:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):318 -> a
-    99:109:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):395:405 -> a
-    110:110:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():99:99 -> a
-    110:110:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):405 -> a
-    111:124:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):416:429 -> a
-    125:125:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):398:398 -> a
-    126:129:boolean isStringConcat(com.android.tools.r8.graph.DexMethodHandle):436:439 -> a
-    130:132:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):444:446 -> a
-    133:146:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):496:509 -> a
-    147:152:boolean isSubtypeOfClass(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,boolean):536:541 -> a
-    147:152:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):511 -> a
-    153:153:void forAllExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):552:552 -> a
-    154:166:void implementedInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):617:629 -> a
-    1:4:void populateSuperType(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):160:163 -> b
-    5:5:void forAllImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):576:576 -> b
-    6:54:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):654:702 -> b
-    1:3:boolean isDirectSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):645:647 -> c
-    1:47:java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.DexMethod):328:374 -> d
-    48:48:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):485:485 -> d
-    49:57:java.lang.Iterable allExtendsSubtypes(com.android.tools.r8.graph.DexType):556:564 -> d
-    1:25:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.DexMethod):259:283 -> e
-    26:26:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):462:462 -> e
-    27:27:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):480:480 -> e
-    1:10:boolean isInterfaceSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):515:524 -> f
-    11:15:java.lang.Iterable allImplementsSubtypes(com.android.tools.r8.graph.DexType):580:584 -> f
-    1:1:boolean lambda$isStrictSubtypeOf$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):509:509 -> g
-    2:5:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):634:637 -> g
-    6:6:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809:809 -> g
-    6:6:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):637 -> g
-    7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getNext(java.util.Iterator,java.lang.Object):888:888 -> g
-    7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809 -> g
-    7:7:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):637 -> g
-    8:8:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):637:637 -> g
-    1:1:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):322:322 -> h
-    2:2:boolean hasSubtyping():451:451 -> h
-    1:1:boolean hasSubtypes(com.android.tools.r8.graph.DexType):475:475 -> i
-    1:12:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):602:613 -> j
-    13:13:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):612:612 -> j
-    1:1:boolean isMarkedAsInterface(com.android.tools.r8.graph.DexType):470:470 -> k
-    1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):588:588 -> l
-    2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithSubtyping):679:683 -> l
-    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):589 -> l
-    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():457:457 -> m
-    2:2:boolean isSerializable(com.android.tools.r8.graph.DexType):597:597 -> m
-    1:1:java.util.Set access$000():25:25 -> n
-    2:2:boolean isUnknown(com.android.tools.r8.graph.DexType):466:466 -> n
-    3:3:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():99:99 -> n
-    3:3:boolean isUnknown(com.android.tools.r8.graph.DexType):466 -> n
-    1:2:java.util.Set getMissingClasses():146:147 -> o
-    3:6:java.util.Set subtypes(com.android.tools.r8.graph.DexType):151:154 -> o
-    1:1:java.lang.Iterable libraryClasses():141:141 -> p
-    2:2:com.android.tools.r8.graph.DirectMappedDexApplication getDirectApplication():137:137 -> p
-    2:2:java.lang.Iterable libraryClasses():142 -> p
-    3:3:java.lang.Iterable libraryClasses():142:142 -> p
-    4:4:com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo getTypeInfo(com.android.tools.r8.graph.DexType):169:169 -> p
-    1:1:boolean lambda$allExtendsSubtypes$3(com.android.tools.r8.graph.DexType):559:559 -> q
-    1:1:boolean lambda$allExtendsSubtypes$4(com.android.tools.r8.graph.DexType):562:562 -> r
-    1:1:boolean lambda$allImplementsSubtypes$5(com.android.tools.r8.graph.DexType):582:582 -> s
-    1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):160:160 -> t
-com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo -> a.a.a.a.g.h:
-    java.util.Set directSubtypes -> c
-    java.util.Set implementedInterfaces -> d
-    boolean $assertionsDisabled -> e
-    com.android.tools.r8.graph.DexType type -> a
-    int hierarchyLevel -> b
-    1:1:void <clinit>():34:34 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType):47:47 -> <init>
-    2:13:void <init>(com.android.tools.r8.graph.DexType):37:48 -> <init>
-    1:11:void setLevel(int):63:73 -> a
-    12:15:void addDirectSubtype(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):78:81 -> a
-    16:18:boolean isInterface():93:95 -> a
-    19:21:void addInterfaceSubtype(com.android.tools.r8.graph.DexType):105:107 -> a
-    1:1:void tagAsInteface():89:89 -> b
-    1:1:void tagAsSubtypeRoot():85:85 -> c
-    1:2:void ensureDirectSubTypeSet():57:58 -> d
-    1:1:java.lang.String toString():53:53 -> toString
-com.android.tools.r8.graph.AppServices -> a.a.a.a.g.m:
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication):29:29 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexApplication):24:31 -> <init>
+    10:10:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):35:35 -> <init>
+    11:25:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):24:38 -> <init>
+    1:24:void populateAllSuperTypes(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):76:99 -> a
+    25:34:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):105:114 -> a
+    35:36:void lambda$lookupVirtualTargets$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):145:146 -> a
+    37:41:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):170:174 -> a
+    42:42:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():624:624 -> a
+    42:42:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):175 -> a
+    43:43:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):175:175 -> a
+    44:63:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppInfo.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):193:212 -> a
+    44:63:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):177 -> a
+    64:98:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):254:288 -> a
+    99:99:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):257:257 -> a
+    100:103:boolean isStringConcat(com.android.tools.r8.graph.DexMethodHandle):295:298 -> a
+    104:106:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):303:305 -> a
+    1:4:void populateSuperType(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):66:69 -> b
+    1:1:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):181:181 -> d
+    2:48:java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.DexMethod):187:233 -> d
+    1:4:java.util.Set subtypes(com.android.tools.r8.graph.DexType):57:60 -> e
+    5:29:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.DexMethod):119:143 -> e
+    1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):66:66 -> f
+    1:1:boolean hasSubtyping():310:310 -> h
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():316:316 -> m
+    1:2:java.util.Set getMissingClasses():52:53 -> n
+    1:1:java.lang.Iterable libraryClasses():47:47 -> o
+    2:2:com.android.tools.r8.graph.DirectMappedDexApplication getDirectApplication():43:43 -> o
+    2:2:java.lang.Iterable libraryClasses():48 -> o
+    3:3:java.lang.Iterable libraryClasses():48:48 -> o
+com.android.tools.r8.graph.AppServices -> a.a.a.a.g.l:
     java.util.Map services -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():31:31 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):40:42 -> <init>
-    4:6:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):40:42 -> <init>
-    4:6:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.AppServices$1):31 -> <init>
-    1:2:java.util.Set allServiceTypes():46:47 -> a
-    3:11:java.util.List serviceImplementationsFor(com.android.tools.r8.graph.DexType):51:59 -> a
-    12:14:java.util.List serviceImplementationsFor(com.android.tools.r8.graph.DexType):55:57 -> a
-    15:24:com.android.tools.r8.graph.AppServices rewrittenWithLens(com.android.tools.r8.graph.GraphLense):65:74 -> a
-    25:25:com.android.tools.r8.graph.AppServices$Builder builder(com.android.tools.r8.graph.AppView):88:88 -> a
-    1:4:boolean verifyRewrittenWithLens():78:81 -> b
-com.android.tools.r8.graph.AppServices$1 -> a.a.a.a.g.j:
-com.android.tools.r8.graph.AppServices$Builder -> a.a.a.a.g.l:
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):38:40 -> <init>
+    4:6:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):38:40 -> <init>
+    4:6:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.AppServices$1):29 -> <init>
+    1:2:java.util.Set allServiceTypes():44:45 -> a
+    3:11:java.util.Set serviceImplementationsFor(com.android.tools.r8.graph.DexType):49:57 -> a
+    12:14:java.util.Set serviceImplementationsFor(com.android.tools.r8.graph.DexType):53:55 -> a
+    15:24:com.android.tools.r8.graph.AppServices rewrittenWithLens(com.android.tools.r8.graph.GraphLense):63:72 -> a
+    25:25:com.android.tools.r8.graph.AppServices$Builder builder(com.android.tools.r8.graph.AppView):86:86 -> a
+    1:4:boolean verifyRewrittenWithLens():76:79 -> b
+com.android.tools.r8.graph.AppServices$1 -> a.a.a.a.g.i:
+com.android.tools.r8.graph.AppServices$Builder -> a.a.a.a.g.k:
     java.util.Map services -> b
     com.android.tools.r8.graph.AppView appView -> a
-    1:1:void <init>(com.android.tools.r8.graph.AppView):96:96 -> <init>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppServices$1):91 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView):94:97 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppServices$1):91 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.graph.AppServices$Builder):91:91 -> a
-    2:2:com.android.tools.r8.graph.AppServices build():101:101 -> a
-    3:5:void readServices(com.android.tools.r8.DataResourceProvider):109:111 -> a
-    3:5:com.android.tools.r8.graph.AppServices build():102 -> a
-    6:6:com.android.tools.r8.graph.AppServices build():104:104 -> a
-    1:1:java.util.Map access$400(com.android.tools.r8.graph.AppServices$Builder):91:91 -> b
-com.android.tools.r8.graph.AppServices$Builder$DataResourceProviderVisitor -> a.a.a.a.g.k:
+    1:1:void <init>(com.android.tools.r8.graph.AppView):94:94 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppServices$1):89 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.AppView):92:95 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppServices$1):89 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.graph.AppServices$Builder):89:89 -> a
+    2:2:com.android.tools.r8.graph.AppServices build():99:99 -> a
+    3:5:void readServices(com.android.tools.r8.DataResourceProvider):107:109 -> a
+    3:5:com.android.tools.r8.graph.AppServices build():100 -> a
+    6:6:com.android.tools.r8.graph.AppServices build():102:102 -> a
+    1:1:java.util.Map access$400(com.android.tools.r8.graph.AppServices$Builder):89:89 -> b
+com.android.tools.r8.graph.AppServices$Builder$DataResourceProviderVisitor -> a.a.a.a.g.j:
     com.android.tools.r8.graph.AppServices$Builder this$0 -> a
-    1:1:void <init>(com.android.tools.r8.graph.AppServices$Builder):115:115 -> <init>
-    1:1:void <init>(com.android.tools.r8.graph.AppServices$Builder,com.android.tools.r8.graph.AppServices$1):115 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppServices$Builder):113:113 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppServices$Builder,com.android.tools.r8.graph.AppServices$1):113 -> <init>
     void visit(com.android.tools.r8.DataDirectoryResource) -> a
-    1:10:void visit(com.android.tools.r8.DataEntryResource):125:134 -> a
-    11:16:void visit(com.android.tools.r8.DataEntryResource):133:138 -> a
-    17:44:java.util.List readServiceImplementationsForService(java.lang.String,com.android.tools.r8.origin.Origin):144:171 -> a
-    45:45:boolean lambda$readServiceImplementationsForService$0(java.lang.String):148:148 -> a
-    46:54:boolean lambda$readServiceImplementationsForService$1(com.android.tools.r8.origin.Origin,java.util.Set,com.android.tools.r8.graph.DexType):154:162 -> a
-    55:63:boolean lambda$readServiceImplementationsForService$1(com.android.tools.r8.origin.Origin,java.util.Set,com.android.tools.r8.graph.DexType):159:167 -> a
-    1:2:java.lang.String prefixUntilCommentChar(java.lang.String):175:176 -> b
-com.android.tools.r8.graph.AppView -> a.a.a.a.g.o:
+    1:10:void visit(com.android.tools.r8.DataEntryResource):123:132 -> a
+    11:16:void visit(com.android.tools.r8.DataEntryResource):131:136 -> a
+    17:42:java.util.Set readServiceImplementationsForService(java.lang.String,com.android.tools.r8.origin.Origin):142:167 -> a
+    43:43:boolean lambda$readServiceImplementationsForService$0(java.lang.String):144:144 -> a
+    44:52:boolean lambda$readServiceImplementationsForService$1(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType):150:158 -> a
+    53:53:boolean lambda$readServiceImplementationsForService$1(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType):155:155 -> a
+com.android.tools.r8.graph.AppView -> a.a.a.a.g.n:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
-    boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.AppServices appServices -> b
     com.android.tools.r8.graph.GraphLense graphLense -> e
     com.android.tools.r8.graph.AppView$WholeProgramOptimizations wholeProgramOptimizations -> d
+    com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses verticallyMergedClasses -> g
     com.android.tools.r8.utils.InternalOptions options -> f
+    boolean $assertionsDisabled -> h
     com.android.tools.r8.graph.AppInfo appInfo -> a
-    com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet -> g
-    com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses verticallyMergedClasses -> h
-    1:1:void <clinit>():13:13 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):30:35 -> <init>
-    1:1:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):43:43 -> a
-    2:2:com.android.tools.r8.graph.AppInfo appInfo():47:47 -> a
-    2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):87 -> a
-    3:3:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):87:87 -> a
-    4:4:com.android.tools.r8.graph.AppInfo appInfo():47:47 -> a
-    4:4:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):72 -> a
-    5:5:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):72:72 -> a
-    6:6:com.android.tools.r8.graph.AppInfo appInfo():47:47 -> a
-    6:6:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):77 -> a
-    7:7:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):77:77 -> a
-    8:8:com.android.tools.r8.graph.AppInfo appInfo():47:47 -> a
-    8:8:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):82 -> a
-    9:9:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):82:82 -> a
-    10:10:com.android.tools.r8.graph.AppInfo appInfo():47:47 -> a
-    10:10:com.android.tools.r8.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):164 -> a
-    11:11:com.android.tools.r8.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):164:164 -> a
-    12:12:com.android.tools.r8.graph.AppInfo appInfo():47:47 -> a
-    12:12:com.android.tools.r8.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):165 -> a
-    13:13:com.android.tools.r8.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):165:165 -> a
-    14:18:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):51:55 -> a
-    19:19:void setAppServices(com.android.tools.r8.graph.AppServices):67:67 -> a
-    20:20:com.android.tools.r8.graph.DexItemFactory dexItemFactory():107:107 -> a
-    21:22:boolean setGraphLense(com.android.tools.r8.graph.GraphLense):120:121 -> a
-    23:24:void setRootSet(com.android.tools.r8.shaking.RootSetBuilder$RootSet):136:137 -> a
-    25:25:void setVerticallyMergedClasses(com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses):147:147 -> a
-    1:1:com.android.tools.r8.graph.AppInfo appInfo():47:47 -> b
-    2:3:com.android.tools.r8.OptionalBool isInterface(com.android.tools.r8.graph.DexType):93:94 -> b
-    4:4:com.android.tools.r8.graph.AppInfo appInfo():47:47 -> b
-    4:4:com.android.tools.r8.OptionalBool isInterface(com.android.tools.r8.graph.DexType):94 -> b
-    5:5:com.android.tools.r8.OptionalBool isInterface(com.android.tools.r8.graph.DexType):94:94 -> b
-    6:6:com.android.tools.r8.graph.AppInfo appInfo():47:47 -> b
-    6:6:com.android.tools.r8.OptionalBool isInterface(com.android.tools.r8.graph.DexType):95 -> b
-    7:7:com.android.tools.r8.OptionalBool isInterface(com.android.tools.r8.graph.DexType):95:95 -> b
-    8:8:com.android.tools.r8.graph.AppInfo appInfo():47:47 -> b
-    8:8:com.android.tools.r8.OptionalBool isInterface(com.android.tools.r8.graph.DexType):96 -> b
-    9:15:com.android.tools.r8.OptionalBool isInterface(com.android.tools.r8.graph.DexType):96:102 -> b
-    1:1:com.android.tools.r8.graph.AppServices appServices():63:63 -> c
-    1:1:boolean enableWholeProgramOptimizations():111:111 -> d
-    1:1:com.android.tools.r8.graph.GraphLense graphLense():115:115 -> e
-    1:1:com.android.tools.r8.utils.InternalOptions options():128:128 -> f
-    1:1:com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet():132:132 -> g
-    1:1:com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses verticallyMergedClasses():143:143 -> h
-    com.android.tools.r8.graph.AppView withLiveness() -> i
-    1:1:com.android.tools.r8.graph.AppView withSubtyping():152:152 -> j
-com.android.tools.r8.graph.AppView$WholeProgramOptimizations -> a.a.a.a.g.n:
+    1:1:void <clinit>():11:11 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):27:32 -> <init>
+    1:1:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):40:40 -> a
+    2:2:com.android.tools.r8.graph.AppInfo appInfo():44:44 -> a
+    2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):81 -> a
+    3:3:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):81:81 -> a
+    4:4:com.android.tools.r8.graph.AppInfo appInfo():44:44 -> a
+    4:4:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):66 -> a
+    5:5:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):66:66 -> a
+    6:6:com.android.tools.r8.graph.AppInfo appInfo():44:44 -> a
+    6:6:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):71 -> a
+    7:7:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):71:71 -> a
+    8:8:com.android.tools.r8.graph.AppInfo appInfo():44:44 -> a
+    8:8:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):76 -> a
+    9:9:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):76:76 -> a
+    10:14:void setAppInfo(com.android.tools.r8.graph.AppInfo):48:52 -> a
+    15:15:void setAppServices(com.android.tools.r8.graph.AppServices):61:61 -> a
+    16:16:com.android.tools.r8.graph.DexItemFactory dexItemFactory():86:86 -> a
+    17:17:void setGraphLense(com.android.tools.r8.graph.GraphLense):98:98 -> a
+    18:18:void setVerticallyMergedClasses(com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses):112:112 -> a
+    1:1:com.android.tools.r8.graph.AppInfo appInfo():44:44 -> b
+    1:1:com.android.tools.r8.graph.AppServices appServices():57:57 -> c
+    1:1:boolean enableWholeProgramOptimizations():90:90 -> d
+    1:1:com.android.tools.r8.graph.GraphLense graphLense():94:94 -> e
+    1:1:com.android.tools.r8.utils.InternalOptions options():102:102 -> f
+    1:1:com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses verticallyMergedClasses():108:108 -> g
+    com.android.tools.r8.graph.AppView withLiveness() -> h
+com.android.tools.r8.graph.AppView$WholeProgramOptimizations -> a.a.a.a.g.m:
     com.android.tools.r8.graph.AppView$WholeProgramOptimizations ON -> a
     com.android.tools.r8.graph.AppView$WholeProgramOptimizations OFF -> b
-    1:2:void <clinit>():16:17 -> <clinit>
-    3:3:void <clinit>():15:15 -> <clinit>
-    1:1:void <init>(java.lang.String,int):15:15 -> <init>
-com.android.tools.r8.graph.AppliedGraphLens -> a.a.a.a.g.p:
+    1:2:void <clinit>():14:15 -> <clinit>
+    3:3:void <clinit>():13:13 -> <clinit>
+    1:1:void <init>(java.lang.String,int):13:13 -> <init>
+com.android.tools.r8.graph.AppliedGraphLens -> a.a.a.a.g.o:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.com.google.common.collect.BiMap originalTypeNames -> c
     com.android.tools.r8.com.google.common.collect.BiMap originalFieldSignatures -> d
@@ -13083,23 +12805,17 @@
     boolean isContextFreeForMethods() -> c
     com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField) -> c
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):126:126 -> f
-com.android.tools.r8.graph.ArgumentUse -> a.a.a.a.g.q:
+com.android.tools.r8.graph.ArgumentUse -> a.a.a.a.g.p:
     1:1:void <init>():7:7 -> <init>
     boolean register(int) -> a
-com.android.tools.r8.graph.BottomUpClassHierarchyTraversal -> a.a.a.a.g.r:
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):12:12 -> <init>
-    com.android.tools.r8.graph.ClassHierarchyTraversal self() -> a
-    1:1:void visit(java.lang.Iterable,java.util.function.Consumer):7:7 -> a
-    2:2:com.android.tools.r8.graph.BottomUpClassHierarchyTraversal forProgramClasses(com.android.tools.r8.graph.AppView):30:30 -> a
-    3:18:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):43:58 -> a
-com.android.tools.r8.graph.CachedHashValueDexItem -> a.a.a.a.g.s:
+com.android.tools.r8.graph.CachedHashValueDexItem -> a.a.a.a.g.q:
     int hash -> a
     1:5:void <init>():9:13 -> <init>
     boolean computeEquals(java.lang.Object) -> b
     1:1:boolean equals(java.lang.Object):40:40 -> equals
     int computeHashCode() -> g
     1:7:int hashCode():21:27 -> hashCode
-com.android.tools.r8.graph.CfCode -> a.a.a.a.g.u:
+com.android.tools.r8.graph.CfCode -> a.a.a.a.g.s:
     boolean $assertionsDisabled -> i
     java.util.List instructions -> f
     int maxStack -> d
@@ -13115,10 +12831,10 @@
     44:45:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):219:220 -> a
     46:49:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):231:234 -> a
     50:55:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):263:268 -> a
-    1:1:boolean computeEquals(java.lang.Object):201:201 -> b
-    2:14:com.android.tools.r8.ir.code.IRCode internalBuild(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):246:258 -> b
-    1:1:boolean estimatedSizeForInliningAtMost(int):128:128 -> c
-    1:2:int countNonStackOperations(int):133:134 -> d
+    1:1:boolean estimatedSizeForInliningAtMost(int):128:128 -> b
+    2:2:boolean computeEquals(java.lang.Object):201:201 -> b
+    3:15:com.android.tools.r8.ir.code.IRCode internalBuild(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):246:258 -> b
+    1:2:int countNonStackOperations(int):133:134 -> c
     1:1:int computeHashCode():196:196 -> g
     com.android.tools.r8.graph.CfCode asCfCode() -> h
     1:1:int estimatedSizeForInlining():123:123 -> l
@@ -13131,7 +12847,7 @@
     1:1:int getMaxStack():102:102 -> v
     1:1:com.android.tools.r8.graph.DexMethod getMethod():98:98 -> w
     1:1:java.util.List getTryCatchRanges():110:110 -> x
-com.android.tools.r8.graph.CfCode$LocalVariableInfo -> a.a.a.a.g.t:
+com.android.tools.r8.graph.CfCode$LocalVariableInfo -> a.a.a.a.g.r:
     com.android.tools.r8.graph.DebugLocalInfo local -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.cf.code.CfLabel start -> c
@@ -13149,7 +12865,7 @@
     1:1:int access$300(com.android.tools.r8.graph.CfCode$LocalVariableInfo):30:30 -> d
     2:2:com.android.tools.r8.cf.code.CfLabel getStart():62:62 -> d
     1:1:java.lang.String toString():71:71 -> toString
-com.android.tools.r8.graph.ClassAccessFlags -> a.a.a.a.g.v:
+com.android.tools.r8.graph.ClassAccessFlags -> a.a.a.a.g.t:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(int,int):57:57 -> <init>
@@ -13176,28 +12892,7 @@
     1:1:com.android.tools.r8.graph.ClassAccessFlags copy():77:77 -> y
     1:1:int com.android.tools.r8.graph.AccessFlags.materialize():61:61 -> z
     1:1:int getAsCfAccessFlags():98 -> z
-com.android.tools.r8.graph.ClassHierarchy -> a.a.a.a.g.w:
-com.android.tools.r8.graph.ClassHierarchyTraversal -> a.a.a.a.g.y:
-    java.util.Deque worklist -> d
-    com.android.tools.r8.graph.AppView appView -> a
-    java.util.Set visited -> c
-    com.android.tools.r8.graph.ClassHierarchyTraversal$Scope scope -> b
-    boolean excludeInterfaces -> e
-    boolean $assertionsDisabled -> f
-    1:1:void <clinit>():14:14 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):30:30 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):25:32 -> <init>
-    void addDependentsToWorklist(com.android.tools.r8.graph.DexClass) -> a
-    com.android.tools.r8.graph.ClassHierarchyTraversal self() -> a
-    1:22:void visit(java.lang.Iterable,java.util.function.Consumer):43:64 -> a
-    23:36:void visit(java.lang.Iterable,java.util.function.Consumer):47:60 -> a
-com.android.tools.r8.graph.ClassHierarchyTraversal$Scope -> a.a.a.a.g.x:
-    com.android.tools.r8.graph.ClassHierarchyTraversal$Scope ALL_CLASSES -> a
-    com.android.tools.r8.graph.ClassHierarchyTraversal$Scope ONLY_PROGRAM_CLASSES -> b
-    1:2:void <clinit>():18:19 -> <clinit>
-    3:3:void <clinit>():17:17 -> <clinit>
-    1:1:void <init>(java.lang.String,int):17:17 -> <init>
-com.android.tools.r8.graph.ClassKind -> a.a.a.a.g.A:
+com.android.tools.r8.graph.ClassKind -> a.a.a.a.g.v:
     com.android.tools.r8.graph.ClassKind CLASSPATH -> d
     com.android.tools.r8.graph.ClassKind LIBRARY -> e
     java.util.function.Predicate check -> b
@@ -13211,9 +12906,9 @@
     2:2:boolean isOfKind(com.android.tools.r8.graph.DexClass):81:81 -> a
     3:3:java.util.function.Consumer bridgeConsumer(java.util.function.Consumer):85:85 -> a
     4:6:void lambda$bridgeConsumer$0(java.util.function.Consumer,com.android.tools.r8.graph.DexClass):86:88 -> a
-com.android.tools.r8.graph.ClassKind$Factory -> a.a.a.a.g.z:
+com.android.tools.r8.graph.ClassKind$Factory -> a.a.a.a.g.u:
     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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean) -> a
-com.android.tools.r8.graph.Code -> a.a.a.a.g.B:
+com.android.tools.r8.graph.Code -> a.a.a.a.g.w:
     com.android.tools.r8.graph.DexEncodedMethod owner -> b
     1:1:void <init>():16:16 -> <init>
     com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin) -> a
@@ -13223,7 +12918,7 @@
     4:4:void registerArgumentReferences(com.android.tools.r8.graph.ArgumentUse):47:47 -> a
     5:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):104:104 -> a
     6:6:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):109:109 -> a
-    1:1:boolean estimatedSizeForInliningAtMost(int):78:78 -> c
+    1:1:boolean estimatedSizeForInliningAtMost(int):78:78 -> b
     1:1:com.android.tools.r8.graph.CfCode asCfCode():82:82 -> h
     1:1:com.android.tools.r8.graph.DexCode asDexCode():90:90 -> i
     1:1:com.android.tools.r8.graph.JarCode asJarCode():94:94 -> j
@@ -13235,7 +12930,7 @@
     boolean isEmptyVoidMethod() -> p
     boolean isJarCode() -> q
     boolean isOutlineCode() -> r
-com.android.tools.r8.graph.DebugLocalInfo -> a.a.a.a.g.D:
+com.android.tools.r8.graph.DebugLocalInfo -> a.a.a.a.g.y:
     com.android.tools.r8.graph.DexString name -> a
     com.android.tools.r8.graph.DexString signature -> c
     com.android.tools.r8.graph.DexType type -> b
@@ -13249,7 +12944,7 @@
     1:3:int hashCode():94:96 -> hashCode
     1:11:java.lang.String toString():103:113 -> toString
     12:12:java.lang.String toString():107:107 -> toString
-com.android.tools.r8.graph.DebugLocalInfo$PrintLevel -> a.a.a.a.g.C:
+com.android.tools.r8.graph.DebugLocalInfo$PrintLevel -> a.a.a.a.g.x:
     com.android.tools.r8.graph.DebugLocalInfo$PrintLevel[] $VALUES -> d
     com.android.tools.r8.graph.DebugLocalInfo$PrintLevel NAME -> b
     com.android.tools.r8.graph.DebugLocalInfo$PrintLevel NONE -> a
@@ -13257,10 +12952,10 @@
     1:3:void <clinit>():16:18 -> <clinit>
     4:4:void <clinit>():15:15 -> <clinit>
     1:1:void <init>(java.lang.String,int):15:15 -> <init>
-com.android.tools.r8.graph.Descriptor -> a.a.a.a.g.E:
+com.android.tools.r8.graph.Descriptor -> a.a.a.a.g.z:
     1:1:void <init>():6:6 -> <init>
     boolean match(com.android.tools.r8.graph.DexItem) -> a
-com.android.tools.r8.graph.DexAnnotation -> a.a.a.a.g.F:
+com.android.tools.r8.graph.DexAnnotation -> a.a.a.a.g.A:
     com.android.tools.r8.graph.DexEncodedAnnotation annotation -> b
     com.android.tools.r8.graph.DexAnnotation[] EMPTY_ARRAY -> c
     boolean $assertionsDisabled -> d
@@ -13305,7 +13000,7 @@
     103:104:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):329:330 -> a
     105:128:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):324:347 -> a
     129:129:java.lang.String getInvalidSynthesizedClassMapMessage(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):353:353 -> a
-    130:130:java.lang.String com.android.tools.r8.graph.DexType.toString():118:118 -> a
+    130:130:java.lang.String com.android.tools.r8.graph.DexType.toString():360:360 -> a
     130:130:java.lang.String getInvalidSynthesizedClassMapMessage(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):355 -> a
     131:131:java.lang.String getInvalidSynthesizedClassMapMessage(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):355:355 -> a
     132:132:java.lang.String toString():56:56 -> a
@@ -13313,6 +13008,7 @@
     133:133:java.lang.String getInvalidSynthesizedClassMapMessage(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):356:356 -> a
     134:140:com.android.tools.r8.graph.DexAnnotation createAnnotationSynthesizedClassMap(java.util.TreeSet,com.android.tools.r8.graph.DexItemFactory):362:368 -> a
     1:4:com.android.tools.r8.graph.DexMethod getEnclosingMethodFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):91:94 -> b
+    5:5:com.android.tools.r8.graph.DexValue$DexValueType[] lambda$createAnnotationSynthesizedClassMap$0(int):364:364 -> b
     1:3:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):133:135 -> c
     4:4:void com.android.tools.r8.utils.Pair.<init>():20:20 -> c
     4:4:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):135 -> c
@@ -13320,7 +13016,6 @@
     13:13:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():443:443 -> c
     13:13:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):143 -> c
     14:14:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):143:143 -> c
-    15:15:com.android.tools.r8.graph.DexValue$DexValueType[] lambda$createAnnotationSynthesizedClassMap$0(int):364:364 -> c
     1:6:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):161:166 -> d
     7:7:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():908:908 -> d
     7:7:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):166 -> d
@@ -13333,7 +13028,7 @@
     1:1:boolean isSignatureAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):249:249 -> f
     1:1:int hashCode():39:39 -> hashCode
     1:1:java.lang.String toString():56:56 -> toString
-com.android.tools.r8.graph.DexAnnotationDirectory -> a.a.a.a.g.G:
+com.android.tools.r8.graph.DexAnnotationDirectory -> a.a.a.a.g.B:
     java.util.List methodAnnotations -> b
     java.util.List fieldAnnotations -> d
     com.android.tools.r8.graph.DexProgramClass clazz -> a
@@ -13353,7 +13048,7 @@
     1:4:int hashCode():93:96 -> hashCode
     1:1:java.util.List getMethodAnnotations():58:58 -> i
     1:1:java.util.List getParameterAnnotations():62:62 -> j
-com.android.tools.r8.graph.DexAnnotationElement -> a.a.a.a.g.H:
+com.android.tools.r8.graph.DexAnnotationElement -> a.a.a.a.g.C:
     com.android.tools.r8.graph.DexAnnotationElement[] EMPTY_ARRAY -> c
     com.android.tools.r8.graph.DexString name -> a
     com.android.tools.r8.graph.DexValue value -> b
@@ -13365,36 +13060,33 @@
     1:3:boolean equals(java.lang.Object):30:32 -> equals
     1:1:int hashCode():22:22 -> hashCode
     1:1:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.graph.DexAnnotationSet -> a.a.a.a.g.I:
+com.android.tools.r8.graph.DexAnnotationSet -> a.a.a.a.g.D:
     com.android.tools.r8.graph.DexAnnotationSet THE_EMPTY_ANNOTATIONS_SET -> d
     boolean $assertionsDisabled -> e
     int sorted -> c
     com.android.tools.r8.graph.DexAnnotation[] annotations -> b
-    1:4:void <clinit>():16:19 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexAnnotation[]):25:25 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.DexAnnotation[]):23:26 -> <init>
-    1:1:com.android.tools.r8.graph.DexType findDuplicateEntryType(com.android.tools.r8.graph.DexAnnotation[]):30:30 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):64:64 -> a
-    3:4:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):69:70 -> a
-    5:5:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):82:82 -> a
-    6:7:com.android.tools.r8.graph.DexAnnotation getFirstMatching(com.android.tools.r8.graph.DexType):90:91 -> a
-    8:8:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):140:140 -> a
-    9:9:com.android.tools.r8.graph.DexAnnotation lambda$keepIf$1(java.util.function.Predicate,com.android.tools.r8.graph.DexAnnotation):140:140 -> a
-    10:17:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):144:151 -> a
-    18:18:com.android.tools.r8.graph.DexAnnotationSet empty():44:44 -> a
-    18:18:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):152 -> a
-    19:19:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):154:154 -> a
-    1:4:com.android.tools.r8.graph.DexType findDuplicateEntryType(java.util.List):34:37 -> b
-    5:7:boolean computeEquals(java.lang.Object):54:56 -> b
-    1:1:int computeHashCode():49:49 -> g
-    1:1:com.android.tools.r8.graph.DexAnnotationSet empty():44:44 -> h
-    1:1:boolean isEmpty():74:74 -> i
-    1:2:void sort():78:79 -> j
-    3:3:int sortedHashCode():115:115 -> j
-    3:3:void sort():79 -> j
-    4:11:void sort():79:86 -> j
-    1:1:java.lang.String toString():159:159 -> toString
-com.android.tools.r8.graph.DexApplication -> a.a.a.a.g.L:
+    1:4:void <clinit>():13:16 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexAnnotation[]):22:22 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.DexAnnotation[]):20:23 -> <init>
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):47:47 -> a
+    2:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):52:53 -> a
+    4:4:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):65:65 -> a
+    5:6:com.android.tools.r8.graph.DexAnnotation getFirstMatching(com.android.tools.r8.graph.DexType):73:74 -> a
+    7:7:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):123:123 -> a
+    8:8:com.android.tools.r8.graph.DexAnnotation lambda$keepIf$1(java.util.function.Predicate,com.android.tools.r8.graph.DexAnnotation):123:123 -> a
+    9:16:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):127:134 -> a
+    17:17:com.android.tools.r8.graph.DexAnnotationSet empty():27:27 -> a
+    17:17:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):135 -> a
+    18:18:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):137:137 -> a
+    1:3:boolean computeEquals(java.lang.Object):37:39 -> b
+    1:1:int computeHashCode():32:32 -> g
+    1:1:com.android.tools.r8.graph.DexAnnotationSet empty():27:27 -> h
+    1:2:void sort():61:62 -> i
+    3:3:int sortedHashCode():98:98 -> i
+    3:3:void sort():62 -> i
+    4:11:void sort():62:69 -> i
+    1:1:boolean isEmpty():57:57 -> isEmpty
+com.android.tools.r8.graph.DexApplication -> a.a.a.a.g.G:
     com.android.tools.r8.utils.Timing timing -> e
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> f
     com.android.tools.r8.naming.ClassNameMapper proguardMap -> d
@@ -13416,7 +13108,7 @@
     1:1:com.android.tools.r8.naming.ClassNameMapper getProguardMap():112:112 -> e
     java.util.List programClasses() -> f
     com.android.tools.r8.graph.DirectMappedDexApplication toDirect() -> g
-com.android.tools.r8.graph.DexApplication$Builder -> a.a.a.a.g.J:
+com.android.tools.r8.graph.DexApplication$Builder -> a.a.a.a.g.E:
     java.util.List dataResourceProviders -> b
     java.lang.String deadCode -> g
     java.util.List programClasses -> a
@@ -13445,12 +13137,12 @@
     1:1:java.util.Collection getProgramClasses():210:210 -> c
     1:1:java.util.Collection getSynthesizedClasses():214:214 -> d
     com.android.tools.r8.graph.DexApplication$Builder self() -> e
-com.android.tools.r8.graph.DexApplication$ReorderBox -> a.a.a.a.g.K:
+com.android.tools.r8.graph.DexApplication$ReorderBox -> a.a.a.a.g.F:
     java.util.List classes -> a
     1:2:void <init>(java.util.List):71:72 -> <init>
     1:1:java.util.List getClasses():85:85 -> a
     1:3:boolean reorderClasses():77:79 -> b
-com.android.tools.r8.graph.DexCallSite -> a.a.a.a.g.O:
+com.android.tools.r8.graph.DexCallSite -> a.a.a.a.g.J:
     com.android.tools.r8.graph.DexString methodName -> d
     int instructionOffset -> j
     boolean $assertionsDisabled -> k
@@ -13480,8 +13172,8 @@
     1:14:com.android.tools.r8.graph.DexEncodedArray getEncodedArray():289:302 -> j
     1:1:java.lang.String getHash():155:155 -> k
     1:11:java.lang.String toString():104:114 -> toString
-com.android.tools.r8.graph.DexCallSite$1 -> a.a.a.a.g.M:
-com.android.tools.r8.graph.DexCallSite$HashBuilder -> a.a.a.a.g.N:
+com.android.tools.r8.graph.DexCallSite$1 -> a.a.a.a.g.H:
+com.android.tools.r8.graph.DexCallSite$HashBuilder -> a.a.a.a.g.I:
     java.io.ByteArrayOutputStream bytes -> a
     com.android.tools.r8.graph.DexCallSite this$0 -> c
     java.io.ObjectOutputStream out -> b
@@ -13500,7 +13192,7 @@
     14:19:void write(com.android.tools.r8.graph.DexProto):192:197 -> a
     20:67:void write(java.util.List):214:261 -> a
     68:84:java.lang.String build():267:283 -> a
-com.android.tools.r8.graph.DexClass -> a.a.a.a.g.S:
+com.android.tools.r8.graph.DexClass -> a.a.a.a.g.M:
     com.android.tools.r8.graph.DexEncodedField[] instanceFields -> i
     com.android.tools.r8.graph.DexTypeList interfaces -> f
     boolean $assertionsDisabled -> p
@@ -13517,135 +13209,131 @@
     java.util.List innerClasses -> m
     com.android.tools.r8.graph.ClassAccessFlags accessFlags -> d
     com.android.tools.r8.graph.DexType superType -> e
-    1:2:void <clinit>():27:28 -> <clinit>
-    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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):81:81 -> <init>
-    2:65: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):38:101 -> <init>
-    66:66:java.lang.String com.android.tools.r8.graph.DexType.toString():118:118 -> <init>
-    66:66: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):101 -> <init>
-    67: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):101:107 -> <init>
-    74:74: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):97:97 -> <init>
-    75:75:java.lang.String com.android.tools.r8.graph.DexType.toString():118:118 -> <init>
-    75:75: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):97 -> <init>
-    76:76: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):97:97 -> <init>
-    1:1:java.util.List getInnerClasses():749:749 -> A
-    1:1:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():775 -> A
-    2:3:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():775:776 -> A
-    1:1:java.util.List getInnerClasses():749:749 -> B
-    com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> C
-    1:1:com.android.tools.r8.graph.DexType getType():632:632 -> D
-    1:1:boolean hasClassInitializer():636:636 -> E
-    1:1:boolean hasDefaultInitializer():661:661 -> F
-    1:1:boolean hasKotlinInfo():809:809 -> G
-    1:9:boolean hasNonTrivialClassInitializer():649:657 -> H
-    1:5:java.util.List instanceFields():413:417 -> I
-    1:3:boolean isAnonymousClass():799:801 -> J
-    4:4:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():753:753 -> J
-    4:4:boolean isAnonymousClass():802 -> J
-    boolean isClasspathClass() -> K
-    1:1:boolean isInterface():554:554 -> L
-    boolean isLibraryClass() -> M
-    1:3:boolean isLocalClass():784:786 -> N
-    4:4:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():753:753 -> N
-    4:4:boolean isLocalClass():787 -> N
-    1:4:boolean isMemberClass():791:794 -> O
-    5:5:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():753:753 -> O
-    5:5:boolean isMemberClass():795 -> O
-    boolean isNotProgramClass() -> P
-    boolean isProgramClass() -> Q
-    1:2:boolean isValid():813:814 -> R
-    3:8:boolean isValid():813:818 -> R
-    1:1:java.lang.Iterable methods():123:123 -> S
-    1:5:java.util.List staticFields():355:359 -> T
-    1:5:java.util.List virtualMethods():192:196 -> U
-    1:4:boolean verifyNoDuplicateFields():480:483 -> V
-    1:4:boolean verifyNoDuplicateMethods():259:262 -> W
-    java.util.Iterator lambda$allImmediateSupertypes$2(java.util.Iterator) -> a
-    1:3:java.lang.Iterable fields(java.util.function.Predicate):117:119 -> a
+    1:2:void <clinit>():25:26 -> <clinit>
+    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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):79:79 -> <init>
+    2:65: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):36:99 -> <init>
+    66:66:java.lang.String com.android.tools.r8.graph.DexType.toString():360:360 -> <init>
+    66:66: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):99 -> <init>
+    67: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):99:105 -> <init>
+    74:74: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):95:95 -> <init>
+    75:75:java.lang.String com.android.tools.r8.graph.DexType.toString():360:360 -> <init>
+    75:75: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):95 -> <init>
+    76:76: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):95:95 -> <init>
+    1:1:java.util.List getInnerClasses():731:731 -> A
+    com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> B
+    1:1:boolean hasClassInitializer():632:632 -> C
+    1:1:boolean hasDefaultInitializer():657:657 -> D
+    1:1:boolean hasKotlinInfo():791:791 -> E
+    1:9:boolean hasNonTrivialClassInitializer():645:653 -> F
+    1:5:java.util.List instanceFields():411:415 -> G
+    1:3:boolean isAnonymousClass():781:783 -> H
+    4:4:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():735:735 -> H
+    4:4:boolean isAnonymousClass():784 -> H
+    boolean isClasspathClass() -> I
+    1:1:boolean isInterface():552:552 -> J
+    boolean isLibraryClass() -> K
+    1:3:boolean isLocalClass():766:768 -> L
+    4:4:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():735:735 -> L
+    4:4:boolean isLocalClass():769 -> L
+    1:4:boolean isMemberClass():773:776 -> M
+    5:5:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():735:735 -> M
+    5:5:boolean isMemberClass():777 -> M
+    boolean isProgramClass() -> N
+    1:2:boolean isValid():795:796 -> O
+    3:8:boolean isValid():795:800 -> O
+    1:1:java.lang.Iterable methods():121:121 -> P
+    1:5:java.util.List staticFields():353:357 -> Q
+    1:5:java.util.List virtualMethods():190:194 -> R
+    1:4:boolean verifyNoDuplicateFields():478:481 -> S
+    1:4:boolean verifyNoDuplicateMethods():257:260 -> T
+    1:3:java.lang.Iterable fields(java.util.function.Predicate):115:117 -> a
     4:4:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    4:4:java.lang.Iterable fields(java.util.function.Predicate):117 -> a
-    5:5:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):134:134 -> a
-    6:12:void appendDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):146:152 -> a
-    13:23:void appendDirectMethods(java.util.Collection):156:166 -> a
-    24:27:void setDirectMethod(int,com.android.tools.r8.graph.DexEncodedMethod):178:181 -> a
-    28:31:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):185:188 -> a
-    32:32:int lambda$allMethodsSorted$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):283:283 -> a
-    33:55:void virtualizeMethods(java.util.Set):288:310 -> a
-    56:58:void setInstanceField(int,com.android.tools.r8.graph.DexEncodedField):451:453 -> a
-    59:61:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):457:459 -> a
-    62:63:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):473:474 -> a
-    64:64:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):510:510 -> a
-    64:64:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):517 -> a
-    65:65:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):503:503 -> a
-    65:65:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):518 -> a
-    66:66:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):525:525 -> a
-    67:68:com.android.tools.r8.graph.DexItem lookupTarget(com.android.tools.r8.graph.DexItem[],com.android.tools.r8.graph.Descriptor):544:545 -> a
-    69:71:com.android.tools.r8.graph.DexEncodedMethod getInitializer(com.android.tools.r8.graph.DexType[]):665:667 -> a
-    72:72:boolean isSerializable(com.android.tools.r8.graph.AppView):691:691 -> a
-    73:73:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier):699:699 -> a
-    74:84:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Predicate):704:714 -> a
-    85:85:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$3(com.android.tools.r8.graph.DexEncodedField):745:745 -> a
+    4:4:java.lang.Iterable fields(java.util.function.Predicate):115 -> a
+    5:5:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):132:132 -> a
+    6:12:void appendDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):144:150 -> a
+    13:23:void appendDirectMethods(java.util.Collection):154:164 -> a
+    24:27:void setDirectMethod(int,com.android.tools.r8.graph.DexEncodedMethod):176:179 -> a
+    28:31:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):183:186 -> a
+    32:32:int lambda$allMethodsSorted$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):281:281 -> a
+    33:55:void virtualizeMethods(java.util.Set):286:308 -> a
+    56:58:void setInstanceField(int,com.android.tools.r8.graph.DexEncodedField):449:451 -> a
+    59:61:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):455:457 -> a
+    62:63:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):471:472 -> a
+    64:64:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):508:508 -> a
+    64:64:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):515 -> a
+    65:65:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):501:501 -> a
+    65:65:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):516 -> a
+    66:66:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):523:523 -> a
+    67:68:com.android.tools.r8.graph.DexItem lookupTarget(com.android.tools.r8.graph.DexItem[],com.android.tools.r8.graph.Descriptor):542:543 -> a
+    69:69:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier):690:690 -> a
+    70:80:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Predicate):695:705 -> a
+    81:81:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$2(com.android.tools.r8.graph.DexEncodedField):727:727 -> a
     void addDependencies(com.android.tools.r8.dex.MixedSectionCollection) -> b
-    1:3:java.lang.Iterable methods(java.util.function.Predicate):127:129 -> b
+    1:3:java.lang.Iterable methods(java.util.function.Predicate):125:127 -> b
     4:4:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> b
-    4:4:java.lang.Iterable methods(java.util.function.Predicate):127 -> b
-    5:10:void appendVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):200:205 -> b
-    11:20:void appendVirtualMethods(java.util.Collection):209:218 -> b
-    21:23:void setVirtualMethod(int,com.android.tools.r8.graph.DexEncodedMethod):230:232 -> b
-    24:26:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):236:238 -> b
-    27:28:boolean verifyCorrectnessOfMethodHolders(java.lang.Iterable):252:253 -> b
-    29:33:void forEachField(java.util.function.Consumer):346:350 -> b
-    34:36:void setStaticField(int,com.android.tools.r8.graph.DexEncodedField):392:394 -> b
-    37:39:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):398:400 -> b
-    40:44:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):463:467 -> b
-    45:45:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):510:510 -> b
-    46:46:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):525:525 -> b
-    46:46:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):539 -> b
-    47:47:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):532:532 -> b
-    47:47:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):540 -> b
-    48:53:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Predicate):732:737 -> b
-    1:5:void removeDirectMethod(int):170:174 -> c
-    6:10:void forEachMethod(java.util.function.Consumer):268:272 -> c
-    11:11:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):503:503 -> c
-    12:12:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):532:532 -> c
-    13:14:void removeEnclosingMethod(java.util.function.Predicate):761:762 -> c
-    15:15:boolean lambda$isValid$4(com.android.tools.r8.graph.DexEncodedMethod):814:814 -> c
-    1:5:boolean verifyCorrectnessOfMethodHolder(com.android.tools.r8.graph.DexEncodedMethod):242:246 -> d
-    6:6:void removeInnerClasses(java.util.function.Predicate):771:771 -> d
+    4:4:java.lang.Iterable methods(java.util.function.Predicate):125 -> b
+    5:9:void removeDirectMethod(int):168:172 -> b
+    10:15:void appendVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):198:203 -> b
+    16:25:void appendVirtualMethods(java.util.Collection):207:216 -> b
+    26:28:void setVirtualMethod(int,com.android.tools.r8.graph.DexEncodedMethod):228:230 -> b
+    29:31:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):234:236 -> b
+    32:33:boolean verifyCorrectnessOfMethodHolders(java.lang.Iterable):250:251 -> b
+    34:38:void forEachField(java.util.function.Consumer):344:348 -> b
+    39:41:void setStaticField(int,com.android.tools.r8.graph.DexEncodedField):390:392 -> b
+    42:44:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):396:398 -> b
+    45:49:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):461:465 -> b
+    50:50:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):508:508 -> b
+    51:51:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):523:523 -> b
+    51:51:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):537 -> b
+    52:52:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):530:530 -> b
+    52:52:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):538 -> b
+    53:57:boolean hasMissingSuperType(com.android.tools.r8.graph.DexDefinitionSupplier):670:674 -> b
+    58:63:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Predicate):714:719 -> b
+    1:5:void forEachMethod(java.util.function.Consumer):266:270 -> c
+    6:6:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):501:501 -> c
+    7:7:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):530:530 -> c
+    8:8:boolean isSerializable(com.android.tools.r8.graph.DexDefinitionSupplier):682:682 -> c
+    9:10:boolean com.android.tools.r8.graph.DexType.isSerializable(com.android.tools.r8.graph.DexDefinitionSupplier):125:126 -> c
+    9:10:boolean isSerializable(com.android.tools.r8.graph.DexDefinitionSupplier):682 -> c
+    11:12:void removeEnclosingMethod(java.util.function.Predicate):743:744 -> c
+    13:13:boolean lambda$isValid$3(com.android.tools.r8.graph.DexEncodedMethod):796:796 -> c
+    1:5:boolean verifyCorrectnessOfMethodHolder(com.android.tools.r8.graph.DexEncodedMethod):240:244 -> d
+    6:6:void removeInnerClasses(java.util.function.Predicate):753:753 -> d
     com.android.tools.r8.graph.DexClass asDexClass() -> g
     boolean isDexClass() -> j
     boolean isStaticMember() -> m
-    1:1:com.android.tools.r8.graph.DexType getType():632:632 -> n
-    1:1:com.android.tools.r8.graph.DexReference toReference():565 -> n
-    1:3:java.lang.Iterable allImmediateSupertypes():719:721 -> o
-    4:7:java.lang.Iterable allImmediateSupertypes():720:723 -> o
-    1:6:com.android.tools.r8.graph.DexEncodedMethod[] allMethodsSorted():277:282 -> p
-    com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> q
-    com.android.tools.r8.graph.DexProgramClass asProgramClass() -> r
-    1:1:void clearEnclosingMethod():757:757 -> s
-    1:1:void clearInnerClasses():767:767 -> t
-    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():744:745 -> u
-    1:5:java.util.List directMethods():138:142 -> v
-    1:1:java.lang.Iterable fields():113:113 -> w
-    1:10:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():615:624 -> x
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():675:675 -> y
-    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():753:753 -> z
-com.android.tools.r8.graph.DexClass$FieldSetter -> a.a.a.a.g.P:
+    1:1:com.android.tools.r8.graph.DexType getType():628:628 -> n
+    1:1:com.android.tools.r8.graph.DexReference toReference():563 -> n
+    1:6:com.android.tools.r8.graph.DexEncodedMethod[] allMethodsSorted():275:280 -> o
+    com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> p
+    com.android.tools.r8.graph.DexProgramClass asProgramClass() -> q
+    1:1:void clearEnclosingMethod():739:739 -> r
+    1:1:void clearInnerClasses():749:749 -> s
+    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():726:727 -> t
+    1:5:java.util.List directMethods():136:140 -> u
+    1:1:java.lang.Iterable fields():111:111 -> v
+    1:10:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():611:620 -> w
+    1:2:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():661:662 -> x
+    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():735:735 -> y
+    1:1:java.util.List getInnerClasses():731:731 -> z
+    1:1:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():757 -> z
+    2:3:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():757:758 -> z
+com.android.tools.r8.graph.DexClass$FieldSetter -> a.a.a.a.g.K:
     void setField(int,com.android.tools.r8.graph.DexEncodedField) -> a
-com.android.tools.r8.graph.DexClass$MethodSetter -> a.a.a.a.g.Q:
+com.android.tools.r8.graph.DexClass$MethodSetter -> a.a.a.a.g.L:
     void setMethod(int,com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.graph.DexClasspathClass -> a.a.a.a.g.T:
+com.android.tools.r8.graph.DexClasspathClass -> a.a.a.a.g.N:
     boolean $assertionsDisabled -> q
     1:1:void <clinit>():16:16 -> <clinit>
     1:16:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):34:49 -> <init>
-    1:1:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo():86:86 -> C
-    boolean isClasspathClass() -> K
-    boolean isNotProgramClass() -> P
+    1:1:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo():81:81 -> B
+    boolean isClasspathClass() -> I
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):55:55 -> a
     1:1:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):66:66 -> b
     1:1:java.lang.String toString():60:60 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():118:118 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():360:360 -> toString
     2:2:java.lang.String toString():60 -> toString
-com.android.tools.r8.graph.DexCode -> a.a.a.a.g.X:
+com.android.tools.r8.graph.DexCode -> a.a.a.a.g.S:
     com.android.tools.r8.graph.DexDebugInfoForWriting debugInfoForWriting -> k
     boolean $assertionsDisabled -> l
     com.android.tools.r8.code.Instruction[] instructions -> h
@@ -13712,7 +13400,7 @@
     2:11:com.android.tools.r8.graph.DexDebugInfo debugInfoWithoutFirstParameter():148:157 -> u
     2:11:com.android.tools.r8.graph.DexCode withoutThisParameter():81 -> u
     12:12:com.android.tools.r8.graph.DexCode withoutThisParameter():81:81 -> u
-com.android.tools.r8.graph.DexCode$Try -> a.a.a.a.g.U:
+com.android.tools.r8.graph.DexCode$Try -> a.a.a.a.g.O:
     boolean $assertionsDisabled -> e
     int handlerIndex -> d
     int startAddress -> b
@@ -13725,7 +13413,7 @@
     1:9:boolean equals(java.lang.Object):480:488 -> equals
     1:1:int hashCode():472:472 -> hashCode
     1:4:java.lang.String toString():495:498 -> toString
-com.android.tools.r8.graph.DexCode$TryHandler -> a.a.a.a.g.W:
+com.android.tools.r8.graph.DexCode$TryHandler -> a.a.a.a.g.Q:
     com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair[] pairs -> a
     int catchAllAddr -> b
     boolean $assertionsDisabled -> c
@@ -13736,7 +13424,7 @@
     1:6:boolean equals(java.lang.Object):539:544 -> equals
     1:1:int hashCode():531:531 -> hashCode
     1:16:java.lang.String toString():563:578 -> toString
-com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair -> a.a.a.a.g.V:
+com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair -> a.a.a.a.g.P:
     com.android.tools.r8.graph.DexType type -> a
     int addr -> b
     boolean $assertionsDisabled -> c
@@ -13746,7 +13434,7 @@
     2:2:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):600:600 -> a
     1:3:boolean equals(java.lang.Object):613:615 -> equals
     1:1:int hashCode():605:605 -> hashCode
-com.android.tools.r8.graph.DexDebugEntry -> a.a.a.a.g.Y:
+com.android.tools.r8.graph.DexDebugEntry -> a.a.a.a.g.T:
     com.android.tools.r8.ir.code.Position callerPosition -> i
     com.android.tools.r8.graph.DexString sourceFile -> d
     boolean $assertionsDisabled -> j
@@ -13761,7 +13449,7 @@
     1:11:void <init>(boolean,int,int,com.android.tools.r8.graph.DexString,boolean,boolean,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):34:44 -> <init>
     1:38:java.lang.String toString(boolean):53:90 -> a
     1:1:java.lang.String toString():49:49 -> toString
-com.android.tools.r8.graph.DexDebugEntryBuilder -> a.a.a.a.g.ba:
+com.android.tools.r8.graph.DexDebugEntryBuilder -> a.a.a.a.g.W:
     com.android.tools.r8.graph.DexDebugPositionState positionState -> h
     java.util.Map locals -> c
     boolean $assertionsDisabled -> i
@@ -13799,13 +13487,13 @@
     32:56:void entryEventReceived(boolean):161:185 -> a
     57:62:java.util.List build():190:195 -> a
     63:66:com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry getEntry(int):206:209 -> a
-com.android.tools.r8.graph.DexDebugEntryBuilder$1 -> a.a.a.a.g.Z:
-com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry -> a.a.a.a.g.aa:
+com.android.tools.r8.graph.DexDebugEntryBuilder$1 -> a.a.a.a.g.U:
+com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry -> a.a.a.a.g.V:
     com.android.tools.r8.graph.DebugLocalInfo current -> a
     com.android.tools.r8.graph.DebugLocalInfo last -> b
     1:1:void <init>():24:24 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexDebugEntryBuilder$1):24 -> <init>
-com.android.tools.r8.graph.DexDebugEvent -> a.a.a.a.g.ma:
+com.android.tools.r8.graph.DexDebugEvent -> a.a.a.a.g.ha:
     com.android.tools.r8.graph.DexDebugEvent[] EMPTY_ARRAY -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -13813,7 +13501,7 @@
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
     void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection) -> a
     void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping) -> a
-com.android.tools.r8.graph.DexDebugEvent$AdvanceLine -> a.a.a.a.g.ca:
+com.android.tools.r8.graph.DexDebugEvent$AdvanceLine -> a.a.a.a.g.X:
     int delta -> b
     1:2:void <init>(int):148:149 -> <init>
     1:2:void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping):154:155 -> a
@@ -13821,7 +13509,7 @@
     1:1:boolean equals(java.lang.Object):176:176 -> equals
     1:1:int hashCode():170:170 -> hashCode
     1:1:java.lang.String toString():165:165 -> toString
-com.android.tools.r8.graph.DexDebugEvent$AdvancePC -> a.a.a.a.g.da:
+com.android.tools.r8.graph.DexDebugEvent$AdvancePC -> a.a.a.a.g.Y:
     int delta -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():41:41 -> <clinit>
@@ -13831,7 +13519,7 @@
     1:1:boolean equals(java.lang.Object):75:75 -> equals
     1:1:int hashCode():69:69 -> hashCode
     1:1:java.lang.String toString():64:64 -> toString
-com.android.tools.r8.graph.DexDebugEvent$Default -> a.a.a.a.g.ea:
+com.android.tools.r8.graph.DexDebugEvent$Default -> a.a.a.a.g.Z:
     int value -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():426:426 -> <clinit>
@@ -13843,7 +13531,7 @@
     1:2:int getPCDelta():446:447 -> h
     1:1:int hashCode():462:462 -> hashCode
     1:1:java.lang.String toString():457:457 -> toString
-com.android.tools.r8.graph.DexDebugEvent$EndLocal -> a.a.a.a.g.fa:
+com.android.tools.r8.graph.DexDebugEvent$EndLocal -> a.a.a.a.g.aa:
     int registerNum -> b
     1:2:void <init>(int):272:273 -> <init>
     1:2:void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping):278:279 -> a
@@ -13851,7 +13539,7 @@
     1:1:boolean equals(java.lang.Object):300:300 -> equals
     1:1:int hashCode():294:294 -> hashCode
     1:1:java.lang.String toString():289:289 -> toString
-com.android.tools.r8.graph.DexDebugEvent$RestartLocal -> a.a.a.a.g.ga:
+com.android.tools.r8.graph.DexDebugEvent$RestartLocal -> a.a.a.a.g.ba:
     int registerNum -> b
     1:2:void <init>(int):309:310 -> <init>
     1:2:void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping):315:316 -> a
@@ -13859,12 +13547,12 @@
     1:1:boolean equals(java.lang.Object):337:337 -> equals
     1:1:int hashCode():331:331 -> hashCode
     1:1:java.lang.String toString():326:326 -> toString
-com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin -> a.a.a.a.g.ha:
+com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin -> a.a.a.a.g.ca:
     1:1:void <init>():115:115 -> <init>
     1:1:void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping):120:120 -> a
     2:2:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):125:125 -> a
     1:1:boolean equals(java.lang.Object):140:140 -> equals
-com.android.tools.r8.graph.DexDebugEvent$SetFile -> a.a.a.a.g.ia:
+com.android.tools.r8.graph.DexDebugEvent$SetFile -> a.a.a.a.g.da:
     com.android.tools.r8.graph.DexString fileName -> b
     1:2:void <init>(com.android.tools.r8.graph.DexString):346:347 -> <init>
     1:2:void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping):352:353 -> a
@@ -13873,7 +13561,7 @@
     1:2:boolean equals(java.lang.Object):380:381 -> equals
     1:2:int hashCode():374:375 -> hashCode
     1:1:java.lang.String toString():369:369 -> toString
-com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame -> a.a.a.a.g.ja:
+com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame -> a.a.a.a.g.ea:
     com.android.tools.r8.graph.DexMethod callee -> b
     com.android.tools.r8.ir.code.Position caller -> c
     boolean $assertionsDisabled -> d
@@ -13884,12 +13572,12 @@
     1:5:boolean equals(java.lang.Object):418:422 -> equals
     1:1:int hashCode():413:413 -> hashCode
     1:1:java.lang.String toString():408:408 -> toString
-com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd -> a.a.a.a.g.ka:
+com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd -> a.a.a.a.g.fa:
     1:1:void <init>():82:82 -> <init>
     1:1:void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping):87:87 -> a
     2:2:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):92:92 -> a
     1:1:boolean equals(java.lang.Object):108:108 -> equals
-com.android.tools.r8.graph.DexDebugEvent$StartLocal -> a.a.a.a.g.la:
+com.android.tools.r8.graph.DexDebugEvent$StartLocal -> a.a.a.a.g.ga:
     com.android.tools.r8.graph.DexString name -> c
     com.android.tools.r8.graph.DexString signature -> e
     com.android.tools.r8.graph.DexType type -> d
@@ -13901,7 +13589,7 @@
     1:14:boolean equals(java.lang.Object):251:264 -> equals
     1:5:int hashCode():242:246 -> hashCode
     1:1:java.lang.String toString():237:237 -> toString
-com.android.tools.r8.graph.DexDebugEventBuilder -> a.a.a.a.g.na:
+com.android.tools.r8.graph.DexDebugEventBuilder -> a.a.a.a.g.ia:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexItemFactory factory -> b
     int startLine -> l
@@ -13956,7 +13644,7 @@
     148:148:void emitLocalChangeEvents(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,java.util.List,com.android.tools.r8.graph.DexItemFactory):290 -> a
     149:150:void emitLocalChangeEvents(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,java.util.List,com.android.tools.r8.graph.DexItemFactory):290:291 -> a
     1:5:boolean localsChanged():174:178 -> b
-com.android.tools.r8.graph.DexDebugEventVisitor -> a.a.a.a.g.oa:
+com.android.tools.r8.graph.DexDebugEventVisitor -> a.a.a.a.g.ja:
     void visit(com.android.tools.r8.graph.DexDebugEvent$AdvanceLine) -> a
     void visit(com.android.tools.r8.graph.DexDebugEvent$AdvancePC) -> a
     void visit(com.android.tools.r8.graph.DexDebugEvent$Default) -> a
@@ -13967,7 +13655,7 @@
     void visit(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
     void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd) -> a
     void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal) -> a
-com.android.tools.r8.graph.DexDebugInfo -> a.a.a.a.g.pa:
+com.android.tools.r8.graph.DexDebugInfo -> a.a.a.a.g.ka:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexDebugEvent[] events -> d
     int startLine -> b
@@ -13979,12 +13667,12 @@
     1:9:boolean computeEquals(java.lang.Object):44:52 -> b
     1:3:int computeHashCode():37:39 -> g
     1:8:java.lang.String toString():71:78 -> toString
-com.android.tools.r8.graph.DexDebugInfoForWriting -> a.a.a.a.g.qa:
+com.android.tools.r8.graph.DexDebugInfoForWriting -> a.a.a.a.g.la:
     1:4:void <init>(com.android.tools.r8.graph.DexDebugInfo):17:20 -> <init>
     5:5:void <init>(com.android.tools.r8.graph.DexDebugInfo):17:17 -> <init>
     1:1:boolean lambda$new$0(com.android.tools.r8.graph.DexDebugEvent):19:19 -> a
-    1:1:com.android.tools.r8.graph.DexDebugEvent[] lambda$new$1(int):20:20 -> c
-com.android.tools.r8.graph.DexDebugPositionState -> a.a.a.a.g.ra:
+    1:1:com.android.tools.r8.graph.DexDebugEvent[] lambda$new$1(int):20:20 -> b
+com.android.tools.r8.graph.DexDebugPositionState -> a.a.a.a.g.ma:
     com.android.tools.r8.graph.DexString currentFile -> c
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexMethod currentMethod -> d
@@ -14009,7 +13697,7 @@
     1:1:int getCurrentLine():94:94 -> c
     1:1:com.android.tools.r8.graph.DexMethod getCurrentMethod():102:102 -> d
     1:1:int getCurrentPc():90:90 -> e
-com.android.tools.r8.graph.DexDefinition -> a.a.a.a.g.sa:
+com.android.tools.r8.graph.DexDefinition -> a.a.a.a.g.na:
     1:1:void <init>():13:13 -> <init>
     1:1:java.util.stream.Stream filterDexEncodedField(java.util.stream.Stream):71:71 -> a
     2:2:java.util.stream.Stream filter(java.util.stream.Stream,java.util.function.Predicate,java.util.function.Function):63:63 -> a
@@ -14025,10 +13713,10 @@
     boolean isDexEncodedMethod() -> l
     boolean isStaticMember() -> m
     com.android.tools.r8.graph.DexReference toReference() -> n
-com.android.tools.r8.graph.DexDefinitionSupplier -> a.a.a.a.g.ta:
+com.android.tools.r8.graph.DexDefinitionSupplier -> a.a.a.a.g.oa:
     com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexItemFactory dexItemFactory() -> a
-com.android.tools.r8.graph.DexEncodedAnnotation -> a.a.a.a.g.ua:
+com.android.tools.r8.graph.DexEncodedAnnotation -> a.a.a.a.g.pa:
     com.android.tools.r8.graph.DexAnnotationElement[] elements -> b
     com.android.tools.r8.graph.DexType type -> a
     int sorted -> c
@@ -14049,7 +13737,7 @@
     11:11:void sort():70:70 -> g
     1:1:int hashCode():46:46 -> hashCode
     1:1:java.lang.String toString():41:41 -> toString
-com.android.tools.r8.graph.DexEncodedArray -> a.a.a.a.g.va:
+com.android.tools.r8.graph.DexEncodedArray -> a.a.a.a.g.qa:
     com.android.tools.r8.graph.DexValue[] values -> a
     1:2:void <init>(com.android.tools.r8.graph.DexValue[]):14:15 -> <init>
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):21:21 -> a
@@ -14057,7 +13745,7 @@
     1:1:boolean equals(java.lang.Object):39:39 -> equals
     1:1:int hashCode():31:31 -> hashCode
     1:1:java.lang.String toString():44:44 -> toString
-com.android.tools.r8.graph.DexEncodedField -> a.a.a.a.g.wa:
+com.android.tools.r8.graph.DexEncodedField -> a.a.a.a.g.ra:
     com.android.tools.r8.graph.DexAnnotationSet annotations -> c
     com.android.tools.r8.graph.DexEncodedField[] EMPTY_ARRAY -> e
     boolean $assertionsDisabled -> f
@@ -14068,158 +13756,158 @@
     1:5:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):25:29 -> <init>
     1:3:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):33:35 -> a
     4:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):43:44 -> a
-    6:6:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):64:64 -> a
+    6:6:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):47:47 -> a
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):44 -> a
     7:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):45:46 -> a
     9:9:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):52:52 -> a
-    10:12:void setStaticValue(com.android.tools.r8.graph.DexValue):114:116 -> a
-    13:22:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.InternalOptions):129:138 -> a
-    23:26:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):144:147 -> a
+    10:12:void setStaticValue(com.android.tools.r8.graph.DexValue):110:112 -> a
+    13:22:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.InternalOptions):125:134 -> a
+    23:26:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):140:143 -> a
     1:1:java.lang.String toSourceString():67:67 -> f
     com.android.tools.r8.graph.DexEncodedField asDexEncodedField() -> h
     boolean isDexEncodedField() -> k
-    1:1:boolean isStaticMember():101:101 -> m
+    1:1:boolean isStaticMember():97:97 -> m
     1:1:com.android.tools.r8.graph.DexReference toReference():77:77 -> n
     1:1:com.android.tools.r8.graph.DexField getKey():72:72 -> o
     2:2:com.android.tools.r8.graph.DexField getKey():72:72 -> o
     2:2:com.android.tools.r8.graph.PresortedComparable getKey():13 -> o
-    1:2:com.android.tools.r8.graph.DexValue getStaticValue():120:121 -> p
-    1:1:boolean hasAnnotation():105:105 -> q
-    1:2:boolean hasExplicitStaticValue():109:110 -> r
+    1:2:com.android.tools.r8.graph.DexValue getStaticValue():116:117 -> p
+    1:1:boolean hasAnnotation():101:101 -> q
+    1:2:boolean hasExplicitStaticValue():105:106 -> r
     1:1:boolean isStatic():92:92 -> s
     1:1:java.lang.String toString():57:57 -> toString
-com.android.tools.r8.graph.DexEncodedMethod -> a.a.a.a.g.Ga:
-    boolean $assertionsDisabled -> m
+com.android.tools.r8.graph.DexEncodedMethod -> a.a.a.a.g.Ba:
+    com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> f
+    com.android.tools.r8.graph.DexEncodedMethod[] EMPTY_ARRAY -> j
     com.android.tools.r8.graph.DexAnnotationSet annotations -> c
+    com.android.tools.r8.graph.Code code -> e
+    com.android.tools.r8.graph.DexEncodedMethod SENTINEL -> k
+    boolean obsolete -> i
     com.android.tools.r8.graph.ParameterAnnotationsList parameterAnnotationsList -> d
-    boolean obsolete -> j
     int classFileVersion -> h
+    boolean $assertionsDisabled -> l
+    com.android.tools.r8.graph.MethodAccessFlags accessFlags -> b
     com.android.tools.r8.graph.OptimizationInfo optimizationInfo -> g
     com.android.tools.r8.graph.DexMethod method -> a
-    com.android.tools.r8.graph.DexEncodedMethod[] EMPTY_ARRAY -> k
-    com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> f
-    com.android.tools.r8.graph.DexEncodedMethod SENTINEL -> l
-    com.android.tools.r8.graph.Code code -> e
-    com.android.tools.r8.graph.MethodAccessFlags accessFlags -> b
-    com.android.tools.r8.graph.DexEncodedMethod defaultInterfaceMethodImplementation -> i
-    1:40:void <clinit>():58:97 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):170:170 -> <init>
-    2:72:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):107:177 -> <init>
-    73:74:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,int):187:188 -> <init>
-    1:2:boolean isDirectMethod():261:262 -> A
-    1:2:boolean isInitializer():205:206 -> B
-    1:2:boolean isInstanceInitializer():210:211 -> C
-    1:2:boolean isNonAbstractVirtualMethod():238:239 -> D
-    1:1:boolean isObsolete():126:126 -> E
-    1:2:boolean isPrivateMethod():253:254 -> F
-    1:2:boolean isProcessed():200:201 -> G
-    1:2:boolean isPublicized():243:244 -> H
-    1:2:boolean isStatic():267:268 -> I
-    1:2:boolean isVirtualMethod():229:230 -> J
-    1:2:void markNotProcessed():346:347 -> K
-    1:2:java.lang.String qualifiedName():462:463 -> L
-    1:3:void removeCode():426:428 -> M
-    1:1:void setObsolete():132:132 -> N
-    1:1:boolean shouldNotHaveCode():413:413 -> O
-    1:7:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():510:516 -> P
-    1:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():579:585 -> Q
-    1:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex():555:564 -> R
-    1:7:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():707:713 -> S
-    1:1:void unsetObsolete():162:162 -> T
-    1:2:void voidCodeOwnership():438:439 -> U
-    1:1:void checkIfObsolete():120:120 -> V
-    1:2:void setCodeOwnership():432:433 -> W
-    1:1:com.android.tools.r8.graph.Code access$400(com.android.tools.r8.graph.DexEncodedMethod):58:58 -> a
-    2:2:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$502(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$CompilationState):58:58 -> a
-    3:3:com.android.tools.r8.graph.OptimizationInfo access$602(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.OptimizationInfo):58:58 -> a
-    4:6:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):192:194 -> a
-    7:8:boolean isInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):287:288 -> a
-    9:32:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):293:316 -> a
-    33:33:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):314:314 -> a
-    34:34:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):312:312 -> a
-    35:51:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):323:339 -> a
-    52:52:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):336:336 -> a
-    53:53:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):333:333 -> a
-    54:54:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):330:330 -> a
-    55:70:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):327:342 -> a
-    71:72:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):351:352 -> a
-    73:74:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):361:362 -> a
-    75:78:void setCode(com.android.tools.r8.graph.Code):367:370 -> a
-    79:81:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions):374:376 -> a
-    82:83:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):388:389 -> a
-    84:84:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
-    84:84:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):389 -> a
-    85:86:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):390:391 -> a
-    87:87:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod):50:50 -> a
-    87:87:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):391 -> a
-    88:88:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):393:393 -> a
+    1:40:void <clinit>():56:95 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):149:149 -> <init>
+    2:52:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):105:155 -> <init>
+    53:54:void setCodeOwnership():403:404 -> <init>
+    53:54:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):156 -> <init>
+    55:56:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,int):166:167 -> <init>
+    1:2:boolean isDirectMethod():232:233 -> A
+    1:2:boolean isInitializer():176:177 -> B
+    1:2:boolean isInstanceInitializer():181:182 -> C
+    1:2:boolean isNonAbstractVirtualMethod():209:210 -> D
+    1:1:boolean isObsolete():122:122 -> E
+    1:2:boolean isPrivateMethod():224:225 -> F
+    1:2:boolean isProcessed():171:172 -> G
+    1:2:boolean isPublicized():214:215 -> H
+    1:2:boolean isStatic():238:239 -> I
+    1:2:boolean isVirtualMethod():200:201 -> J
+    1:2:void markNotProcessed():317:318 -> K
+    1:2:java.lang.String qualifiedName():433:434 -> L
+    1:3:void removeCode():397:399 -> M
+    1:1:void setObsolete():128:128 -> N
+    1:1:boolean shouldNotHaveCode():384:384 -> O
+    1:7:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():481:487 -> P
+    1:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():550:556 -> Q
+    1:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex():526:535 -> R
+    1:7:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():678:684 -> S
+    1:1:void unsetObsolete():141:141 -> T
+    1:2:void voidCodeOwnership():409:410 -> U
+    1:1:void checkIfObsolete():116:116 -> V
+    1:1:com.android.tools.r8.graph.Code access$400(com.android.tools.r8.graph.DexEncodedMethod):56:56 -> a
+    2:2:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$502(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$CompilationState):56:56 -> a
+    3:3:com.android.tools.r8.graph.OptimizationInfo access$602(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.OptimizationInfo):56:56 -> a
+    4:5:boolean isInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):258:259 -> a
+    6:29:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):264:287 -> a
+    30:30:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):285:285 -> a
+    31:31:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):283:283 -> a
+    32:48:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):294:310 -> a
+    49:49:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):307:307 -> a
+    50:50:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):304:304 -> a
+    51:51:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):301:301 -> a
+    52:67:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):298:313 -> a
+    68:69:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):322:323 -> a
+    70:71:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):332:333 -> a
+    72:74:void setCode(com.android.tools.r8.graph.Code):338:340 -> a
+    75:76:void setCodeOwnership():403:404 -> a
+    75:76:void setCode(com.android.tools.r8.graph.Code):341 -> a
+    77:79:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions):345:347 -> a
+    80:81:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):359:360 -> a
+    82:82:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
+    82:82:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):360 -> a
+    83:84:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):361:362 -> a
+    85:85:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod):50:50 -> a
+    85:85:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):362 -> a
+    86:86:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):364:364 -> a
+    87:87:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
+    87:87:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):364 -> a
+    88:88:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):365:365 -> a
     89:89:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
-    89:89:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):393 -> a
-    90:90:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):394:394 -> a
-    91:91:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
-    91:91:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):394 -> a
-    92:92:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):399:399 -> a
-    93:98:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):404:409 -> a
-    99:107:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):472:480 -> a
-    108:109:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):530:531 -> a
-    110:110:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    110:110:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):532 -> a
-    111:118:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):533:540 -> a
-    119:123:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.DexItemFactory):589:593 -> a
-    124:129:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.DexItemFactory):592:597 -> a
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> a
-    130:130:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.DexItemFactory):599 -> a
-    131:131:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.DexItemFactory):600:600 -> a
-    132:132:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.DexItemFactory):599:599 -> a
-    133:133:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> a
-    133:133:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.DexItemFactory):601 -> a
-    134:164:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.DexItemFactory):602:632 -> a
-    165:174:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):636:645 -> a
-    175:217:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):661:703 -> a
-    218:226:com.android.tools.r8.ir.conversion.SourceCode lambda$toForwardingMethod$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Position):682:690 -> a
-    227:238:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):720:731 -> a
-    239:249:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):730:740 -> a
-    250:255:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):781:786 -> a
-    256:257:void setOptimizationInfo(com.android.tools.r8.graph.UpdatableOptimizationInfo):1301:1302 -> a
-    258:258:boolean hasSingleTarget():1399:1399 -> a
-    259:260:void forEachTarget(java.util.function.Consumer):1411:1412 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$500(com.android.tools.r8.graph.DexEncodedMethod):58:58 -> b
-    2:5:void lambda$toForwardingMethod$1(com.android.tools.r8.graph.UseRegistry):692:695 -> b
-    6:6:com.android.tools.r8.graph.DexEncodedMethod asSingleTarget():1393:1393 -> b
-    1:1:com.android.tools.r8.graph.OptimizationInfo access$600(com.android.tools.r8.graph.DexEncodedMethod):58:58 -> c
-    2:5:void upgradeClassFileVersion(int):455:458 -> c
-    6:6:com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve():1387:1387 -> c
-    1:1:int access$700(com.android.tools.r8.graph.DexEncodedMethod):58:58 -> d
-    2:3:java.util.List asListOfTargets():1405:1406 -> d
-    1:7:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1306:1312 -> e
-    1:10:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):140:149 -> f
-    11:12:java.lang.String toSourceString():505:506 -> f
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1317:1317 -> g
-    1:1:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():771:771 -> i
-    1:1:boolean isDexEncodedMethod():765:765 -> l
-    1:2:boolean isStaticMember():273:274 -> m
-    1:2:com.android.tools.r8.graph.DexReference toReference():759:760 -> n
-    1:1:com.android.tools.r8.graph.DexMethod getKey():754:754 -> o
-    2:2:com.android.tools.r8.graph.DexMethod getKey():754:754 -> o
-    2:2:com.android.tools.r8.graph.PresortedComparable getKey():58 -> o
-    1:8:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():568:575 -> p
-    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():550:551 -> q
-    1:3:int getClassFileVersion():444:446 -> r
-    1:2:com.android.tools.r8.graph.Code getCode():421:422 -> s
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInterfaceMethodImplementation():136:136 -> t
-    1:2:java.lang.String toString():381:382 -> toString
-    1:5:com.android.tools.r8.graph.UpdatableOptimizationInfo getMutableOptimizationInfo():1293:1297 -> u
-    1:2:com.android.tools.r8.graph.OptimizationInfo getOptimizationInfo():1288:1289 -> v
-    1:2:boolean hasAnnotation():776:777 -> w
-    1:2:boolean hasClassFileVersion():450:451 -> x
-    1:1:boolean hasCode():417:417 -> y
-    1:2:boolean isClassInitializer():220:221 -> z
-com.android.tools.r8.graph.DexEncodedMethod$1 -> a.a.a.a.g.xa:
+    89:89:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):365 -> a
+    90:90:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):370:370 -> a
+    91:96:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):375:380 -> a
+    97:105:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):443:451 -> a
+    106:107:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):501:502 -> a
+    108:108:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
+    108:108:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):503 -> a
+    109:116:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):504:511 -> a
+    117:121:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.DexItemFactory):560:564 -> a
+    122:127:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.DexItemFactory):563:568 -> a
+    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> a
+    128:128:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.DexItemFactory):570 -> a
+    129:129:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.DexItemFactory):571:571 -> a
+    130:130:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.DexItemFactory):570:570 -> a
+    131:131:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> a
+    131:131:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.DexItemFactory):572 -> a
+    132:162:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.DexItemFactory):573:603 -> a
+    163:172:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):607:616 -> a
+    173:215:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):632:674 -> a
+    216:224:com.android.tools.r8.ir.conversion.SourceCode lambda$toForwardingMethod$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Position):653:661 -> a
+    225:236:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):691:702 -> a
+    237:247:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):701:711 -> a
+    248:253:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):752:757 -> a
+    254:255:void setOptimizationInfo(com.android.tools.r8.graph.UpdatableOptimizationInfo):1254:1255 -> a
+    256:256:com.android.tools.r8.graph.DexEncodedMethod asSingleTarget():1346:1346 -> a
+    257:258:void forEachTarget(java.util.function.Consumer):1364:1365 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$500(com.android.tools.r8.graph.DexEncodedMethod):56:56 -> b
+    2:5:void upgradeClassFileVersion(int):426:429 -> b
+    6:9:void lambda$toForwardingMethod$1(com.android.tools.r8.graph.UseRegistry):663:666 -> b
+    10:11:java.util.List asListOfTargets():1358:1359 -> b
+    1:1:com.android.tools.r8.graph.OptimizationInfo access$600(com.android.tools.r8.graph.DexEncodedMethod):56:56 -> c
+    2:2:boolean hasSingleTarget():1352:1352 -> c
+    1:1:int access$700(com.android.tools.r8.graph.DexEncodedMethod):56:56 -> d
+    2:2:com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve():1340:1340 -> d
+    1:7:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1259:1265 -> e
+    1:2:java.lang.String toSourceString():476:477 -> f
+    3:3:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1270:1270 -> f
+    1:1:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():742:742 -> i
+    1:1:boolean isDexEncodedMethod():736:736 -> l
+    1:2:boolean isStaticMember():244:245 -> m
+    1:2:com.android.tools.r8.graph.DexReference toReference():730:731 -> n
+    1:1:com.android.tools.r8.graph.DexMethod getKey():725:725 -> o
+    2:2:com.android.tools.r8.graph.DexMethod getKey():725:725 -> o
+    2:2:com.android.tools.r8.graph.PresortedComparable getKey():56 -> o
+    1:8:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():539:546 -> p
+    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():521:522 -> q
+    1:3:int getClassFileVersion():415:417 -> r
+    1:2:com.android.tools.r8.graph.Code getCode():392:393 -> s
+    1:5:com.android.tools.r8.graph.UpdatableOptimizationInfo getMutableOptimizationInfo():1246:1250 -> t
+    1:2:java.lang.String toString():352:353 -> toString
+    1:2:com.android.tools.r8.graph.OptimizationInfo getOptimizationInfo():1241:1242 -> u
+    1:2:boolean hasAnnotation():747:748 -> v
+    1:2:boolean hasClassFileVersion():421:422 -> w
+    1:1:boolean hasCode():388:388 -> x
+    1:2:boolean isClassInitializer():191:192 -> y
+    1:2:boolean isDefaultInitializer():186:187 -> z
+com.android.tools.r8.graph.DexEncodedMethod$1 -> a.a.a.a.g.sa:
     int[] $SwitchMap$com$android$tools$r8$ir$optimize$Inliner$Constraint -> b
     int[] $SwitchMap$com$android$tools$r8$graph$DexEncodedMethod$CompilationState -> a
-    1:1:void <clinit>():325:325 -> <clinit>
-    2:2:void <clinit>():308:308 -> <clinit>
-com.android.tools.r8.graph.DexEncodedMethod$Builder -> a.a.a.a.g.ya:
+    1:1:void <clinit>():296:296 -> <clinit>
+    2:2:void <clinit>():279:279 -> <clinit>
+com.android.tools.r8.graph.DexEncodedMethod$Builder -> a.a.a.a.g.ta:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> f
     com.android.tools.r8.graph.DexAnnotationSet annotations -> c
     com.android.tools.r8.graph.Code code -> e
@@ -14229,20 +13917,20 @@
     com.android.tools.r8.graph.MethodAccessFlags accessFlags -> b
     com.android.tools.r8.graph.OptimizationInfo optimizationInfo -> g
     com.android.tools.r8.graph.DexMethod method -> a
-    1:1:void <clinit>():1320:1320 -> <clinit>
-    1:10:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1331:1340 -> <init>
-    1:10:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1320 -> <init>
-    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1320:1320 -> a
-    2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1344:1344 -> a
-    3:3:void setCode(com.android.tools.r8.graph.Code):1368:1368 -> a
-    4:12:com.android.tools.r8.graph.DexEncodedMethod build():1372:1380 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1348:1348 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder unsetOptimizationInfo():1353:1353 -> c
-    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1358:1362 -> d
-com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility -> a.a.a.a.g.za:
+    1:1:void <clinit>():1273:1273 -> <clinit>
+    1:10:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1284:1293 -> <init>
+    1:10:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1273 -> <init>
+    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1273:1273 -> a
+    2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1297:1297 -> a
+    3:3:void setCode(com.android.tools.r8.graph.Code):1321:1321 -> a
+    4:12:com.android.tools.r8.graph.DexEncodedMethod build():1325:1333 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1301:1301 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder unsetOptimizationInfo():1306:1306 -> c
+    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1311:1315 -> d
+com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility -> a.a.a.a.g.ua:
     boolean returnsReceiver -> a
-    1:2:void <init>(boolean):797:798 -> <init>
-com.android.tools.r8.graph.DexEncodedMethod$CompilationState -> a.a.a.a.g.Aa:
+    1:2:void <init>(boolean):768:769 -> <init>
+com.android.tools.r8.graph.DexEncodedMethod$CompilationState -> a.a.a.a.g.va:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_CLASS -> f
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_NOT_INLINING_CANDIDATE -> b
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_ANY -> c
@@ -14250,148 +13938,143 @@
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_PACKAGE -> e
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] $VALUES -> g
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState NOT_PROCESSED -> a
-    1:24:void <clinit>():70:93 -> <clinit>
-    25:25:void <clinit>():66:66 -> <clinit>
-    1:1:void <init>(java.lang.String,int):66:66 -> <init>
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] values():66:66 -> a
-com.android.tools.r8.graph.DexEncodedMethod$DefaultOptimizationInfoImpl -> a.a.a.a.g.Ba:
-    boolean UNKNOWN_INITIALIZER_ENABLING_JAVA_ASSERTIONS -> n
-    boolean UNKNOWN_MAY_HAVE_SIDE_EFFECTS -> p
-    boolean DOES_NOT_USE_IDNETIFIER_NAME_STRING -> i
-    boolean UNKNOWN_CHECKS_NULL_RECEIVER_BEFORE_ANY_SIDE_EFFECT -> j
-    boolean UNKNOWN_TRIGGERS_CLASS_INIT_BEFORE_ANY_SIDE_EFFECT -> k
-    long UNKNOWN_RETURNED_CONSTANT_NUMBER -> g
-    com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer UNKNOWN_TRIVIAL_INITIALIZER -> m
-    java.util.BitSet NO_NULL_PARAMETER_OR_THROW_FACTS -> q
-    java.util.Set UNKNOWN_INITIALIZED_CLASSES_ON_NORMAL_EXIT -> b
-    int UNKNOWN_RETURNED_ARGUMENT -> c
-    java.util.BitSet NO_NULL_PARAMETER_ON_NORMAL_EXITS_FACTS -> r
-    com.android.tools.r8.graph.ParameterUsagesInfo UNKNOWN_PARAMETER_USAGE_INFO -> o
-    boolean $assertionsDisabled -> s
+    1:24:void <clinit>():68:91 -> <clinit>
+    25:25:void <clinit>():64:64 -> <clinit>
+    1:1:void <init>(java.lang.String,int):64:64 -> <init>
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] values():64:64 -> a
+com.android.tools.r8.graph.DexEncodedMethod$DefaultOptimizationInfoImpl -> a.a.a.a.g.wa:
+    boolean UNKNOWN_INITIALIZER_ENABLING_JAVA_ASSERTIONS -> m
+    boolean UNKNOWN_MAY_HAVE_SIDE_EFFECTS -> o
+    long UNKNOWN_RETURNED_CONSTANT_NUMBER -> f
+    boolean UNKNOWN_CHECKS_NULL_RECEIVER_BEFORE_ANY_SIDE_EFFECT -> i
+    boolean UNKNOWN_TRIGGERS_CLASS_INIT_BEFORE_ANY_SIDE_EFFECT -> j
+    java.util.BitSet NO_NULL_PARAMETER_ON_NORMAL_EXITS_FACTS -> q
+    java.util.BitSet NO_NULL_PARAMETER_OR_THROW_FACTS -> p
+    int UNKNOWN_RETURNED_ARGUMENT -> b
+    com.android.tools.r8.graph.ParameterUsagesInfo UNKNOWN_PARAMETER_USAGE_INFO -> n
+    boolean $assertionsDisabled -> r
     com.android.tools.r8.graph.OptimizationInfo DEFAULT_INSTANCE -> a
-    boolean UNKNOWN_NEVER_RETURNS_NORMALLY -> e
-    com.android.tools.r8.graph.DexString UNKNOWN_RETURNED_CONSTANT_STRING -> h
-    boolean UNKNOWN_RETURNS_CONSTANT -> f
-    boolean UNKNOWN_NEVER_RETURNS_NULL -> d
-    com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility UNKNOWN_CLASS_INLINER_ELIGIBILITY -> l
-    1:20:void <clinit>():824:843 -> <clinit>
-    1:1:void <init>():845:845 -> <init>
-    1:1:com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):859:859 -> a
-    2:2:com.android.tools.r8.graph.UpdatableOptimizationInfo mutableCopy():968:968 -> a
-    1:1:java.util.BitSet getNonNullParamOnNormalExits():870:870 -> b
-    1:1:boolean checksNullReceiverBeforeAnySideEffect():953:953 -> c
-    1:2:int getReturnedArgument():885:886 -> d
-    1:1:com.android.tools.r8.graph.DexString getReturnedConstantString():927:927 -> e
-    2:2:boolean returnsConstantString():911:911 -> e
-    2:2:com.android.tools.r8.graph.DexString getReturnedConstantString():927 -> e
-    3:4:com.android.tools.r8.graph.DexString getReturnedConstantString():927:928 -> e
-    boolean neverInline() -> f
-    1:1:boolean neverReturnsNormally():896:896 -> g
-    1:1:boolean returnsConstant():901:901 -> h
-    1:1:boolean returnsConstantString():911:911 -> i
-    1:1:boolean useIdentifierNameString():938:938 -> j
-    1:1:boolean triggersClassInitBeforeAnySideEffect():958:958 -> k
-    1:1:boolean returnsConstantNumber():906:906 -> l
-    boolean returnsArgument() -> m
-    1:1:boolean neverReturnsNull():891:891 -> n
-    boolean isReachabilitySensitive() -> o
-    boolean forceInline() -> p
-    1:1:boolean mayHaveSideEffects():963:963 -> q
-    1:1:long getReturnedConstantNumber():921:921 -> r
-    2:2:boolean returnsConstantNumber():906:906 -> r
-    2:2:long getReturnedConstantNumber():921 -> r
-    3:4:long getReturnedConstantNumber():921:922 -> r
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility():916:916 -> s
-    1:1:java.util.Set getInitializedClassesOnNormalExit():849:849 -> t
-    1:1:boolean isInitializerEnablingJavaAssertions():933:933 -> u
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo():854:854 -> v
-    1:1:java.util.BitSet getNonNullParamOrThrow():865:865 -> w
-com.android.tools.r8.graph.DexEncodedMethod$OptimizationInfoImpl -> a.a.a.a.g.Ca:
-    boolean triggersClassInitBeforeAnySideEffect -> m
-    boolean initializerEnablingJavaAssertions -> p
-    boolean useIdentifierNameString -> k
-    long returnedConstantNumber -> g
-    boolean checksNullReceiverBeforeAnySideEffect -> l
-    boolean $assertionsDisabled -> u
-    com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer trivialInitializerInfo -> o
-    java.util.Set initializedClassesOnNormalExit -> a
-    int returnedArgument -> b
-    com.android.tools.r8.graph.OptimizationInfo$InlinePreference inlining -> j
-    java.util.BitSet nonNullParamOnNormalExits -> s
-    java.util.BitSet nonNullParamOrThrow -> r
-    boolean reachabilitySensitive -> t
-    com.android.tools.r8.graph.ParameterUsagesInfo parametersUsages -> q
-    boolean neverReturnsNormally -> e
-    boolean returnsConstantNumber -> f
-    com.android.tools.r8.graph.DexString returnedConstantString -> i
-    com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility classInlinerEligibility -> n
-    boolean returnsConstantString -> h
-    boolean mayHaveSideEffects -> c
-    boolean neverReturnsNull -> d
-    1:1:void <clinit>():972:972 -> <clinit>
-    1:1:void <init>():1022:1022 -> <init>
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):972 -> <init>
-    2:48:void <init>():974:1020 -> <init>
-    2:48:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):972 -> <init>
-    49:49:void <init>(com.android.tools.r8.graph.DexEncodedMethod$OptimizationInfoImpl):1026:1026 -> <init>
-    50:120:void <init>(com.android.tools.r8.graph.DexEncodedMethod$OptimizationInfoImpl):974:1044 -> <init>
-    1:1:void markNeverReturnsNormally():1225:1225 -> A
-    1:1:void markNeverReturnsNull():1220:1220 -> B
-    1:1:void markUseIdentifierNameString():1267:1267 -> C
-    1:1:void setInitializerEnablingJavaAssertions():1198:1198 -> D
-    1:1:com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):1059:1059 -> a
-    2:2:void setParameterUsages(com.android.tools.r8.graph.ParameterUsagesInfo):1168:1168 -> a
-    3:3:void setNonNullParamOnNormalExits(java.util.BitSet):1178:1178 -> a
-    4:4:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):1188:1188 -> a
-    5:5:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):1193:1193 -> a
-    6:6:void markInitializesClassesOnNormalExit(java.util.Set):1203:1203 -> a
-    7:10:void markReturnsConstantNumber(long):1230:1233 -> a
-    11:14:void markReturnsConstantString(com.android.tools.r8.graph.DexString):1238:1241 -> a
-    15:15:void markCheckNullReceiverBeforeAnySideEffect(boolean):1272:1272 -> a
-    16:17:com.android.tools.r8.graph.UpdatableOptimizationInfo mutableCopy():1282:1283 -> a
-    1:1:java.util.BitSet getNonNullParamOnNormalExits():1069:1069 -> b
-    2:2:void setNonNullParamOrThrow(java.util.BitSet):1173:1173 -> b
-    3:5:void markReturnsArgument(int):1208:1210 -> b
-    6:6:void markTriggerClassInitBeforeAnySideEffect(boolean):1277:1277 -> b
-    1:1:boolean checksNullReceiverBeforeAnySideEffect():1153:1153 -> c
-    2:2:void setReachabilitySensitive(boolean):1183:1183 -> c
-    1:1:int getReturnedArgument():1084:1084 -> d
-    2:2:boolean returnsArgument():1079:1079 -> d
-    2:2:int getReturnedArgument():1084 -> d
-    3:4:int getReturnedArgument():1084:1085 -> d
-    1:2:com.android.tools.r8.graph.DexString getReturnedConstantString():1127:1128 -> e
-    1:1:boolean neverInline():1148:1148 -> f
-    1:1:boolean neverReturnsNormally():1095:1095 -> g
-    1:2:boolean returnsConstant():1100:1101 -> h
-    1:1:boolean returnsConstantString():1111:1111 -> i
-    1:1:boolean useIdentifierNameString():1138:1138 -> j
-    1:1:boolean triggersClassInitBeforeAnySideEffect():1158:1158 -> k
-    1:1:boolean returnsConstantNumber():1106:1106 -> l
-    1:1:boolean returnsArgument():1079:1079 -> m
-    1:1:boolean neverReturnsNull():1090:1090 -> n
-    1:1:boolean isReachabilitySensitive():1074:1074 -> o
-    1:1:boolean forceInline():1143:1143 -> p
-    1:1:boolean mayHaveSideEffects():1163:1163 -> q
-    1:2:long getReturnedConstantNumber():1121:1122 -> r
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility():1116:1116 -> s
-    1:1:java.util.Set getInitializedClassesOnNormalExit():1049:1049 -> t
-    1:1:boolean isInitializerEnablingJavaAssertions():1133:1133 -> u
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo():1054:1054 -> v
-    1:1:java.util.BitSet getNonNullParamOrThrow():1064:1064 -> w
-    1:2:void markForceInline():1247:1248 -> x
-    1:1:void markMayNotHaveSideEffects():1215:1215 -> y
-    1:2:void markNeverInline():1261:1262 -> z
-com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer -> a.a.a.a.g.Fa:
-    1:1:void <init>():803:803 -> <init>
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):802 -> <init>
-com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer -> a.a.a.a.g.Da:
+    com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer UNKNOWN_TRIVIAL_INITIALIZER -> l
+    com.android.tools.r8.graph.DexString UNKNOWN_RETURNED_CONSTANT_STRING -> g
+    boolean UNKNOWN_RETURNS_CONSTANT -> e
+    boolean DOES_NOT_USE_IDNETIFIER_NAME_STRING -> h
+    com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility UNKNOWN_CLASS_INLINER_ELIGIBILITY -> k
+    boolean UNKNOWN_NEVER_RETURNS_NULL -> c
+    boolean UNKNOWN_NEVER_RETURNS_NORMALLY -> d
+    1:19:void <clinit>():795:813 -> <clinit>
+    1:1:void <init>():815:815 -> <init>
+    1:1:com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):824:824 -> a
+    2:2:com.android.tools.r8.graph.UpdatableOptimizationInfo mutableCopy():933:933 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo():819:819 -> b
+    1:1:boolean returnsConstantString():876:876 -> c
+    1:1:boolean triggersClassInitBeforeAnySideEffect():923:923 -> d
+    1:1:java.util.BitSet getNonNullParamOrThrow():830:830 -> e
+    boolean returnsArgument() -> f
+    1:1:boolean isInitializerEnablingJavaAssertions():898:898 -> g
+    1:1:boolean checksNullReceiverBeforeAnySideEffect():918:918 -> h
+    boolean forceInline() -> i
+    1:1:boolean mayHaveSideEffects():928:928 -> j
+    boolean neverInline() -> k
+    1:1:com.android.tools.r8.graph.DexString getReturnedConstantString():892:892 -> l
+    2:2:boolean returnsConstantString():876:876 -> l
+    2:2:com.android.tools.r8.graph.DexString getReturnedConstantString():892 -> l
+    3:4:com.android.tools.r8.graph.DexString getReturnedConstantString():892:893 -> l
+    1:1:boolean useIdentifierNameString():903:903 -> m
+    boolean isReachabilitySensitive() -> n
+    1:1:boolean neverReturnsNull():856:856 -> o
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility():881:881 -> p
+    1:2:int getReturnedArgument():850:851 -> q
+    1:1:boolean returnsConstant():866:866 -> r
+    1:1:java.util.BitSet getNonNullParamOnNormalExits():835:835 -> s
+    1:1:boolean neverReturnsNormally():861:861 -> t
+    1:1:boolean returnsConstantNumber():871:871 -> u
+    1:1:long getReturnedConstantNumber():886:886 -> v
+    2:2:boolean returnsConstantNumber():871:871 -> v
+    2:2:long getReturnedConstantNumber():886 -> v
+    3:4:long getReturnedConstantNumber():886:887 -> v
+com.android.tools.r8.graph.DexEncodedMethod$OptimizationInfoImpl -> a.a.a.a.g.xa:
+    boolean initializerEnablingJavaAssertions -> o
+    long returnedConstantNumber -> f
+    boolean useIdentifierNameString -> j
+    boolean checksNullReceiverBeforeAnySideEffect -> k
+    boolean triggersClassInitBeforeAnySideEffect -> l
+    java.util.BitSet nonNullParamOrThrow -> q
+    com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer trivialInitializerInfo -> n
+    com.android.tools.r8.graph.OptimizationInfo$InlinePreference inlining -> i
+    java.util.BitSet nonNullParamOnNormalExits -> r
+    boolean reachabilitySensitive -> s
+    boolean $assertionsDisabled -> t
+    int returnedArgument -> a
+    com.android.tools.r8.graph.ParameterUsagesInfo parametersUsages -> p
+    boolean returnsConstantNumber -> e
+    com.android.tools.r8.graph.DexString returnedConstantString -> h
+    boolean returnsConstantString -> g
+    boolean mayHaveSideEffects -> b
+    boolean neverReturnsNull -> c
+    com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility classInlinerEligibility -> m
+    boolean neverReturnsNormally -> d
+    1:1:void <clinit>():937:937 -> <clinit>
+    1:1:void <init>():985:985 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):937 -> <init>
+    2:46:void <init>():939:983 -> <init>
+    2:46:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):937 -> <init>
+    47:47:void <init>(com.android.tools.r8.graph.DexEncodedMethod$OptimizationInfoImpl):989:989 -> <init>
+    48:116:void <init>(com.android.tools.r8.graph.DexEncodedMethod$OptimizationInfoImpl):939:1007 -> <init>
+    1:1:void markNeverReturnsNull():1173:1173 -> A
+    1:1:void markUseIdentifierNameString():1220:1220 -> B
+    1:1:void setInitializerEnablingJavaAssertions():1156:1156 -> C
+    1:1:com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):1017:1017 -> a
+    2:2:void setParameterUsages(com.android.tools.r8.graph.ParameterUsagesInfo):1126:1126 -> a
+    3:3:void setNonNullParamOnNormalExits(java.util.BitSet):1136:1136 -> a
+    4:4:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):1146:1146 -> a
+    5:5:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):1151:1151 -> a
+    6:9:void markReturnsConstantNumber(long):1183:1186 -> a
+    10:13:void markReturnsConstantString(com.android.tools.r8.graph.DexString):1191:1194 -> a
+    14:14:void markCheckNullReceiverBeforeAnySideEffect(boolean):1225:1225 -> a
+    15:16:com.android.tools.r8.graph.UpdatableOptimizationInfo mutableCopy():1235:1236 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo():1012:1012 -> b
+    2:2:void setNonNullParamOrThrow(java.util.BitSet):1131:1131 -> b
+    3:5:void markReturnsArgument(int):1161:1163 -> b
+    6:6:void markTriggerClassInitBeforeAnySideEffect(boolean):1230:1230 -> b
+    1:1:boolean returnsConstantString():1069:1069 -> c
+    2:2:void setReachabilitySensitive(boolean):1141:1141 -> c
+    1:1:boolean triggersClassInitBeforeAnySideEffect():1116:1116 -> d
+    1:1:java.util.BitSet getNonNullParamOrThrow():1022:1022 -> e
+    1:1:boolean returnsArgument():1037:1037 -> f
+    1:1:boolean isInitializerEnablingJavaAssertions():1091:1091 -> g
+    1:1:boolean checksNullReceiverBeforeAnySideEffect():1111:1111 -> h
+    1:1:boolean forceInline():1101:1101 -> i
+    1:1:boolean mayHaveSideEffects():1121:1121 -> j
+    1:1:boolean neverInline():1106:1106 -> k
+    1:2:com.android.tools.r8.graph.DexString getReturnedConstantString():1085:1086 -> l
+    1:1:boolean useIdentifierNameString():1096:1096 -> m
+    1:1:boolean isReachabilitySensitive():1032:1032 -> n
+    1:1:boolean neverReturnsNull():1048:1048 -> o
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility():1074:1074 -> p
+    1:1:int getReturnedArgument():1042:1042 -> q
+    2:2:boolean returnsArgument():1037:1037 -> q
+    2:2:int getReturnedArgument():1042 -> q
+    3:4:int getReturnedArgument():1042:1043 -> q
+    1:2:boolean returnsConstant():1058:1059 -> r
+    1:1:java.util.BitSet getNonNullParamOnNormalExits():1027:1027 -> s
+    1:1:boolean neverReturnsNormally():1053:1053 -> t
+    1:1:boolean returnsConstantNumber():1064:1064 -> u
+    1:2:long getReturnedConstantNumber():1079:1080 -> v
+    1:2:void markForceInline():1200:1201 -> w
+    1:1:void markMayNotHaveSideEffects():1168:1168 -> x
+    1:2:void markNeverInline():1214:1215 -> y
+    1:1:void markNeverReturnsNormally():1178:1178 -> z
+com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer -> a.a.a.a.g.Aa:
+    1:1:void <init>():774:774 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):773 -> <init>
+com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer -> a.a.a.a.g.ya:
     com.android.tools.r8.graph.DexField field -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexField):818:819 -> <init>
-com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer -> a.a.a.a.g.Ea:
+    1:2:void <init>(com.android.tools.r8.graph.DexField):789:790 -> <init>
+com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer -> a.a.a.a.g.za:
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer INSTANCE -> a
-    1:1:void <clinit>():809:809 -> <clinit>
-    1:1:void <init>():808:808 -> <init>
-com.android.tools.r8.graph.DexField -> a.a.a.a.g.Ha:
+    1:1:void <clinit>():780:780 -> <clinit>
+    1:1:void <init>():779:779 -> <init>
+com.android.tools.r8.graph.DexField -> a.a.a.a.g.Ca:
     com.android.tools.r8.graph.DexString name -> f
     com.android.tools.r8.graph.DexType holder -> d
     com.android.tools.r8.graph.DexType type -> e
@@ -14410,10 +14093,10 @@
     2:2:int compareTo(com.android.tools.r8.graph.DexField):78:78 -> compareTo
     2:2:int compareTo(java.lang.Object):10 -> compareTo
     1:1:java.lang.String toSmaliString():131:131 -> e
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():113:113 -> e
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():355:355 -> e
     2:2:java.lang.String toSmaliString():131 -> e
     3:3:java.lang.String toSmaliString():131:131 -> e
-    4:4:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():113:113 -> e
+    4:4:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():355:355 -> e
     4:4:java.lang.String toSmaliString():131 -> e
     5:5:java.lang.String toSmaliString():131:131 -> e
     1:1:java.lang.String toSourceString():136:136 -> f
@@ -14423,8 +14106,9 @@
     1:3:int computeHashCode():29:31 -> g
     com.android.tools.r8.graph.DexField asDexField() -> j
     boolean isDexField() -> n
+    1:1:java.lang.String qualifiedName():126:126 -> q
     1:1:java.lang.String toString():47:47 -> toString
-com.android.tools.r8.graph.DexItem -> a.a.a.a.g.Ia:
+com.android.tools.r8.graph.DexItem -> a.a.a.a.g.Da:
     1:1:void <init>():12:12 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
     void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection) -> a
@@ -14440,418 +14124,388 @@
     1:1:void lambda$collectAll$2(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexItem):24:24 -> b
     1:1:java.lang.String toSmaliString():60:60 -> e
     1:1:java.lang.String toSourceString():64:64 -> f
-com.android.tools.r8.graph.DexItemFactory -> a.a.a.a.g._a:
-    com.android.tools.r8.graph.DexString unboxFloatMethodName -> Q
-    com.android.tools.r8.graph.DexType boxedCharType -> vb
+com.android.tools.r8.graph.DexItemFactory -> a.a.a.a.g.Sa:
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> Rb
+    com.android.tools.r8.graph.DexString unboxLongMethodName -> Q
+    com.android.tools.r8.graph.DexType boxedShortType -> vb
     com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd setPrologueEnd -> m
-    com.android.tools.r8.graph.DexString proxyDescriptor -> Ya
-    com.android.tools.r8.graph.DexString unknownTypeName -> Zc
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> Zb
-    com.android.tools.r8.graph.DexType doubleType -> nb
-    com.android.tools.r8.graph.DexString indexOfMethodName -> aa
-    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> sc
-    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> Lc
+    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> Ya
+    com.android.tools.r8.graph.DexType voidType -> nb
+    com.android.tools.r8.graph.DexString contentEqualsMethodName -> aa
     com.android.tools.r8.graph.DexString voidDescriptor -> A
-    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> Xc
-    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> lc
-    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> jb
-    com.android.tools.r8.graph.DexType callSiteType -> Fc
+    com.android.tools.r8.graph.DexType booleanType -> fb
     java.util.concurrent.ConcurrentHashMap strings -> a
-    com.android.tools.r8.graph.DexString classArrayDescriptor -> Ia
-    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> oc
-    com.android.tools.r8.graph.DexMethod stringConcatMethod -> Qc
-    com.android.tools.r8.graph.DexString objectsDescriptor -> Qa
-    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> hc
-    com.android.tools.r8.graph.DexString unboxDoubleMethodName -> R
-    com.android.tools.r8.graph.DexType npeType -> Vb
-    com.android.tools.r8.graph.DexType annotationInnerClass -> wc
+    com.android.tools.r8.graph.DexString fieldDescriptor -> Ia
+    com.android.tools.r8.graph.DexString stringBufferDescriptor -> Qa
+    com.android.tools.r8.graph.DexString unboxFloatMethodName -> R
+    com.android.tools.r8.graph.DexType lookupType -> wc
     com.android.tools.r8.graph.DexString booleanDescriptor -> s
-    com.android.tools.r8.graph.DexString invokeMethodName -> ya
-    com.android.tools.r8.graph.DexType classLoaderType -> Nb
+    com.android.tools.r8.graph.DexString invokeExactMethodName -> ya
+    com.android.tools.r8.graph.DexType methodHandleType -> Nb
+    com.android.tools.r8.graph.DexType annotationMethodParameters -> oc
     boolean sorted -> r
-    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> ab
-    com.android.tools.r8.graph.DexType objectType -> Fb
+    com.android.tools.r8.graph.DexString classConstructorMethodName -> ab
+    com.android.tools.r8.graph.DexType throwableType -> Fb
     com.android.tools.r8.graph.DexString boxedBooleanDescriptor -> B
-    com.android.tools.r8.graph.DexString getClassMethodName -> ia
+    com.android.tools.r8.graph.DexString toStringMethodName -> ia
     java.util.concurrent.ConcurrentHashMap referenceTypeLatticeElements -> p
-    java.util.Set libraryTypesAssumedToBePresent -> Uc
-    com.android.tools.r8.graph.DexString getTypeNameName -> qa
-    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> rc
-    com.android.tools.r8.graph.DexString isEmptyMethodName -> S
+    com.android.tools.r8.graph.DexString getSimpleNameName -> qa
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> Sb
+    com.android.tools.r8.graph.DexString unboxDoubleMethodName -> S
     com.android.tools.r8.graph.DexString byteDescriptor -> t
-    com.android.tools.r8.graph.DexType boxedByteType -> ub
-    com.android.tools.r8.graph.DexString npeDescriptor -> Xa
-    com.android.tools.r8.graph.DexType charType -> mb
+    com.android.tools.r8.graph.DexType boxedLongType -> ub
+    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> Xa
+    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> Vb
+    com.android.tools.r8.graph.DexType shortType -> mb
     com.android.tools.r8.graph.DexString boxedByteDescriptor -> C
-    com.android.tools.r8.graph.DexString autoCloseableDescriptor -> Ha
-    com.android.tools.r8.graph.DexType metafactoryType -> Ec
-    com.android.tools.r8.graph.DexMethod stringConcatWithConstantsMethod -> Pc
-    com.android.tools.r8.graph.DexString exceptionInInitializerErrorDescriptor -> Pa
-    com.android.tools.r8.graph.DexString lengthMethodName -> T
+    com.android.tools.r8.graph.DexString classArrayDescriptor -> Ha
+    com.android.tools.r8.graph.DexString stringBuilderDescriptor -> Pa
+    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> Ic
+    com.android.tools.r8.graph.DexString isEmptyMethodName -> T
     com.android.tools.r8.graph.DexString charDescriptor -> u
-    com.android.tools.r8.graph.DexType invocationHandlerType -> Ub
-    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> vc
-    com.android.tools.r8.graph.DexString assertionsDisabled -> xa
-    com.android.tools.r8.graph.DexType classType -> Mb
+    com.android.tools.r8.graph.DexType callSiteType -> vc
+    com.android.tools.r8.graph.DexString invokeMethodName -> xa
+    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> bc
+    com.android.tools.r8.graph.DexType varHandleType -> Mb
+    com.android.tools.r8.graph.DexType annotationMemberClasses -> nc
     com.android.tools.r8.graph.DexString boxedCharDescriptor -> D
-    com.android.tools.r8.graph.DexType stringArrayType -> Eb
-    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> gc
-    com.android.tools.r8.graph.DexString toStringMethodName -> ha
-    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> jc
-    java.util.Set libraryMethodsWithoutSideEffects -> Tc
-    com.android.tools.r8.graph.DexString getSimpleNameName -> pa
-    com.android.tools.r8.graph.DexString stringBufferDescriptor -> Sa
-    com.android.tools.r8.graph.DexType boxedBooleanType -> tb
+    com.android.tools.r8.graph.DexType annotationType -> Eb
+    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> Xb
+    com.android.tools.r8.graph.DexString valueOfMethodName -> ha
+    com.android.tools.r8.graph.DexString getCanonicalNameName -> pa
+    com.android.tools.r8.graph.DexString methodHandleDescriptor -> Sa
+    com.android.tools.r8.graph.DexType boxedIntType -> tb
+    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> ic
     java.util.Map setInlineFrames -> o
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap defaults -> i
-    com.android.tools.r8.graph.DexType byteType -> lb
-    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> qc
-    com.android.tools.r8.graph.DexString newUpdaterName -> db
-    com.android.tools.r8.graph.DexString stringArrayDescriptor -> Ca
+    com.android.tools.r8.graph.DexType longType -> lb
+    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> Cc
+    com.android.tools.r8.graph.DexString objectDescriptor -> Ca
     com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin setEpilogueBegin -> l
     java.util.concurrent.ConcurrentHashMap methods -> e
-    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> Dc
-    com.android.tools.r8.graph.DexString fieldDescriptor -> Ka
-    com.android.tools.r8.graph.DexString unboxCharMethodName -> M
+    com.android.tools.r8.graph.DexType charArrayType -> db
+    com.android.tools.r8.graph.DexType stringConcatFactoryType -> Dc
+    com.android.tools.r8.graph.DexString enumDescriptor -> Ka
+    com.android.tools.r8.graph.DexString unboxByteMethodName -> M
     com.android.tools.r8.graph.DexString getFieldName -> sa
-    com.android.tools.r8.graph.DexType methodTypeType -> Tb
-    com.android.tools.r8.graph.DexType annotationEnclosingClass -> uc
+    com.android.tools.r8.graph.DexType metafactoryType -> uc
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advancePCs -> h
-    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> bc
-    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> Lb
-    com.android.tools.r8.graph.DexString compareToMethodName -> ca
-    com.android.tools.r8.graph.DexItemFactory$LongMethods longMethods -> dc
+    java.util.Set libraryTypesWithoutStaticInitialization -> Gc
+    com.android.tools.r8.graph.DexType stringBufferType -> Lb
+    com.android.tools.r8.graph.DexType annotationInnerClass -> mc
+    com.android.tools.r8.graph.DexString lastIndexOfMethodName -> ca
     java.util.concurrent.ConcurrentHashMap protos -> d
-    com.android.tools.r8.graph.DexType stringType -> Db
-    com.android.tools.r8.graph.DexString ordinalMethodName -> ka
-    com.android.tools.r8.graph.DexString unboxShortMethodName -> N
-    com.android.tools.r8.graph.DexString stringBuilderDescriptor -> Ra
-    com.android.tools.r8.graph.DexType voidType -> sb
-    com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> Za
+    com.android.tools.r8.graph.DexType enumType -> Db
+    com.android.tools.r8.graph.DexString finalizeMethodName -> ka
+    com.android.tools.r8.graph.DexString unboxCharMethodName -> N
+    com.android.tools.r8.graph.DexString varHandleDescriptor -> Ra
+    com.android.tools.r8.graph.DexType boxedFloatType -> sb
+    com.android.tools.r8.graph.DexString newUpdaterName -> Za
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap restartLocals -> k
-    com.android.tools.r8.graph.DexType comparableType -> Kc
-    com.android.tools.r8.graph.DexType booleanType -> kb
-    com.android.tools.r8.graph.DexString stringDescriptor -> Ba
-    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> cb
+    com.android.tools.r8.graph.DexType intType -> kb
+    com.android.tools.r8.graph.DexMethod metafactoryMethod -> Bc
+    com.android.tools.r8.graph.DexString stringArrayDescriptor -> Ba
+    com.android.tools.r8.graph.DexString charArrayDescriptor -> cb
     java.util.concurrent.ConcurrentHashMap fields -> c
-    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> Cc
-    com.android.tools.r8.graph.DexString constructorDescriptor -> Ja
-    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> ac
-    com.android.tools.r8.graph.DexString unboxIntMethodName -> O
-    com.android.tools.r8.graph.DexString unboxLongMethodName -> P
-    com.android.tools.r8.graph.DexString getDeclaredConstructorName -> ra
-    com.android.tools.r8.graph.DexType methodHandleType -> Sb
-    com.android.tools.r8.graph.DexType annotationDefault -> tc
+    com.android.tools.r8.graph.DexString unknownTypeName -> Kc
+    com.android.tools.r8.graph.DexString methodDescriptor -> Ja
+    com.android.tools.r8.graph.DexString unboxShortMethodName -> O
+    com.android.tools.r8.graph.DexString unboxIntMethodName -> P
+    com.android.tools.r8.graph.DexString getTypeNameName -> ra
+    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> _b
+    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> tc
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap endLocals -> j
-    com.android.tools.r8.graph.DexString invokeExactMethodName -> za
-    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> bb
-    com.android.tools.r8.graph.DexString charSequenceDescriptor -> Aa
-    com.android.tools.r8.graph.DexType throwableType -> Kb
-    com.android.tools.r8.graph.DexString lastIndexOfMethodName -> ba
-    com.android.tools.r8.graph.DexType charSequenceType -> Cb
+    com.android.tools.r8.graph.DexString charSequenceDescriptor -> za
+    java.util.IdentityHashMap internalSentinels -> Lc
+    boolean $assertionsDisabled -> Mc
+    com.android.tools.r8.graph.DexString thisName -> bb
+    com.android.tools.r8.graph.DexString stringDescriptor -> Aa
+    com.android.tools.r8.graph.DexType stringBuilderType -> Kb
+    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> lc
+    com.android.tools.r8.graph.DexString indexOfMethodName -> ba
+    com.android.tools.r8.graph.DexType classArrayType -> Cb
     java.util.concurrent.ConcurrentHashMap types -> b
-    java.util.Set libraryTypesWithoutStaticInitialization -> Vc
-    com.android.tools.r8.graph.DexString finalizeMethodName -> ja
+    com.android.tools.r8.graph.DexString getClassMethodName -> ja
     com.android.tools.r8.utils.LRUCacheTable leastUpperBoundOfInterfacesTable -> q
-    com.android.tools.r8.graph.DexString methodHandleDescriptor -> Ua
-    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> fc
-    com.android.tools.r8.graph.DexType shortType -> rb
-    com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> Y
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods utilArraysMethods -> ec
+    com.android.tools.r8.graph.DexString npeDescriptor -> Ua
+    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> Yb
+    com.android.tools.r8.graph.DexType boxedDoubleType -> rb
+    com.android.tools.r8.graph.DexString equalsMethodName -> Y
     com.android.tools.r8.graph.DexString shortDescriptor -> z
-    com.android.tools.r8.kotlin.Kotlin kotlin -> mc
-    com.android.tools.r8.graph.DexType externalizableType -> Jc
-    com.android.tools.r8.graph.DexString classConstructorMethodName -> fb
-    com.android.tools.r8.graph.DexString objectArrayDescriptor -> Ea
-    java.util.IdentityHashMap internalSentinels -> _c
-    com.android.tools.r8.graph.DexMethod metafactoryMethod -> Mc
+    com.android.tools.r8.graph.DexType floatType -> jb
+    com.android.tools.r8.graph.DexMethod stringConcatWithConstantsMethod -> Ec
+    com.android.tools.r8.graph.DexType nullValueType -> Jc
+    com.android.tools.r8.graph.DexString classDescriptor -> Ea
     com.android.tools.r8.graph.DexString boxedShortDescriptor -> I
-    com.android.tools.r8.graph.DexString enumDescriptor -> Ma
-    com.android.tools.r8.graph.DexType annotationThrows -> Bc
+    com.android.tools.r8.graph.DexString throwableDescriptor -> Ma
     com.android.tools.r8.graph.DexString getMethodName -> ua
-    com.android.tools.r8.graph.DexType varHandleType -> Rb
-    com.android.tools.r8.graph.DexString contentEqualsMethodName -> Z
-    com.android.tools.r8.graph.DexType annotationType -> Jb
-    com.android.tools.r8.graph.DexString cloneMethodName -> ea
-    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> kc
-    com.android.tools.r8.graph.DexType boxedNumberType -> Bb
+    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> sc
+    com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> Z
+    com.android.tools.r8.graph.DexType autoCloseableType -> Jb
+    com.android.tools.r8.graph.DexType annotationEnclosingClass -> kc
+    com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> ea
+    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> fc
+    com.android.tools.r8.graph.DexType objectArrayType -> Bb
     com.android.tools.r8.graph.DexString boxedNumberDescriptor -> J
-    com.android.tools.r8.graph.DexString forNameMethodName -> ma
-    com.android.tools.r8.graph.DexType nullValueType -> Yc
-    com.android.tools.r8.graph.DexType boxedIntType -> yb
-    com.android.tools.r8.graph.DexString varHandleDescriptor -> Ta
+    com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> ma
+    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> gc
+    com.android.tools.r8.graph.DexType stringType -> yb
+    com.android.tools.r8.graph.DexString methodTypeDescriptor -> Ta
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advanceLines -> g
-    com.android.tools.r8.graph.DexType longType -> qb
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> _b
-    com.android.tools.r8.graph.DexType charArrayType -> ib
-    com.android.tools.r8.graph.DexString objectDescriptor -> Da
-    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> cc
-    com.android.tools.r8.graph.DexString constructorMethodName -> eb
-    com.android.tools.r8.graph.DexType serializableType -> Ic
-    com.android.tools.r8.graph.DexString unboxBooleanMethodName -> K
-    com.android.tools.r8.graph.DexString methodDescriptor -> La
-    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> Ac
-    boolean skipNameValidationForTesting -> Wc
-    com.android.tools.r8.graph.DexType listType -> Yb
-    com.android.tools.r8.graph.DexType annotationSignature -> zc
+    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> Zb
+    com.android.tools.r8.graph.DexType boxedCharType -> qb
+    com.android.tools.r8.graph.DexType doubleType -> ib
+    com.android.tools.r8.graph.DexString objectArrayDescriptor -> Da
+    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> eb
+    com.android.tools.r8.graph.DexString initMethodName -> K
+    com.android.tools.r8.graph.DexString annotationDescriptor -> La
+    com.android.tools.r8.graph.DexType comparableType -> Ac
+    com.android.tools.r8.graph.DexType externalizableType -> zc
     com.android.tools.r8.graph.DexString getDeclaredFieldName -> ta
     java.util.Map setFiles -> n
-    com.android.tools.r8.graph.DexType stringBufferType -> Qb
+    com.android.tools.r8.graph.DexType serviceLoaderType -> Qb
+    com.android.tools.r8.graph.DexType annotationThrows -> rc
+    com.android.tools.r8.graph.DexType annotationDefault -> jc
     java.util.concurrent.ConcurrentHashMap methodHandles -> f
-    com.android.tools.r8.graph.DexType enumType -> Ib
-    com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> da
-    com.android.tools.r8.graph.DexType boxedShortType -> Ab
-    com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> la
-    com.android.tools.r8.graph.DexString unboxByteMethodName -> L
-    com.android.tools.r8.graph.DexType boxedLongType -> zb
-    com.android.tools.r8.graph.DexType boxedFloatType -> xb
-    com.android.tools.r8.graph.DexString invocationHandlerDescriptor -> Wa
-    com.android.tools.r8.graph.DexString containsMethodName -> U
+    com.android.tools.r8.graph.DexType classLoaderType -> Ib
+    com.android.tools.r8.graph.DexString compareToMethodName -> da
+    com.android.tools.r8.graph.DexType objectType -> Ab
+    com.android.tools.r8.graph.DexString ordinalMethodName -> la
+    com.android.tools.r8.graph.DexString unboxBooleanMethodName -> L
+    com.android.tools.r8.graph.DexType stringArrayType -> zb
+    com.android.tools.r8.graph.DexType charSequenceType -> xb
+    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> Wa
+    com.android.tools.r8.kotlin.Kotlin kotlin -> cc
+    com.android.tools.r8.graph.DexString lengthMethodName -> U
     com.android.tools.r8.graph.DexString doubleDescriptor -> v
-    com.android.tools.r8.graph.DexType intType -> pb
-    com.android.tools.r8.graph.DexString listDescriptor -> _a
-    com.android.tools.r8.graph.DexType iteratorType -> Hc
-    com.android.tools.r8.graph.DexString charArrayDescriptor -> hb
+    com.android.tools.r8.graph.DexType boxedByteType -> pb
+    com.android.tools.r8.graph.DexString constructorMethodName -> _a
+    com.android.tools.r8.graph.DexType charType -> hb
     com.android.tools.r8.graph.DexString boxedDoubleDescriptor -> E
-    com.android.tools.r8.graph.DexString classLoaderDescriptor -> Ga
-    com.android.tools.r8.graph.DexString throwableDescriptor -> Oa
-    com.android.tools.r8.graph.DexType serviceLoaderType -> Xb
-    com.android.tools.r8.graph.DexType annotationMethodParameters -> yc
-    com.android.tools.r8.graph.DexString newInstanceName -> wa
-    com.android.tools.r8.graph.DexString startsWithMethodName -> V
+    com.android.tools.r8.graph.DexString autoCloseableDescriptor -> Ga
+    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> Ub
+    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> dc
+    com.android.tools.r8.graph.DexString objectsDescriptor -> Oa
+    com.android.tools.r8.graph.DexType serializableType -> yc
+    com.android.tools.r8.graph.DexString assertionsDisabled -> wa
+    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> ac
+    com.android.tools.r8.graph.DexString containsMethodName -> V
     com.android.tools.r8.graph.DexString floatDescriptor -> w
-    com.android.tools.r8.graph.DexType stringBuilderType -> Pb
-    com.android.tools.r8.graph.DexType classArrayType -> Hb
-    com.android.tools.r8.graph.DexString valueOfMethodName -> ga
+    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> Tb
+    com.android.tools.r8.graph.DexType npeType -> Pb
+    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> qc
+    boolean skipNameValidationForTesting -> Hc
+    com.android.tools.r8.graph.DexType classType -> Hb
+    com.android.tools.r8.graph.DexString substringName -> ga
+    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> hc
     com.android.tools.r8.graph.DexString boxedFloatDescriptor -> F
-    boolean $assertionsDisabled -> ad
-    com.android.tools.r8.graph.DexString getCanonicalNameName -> oa
-    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> pc
-    java.util.Set libraryMethodsReturningNonNull -> Sc
-    com.android.tools.r8.graph.DexType boxedDoubleType -> wb
-    com.android.tools.r8.graph.DexString methodTypeDescriptor -> Va
-    com.android.tools.r8.graph.DexString endsWithMethodName -> W
+    com.android.tools.r8.graph.DexString getNameName -> oa
+    com.android.tools.r8.graph.DexType boxedNumberType -> wb
+    com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> Va
+    com.android.tools.r8.graph.DexString startsWithMethodName -> W
     com.android.tools.r8.graph.DexString intDescriptor -> x
-    com.android.tools.r8.graph.DexType stringConcatFactoryType -> Oc
-    com.android.tools.r8.graph.DexType floatType -> ob
-    com.android.tools.r8.graph.DexType lookupType -> Gc
-    com.android.tools.r8.graph.DexString classDescriptor -> Fa
-    com.android.tools.r8.graph.DexString thisName -> gb
+    com.android.tools.r8.graph.DexType boxedBooleanType -> ob
+    com.android.tools.r8.graph.DexType byteType -> gb
+    com.android.tools.r8.graph.DexMethod stringConcatMethod -> Fc
+    com.android.tools.r8.graph.DexString classLoaderDescriptor -> Fa
     com.android.tools.r8.graph.DexString boxedIntDescriptor -> G
-    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> Nc
-    com.android.tools.r8.graph.DexString annotationDescriptor -> Na
-    com.android.tools.r8.graph.DexType proxyType -> Wb
-    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> nc
-    com.android.tools.r8.graph.DexType annotationMemberClasses -> xc
+    com.android.tools.r8.graph.DexString exceptionInInitializerErrorDescriptor -> Na
+    com.android.tools.r8.graph.DexItemFactory$LongMethods longMethods -> Wb
+    com.android.tools.r8.graph.DexType iteratorType -> xc
     com.android.tools.r8.graph.DexString getDeclaredMethodName -> va
-    com.android.tools.r8.graph.DexString equalsMethodName -> X
+    com.android.tools.r8.graph.DexString endsWithMethodName -> X
     com.android.tools.r8.graph.DexString longDescriptor -> y
-    com.android.tools.r8.graph.DexType autoCloseableType -> Ob
-    com.android.tools.r8.graph.DexType objectArrayType -> Gb
-    com.android.tools.r8.graph.DexString substringName -> fa
-    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> ic
+    com.android.tools.r8.graph.DexType methodTypeType -> Ob
+    com.android.tools.r8.graph.DexType annotationSignature -> pc
+    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> Gb
+    com.android.tools.r8.graph.DexString cloneMethodName -> fa
     com.android.tools.r8.graph.DexString boxedLongDescriptor -> H
-    java.util.Set libraryMethodsReturningReceiver -> Rc
-    com.android.tools.r8.graph.DexString getNameName -> na
-    1:39:void <clinit>():49:87 -> <clinit>
-    1:1:void <init>():91:91 -> <init>
-    2:238:void <init>():53:289 -> <init>
-    239:239:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    239:239:void <init>():290 -> <init>
-    240:240:void <init>():290:290 -> <init>
-    241:241:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    241:241:void <init>():294 -> <init>
-    242:242:void <init>():294:294 -> <init>
-    243:243:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    243:243:void <init>():295 -> <init>
-    244:244:void <init>():295:295 -> <init>
-    245:245:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    245:245:void <init>():296 -> <init>
-    246:246:void <init>():296:296 -> <init>
-    247:247:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    247:247:void <init>():298 -> <init>
-    248:248:void <init>():298:298 -> <init>
-    249:249:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
+    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> ec
+    com.android.tools.r8.graph.DexString forNameMethodName -> na
+    1:39:void <clinit>():51:89 -> <clinit>
+    1:1:void <init>():93:93 -> <init>
+    2:228:void <init>():55:281 -> <init>
+    229:229:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    229:229:void <init>():282 -> <init>
+    230:230:void <init>():282:282 -> <init>
+    231:231:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    231:231:void <init>():286 -> <init>
+    232:232:void <init>():286:286 -> <init>
+    233:233:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    233:233:void <init>():287 -> <init>
+    234:234:void <init>():287:287 -> <init>
+    235:235:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    235:235:void <init>():288 -> <init>
+    236:236:void <init>():288:288 -> <init>
+    237:237:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    237:237:void <init>():290 -> <init>
+    238:238:void <init>():290:290 -> <init>
+    239:239:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    239:239:void <init>():291 -> <init>
+    240:240:void <init>():291:291 -> <init>
+    241:241:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    241:241:void <init>():292 -> <init>
+    242:242:void <init>():292:292 -> <init>
+    243:243:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    243:243:void <init>():294 -> <init>
+    244:244:void <init>():294:294 -> <init>
+    245:245:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    245:245:void <init>():295 -> <init>
+    246:246:void <init>():295:295 -> <init>
+    247:247:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    247:247:void <init>():297 -> <init>
+    248:248:void <init>():297:297 -> <init>
+    249:249:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
     249:249:void <init>():299 -> <init>
     250:250:void <init>():299:299 -> <init>
-    251:251:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    251:251:void <init>():300 -> <init>
-    252:252:void <init>():300:300 -> <init>
-    253:253:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    253:253:void <init>():302 -> <init>
-    254:254:void <init>():302:302 -> <init>
-    255:255:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    255:255:void <init>():303 -> <init>
-    256:256:void <init>():303:303 -> <init>
-    257:257:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    257:257:void <init>():305 -> <init>
-    258:258:void <init>():305:305 -> <init>
-    259:259:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    259:259:void <init>():307 -> <init>
-    260:260:void <init>():307:307 -> <init>
-    261:261:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    261:261:void <init>():309 -> <init>
-    262:262:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    262:262:void <init>():311 -> <init>
-    263:263:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    263:263:void <init>():313 -> <init>
-    264:264:void <init>():313:313 -> <init>
-    265:265:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    265:265:void <init>():318 -> <init>
-    266:266:void <init>():318:318 -> <init>
-    267:267:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    267:267:void <init>():319 -> <init>
-    268:268:void <init>():319:319 -> <init>
-    269:269:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    269:269:void <init>():320 -> <init>
-    270:270:void <init>():320:320 -> <init>
-    271:271:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    271:271:void <init>():321 -> <init>
-    272:272:void <init>():321:321 -> <init>
-    273:273:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    273:273:void <init>():322 -> <init>
-    274:274:void <init>():322:322 -> <init>
-    275:275:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    275:275:void <init>():323 -> <init>
-    276:276:void <init>():323:323 -> <init>
-    277:277:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    277:277:void <init>():324 -> <init>
-    278:293:void <init>():324:339 -> <init>
-    294:310:void <init>():329:345 -> <init>
-    311:311:void <init>():342:342 -> <init>
-    312:312:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> <init>
-    312:312:void <init>():348 -> <init>
-    313:325:void <init>():348:360 -> <init>
-    326:346:void <init>():351:371 -> <init>
-    347:406:void <init>():364:423 -> <init>
-    407:407:void <init>():413:413 -> <init>
-    408:408:void <init>():92:92 -> <init>
+    251:251:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    251:251:void <init>():301 -> <init>
+    252:252:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    252:252:void <init>():303 -> <init>
+    253:253:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    253:253:void <init>():305 -> <init>
+    254:254:void <init>():305:305 -> <init>
+    255:255:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    255:255:void <init>():310 -> <init>
+    256:256:void <init>():310:310 -> <init>
+    257:257:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    257:257:void <init>():311 -> <init>
+    258:258:void <init>():311:311 -> <init>
+    259:259:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    259:259:void <init>():312 -> <init>
+    260:260:void <init>():312:312 -> <init>
+    261:261:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    261:261:void <init>():313 -> <init>
+    262:262:void <init>():313:313 -> <init>
+    263:263:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    263:263:void <init>():314 -> <init>
+    264:264:void <init>():314:314 -> <init>
+    265:265:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    265:265:void <init>():315 -> <init>
+    266:266:void <init>():315:315 -> <init>
+    267:267:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    267:267:void <init>():316 -> <init>
+    268:281:void <init>():316:329 -> <init>
+    282:298:void <init>():319:335 -> <init>
+    299:299:void <init>():332:332 -> <init>
+    300:300:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> <init>
+    300:300:void <init>():338 -> <init>
+    301:313:void <init>():338:350 -> <init>
+    314:334:void <init>():341:361 -> <init>
+    335:376:void <init>():354:395 -> <init>
+    377:377:void <init>():385:385 -> <init>
+    378:378:void <init>():94:94 -> <init>
     com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame lambda$createSetInlineFrame$0(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
-    1:1:com.android.tools.r8.graph.DexType access$1700(com.android.tools.r8.graph.DexItemFactory):49:49 -> a
-    2:2:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):96:96 -> a
-    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):426:427 -> a
-    5:7:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):934:936 -> a
-    8:9:com.android.tools.r8.graph.DexString createString(int,byte[]):941:942 -> a
-    10:11:com.android.tools.r8.graph.DexString createString(java.lang.String):946:947 -> a
-    12:13:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1004:1005 -> a
-    14:16: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):1009:1011 -> a
-    17:17:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1015:1015 -> a
-    18:20:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList):1019:1021 -> a
-    21:21:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1025:1025 -> a
-    22:27:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1066:1071 -> a
-    22:27:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1026 -> a
-    28:28:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1027:1027 -> a
-    29:29:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1026:1026 -> a
-    30:34:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1032:1036 -> a
-    35:42:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1053:1060 -> a
-    35:42:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1036 -> a
-    43:52:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.copyWithSparseChanges(java.lang.Class,java.lang.Object[],java.util.Map):25:34 -> a
-    43:52:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1062 -> a
-    43:52:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1036 -> a
-    53:53:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1062:1062 -> a
-    53:53:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1036 -> a
-    54:60:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1037:1043 -> a
-    61:65:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1042:1046 -> a
-    66:68: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):1075:1077 -> a
-    69:69:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1081:1081 -> a
-    70:72:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):1088:1090 -> a
-    73:74: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):1099:1100 -> a
-    75:84: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[]):1106:1115 -> a
-    85:87:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1119:1121 -> a
-    88:90:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1157:1159 -> a
-    91:93:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1164:1166 -> a
-    94:94:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1174:1174 -> a
-    95:95:void clearReferenceTypeLatticeElementsCache():1178:1178 -> a
-    96:103:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1203:1210 -> a
-    104:132:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1209:1237 -> a
-    133:141:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1217:1225 -> a
-    142:153:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1224:1235 -> a
-    154:158:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1242:1246 -> a
-    159:159:int lambda$assignSortedIndices$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1243:1243 -> a
-    160:166:void sort(com.android.tools.r8.naming.NamingLens):1251:1257 -> a
-    167:167:void forAllTypes(java.util.function.Consumer):1274:1274 -> a
-    1:7:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):982:988 -> b
-    8:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):987:990 -> b
-    12:12:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> b
-    13:15:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1125:1127 -> b
-    16:16:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1149:1149 -> b
-    17:17:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1170:1170 -> b
-    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):410:410 -> c
-    2:2:com.android.tools.r8.graph.DexString lookupString(java.lang.String):951:951 -> c
-    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1000:1000 -> c
-    4:6:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1131:1133 -> c
-    7:7:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1153:1153 -> c
-    1:5:java.util.Collection extractMarker():957:961 -> d
-    6:8:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1137:1139 -> d
-    1:1:boolean getSkipNameValidationForTesting():406:406 -> e
-    2:4:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1143:1145 -> e
-    1:10:void resetSortedIndices():1261:1270 -> f
-    1:1:boolean verifyNoCachedReferenceTypeLatticeElements():1182:1182 -> g
-com.android.tools.r8.graph.DexItemFactory$1 -> a.a.a.a.g.Ja:
-com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> a.a.a.a.g.Ka:
+    1:1:com.android.tools.r8.graph.DexType access$1200(com.android.tools.r8.graph.DexItemFactory):51:51 -> a
+    2:2:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):98:98 -> a
+    3:3:void clearSubtypeInformation():382:382 -> a
+    4:5:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):398:399 -> a
+    6:8:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):833:835 -> a
+    9:10:com.android.tools.r8.graph.DexString createString(int,byte[]):840:841 -> a
+    11:12:com.android.tools.r8.graph.DexString createString(java.lang.String):845:846 -> a
+    13:14:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):903:904 -> a
+    15:17: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):908:910 -> a
+    18:18:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):914:914 -> a
+    19:21:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList):918:920 -> a
+    22:22:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):924:924 -> a
+    23:28:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):965:970 -> a
+    23:28:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):925 -> a
+    29:29:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):926:926 -> a
+    30:30:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):925:925 -> a
+    31:35:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):931:935 -> a
+    36:43:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):952:959 -> a
+    36:43:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):935 -> a
+    44:53:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.copyWithSparseChanges(java.lang.Class,java.lang.Object[],java.util.Map):25:34 -> a
+    44:53:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):961 -> a
+    44:53:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):935 -> a
+    54:54:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):961:961 -> a
+    54:54:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):935 -> a
+    55:61:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):936:942 -> a
+    62:66:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):941:945 -> a
+    67:69: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):974:976 -> a
+    70:70:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):980:980 -> a
+    71:73:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor):986:988 -> a
+    74:75: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):997:998 -> a
+    76:85: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[]):1004:1013 -> a
+    86:88:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1017:1019 -> a
+    89:91:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1055:1057 -> a
+    92:94:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1062:1064 -> a
+    95:95:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1072:1072 -> a
+    96:131:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier):1077:1112 -> a
+    132:132:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier):1107:1107 -> a
+    133:137:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1117:1121 -> a
+    138:138:int lambda$assignSortedIndices$1(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1118:1118 -> a
+    139:145:void sort(com.android.tools.r8.naming.NamingLens):1126:1132 -> a
+    146:146:void forAllTypes(java.util.function.Consumer):1149:1149 -> a
+    1:7:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):881:887 -> b
+    8:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):886:889 -> b
+    12:12:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> b
+    13:15:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1023:1025 -> b
+    16:16:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1047:1047 -> b
+    17:17:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1068:1068 -> b
+    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):378:378 -> c
+    2:2:com.android.tools.r8.graph.DexString lookupString(java.lang.String):850:850 -> c
+    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):899:899 -> c
+    4:6:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1029:1031 -> c
+    7:7:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1051:1051 -> c
+    1:5:java.util.Collection extractMarker():856:860 -> d
+    6:8:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1035:1037 -> d
+    1:1:boolean getSkipNameValidationForTesting():374:374 -> e
+    2:4:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1041:1043 -> e
+    1:10:void resetSortedIndices():1136:1145 -> f
+com.android.tools.r8.graph.DexItemFactory$1 -> a.a.a.a.g.Ea:
+com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> a.a.a.a.g.Fa:
     java.util.Set updaters -> d
     com.android.tools.r8.graph.DexMethod referenceUpdater -> c
     com.android.tools.r8.graph.DexMethod longUpdater -> b
     com.android.tools.r8.graph.DexMethod intUpdater -> a
-    1:20:void <init>(com.android.tools.r8.graph.DexItemFactory):653:672 -> <init>
-    1:20:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):647 -> <init>
-    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):676:676 -> a
-com.android.tools.r8.graph.DexItemFactory$ClassMethods -> a.a.a.a.g.La:
-    com.android.tools.r8.graph.DexMethod newInstance -> l
-    com.android.tools.r8.graph.DexMethod getDeclaredMethod -> k
-    com.android.tools.r8.graph.DexMethod getMethod -> j
-    com.android.tools.r8.graph.DexMethod getDeclaredField -> i
-    com.android.tools.r8.graph.DexMethod getField -> h
-    com.android.tools.r8.graph.DexMethod getDeclaredConstructor -> g
+    1:20:void <init>(com.android.tools.r8.graph.DexItemFactory):582:601 -> <init>
+    1:20:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):576 -> <init>
+    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):605:605 -> a
+com.android.tools.r8.graph.DexItemFactory$ClassMethods -> a.a.a.a.g.Ga:
+    com.android.tools.r8.graph.DexMethod getDeclaredMethod -> j
+    com.android.tools.r8.graph.DexMethod getMethod -> i
+    com.android.tools.r8.graph.DexMethod getDeclaredField -> h
+    com.android.tools.r8.graph.DexMethod getField -> g
     com.android.tools.r8.graph.DexMethod getTypeName -> f
     com.android.tools.r8.graph.DexMethod getSimpleName -> e
     com.android.tools.r8.graph.DexMethod getCanonicalName -> d
     com.android.tools.r8.graph.DexMethod getName -> c
+    java.util.Set getMembers -> k
     com.android.tools.r8.graph.DexMethod forName -> b
+    java.util.Set getNames -> l
     com.android.tools.r8.graph.DexMethod desiredAssertionStatus -> a
-    java.util.Set getMembers -> m
-    java.util.Set getNames -> n
-    1:30:void <init>(com.android.tools.r8.graph.DexItemFactory):514:543 -> <init>
-    1:30:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):497 -> <init>
-    1:1:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):547:547 -> a
-    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):551:551 -> b
-com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> a.a.a.a.g.Ma:
-    com.android.tools.r8.graph.DexMethod newInstance -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):559:561 -> <init>
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):555 -> <init>
-com.android.tools.r8.graph.DexItemFactory$EnumMethods -> a.a.a.a.g.Na:
+    1:22:void <init>(com.android.tools.r8.graph.DexItemFactory):470:491 -> <init>
+    1:22:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):455 -> <init>
+    1:1:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):495:495 -> a
+    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):499:499 -> b
+com.android.tools.r8.graph.DexItemFactory$EnumMethods -> a.a.a.a.g.Ha:
     com.android.tools.r8.graph.DexMethod valueOf -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):573:575 -> <init>
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):569 -> <init>
-com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> a.a.a.a.g.Oa:
-    com.android.tools.r8.graph.DexMethod asList -> a
-    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):448:452 -> <init>
-    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):444 -> <init>
-    6:6:void <init>(com.android.tools.r8.graph.DexItemFactory):450:450 -> <init>
-    6:6:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):444 -> <init>
-com.android.tools.r8.graph.DexItemFactory$LongMethods -> a.a.a.a.g.Pa:
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):507:509 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):503 -> <init>
+com.android.tools.r8.graph.DexItemFactory$LongMethods -> a.a.a.a.g.Ia:
     com.android.tools.r8.graph.DexMethod compare -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):438:440 -> <init>
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):434 -> <init>
-    4:4:void <init>(com.android.tools.r8.graph.DexItemFactory):439:439 -> <init>
-    4:4:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):434 -> <init>
-com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> a.a.a.a.g.Qa:
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):410:412 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):406 -> <init>
+    4:4:void <init>(com.android.tools.r8.graph.DexItemFactory):411:411 -> <init>
+    4:4:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):406 -> <init>
+com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> a.a.a.a.g.Ja:
     com.android.tools.r8.graph.DexMethod init -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):587:589 -> <init>
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):583 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ObjectMethods -> a.a.a.a.g.Ra:
+    1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):521:522 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):517 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ObjectMethods -> a.a.a.a.g.Ka:
     com.android.tools.r8.graph.DexMethod finalize -> c
     com.android.tools.r8.graph.DexMethod constructor -> b
     com.android.tools.r8.graph.DexMethod getClass -> a
-    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):477:482 -> <init>
-    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):471 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> a.a.a.a.g.Sa:
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):435:440 -> <init>
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):429 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> a.a.a.a.g.La:
     com.android.tools.r8.graph.DexMethod requireNonNull -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):491:493 -> <init>
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):487 -> <init>
-    4:4:void <init>(com.android.tools.r8.graph.DexItemFactory):492:492 -> <init>
-    4:4:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):487 -> <init>
-com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> a.a.a.a.g.Ta:
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):449:451 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):445 -> <init>
+    4:4:void <init>(com.android.tools.r8.graph.DexItemFactory):450:450 -> <init>
+    4:4:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):445 -> <init>
+com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> a.a.a.a.g.Ma:
     com.android.tools.r8.graph.DexProto compareAndSetSignature -> c
     java.util.Set varHandleMethods -> d
     com.android.tools.r8.graph.DexItemFactory this$0 -> g
@@ -14859,10 +14513,10 @@
     java.util.Set varHandleCompareAndSetMethods -> f
     com.android.tools.r8.graph.DexProto signature -> a
     com.android.tools.r8.graph.DexProto setSignature -> b
-    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):822:857 -> <init>
-    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):865:875 -> a
-    12:17:java.util.Set createStrings(java.lang.String[]):882:887 -> a
-com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> a.a.a.a.g.Ua:
+    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):737:772 -> <init>
+    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):780:790 -> a
+    12:17:java.util.Set createStrings(java.lang.String[]):797:802 -> a
+com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> a.a.a.a.g.Na:
     com.android.tools.r8.graph.DexField longTYPE -> f
     com.android.tools.r8.graph.DexField intTYPE -> e
     com.android.tools.r8.graph.DexField doubleTYPE -> h
@@ -14872,34 +14526,24 @@
     com.android.tools.r8.graph.DexField booleanTYPE -> a
     com.android.tools.r8.graph.DexField shortTYPE -> d
     com.android.tools.r8.graph.DexField charTYPE -> c
-    1:21:void <init>(com.android.tools.r8.graph.DexItemFactory):615:635 -> <init>
-    1:21:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):603 -> <init>
-    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):639:639 -> a
-com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> a.a.a.a.g.Va:
-    com.android.tools.r8.graph.DexMethod newProxyInstance -> a
-    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):895:900 -> <init>
-    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):891 -> <init>
-    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):897:897 -> <init>
-    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):891 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> a.a.a.a.g.Wa:
-    com.android.tools.r8.graph.DexMethod iterator -> d
+    1:21:void <init>(com.android.tools.r8.graph.DexItemFactory):544:564 -> <init>
+    1:21:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):532 -> <init>
+    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):568:568 -> a
+com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> a.a.a.a.g.Oa:
     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:7:void <init>(com.android.tools.r8.graph.DexItemFactory):911:917 -> <init>
-    1:7:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):904 -> <init>
-    8:16:void <init>(com.android.tools.r8.graph.DexItemFactory):915:923 -> <init>
-    8:16:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):904 -> <init>
-    17:22:void <init>(com.android.tools.r8.graph.DexItemFactory):920:925 -> <init>
-    17:22:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):904 -> <init>
-    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):929:929 -> a
-com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> a.a.a.a.g.Xa:
-    com.android.tools.r8.graph.DexMethod defaultConstructor -> o
-    com.android.tools.r8.graph.DexMethod charSequenceConstructor -> n
+    1:7:void <init>(com.android.tools.r8.graph.DexItemFactory):812:818 -> <init>
+    1:7:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):806 -> <init>
+    8:16:void <init>(com.android.tools.r8.graph.DexItemFactory):816:824 -> <init>
+    8:16:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):806 -> <init>
+    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):821:821 -> <init>
+    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):806 -> <init>
+    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):828:828 -> a
+com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> a.a.a.a.g.Pa:
     com.android.tools.r8.graph.DexMethod appendStringBuffer -> m
     com.android.tools.r8.graph.DexMethod appendString -> l
     com.android.tools.r8.graph.DexMethod appendObject -> k
-    java.util.Set constructorMethods -> s
     com.android.tools.r8.graph.DexMethod appendLong -> j
     com.android.tools.r8.graph.DexMethod appendFloat -> i
     com.android.tools.r8.graph.DexMethod appendDouble -> h
@@ -14910,14 +14554,11 @@
     com.android.tools.r8.graph.DexMethod appendCharArray -> c
     com.android.tools.r8.graph.DexMethod appendChar -> b
     com.android.tools.r8.graph.DexMethod appendBoolean -> a
-    java.util.Set appendMethods -> r
-    com.android.tools.r8.graph.DexMethod stringConstructor -> q
-    com.android.tools.r8.graph.DexMethod intConstructor -> p
-    1:45:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):769:813 -> <init>
-    1:45:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):746 -> <init>
-    1:1:java.util.Set access$1500(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):746:746 -> a
-    1:1:java.util.Set access$1600(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):746:746 -> b
-com.android.tools.r8.graph.DexItemFactory$StringMethods -> a.a.a.a.g.Ya:
+    java.util.Set appenders -> n
+    1:34:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):692:725 -> <init>
+    1:34:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):675 -> <init>
+    1:1:void forEachAppendMethod(java.util.function.Consumer):733:733 -> a
+com.android.tools.r8.graph.DexItemFactory$StringMethods -> a.a.a.a.g.Qa:
     com.android.tools.r8.graph.DexMethod valueOf -> o
     com.android.tools.r8.graph.DexMethod compareToIgnoreCase -> n
     com.android.tools.r8.graph.DexMethod compareTo -> m
@@ -14934,37 +14575,31 @@
     com.android.tools.r8.graph.DexMethod length -> b
     com.android.tools.r8.graph.DexMethod isEmpty -> a
     com.android.tools.r8.graph.DexMethod toString -> p
-    1:41:void <init>(com.android.tools.r8.graph.DexItemFactory):701:741 -> <init>
-    1:41:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):680 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> a.a.a.a.g.Za:
+    1:41:void <init>(com.android.tools.r8.graph.DexItemFactory):630:670 -> <init>
+    1:41:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):609 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> a.a.a.a.g.Ra:
     com.android.tools.r8.graph.DexMethod getSuppressed -> b
     com.android.tools.r8.graph.DexMethod addSuppressed -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):463:465 -> <init>
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):458 -> <init>
-    4:7:void <init>(com.android.tools.r8.graph.DexItemFactory):464:467 -> <init>
-    4:7:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):458 -> <init>
-    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):466:466 -> <init>
-    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):458 -> <init>
-com.android.tools.r8.graph.DexLibraryClass -> a.a.a.a.g.ab:
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):421:423 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):416 -> <init>
+    4:7:void <init>(com.android.tools.r8.graph.DexItemFactory):422:425 -> <init>
+    4:7:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):416 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):424:424 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):416 -> <init>
+com.android.tools.r8.graph.DexLibraryClass -> a.a.a.a.g.Ta:
     boolean $assertionsDisabled -> q
-    1:1:void <clinit>():17:17 -> <clinit>
-    1:25:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):35:59 -> <init>
-    com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> C
-    boolean isLibraryClass() -> M
-    boolean isNotProgramClass() -> P
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):78:78 -> a
-    1:1:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):94:94 -> b
-    1:1:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):70:70 -> c
-    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():96:96 -> c
-    2:2:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):70 -> c
-    3:4:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):70:71 -> c
-    1:3:boolean verifyLibraryMethod(com.android.tools.r8.graph.DexEncodedMethod):63:65 -> e
-    1:1:java.lang.String toSourceString():88:88 -> f
-    com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> q
-    1:1:java.lang.String toString():83:83 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():118:118 -> toString
-    2:2:java.lang.String toString():83 -> toString
-com.android.tools.r8.graph.DexMemberAnnotation -> a.a.a.a.g.eb:
+    1:1:void <clinit>():16:16 -> <clinit>
+    1:21:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):34:54 -> <init>
+    com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> B
+    boolean isLibraryClass() -> K
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):60:60 -> a
+    1:1:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):76:76 -> b
+    1:1:java.lang.String toSourceString():70:70 -> f
+    com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> p
+    1:1:java.lang.String toString():65:65 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():360:360 -> toString
+    2:2:java.lang.String toString():65 -> toString
+com.android.tools.r8.graph.DexMemberAnnotation -> a.a.a.a.g.Xa:
     com.android.tools.r8.graph.Descriptor item -> a
     com.android.tools.r8.graph.DexItem annotations -> b
     1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexItem):14:16 -> <init>
@@ -14972,13 +14607,13 @@
     3:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):28:28 -> a
     1:3:boolean equals(java.lang.Object):41:43 -> equals
     1:1:int hashCode():33:33 -> hashCode
-com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation -> a.a.a.a.g.bb:
+com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation -> a.a.a.a.g.Ua:
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexAnnotationSet):51:51 -> <init>
-com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation -> a.a.a.a.g.cb:
+com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation -> a.a.a.a.g.Va:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexAnnotationSet):58:58 -> <init>
-com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation -> a.a.a.a.g.db:
+com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation -> a.a.a.a.g.Wa:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ParameterAnnotationsList):66:66 -> <init>
-com.android.tools.r8.graph.DexMethod -> a.a.a.a.g.fb:
+com.android.tools.r8.graph.DexMethod -> a.a.a.a.g.Ya:
     com.android.tools.r8.graph.DexProto proto -> e
     com.android.tools.r8.graph.DexString name -> f
     com.android.tools.r8.graph.DexType holder -> d
@@ -15005,7 +14640,7 @@
     2:2:int compareTo(com.android.tools.r8.graph.DexMethod):108:108 -> compareTo
     2:2:int compareTo(java.lang.Object):12 -> compareTo
     1:1:java.lang.String toSmaliString():161:161 -> e
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():113:113 -> e
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():355:355 -> e
     2:2:java.lang.String toSmaliString():161 -> e
     3:3:java.lang.String toSmaliString():161:161 -> e
     4:4:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():95:95 -> e
@@ -15018,42 +14653,41 @@
     1:1:int getArity():39:39 -> q
     1:1:java.lang.String qualifiedName():156:156 -> r
     1:1:java.lang.String toString():35:35 -> toString
-com.android.tools.r8.graph.DexMethodHandle -> a.a.a.a.g.hb:
+com.android.tools.r8.graph.DexMethodHandle -> a.a.a.a.g._a:
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType type -> d
     com.android.tools.r8.graph.Descriptor fieldOrMethod -> e
-    com.android.tools.r8.graph.DexMethod rewrittenTarget -> g
-    boolean isInterface -> f
-    boolean $assertionsDisabled -> h
+    com.android.tools.r8.graph.DexMethod rewrittenTarget -> f
+    boolean $assertionsDisabled -> g
     1:1:void <clinit>():15:15 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):208:212 -> <init>
-    6:10:void <init>(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean,com.android.tools.r8.graph.DexMethod):219:223 -> <init>
+    1:4:void <init>(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor):205:208 -> <init>
+    5:8:void <init>(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexMethod):214:217 -> <init>
     1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):15:15 -> a
-    2:8:int layeredCompareTo(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.naming.NamingLens):344:350 -> a
+    2:8:int layeredCompareTo(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.naming.NamingLens):339:345 -> a
     2:8:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):15 -> a
     9:9:int slowCompareTo(java.lang.Object):15:15 -> a
-    10:15: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):228:233 -> a
-    16:16: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.Descriptor,boolean):109:109 -> a
-    16:16: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):233 -> a
-    17:27:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):266:276 -> a
-    28:28:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):283:283 -> a
-    29:35:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):316:322 -> a
-    36:58:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):366:388 -> a
-    59:80:int getAsmTag():392:413 -> a
-    59:80:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):388 -> a
-    81:81:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):388:388 -> a
-    1:6:boolean computeEquals(java.lang.Object):243:248 -> b
+    10:14: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):222:226 -> a
+    15:15: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.Descriptor):108:108 -> a
+    15:15: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):227 -> a
+    16:26:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):261:271 -> a
+    27:27:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):278:278 -> a
+    28:34:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):311:317 -> a
+    35:56:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):361:382 -> a
+    57:78:int getAsmTag():386:407 -> a
+    57:78:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):382 -> a
+    79:79:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):382:382 -> a
+    1:5:boolean computeEquals(java.lang.Object):239:243 -> b
     1:1:int compareTo(java.lang.Object):15:15 -> compareTo
-    2:2:int compareTo(com.android.tools.r8.graph.DexMethodHandle):358:358 -> compareTo
+    2:2:int compareTo(com.android.tools.r8.graph.DexMethodHandle):353:353 -> compareTo
     2:2:int compareTo(java.lang.Object):15 -> compareTo
-    1:1:java.lang.String toSmaliString():289:289 -> e
-    1:1:int computeHashCode():238:238 -> g
-    1:2:com.android.tools.r8.graph.DexField asField():310:311 -> j
-    1:2:com.android.tools.r8.graph.DexMethod asMethod():305:306 -> k
-    1:1:boolean isFieldHandle():293:293 -> l
-    1:1:boolean isMethodHandle():297:297 -> m
-    1:1:boolean isStaticHandle():301:301 -> n
-    1:6:java.lang.String toString():255:260 -> toString
-com.android.tools.r8.graph.DexMethodHandle$MethodHandleType -> a.a.a.a.g.gb:
+    1:1:java.lang.String toSmaliString():284:284 -> e
+    1:3:int computeHashCode():232:234 -> g
+    1:2:com.android.tools.r8.graph.DexField asField():305:306 -> j
+    1:2:com.android.tools.r8.graph.DexMethod asMethod():300:301 -> k
+    1:1:boolean isFieldHandle():288:288 -> l
+    1:1:boolean isMethodHandle():292:292 -> m
+    1:1:boolean isStaticHandle():296:296 -> n
+    1:6:java.lang.String toString():250:255 -> toString
+com.android.tools.r8.graph.DexMethodHandle$MethodHandleType -> a.a.a.a.g.Za:
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType INVOKE_CONSTRUCTOR -> h
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType INVOKE_INSTANCE -> g
@@ -15070,54 +14704,54 @@
     1:12:void <clinit>():18:29 -> <clinit>
     13:13:void <clinit>():18:18 -> <clinit>
     1:2:void <init>(java.lang.String,int,short):33:34 -> <init>
-    1:1:short getValue():38:38 -> a
-    2:29:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):85:112 -> a
-    30:34:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):106:110 -> a
-    35:48:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):95:108 -> a
-    49:49:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):104:104 -> a
-    50:50:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):93:93 -> a
-    51:51:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):91:91 -> a
-    52:52:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):89:89 -> a
-    53:53:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):87:87 -> a
-    1:1:boolean isFieldType():117:117 -> b
-    2:2:boolean isInstancePut():134:134 -> b
-    2:2:boolean isFieldType():117 -> b
-    3:3:boolean isInstanceGet():138:138 -> b
-    3:3:boolean isFieldType():117 -> b
-    1:1:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):76:76 -> c
-    2:2:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):73:73 -> c
-    3:3:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):70:70 -> c
-    4:4:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):67:67 -> c
-    5:5:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):64:64 -> c
-    6:6:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):61:61 -> c
-    7:7:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):58:58 -> c
-    8:8:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):55:55 -> c
-    9:9:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):52:52 -> c
-    10:10:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):49:49 -> c
-    11:44:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):46:79 -> c
-    45:45:short getValue():38:38 -> c
-    45:45:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):79 -> c
-    46:46:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):79:79 -> c
-    47:47:boolean isInvokeConstructor():162:162 -> c
-    1:1:boolean isInvokeDirect():146:146 -> d
-    1:1:boolean isInvokeInstance():150:150 -> e
-    1:1:boolean isInvokeInterface():154:154 -> f
-    1:1:boolean isInvokeStatic():142:142 -> g
-    1:1:boolean isMethodType():121:121 -> h
-    2:2:boolean isInvokeSuper():158:158 -> h
-    2:2:boolean isMethodType():121 -> h
-    3:3:boolean isMethodType():122:122 -> h
-    1:1:boolean isStaticGet():130:130 -> i
-    1:1:boolean isStaticPut():126:126 -> j
-    1:16:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():166:181 -> k
-    17:17:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():179:179 -> k
-    18:18:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():177:177 -> k
-    19:19:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():175:175 -> k
-    20:20:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():173:173 -> k
-    21:21:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():171:171 -> k
-    22:22:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():169:169 -> k
-    1:1:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType[] values():18:18 -> l
-com.android.tools.r8.graph.DexProgramClass -> a.a.a.a.g.ib:
+    1:28:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):85:112 -> a
+    29:33:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):106:110 -> a
+    34:47:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):95:108 -> a
+    48:48:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):104:104 -> a
+    49:49:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):93:93 -> a
+    50:50:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):91:91 -> a
+    51:51:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):89:89 -> a
+    52:52:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):87:87 -> a
+    53:53:boolean isFieldType():117:117 -> a
+    54:54:boolean isInstancePut():134:134 -> a
+    54:54:boolean isFieldType():117 -> a
+    55:55:boolean isInstanceGet():138:138 -> a
+    55:55:boolean isFieldType():117 -> a
+    1:1:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):76:76 -> b
+    2:2:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):73:73 -> b
+    3:3:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):70:70 -> b
+    4:4:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):67:67 -> b
+    5:5:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):64:64 -> b
+    6:6:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):61:61 -> b
+    7:7:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):58:58 -> b
+    8:8:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):55:55 -> b
+    9:9:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):52:52 -> b
+    10:10:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):49:49 -> b
+    11:44:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):46:79 -> b
+    45:45:short getValue():38:38 -> b
+    45:45:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):79 -> b
+    46:46:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):79:79 -> b
+    47:47:boolean isInvokeConstructor():162:162 -> b
+    1:1:boolean isInvokeDirect():146:146 -> c
+    1:1:boolean isInvokeInstance():150:150 -> d
+    1:1:boolean isInvokeInterface():154:154 -> e
+    1:1:boolean isInvokeStatic():142:142 -> f
+    1:1:boolean isMethodType():121:121 -> g
+    2:2:boolean isInvokeSuper():158:158 -> g
+    2:2:boolean isMethodType():121 -> g
+    3:3:boolean isMethodType():122:122 -> g
+    1:1:short getValue():38:38 -> getValue
+    1:1:boolean isStaticGet():130:130 -> h
+    1:1:boolean isStaticPut():126:126 -> i
+    1:16:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():166:181 -> j
+    17:17:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():179:179 -> j
+    18:18:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():177:177 -> j
+    19:19:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():175:175 -> j
+    20:20:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():173:173 -> j
+    21:21:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():171:171 -> j
+    22:22:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():169:169 -> j
+    1:1:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType[] values():18:18 -> k
+com.android.tools.r8.graph.DexProgramClass -> a.a.a.a.g.ab:
     com.android.tools.r8.graph.DexEncodedArray staticValues -> r
     java.util.Collection synthesizedFrom -> s
     com.android.tools.r8.kotlin.KotlinInfo kotlinInfo -> u
@@ -15131,58 +14765,57 @@
     2:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):49:49 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,java.util.Collection):85:85 -> <init>
     4:79:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,java.util.Collection):28:103 -> <init>
-    1:1:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo():225:225 -> C
-    boolean isNotProgramClass() -> P
-    boolean isProgramClass() -> Q
-    1:20:void computeStaticValues():276:295 -> V
-    1:2:int getInitialClassFileVersion():386:387 -> W
-    1:2:com.android.tools.r8.graph.DexEncodedArray getStaticValues():316:317 -> X
-    1:1:java.util.Collection getSynthesizedFrom():154:154 -> Y
-    1:5:boolean hasAnnotations():240:244 -> Z
+    1:1:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo():220:220 -> B
+    boolean isProgramClass() -> N
+    1:20:void computeStaticValues():271:290 -> S
+    1:2:int getInitialClassFileVersion():381:382 -> T
+    1:2:com.android.tools.r8.graph.DexEncodedArray getStaticValues():311:312 -> U
+    1:1:java.util.Collection getSynthesizedFrom():154:154 -> V
+    1:5:boolean hasAnnotations():235:239 -> W
+    1:1:boolean hasClassFileVersion():377:377 -> X
+    1:2:boolean hasMethodsOrFields():229:230 -> Y
+    1:4:boolean hasOnlyInternalizableAnnotations():243:246 -> Z
     1:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):117:119 -> a
-    4:5:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):124:125 -> a
+    4:5:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):366:367 -> a
     4:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):120 -> a
     6:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):122:124 -> a
     9:9:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):144:144 -> a
     9:9:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):125 -> a
     10:10:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):127:127 -> a
-    11:11:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):64:64 -> a
+    11:11:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):47:47 -> a
     11:11:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):128 -> a
     12:24:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):130:142 -> a
     25:28:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):159:162 -> a
-    29:30:void setKotlinInfo(com.android.tools.r8.kotlin.KotlinInfo):229:230 -> a
-    31:34:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):267:270 -> a
-    35:39:boolean isSorted(com.android.tools.r8.graph.KeyedDexItem[]):308:312 -> a
-    40:63:boolean hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):399:422 -> a
-    1:1:boolean hasClassFileVersion():382:382 -> aa
+    29:30:void setKotlinInfo(com.android.tools.r8.kotlin.KotlinInfo):224:225 -> a
+    31:34:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):262:265 -> a
+    35:39:boolean isSorted(com.android.tools.r8.graph.KeyedDexItem[]):303:307 -> a
+    40:63:boolean hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):394:417 -> a
+    1:4:boolean isSorted():295:298 -> aa
     1:3:void synchronizedCollectAll(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexItem[]):148:150 -> b
     4:8:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):168:172 -> b
-    9:12:void sortMembers():353:356 -> b
+    9:12:void sortMembers():348:351 -> b
     9:12:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):176 -> b
     13:24:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):177:188 -> b
     25:27:void synchronizedCollectAll(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexItem[]):193:195 -> b
-    1:2:boolean hasMethodsOrFields():234:235 -> ba
-    1:3:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedField[]):255:257 -> c
-    4:6:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedMethod[]):261:263 -> c
-    7:8:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):344:345 -> c
-    9:14:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):344:349 -> c
-    15:15:com.android.tools.r8.graph.DexField lambda$sortEncodedFields$0(com.android.tools.r8.graph.DexEncodedField):361:361 -> c
-    1:4:boolean hasOnlyInternalizableAnnotations():248:251 -> ca
-    1:6:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):324:329 -> d
-    7:7:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):327:327 -> d
-    8:10:void sortEncodedFields(com.android.tools.r8.graph.DexEncodedField[]):360:362 -> d
-    11:13:void sortEncodedMethods(com.android.tools.r8.graph.DexEncodedMethod[]):366:368 -> d
-    14:15:void setInitialClassFileVersion(int):377:378 -> d
-    1:4:boolean isSorted():300:303 -> da
-    1:7:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):334:340 -> e
-    1:1:boolean originatesFromDexResource():107:107 -> ea
+    1:1:boolean originatesFromDexResource():107:107 -> ba
+    1:3:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedField[]):250:252 -> c
+    4:6:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedMethod[]):256:258 -> c
+    7:8:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):339:340 -> c
+    9:14:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):339:344 -> c
+    15:15:com.android.tools.r8.graph.DexField lambda$sortEncodedFields$0(com.android.tools.r8.graph.DexEncodedField):356:356 -> c
+    16:17:void setInitialClassFileVersion(int):372:373 -> c
+    1:6:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):319:324 -> d
+    7:7:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):322:322 -> d
+    8:10:void sortEncodedFields(com.android.tools.r8.graph.DexEncodedField[]):355:357 -> d
+    11:13:void sortEncodedMethods(com.android.tools.r8.graph.DexEncodedMethod[]):361:363 -> d
+    1:7:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):329:335 -> e
     1:1:java.lang.String toSourceString():205:205 -> f
-    2:2:com.android.tools.r8.graph.DexMethod lambda$sortEncodedMethods$1(com.android.tools.r8.graph.DexEncodedMethod):367:367 -> f
-    com.android.tools.r8.graph.DexProgramClass asProgramClass() -> r
+    2:2:com.android.tools.r8.graph.DexMethod lambda$sortEncodedMethods$1(com.android.tools.r8.graph.DexEncodedMethod):362:362 -> f
+    com.android.tools.r8.graph.DexProgramClass asProgramClass() -> q
     1:1:java.lang.String toString():200:200 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():118:118 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():360:360 -> toString
     2:2:java.lang.String toString():200 -> toString
-com.android.tools.r8.graph.DexProto -> a.a.a.a.g.jb:
+com.android.tools.r8.graph.DexProto -> a.a.a.a.g.bb:
     com.android.tools.r8.graph.DexProto SENTINEL -> g
     com.android.tools.r8.graph.DexTypeList parameters -> f
     com.android.tools.r8.graph.DexString shorty -> d
@@ -15206,7 +14839,7 @@
     1:3:int computeHashCode():25:27 -> g
     1:1:java.lang.String toDescriptorString():99:99 -> j
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.graph.DexReference -> a.a.a.a.g.kb:
+com.android.tools.r8.graph.DexReference -> a.a.a.a.g.cb:
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     1:1:java.util.stream.Stream filterDexReference(java.util.stream.Stream):59:59 -> a
@@ -15220,7 +14853,7 @@
     boolean isDexField() -> n
     boolean isDexMethod() -> o
     boolean isDexType() -> p
-com.android.tools.r8.graph.DexString -> a.a.a.a.g.lb:
+com.android.tools.r8.graph.DexString -> a.a.a.a.g.db:
     com.android.tools.r8.graph.DexString[] EMPTY_ARRAY -> f
     boolean $assertionsDisabled -> g
     int size -> d
@@ -15265,67 +14898,103 @@
     16:25:java.lang.String decode():86:95 -> n
     26:30:java.lang.String decode():93:97 -> n
     1:3:java.lang.String toString():48:50 -> toString
-com.android.tools.r8.graph.DexType -> a.a.a.a.g.mb:
+com.android.tools.r8.graph.DexType -> a.a.a.a.g.eb:
+    java.util.Set directSubtypes -> g
+    java.util.Set implementedInterfaces -> h
+    java.util.Set NO_DIRECT_SUBTYPE -> j
     com.android.tools.r8.graph.DexString descriptor -> d
-    boolean $assertionsDisabled -> g
-    com.android.tools.r8.graph.DexType[] EMPTY_ARRAY -> f
+    boolean $assertionsDisabled -> k
+    int hierarchyLevel -> f
+    com.android.tools.r8.graph.DexType[] EMPTY_ARRAY -> i
     java.lang.String toStringCache -> e
-    1:2:void <clinit>():23:24 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexString):29:29 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexString):27:31 -> <init>
-    1:1:boolean isDoubleType():217:217 -> A
-    1:1:boolean isFloatType():209:209 -> B
-    1:1:boolean isLongType():213:213 -> C
-    1:4:boolean isPrimitiveArrayType():231:234 -> D
-    1:1:boolean isPrimitiveType():176:176 -> E
-    1:1:boolean isVoidType():185:185 -> F
-    1:1:java.lang.String toDescriptorString():82:82 -> G
-    1:1:char toShorty():107:107 -> H
+    1:9:void <clinit>():32:40 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexString):54:54 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.DexString):43:56 -> <init>
+    1:1:boolean isArrayType():463:463 -> A
+    1:1:boolean isBooleanType():431:431 -> B
+    1:1:boolean isClassType():468:468 -> C
+    1:8:boolean isD8R8SynthesizedClassType():480:487 -> D
+    1:1:boolean isDoubleType():459:459 -> E
+    1:1:boolean isFloatType():451:451 -> F
+    1:3:boolean isInterface():114:116 -> G
+    1:1:boolean isLongType():455:455 -> H
+    1:4:boolean isPrimitiveArrayType():473:476 -> I
+    1:1:boolean isPrimitiveType():418:418 -> J
+    1:1:boolean isUnknown():150:150 -> K
+    1:1:boolean isVoidType():427:427 -> L
+    1:1:void tagAsInteface():105:105 -> M
+    1:1:void tagAsSubtypeRoot():101:101 -> N
+    1:1:java.lang.String toDescriptorString():332:332 -> O
+    1:1:char toShorty():349:349 -> P
+    1:2:void ensureDirectSubTypeSet():73:74 -> Q
     boolean isPrimitiveType(char) -> a
-    1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):23:23 -> a
-    2:4:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):170:172 -> a
-    2:4:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):23 -> a
-    5:5:int slowCompareTo(java.lang.Object):23:23 -> a
-    6:7:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Predicate):53:54 -> a
-    8:8:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppInfo):58:58 -> a
-    9:10:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppInfo,java.util.function.Predicate):63:64 -> a
-    9:10:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppInfo):58 -> a
-    11:15:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):68:72 -> a
-    16:17:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):124:125 -> a
-    18:18:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):138:138 -> a
-    19:19:int compareTo(com.android.tools.r8.graph.DexType):153:153 -> a
-    20:21:boolean isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):249:250 -> a
-    22:31:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):292:301 -> a
-    32:34:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):305:307 -> a
-    35:37:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):306:308 -> a
-    38:45:java.lang.String getPackageOrName(boolean):312:319 -> a
-    1:2:boolean computeEquals(java.lang.Object):41:42 -> b
-    3:3:boolean isSamePackage(com.android.tools.r8.graph.DexType):78:78 -> b
-    4:9:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):282:287 -> b
-    10:12:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):286:288 -> b
-    1:1:int slowCompareTo(com.android.tools.r8.graph.DexType):158:158 -> c
-    1:1:int compareTo(java.lang.Object):23:23 -> compareTo
-    1:1:java.lang.String toSmaliString():113:113 -> e
-    1:9:java.lang.String toSourceString():95:103 -> f
-    1:1:int computeHashCode():36:36 -> g
+    1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):32:32 -> a
+    2:4:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):412:414 -> a
+    2:4:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):32 -> a
+    5:5:int slowCompareTo(java.lang.Object):32:32 -> a
+    6:9:void addDirectSubtype(com.android.tools.r8.graph.DexType):94:97 -> a
+    10:11:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Predicate):135:136 -> a
+    12:12:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppInfo):140:140 -> a
+    13:14:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppInfo,java.util.function.Predicate):145:146 -> a
+    13:14:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppInfo):140 -> a
+    15:15:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):176:176 -> a
+    16:26:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):188:198 -> a
+    27:30:boolean isSubtypeOfClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):228:231 -> a
+    27:30:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):200 -> a
+    31:40:boolean isInterfaceSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):205:214 -> a
+    41:42:java.lang.Iterable allInterfaces(com.android.tools.r8.graph.DexItemFactory):282:283 -> a
+    43:53:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexDefinitionSupplier):297:307 -> a
+    54:54:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexDefinitionSupplier):306:306 -> a
+    55:67:void implementedInterfaces(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Set):311:323 -> a
+    68:69:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):366:367 -> a
+    70:70:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):380:380 -> a
+    71:80:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):529:538 -> a
+    81:111:boolean validateLevelsAreCorrect(java.util.function.Function,com.android.tools.r8.graph.DexItemFactory):550:580 -> a
+    112:119:java.lang.String getPackageOrName(boolean):588:595 -> a
+    120:164:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):634:678 -> a
+    1:2:boolean computeEquals(java.lang.Object):66:67 -> b
+    3:4:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexDefinitionSupplier):109:110 -> b
+    5:7:void addInterfaceSubtype(com.android.tools.r8.graph.DexType):156:158 -> b
+    8:8:boolean isSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):167:167 -> b
+    9:9:boolean lambda$isStrictSubtypeOf$0(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):198:198 -> b
+    10:10:void forAllExtendsSubtypes(java.util.function.Consumer):248:248 -> b
+    11:13:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):542:544 -> b
+    14:16:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):543:545 -> b
+    1:2:void clearSubtypeInformation(com.android.tools.r8.graph.DexType):162:163 -> c
+    3:3:void forAllImplementsSubtypes(java.util.function.Consumer):271:271 -> c
+    4:9:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):519:524 -> c
+    10:12:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):523:525 -> c
+    1:1:int compareTo(java.lang.Object):32:32 -> compareTo
+    1:11:void setLevel(int):79:89 -> d
+    12:12:int compareTo(com.android.tools.r8.graph.DexType):395:395 -> d
+    1:1:java.lang.String toSmaliString():355:355 -> e
+    2:3:boolean isImmediateSubtypeOf(com.android.tools.r8.graph.DexType):626:627 -> e
+    1:1:boolean isSamePackage(com.android.tools.r8.graph.DexType):328:328 -> f
+    2:10:java.lang.String toSourceString():337:345 -> f
+    1:1:int computeHashCode():61:61 -> g
+    2:2:int slowCompareTo(com.android.tools.r8.graph.DexType):400:400 -> g
+    1:1:boolean lambda$allExtendsSubtypes$1(com.android.tools.r8.graph.DexType):257:257 -> h
+    1:1:boolean lambda$allImplementsSubtypes$2(com.android.tools.r8.graph.DexType):276:276 -> i
     com.android.tools.r8.graph.DexType asDexType() -> m
     boolean isDexType() -> p
-    1:16:int elementSizeForPrimitiveArrayType():254:269 -> q
-    1:2:java.lang.String getInternalName():336:337 -> r
-    1:4:java.lang.String getName():328:331 -> s
-    1:1:int getNumberOfLeadingSquareBrackets():275:275 -> t
-    1:1:java.lang.String toString():118:118 -> toString
-    1:1:java.lang.String getPackageDescriptor():324:324 -> u
-    1:4:java.lang.String toBinaryName():86:89 -> v
-    1:4:java.lang.String getPackageName():341 -> v
-    5:8:java.lang.String toBinaryName():87:90 -> v
-    5:8:java.lang.String getPackageName():341 -> v
-    9:9:java.lang.String getPackageName():341:341 -> v
-    1:1:boolean isArrayType():221:221 -> w
-    1:1:boolean isBooleanType():189:189 -> x
-    1:1:boolean isClassType():226:226 -> y
-    1:8:boolean isD8R8SynthesizedClassType():238:245 -> z
-com.android.tools.r8.graph.DexTypeList -> a.a.a.a.g.nb:
+    1:8:java.lang.Iterable allExtendsSubtypes():252:259 -> q
+    1:1:java.util.Set allImmediateSubtypes():237:237 -> r
+    1:4:java.lang.Iterable allImplementsSubtypes():275:278 -> s
+    1:16:int elementSizeForPrimitiveArrayType():491:506 -> t
+    1:1:java.lang.String toString():360:360 -> toString
+    1:2:java.lang.String getInternalName():621:622 -> u
+    1:4:java.lang.String getName():613:616 -> v
+    1:1:int getNumberOfLeadingSquareBrackets():512:512 -> w
+    1:1:java.lang.String getPackageDescriptor():609:609 -> x
+    1:3:com.android.tools.r8.graph.DexType getSingleSubtype():600:602 -> y
+    4:4:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809:809 -> y
+    4:4:com.android.tools.r8.graph.DexType getSingleSubtype():602 -> y
+    5:5:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getNext(java.util.Iterator,java.lang.Object):888:888 -> y
+    5:5:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809 -> y
+    5:5:com.android.tools.r8.graph.DexType getSingleSubtype():602 -> y
+    6:6:com.android.tools.r8.graph.DexType getSingleSubtype():602:602 -> y
+    1:1:boolean hasSubtypes():171:171 -> z
+com.android.tools.r8.graph.DexTypeList -> a.a.a.a.g.fb:
     com.android.tools.r8.graph.DexType[] values -> a
     com.android.tools.r8.graph.DexTypeList theEmptyTypeList -> b
     boolean $assertionsDisabled -> c
@@ -15338,11 +15007,11 @@
     1:1:int compareTo(java.lang.Object):12:12 -> compareTo
     1:2:boolean equals(java.lang.Object):54:55 -> equals
     1:1:com.android.tools.r8.graph.DexTypeList empty():19:19 -> g
-    1:1:boolean isEmpty():59:59 -> h
     1:1:int hashCode():33:33 -> hashCode
-    1:1:int size():63:63 -> i
+    1:1:boolean isEmpty():59:59 -> isEmpty
+    1:1:int size():63:63 -> size
     1:8:java.lang.String toString():68:75 -> toString
-com.android.tools.r8.graph.DexValue -> a.a.a.a.g.Lb:
+com.android.tools.r8.graph.DexValue -> a.a.a.a.g.Db:
     com.android.tools.r8.graph.DexValue$UnknownDexValue UNKNOWN -> b
     com.android.tools.r8.graph.DexValue[] EMPTY_ARRAY -> a
     1:3:void <clinit>():25:27 -> <clinit>
@@ -15365,8 +15034,8 @@
     java.lang.Object getBoxedValue() -> j
     boolean mayHaveSideEffects() -> k
     void sort() -> l
-com.android.tools.r8.graph.DexValue$1 -> a.a.a.a.g.ob:
-com.android.tools.r8.graph.DexValue$DexItemBasedValueString -> a.a.a.a.g.pb:
+com.android.tools.r8.graph.DexValue$1 -> a.a.a.a.g.gb:
+com.android.tools.r8.graph.DexValue$DexItemBasedValueString -> a.a.a.a.g.hb:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo classNameComputationInfo -> d
     1:1:void <clinit>():759:759 -> <clinit>
@@ -15388,7 +15057,7 @@
     1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():668:668 -> o
     1:1:com.android.tools.r8.graph.IndexedDexItem getValue():0 -> o
     1:1:java.lang.String toString():759:759 -> toString
-com.android.tools.r8.graph.DexValue$DexValueAnnotation -> a.a.a.a.g.qb:
+com.android.tools.r8.graph.DexValue$DexValueAnnotation -> a.a.a.a.g.ib:
     com.android.tools.r8.graph.DexEncodedAnnotation value -> c
     1:2:void <init>(com.android.tools.r8.graph.DexEncodedAnnotation):970:971 -> <init>
     1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):91:91 -> a
@@ -15404,7 +15073,7 @@
     1:1:java.lang.Object getBoxedValue():988:988 -> j
     1:1:void sort():998:998 -> l
     1:1:java.lang.String toString():1020:1020 -> toString
-com.android.tools.r8.graph.DexValue$DexValueArray -> a.a.a.a.g.rb:
+com.android.tools.r8.graph.DexValue$DexValueArray -> a.a.a.a.g.jb:
     com.android.tools.r8.graph.DexValue[] values -> c
     1:2:void <init>(com.android.tools.r8.graph.DexValue[]):903:904 -> <init>
     1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):91:91 -> a
@@ -15422,7 +15091,7 @@
     1:2:void sort():938:939 -> l
     1:1:com.android.tools.r8.graph.DexValue[] getValues():908:908 -> m
     1:1:java.lang.String toString():962:962 -> toString
-com.android.tools.r8.graph.DexValue$DexValueBoolean -> a.a.a.a.g.sb:
+com.android.tools.r8.graph.DexValue$DexValueBoolean -> a.a.a.a.g.kb:
     com.android.tools.r8.graph.DexValue$DexValueBoolean TRUE -> d
     com.android.tools.r8.graph.DexValue$DexValueBoolean FALSE -> e
     com.android.tools.r8.graph.DexValue$DexValueBoolean DEFAULT -> f
@@ -15446,7 +15115,7 @@
     void sort() -> l
     1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean access$000():1070:1070 -> m
     1:1:java.lang.String toString():1121:1121 -> toString
-com.android.tools.r8.graph.DexValue$DexValueByte -> a.a.a.a.g.tb:
+com.android.tools.r8.graph.DexValue$DexValueByte -> a.a.a.a.g.lb:
     byte value -> c
     com.android.tools.r8.graph.DexValue$DexValueByte DEFAULT -> d
     1:1:void <clinit>():254:254 -> <clinit>
@@ -15469,7 +15138,7 @@
     boolean mayHaveSideEffects() -> k
     void sort() -> l
     1:1:java.lang.String toString():301:301 -> toString
-com.android.tools.r8.graph.DexValue$DexValueChar -> a.a.a.a.g.ub:
+com.android.tools.r8.graph.DexValue$DexValueChar -> a.a.a.a.g.mb:
     com.android.tools.r8.graph.DexValue$DexValueChar DEFAULT -> d
     char value -> c
     1:1:void <clinit>():370:370 -> <clinit>
@@ -15494,7 +15163,7 @@
     boolean mayHaveSideEffects() -> k
     void sort() -> l
     1:1:java.lang.String toString():419:419 -> toString
-com.android.tools.r8.graph.DexValue$DexValueDouble -> a.a.a.a.g.vb:
+com.android.tools.r8.graph.DexValue$DexValueDouble -> a.a.a.a.g.nb:
     com.android.tools.r8.graph.DexValue$DexValueDouble DEFAULT -> d
     double value -> c
     1:1:void <clinit>():602:602 -> <clinit>
@@ -15514,7 +15183,7 @@
     void sort() -> l
     1:1:double getValue():615:615 -> m
     1:1:java.lang.String toString():653:653 -> toString
-com.android.tools.r8.graph.DexValue$DexValueEnum -> a.a.a.a.g.wb:
+com.android.tools.r8.graph.DexValue$DexValueEnum -> a.a.a.a.g.ob:
     1:1:void <init>(com.android.tools.r8.graph.DexField):861:861 -> <init>
     1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):858:858 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):872:872 -> a
@@ -15525,7 +15194,7 @@
     void sort() -> l
     byte getValueKind() -> m
     1:1:java.lang.String toString():858:858 -> toString
-com.android.tools.r8.graph.DexValue$DexValueField -> a.a.a.a.g.xb:
+com.android.tools.r8.graph.DexValue$DexValueField -> a.a.a.a.g.pb:
     1:1:void <init>(com.android.tools.r8.graph.DexField):825:825 -> <init>
     1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):822:822 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):836:836 -> a
@@ -15536,7 +15205,7 @@
     void sort() -> l
     byte getValueKind() -> m
     1:1:java.lang.String toString():822:822 -> toString
-com.android.tools.r8.graph.DexValue$DexValueFloat -> a.a.a.a.g.yb:
+com.android.tools.r8.graph.DexValue$DexValueFloat -> a.a.a.a.g.qb:
     float value -> c
     com.android.tools.r8.graph.DexValue$DexValueFloat DEFAULT -> d
     1:1:void <clinit>():545:545 -> <clinit>
@@ -15556,7 +15225,7 @@
     void sort() -> l
     1:1:float getValue():557:557 -> m
     1:1:java.lang.String toString():595:595 -> toString
-com.android.tools.r8.graph.DexValue$DexValueInt -> a.a.a.a.g.zb:
+com.android.tools.r8.graph.DexValue$DexValueInt -> a.a.a.a.g.rb:
     int value -> c
     com.android.tools.r8.graph.DexValue$DexValueInt DEFAULT -> d
     1:1:void <clinit>():431:431 -> <clinit>
@@ -15564,7 +15233,7 @@
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
     1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):453:453 -> a
     2:2:com.android.tools.r8.ir.code.Instruction asConstInstruction(boolean,com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.InternalOptions):482:482 -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueInt create(int):439:439 -> c
+    1:1:com.android.tools.r8.graph.DexValue$DexValueInt create(int):439:439 -> b
     1:1:boolean equals(java.lang.Object):471:471 -> equals
     1:1:java.lang.Object asAsmEncodedObject():458:458 -> g
     1:1:int hashCode():463:463 -> hashCode
@@ -15574,7 +15243,7 @@
     boolean mayHaveSideEffects() -> k
     void sort() -> l
     1:1:java.lang.String toString():476:476 -> toString
-com.android.tools.r8.graph.DexValue$DexValueLong -> a.a.a.a.g.Ab:
+com.android.tools.r8.graph.DexValue$DexValueLong -> a.a.a.a.g.sb:
     com.android.tools.r8.graph.DexValue$DexValueLong DEFAULT -> d
     long value -> c
     1:1:void <clinit>():488:488 -> <clinit>
@@ -15591,7 +15260,7 @@
     void sort() -> l
     1:1:long getValue():500:500 -> m
     1:1:java.lang.String toString():533:533 -> toString
-com.android.tools.r8.graph.DexValue$DexValueMethod -> a.a.a.a.g.Bb:
+com.android.tools.r8.graph.DexValue$DexValueMethod -> a.a.a.a.g.tb:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod):843:843 -> <init>
     1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):840:840 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):854:854 -> a
@@ -15604,7 +15273,7 @@
     void sort() -> l
     byte getValueKind() -> m
     1:1:java.lang.String toString():840:840 -> toString
-com.android.tools.r8.graph.DexValue$DexValueMethodHandle -> a.a.a.a.g.Cb:
+com.android.tools.r8.graph.DexValue$DexValueMethodHandle -> a.a.a.a.g.ub:
     1:1:void <init>(com.android.tools.r8.graph.DexMethodHandle):1134:1134 -> <init>
     1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1131:1131 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1150:1150 -> a
@@ -15616,7 +15285,7 @@
     void sort() -> l
     byte getValueKind() -> m
     1:1:java.lang.String toString():1131:1131 -> toString
-com.android.tools.r8.graph.DexValue$DexValueMethodType -> a.a.a.a.g.Db:
+com.android.tools.r8.graph.DexValue$DexValueMethodType -> a.a.a.a.g.vb:
     1:1:void <init>(com.android.tools.r8.graph.DexProto):879:879 -> <init>
     1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):876:876 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):895:895 -> a
@@ -15628,7 +15297,7 @@
     void sort() -> l
     byte getValueKind() -> m
     1:1:java.lang.String toString():876:876 -> toString
-com.android.tools.r8.graph.DexValue$DexValueNull -> a.a.a.a.g.Eb:
+com.android.tools.r8.graph.DexValue$DexValueNull -> a.a.a.a.g.wb:
     com.android.tools.r8.graph.DexValue NULL -> c
     1:1:void <clinit>():1026:1026 -> <clinit>
     1:1:void <init>():1029:1029 -> <init>
@@ -15641,7 +15310,7 @@
     java.lang.Object getBoxedValue() -> j
     boolean mayHaveSideEffects() -> k
     void sort() -> l
-com.android.tools.r8.graph.DexValue$DexValueShort -> a.a.a.a.g.Fb:
+com.android.tools.r8.graph.DexValue$DexValueShort -> a.a.a.a.g.xb:
     com.android.tools.r8.graph.DexValue$DexValueShort DEFAULT -> d
     short value -> c
     1:1:void <clinit>():313:313 -> <clinit>
@@ -15659,7 +15328,7 @@
     boolean mayHaveSideEffects() -> k
     void sort() -> l
     1:1:java.lang.String toString():358:358 -> toString
-com.android.tools.r8.graph.DexValue$DexValueString -> a.a.a.a.g.Gb:
+com.android.tools.r8.graph.DexValue$DexValueString -> a.a.a.a.g.yb:
     1:1:void <init>(com.android.tools.r8.graph.DexString):728:728 -> <init>
     1:1:void com.android.tools.r8.graph.DexValue$NestedDexValue.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):694:694 -> a
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):725 -> a
@@ -15675,7 +15344,7 @@
     1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():668:668 -> n
     1:1:com.android.tools.r8.graph.IndexedDexItem getValue():0 -> n
     1:1:java.lang.String toString():725:725 -> toString
-com.android.tools.r8.graph.DexValue$DexValueType -> a.a.a.a.g.Hb:
+com.android.tools.r8.graph.DexValue$DexValueType -> a.a.a.a.g.zb:
     1:1:void <init>(com.android.tools.r8.graph.DexType):807:807 -> <init>
     1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):804:804 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):818:818 -> a
@@ -15686,7 +15355,7 @@
     void sort() -> l
     byte getValueKind() -> m
     1:1:java.lang.String toString():804:804 -> toString
-com.android.tools.r8.graph.DexValue$NestedDexValue -> a.a.a.a.g.Ib:
+com.android.tools.r8.graph.DexValue$NestedDexValue -> a.a.a.a.g.Ab:
     com.android.tools.r8.graph.IndexedDexItem value -> c
     1:2:void <init>(com.android.tools.r8.graph.IndexedDexItem):661:662 -> <init>
     1:2:void <init>(com.android.tools.r8.graph.IndexedDexItem,com.android.tools.r8.graph.DexValue$1):657 -> <init>
@@ -15704,7 +15373,7 @@
     1:1:java.lang.Object getBoxedValue():683:683 -> j
     byte getValueKind() -> m
     1:1:java.lang.String toString():721:721 -> toString
-com.android.tools.r8.graph.DexValue$SimpleDexValue -> a.a.a.a.g.Jb:
+com.android.tools.r8.graph.DexValue$SimpleDexValue -> a.a.a.a.g.Bb:
     1:1:void <init>():223:223 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexValue$1):223 -> <init>
     1:1:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):244:244 -> a
@@ -15715,7 +15384,7 @@
     4:4:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):24 -> a
     4:4:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):247 -> a
     5:5:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):248:248 -> a
-com.android.tools.r8.graph.DexValue$UnknownDexValue -> a.a.a.a.g.Kb:
+com.android.tools.r8.graph.DexValue$UnknownDexValue -> a.a.a.a.g.Cb:
     com.android.tools.r8.graph.DexValue$UnknownDexValue UNKNOWN -> c
     1:1:void <clinit>():165:165 -> <clinit>
     1:1:void <init>():167:167 -> <init>
@@ -15727,7 +15396,7 @@
     1:1:java.lang.Object getBoxedValue():193:193 -> j
     boolean mayHaveSideEffects() -> k
     1:1:void sort():178:178 -> l
-com.android.tools.r8.graph.DirectMappedDexApplication -> a.a.a.a.g.Ob:
+com.android.tools.r8.graph.DirectMappedDexApplication -> a.a.a.a.g.Gb:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.com.google.common.collect.ImmutableList programClasses -> j
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryClasses -> l
@@ -15753,8 +15422,8 @@
     com.android.tools.r8.graph.DirectMappedDexApplication toDirect() -> g
     1:1:java.util.Collection allClasses():58:58 -> h
     1:1:java.util.Collection libraryClasses():67:67 -> i
-com.android.tools.r8.graph.DirectMappedDexApplication$1 -> a.a.a.a.g.Mb:
-com.android.tools.r8.graph.DirectMappedDexApplication$Builder -> a.a.a.a.g.Nb:
+com.android.tools.r8.graph.DirectMappedDexApplication$1 -> a.a.a.a.g.Eb:
+com.android.tools.r8.graph.DirectMappedDexApplication$Builder -> a.a.a.a.g.Fb:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathClasses -> l
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryClasses -> k
@@ -15765,7 +15434,7 @@
     1:5:com.android.tools.r8.graph.DexApplication build():154:158 -> a
     6:25:com.android.tools.r8.graph.DexApplication build():155:174 -> a
     com.android.tools.r8.graph.DexApplication$Builder self() -> e
-com.android.tools.r8.graph.EnclosingMethodAttribute -> a.a.a.a.g.Pb:
+com.android.tools.r8.graph.EnclosingMethodAttribute -> a.a.a.a.g.Hb:
     com.android.tools.r8.graph.DexType enclosingClass -> a
     com.android.tools.r8.graph.DexMethod enclosingMethod -> b
     boolean $assertionsDisabled -> c
@@ -15784,7 +15453,7 @@
     1:1:com.android.tools.r8.graph.DexMethod getEnclosingMethod():47:47 -> b
     1:1:boolean equals(java.lang.Object):62:62 -> equals
     1:2:int hashCode():56:57 -> hashCode
-com.android.tools.r8.graph.FieldAccessFlags -> a.a.a.a.g.Qb:
+com.android.tools.r8.graph.FieldAccessFlags -> a.a.a.a.g.Ib:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(int,int):44:44 -> <init>
@@ -15801,7 +15470,7 @@
     1:1:int getAsCfAccessFlags():72 -> y
     1:1:int com.android.tools.r8.graph.AccessFlags.materialize():61:61 -> z
     1:1:int getAsDexAccessFlags():77 -> z
-com.android.tools.r8.graph.GraphLense -> a.a.a.a.g._b:
+com.android.tools.r8.graph.GraphLense -> a.a.a.a.g.Sb:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():48:48 -> <clinit>
     1:1:void <init>():48:48 -> <init>
@@ -15834,8 +15503,8 @@
     3:3:boolean isIdentityLense():462 -> d
     1:6:java.util.Set lookupMethodInAllContexts(com.android.tools.r8.graph.DexMethod):420:425 -> e
     com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod) -> f
-com.android.tools.r8.graph.GraphLense$1 -> a.a.a.a.g.Rb:
-com.android.tools.r8.graph.GraphLense$Builder -> a.a.a.a.g.Sb:
+com.android.tools.r8.graph.GraphLense$1 -> a.a.a.a.g.Jb:
+com.android.tools.r8.graph.GraphLense$Builder -> a.a.a.a.g.Kb:
     java.util.Map typeMap -> a
     java.util.Map methodMap -> b
     java.util.Map fieldMap -> c
@@ -15848,13 +15517,13 @@
     4:7:com.android.tools.r8.graph.GraphLense build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLense):362:365 -> a
     1:2:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):345:346 -> b
     3:4:void move(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):353:354 -> b
-com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult -> a.a.a.a.g.Tb:
+com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult -> a.a.a.a.g.Lb:
     com.android.tools.r8.ir.code.Invoke$Type type -> b
     com.android.tools.r8.graph.DexMethod method -> a
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):60:62 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod getMethod():66:66 -> a
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():70:70 -> b
-com.android.tools.r8.graph.GraphLense$IdentityGraphLense -> a.a.a.a.g.Ub:
+com.android.tools.r8.graph.GraphLense$IdentityGraphLense -> a.a.a.a.g.Mb:
     com.android.tools.r8.graph.GraphLense$IdentityGraphLense INSTANCE -> b
     1:1:void <clinit>():733:733 -> <clinit>
     1:1:void <init>():735:735 -> <init>
@@ -15870,7 +15539,7 @@
     1:1:com.android.tools.r8.graph.GraphLense$IdentityGraphLense getInstance():738:738 -> e
     1:1:com.android.tools.r8.graph.GraphLense$IdentityGraphLense access$100():731 -> e
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):778:778 -> f
-com.android.tools.r8.graph.GraphLense$NestedGraphLense -> a.a.a.a.g.Vb:
+com.android.tools.r8.graph.GraphLense$NestedGraphLense -> a.a.a.a.g.Nb:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     java.util.Map typeMap -> d
     boolean $assertionsDisabled -> j
@@ -15900,7 +15569,7 @@
     1:3:java.util.Set lookupMethodInAllContexts(com.android.tools.r8.graph.DexMethod):966:968 -> e
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):923:923 -> f
     1:17:java.lang.String toString():991:1007 -> toString
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription -> a.a.a.a.g.Zb:
+com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription -> a.a.a.a.g.Rb:
     boolean hasBeenChangedToReturnVoid -> a
     com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription none -> c
     com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo removedArgumentsInfo -> b
@@ -15920,19 +15589,20 @@
     3:3:boolean isEmpty():243:243 -> c
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription none():239:239 -> d
     1:2:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription withConstantReturn():298:299 -> e
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo -> a.a.a.a.g.Xb:
+com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo -> a.a.a.a.g.Pb:
     com.android.tools.r8.graph.DexType type -> c
     boolean isAlwaysNull -> b
     int argumentIndex -> a
     1:4:void <init>(int,boolean,com.android.tools.r8.graph.DexType):110:113 -> <init>
     5:8:void <init>(int,boolean,com.android.tools.r8.graph.DexType):110:113 -> <init>
     5:8:void <init>(int,boolean,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense$1):76 -> <init>
-    1:1:int getArgumentIndex():121:121 -> a
+    1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder builder():117:117 -> a
     2:3:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo withArgumentIndex(int):137:138 -> a
-    1:1:com.android.tools.r8.graph.DexType getType():125:125 -> b
-    1:1:boolean isAlwaysNull():129:129 -> c
-    1:1:boolean isNeverUsed():133:133 -> d
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> a.a.a.a.g.Wb:
+    1:1:int getArgumentIndex():121:121 -> b
+    1:1:com.android.tools.r8.graph.DexType getType():125:125 -> c
+    1:1:boolean isAlwaysNull():129:129 -> d
+    1:1:boolean isNeverUsed():133:133 -> e
+com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> a.a.a.a.g.Ob:
     com.android.tools.r8.graph.DexType type -> c
     boolean isAlwaysNull -> b
     boolean $assertionsDisabled -> d
@@ -15943,7 +15613,7 @@
     2:2:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setType(com.android.tools.r8.graph.DexType):95:95 -> a
     3:5:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo build():100:102 -> a
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setIsAlwaysNull():90:90 -> b
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo -> a.a.a.a.g.Yb:
+com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo -> a.a.a.a.g.Qb:
     java.util.List removedArguments -> a
     com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo empty -> b
     boolean $assertionsDisabled -> c
@@ -15958,7 +15628,7 @@
     1:1:boolean hasRemovedArguments():178:178 -> b
     1:3:java.util.ListIterator iterator():172:174 -> c
     1:1:int numberOfRemovedArguments():193:193 -> d
-com.android.tools.r8.graph.IndexedDexItem -> a.a.a.a.g.ac:
+com.android.tools.r8.graph.IndexedDexItem -> a.a.a.a.g.Tb:
     int sortedIndex -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():12:12 -> <clinit>
@@ -15966,41 +15636,36 @@
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
     int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping) -> a
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):24:24 -> a
-    1:3:void setSortedIndex(int):33:35 -> c
-    1:3:int sortedCompareTo(int):45:47 -> d
+    1:3:void setSortedIndex(int):33:35 -> b
+    1:3:int sortedCompareTo(int):45:47 -> c
     1:1:int getSortedIndex():40:40 -> h
     1:1:void resetSortedIndex():57:57 -> i
-com.android.tools.r8.graph.InnerClassAttribute -> a.a.a.a.g.bc:
+com.android.tools.r8.graph.InnerClassAttribute -> a.a.a.a.g.Ub:
     com.android.tools.r8.graph.DexString innerName -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType outer -> c
     com.android.tools.r8.graph.DexType inner -> b
     int access -> a
-    1:1:void <clinit>():13:13 -> <clinit>
-    1:6:void <init>(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):33:38 -> <init>
-    1:1:int getAccess():50:50 -> a
-    2:2:com.android.tools.r8.graph.DexType getOuter():58:58 -> a
-    2:2:com.android.tools.r8.graph.DexType getLiveContext(com.android.tools.r8.shaking.AppInfoWithLiveness):85 -> a
-    3:3:com.android.tools.r8.graph.DexType getInner():54:54 -> a
-    3:3:com.android.tools.r8.graph.DexType getLiveContext(com.android.tools.r8.shaking.AppInfoWithLiveness):87 -> a
-    4:16:com.android.tools.r8.graph.DexType getLiveContext(com.android.tools.r8.shaking.AppInfoWithLiveness):87:99 -> a
-    17:21:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):66:70 -> a
-    22:22:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):67:67 -> a
-    23:23:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):75:75 -> a
-    24:24:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
-    24:24:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):75 -> a
-    25:25:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):76:76 -> a
-    26:26:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
-    26:26:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):77 -> a
-    27:27:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):79:79 -> a
-    28:28:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
-    28:28:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):80 -> a
-    1:1:com.android.tools.r8.graph.DexType getInner():54:54 -> b
-    1:1:com.android.tools.r8.graph.DexString getInnerName():62:62 -> c
-    1:1:com.android.tools.r8.graph.DexType getOuter():58:58 -> d
-    1:1:boolean isAnonymous():46:46 -> e
-    1:1:boolean isNamed():42:42 -> f
-com.android.tools.r8.graph.JarApplicationReader -> a.a.a.a.g.cc:
+    1:1:void <clinit>():12:12 -> <clinit>
+    1:6:void <init>(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):32:37 -> <init>
+    1:1:int getAccess():49:49 -> a
+    2:6:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):65:69 -> a
+    7:7:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):66:66 -> a
+    8:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):74:74 -> a
+    9:9:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
+    9:9:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):74 -> a
+    10:10:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):75:75 -> a
+    11:11:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
+    11:11:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):76 -> a
+    12:12:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):78:78 -> a
+    13:13:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
+    13:13:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):79 -> a
+    1:1:com.android.tools.r8.graph.DexType getInner():53:53 -> b
+    1:1:com.android.tools.r8.graph.DexString getInnerName():61:61 -> c
+    1:1:com.android.tools.r8.graph.DexType getOuter():57:57 -> d
+    1:1:boolean isAnonymous():45:45 -> e
+    1:1:boolean isNamed():41:41 -> f
+com.android.tools.r8.graph.JarApplicationReader -> a.a.a.a.g.Vb:
     java.util.concurrent.ConcurrentHashMap stringCache -> d
     com.android.tools.r8.utils.InternalOptions options -> a
     java.util.concurrent.ConcurrentHashMap asmTypeCache -> c
@@ -16014,107 +15679,105 @@
     3:10:com.android.tools.r8.graph.DexTypeList getTypeListFromNames(java.lang.String[]):62:69 -> a
     11:11:com.android.tools.r8.graph.DexField getField(java.lang.String,java.lang.String,java.lang.String):84:84 -> a
     12:12:com.android.tools.r8.graph.DexField getField(com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String):88:88 -> a
-    13:15:int getArgumentCount(java.lang.String):157:159 -> a
+    13:15:int getArgumentCount(java.lang.String):156:158 -> a
     1:1:com.android.tools.r8.graph.DexMethod getMethod(java.lang.String,java.lang.String,java.lang.String):92:92 -> b
     2:2:com.android.tools.r8.graph.DexMethod getMethod(com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String):96:96 -> b
-    3:7:com.android.tools.r8.org.objectweb.asm.Type[] getArgumentTypes(java.lang.String):169:173 -> b
+    3:7:com.android.tools.r8.org.objectweb.asm.Type[] getArgumentTypes(java.lang.String):168:172 -> b
     1:1:com.android.tools.r8.org.objectweb.asm.Type getAsmObjectType(java.lang.String):32:32 -> c
     1:1:com.android.tools.r8.org.objectweb.asm.Type getAsmType(java.lang.String):36:36 -> d
-    1:1:com.android.tools.r8.graph.DexProto getProto(java.lang.String):113:113 -> e
-    2:2:boolean isValidDescriptor(java.lang.String):137:137 -> e
-    2:2:com.android.tools.r8.graph.DexProto getProto(java.lang.String):113 -> e
-    3:13:com.android.tools.r8.graph.DexProto getProto(java.lang.String):113:123 -> e
+    1:1:com.android.tools.r8.graph.DexProto getProto(java.lang.String):112:112 -> e
+    2:2:boolean isValidDescriptor(java.lang.String):136:136 -> e
+    2:2:com.android.tools.r8.graph.DexProto getProto(java.lang.String):112 -> e
+    3:13:com.android.tools.r8.graph.DexProto getProto(java.lang.String):112:122 -> e
     14:21:com.android.tools.r8.graph.DexTypeList getTypeListFromDescriptors(java.lang.String[]):73:80 -> e
-    14:21:com.android.tools.r8.graph.DexProto getProto(java.lang.String):124 -> e
-    22:22:com.android.tools.r8.graph.DexProto getProto(java.lang.String):121:121 -> e
-    1:1:com.android.tools.r8.org.objectweb.asm.Type getReturnType(java.lang.String):145:145 -> f
+    14:21:com.android.tools.r8.graph.DexProto getProto(java.lang.String):123 -> e
+    22:22:com.android.tools.r8.graph.DexProto getProto(java.lang.String):120:120 -> e
+    1:1:com.android.tools.r8.org.objectweb.asm.Type getReturnType(java.lang.String):144:144 -> f
     1:1:com.android.tools.r8.graph.DexString getString(java.lang.String):44:44 -> g
     1:1:com.android.tools.r8.graph.DexType getTypeFromDescriptor(java.lang.String):57:57 -> h
-    2:2:boolean isValidDescriptor(java.lang.String):137:137 -> h
+    2:2:boolean isValidDescriptor(java.lang.String):136:136 -> h
     2:2:com.android.tools.r8.graph.DexType getTypeFromDescriptor(java.lang.String):57 -> h
     3:4:com.android.tools.r8.graph.DexType getTypeFromDescriptor(java.lang.String):57:58 -> h
     1:1:com.android.tools.r8.graph.DexType getTypeFromName(java.lang.String):52:52 -> i
-    2:2:boolean isValidInternalName(java.lang.String):141:141 -> i
+    2:2:boolean isValidInternalName(java.lang.String):140:140 -> i
     2:2:com.android.tools.r8.graph.DexType getTypeFromName(java.lang.String):52 -> i
     3:4:com.android.tools.r8.graph.DexType getTypeFromName(java.lang.String):52:53 -> i
-    1:35:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):179:213 -> j
-    36:41:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):200:205 -> j
-    42:65:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):187:210 -> j
-    66:66:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):196:196 -> j
-    1:2:java.lang.String getReturnTypeDescriptor(java.lang.String):149:150 -> k
-    1:4:java.lang.String getShortyDescriptor(java.lang.String):129:132 -> l
+    1:35:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):178:212 -> j
+    36:41:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):199:204 -> j
+    42:65:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):186:209 -> j
+    66:66:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):195:195 -> j
+    1:2:java.lang.String getReturnTypeDescriptor(java.lang.String):148:149 -> k
+    1:4:java.lang.String getShortyDescriptor(java.lang.String):128:131 -> l
     1:1:com.android.tools.r8.org.objectweb.asm.Type lambda$getAsmObjectType$0(java.lang.String):32:32 -> m
     1:1:com.android.tools.r8.org.objectweb.asm.Type lambda$getAsmType$1(java.lang.String):36:36 -> n
-com.android.tools.r8.graph.JarClassFileReader -> a.a.a.a.g.ic:
+com.android.tools.r8.graph.JarClassFileReader -> a.a.a.a.g.ac:
     java.util.function.Consumer classConsumer -> b
     com.android.tools.r8.graph.JarApplicationReader application -> a
     byte[] CLASSFILE_HEADER -> c
     boolean $assertionsDisabled -> d
     1:3:void <clinit>():63:65 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):74:76 -> <init>
-    1:1:int access$000(int):63:63 -> a
-    2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor access$100(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):63:63 -> a
-    3:3:com.android.tools.r8.graph.DexEncodedAnnotation access$1700(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):63:63 -> a
-    4:13:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):80:89 -> a
-    14:14:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):29:29 -> a
-    14:14:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):89 -> a
-    15:24:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):89:98 -> a
-    25:33:byte[] com.android.tools.r8.org.objectweb.asm.ClassReader.readStream(java.io.InputStream,boolean):312:320 -> a
-    25:33:void com.android.tools.r8.org.objectweb.asm.ClassReader.<init>(java.io.InputStream):283 -> a
-    25:33:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):98 -> a
-    34:34:void com.android.tools.r8.org.objectweb.asm.ClassReader.<init>(java.io.InputStream):283:283 -> a
-    34:34:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):98 -> a
-    35:42:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):104:111 -> a
-    43:43:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400:400 -> a
-    43:43:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):111 -> a
-    44:50:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):116:122 -> a
-    51:55:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):120:124 -> a
-    56:68:byte[] com.android.tools.r8.org.objectweb.asm.ClassReader.readStream(java.io.InputStream,boolean):312:324 -> a
-    56:68:void com.android.tools.r8.org.objectweb.asm.ClassReader.<init>(java.io.InputStream):283 -> a
-    56:68:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):98 -> a
-    69:69:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):94:94 -> a
-    70:70:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):29:29 -> a
-    70:70:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):94 -> a
-    71:71:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):94:94 -> a
-    72:74:com.android.tools.r8.graph.MethodAccessFlags createMethodAccessFlags(java.lang.String,int):143:145 -> a
-    75:76:void lambda$createAnnotationVisitor$0(java.util.List,int,java.lang.String,com.android.tools.r8.graph.JarApplicationReader,java.util.List,java.util.List):154:155 -> a
-    77:77:void lambda$createAnnotationVisitor$0(java.util.List,int,java.lang.String,com.android.tools.r8.graph.JarApplicationReader,java.util.List,java.util.List):154:154 -> a
-    78:88:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):435:445 -> a
-    78:88:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):63 -> a
-    89:89:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):436:436 -> a
-    89:89:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):63 -> a
-    1:1:com.android.tools.r8.graph.FieldAccessFlags createFieldAccessFlags(int):138:138 -> b
-    2:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):151:153 -> b
-    5:6:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):160:161 -> b
-    7:13:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):160:166 -> b
-    int cleanAccessFlags(int) -> c
-com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> a.a.a.a.g.dc:
+    int access$000(int) -> a
+    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor access$100(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):63:63 -> a
+    2:2:com.android.tools.r8.graph.DexEncodedAnnotation access$1700(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):63:63 -> a
+    3:12:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):80:89 -> a
+    13:13:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):29:29 -> a
+    13:13:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):89 -> a
+    14:23:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):89:98 -> a
+    24:31:byte[] com.android.tools.r8.org.objectweb.asm.ClassReader.readStream(java.io.InputStream,boolean):303:310 -> a
+    24:31:void com.android.tools.r8.org.objectweb.asm.ClassReader.<init>(java.io.InputStream):273 -> a
+    24:31:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):98 -> a
+    32:32:void com.android.tools.r8.org.objectweb.asm.ClassReader.<init>(java.io.InputStream):273:273 -> a
+    32:32:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):98 -> a
+    33:40:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):104:111 -> a
+    41:41:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391:391 -> a
+    41:41:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):111 -> a
+    42:48:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):116:122 -> a
+    49:53:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):120:124 -> a
+    54:54:byte[] com.android.tools.r8.org.objectweb.asm.ClassReader.readStream(java.io.InputStream,boolean):315:315 -> a
+    54:54:void com.android.tools.r8.org.objectweb.asm.ClassReader.<init>(java.io.InputStream):273 -> a
+    54:54:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):98 -> a
+    55:55:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):94:94 -> a
+    56:56:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):29:29 -> a
+    56:56:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):94 -> a
+    57:57:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):94:94 -> a
+    58:60:com.android.tools.r8.graph.MethodAccessFlags createMethodAccessFlags(java.lang.String,int):139:141 -> a
+    61:62:void lambda$createAnnotationVisitor$0(java.util.List,int,java.lang.String,com.android.tools.r8.graph.JarApplicationReader,java.util.List,java.util.List):150:151 -> a
+    63:63:void lambda$createAnnotationVisitor$0(java.util.List,int,java.lang.String,com.android.tools.r8.graph.JarApplicationReader,java.util.List,java.util.List):150:150 -> a
+    64:66:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List):417:419 -> a
+    64:66:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List):63 -> a
+    67:67:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List):418:418 -> a
+    67:67:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List):63 -> a
+    1:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):147:149 -> b
+    4:5:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):156:157 -> b
+    6:12:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):156:162 -> b
+com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> a.a.a.a.g.Wb:
     java.util.List values -> e
     java.util.List names -> d
     com.android.tools.r8.graph.JarApplicationReader application -> b
     boolean $assertionsDisabled -> f
     java.util.function.BiConsumer onVisitEnd -> c
-    1:1:void <clinit>():760:760 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):769:769 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):764:771 -> <init>
-    1:2:void visitEnum(java.lang.String,java.lang.String,java.lang.String):781:782 -> a
-    3:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):787:787 -> a
-    4:5:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):788:789 -> a
-    6:6:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):788:788 -> a
-    7:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):794:794 -> a
-    8:9:void lambda$visitArray$1(java.lang.String,java.util.List,java.util.List):795:796 -> a
-    10:10:void visitEnd():802:802 -> a
-    11:16:void addElement(java.lang.String,com.android.tools.r8.graph.DexValue):807:812 -> a
-    17:38:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):878:899 -> a
-    17:38:void visit(java.lang.String,java.lang.Object):776 -> a
-    39:94:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):816:871 -> a
-    39:94:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):901 -> a
-    39:94:void visit(java.lang.String,java.lang.Object):776 -> a
-    95:95:void visit(java.lang.String,java.lang.Object):776:776 -> a
-    96:96:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):873:873 -> a
-    96:96:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):901 -> a
-    96:96:void visit(java.lang.String,java.lang.Object):776 -> a
-com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> a.a.a.a.g.ec:
+    1:1:void <clinit>():732:732 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):741:741 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):736:743 -> <init>
+    1:2:void visitEnum(java.lang.String,java.lang.String,java.lang.String):753:754 -> a
+    3:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):759:759 -> a
+    4:5:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):760:761 -> a
+    6:6:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):760:760 -> a
+    7:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):766:766 -> a
+    8:9:void lambda$visitArray$1(java.lang.String,java.util.List,java.util.List):767:768 -> a
+    10:10:void visitEnd():774:774 -> a
+    11:16:void addElement(java.lang.String,com.android.tools.r8.graph.DexValue):779:784 -> a
+    17:38:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):850:871 -> a
+    17:38:void visit(java.lang.String,java.lang.Object):748 -> a
+    39:94:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):788:843 -> a
+    39:94:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):873 -> a
+    39:94:void visit(java.lang.String,java.lang.Object):748 -> a
+    95:95:void visit(java.lang.String,java.lang.Object):748:748 -> a
+    96:96:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):845:845 -> a
+    96:96:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):873 -> a
+    96:96:void visit(java.lang.String,java.lang.Object):748 -> a
+com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> a.a.a.a.g.Xb:
     com.android.tools.r8.graph.ClassKind classKind -> d
     java.util.List staticFields -> r
     java.util.Set methodSignatures -> w
@@ -16138,67 +15801,67 @@
     java.util.function.Consumer classConsumer -> f
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> g
     com.android.tools.r8.graph.DexString sourceFile -> m
-    1:1:void <clinit>():169:169 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[],com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):202:202 -> <init>
-    2:34:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[],com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):175:207 -> <init>
+    1:1:void <clinit>():165:165 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[],com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):198:198 -> <init>
+    2:34:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[],com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):171:203 -> <init>
     void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute) -> a
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
-    1:1:com.android.tools.r8.graph.JarClassFileReader$ReparseContext access$1000(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> a
-    2:2:boolean access$1376(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int):169:169 -> a
-    3:8:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):212:217 -> a
-    9:9:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):212:212 -> a
-    10:15:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):223:228 -> a
-    16:16:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):244:244 -> a
-    17:18:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):232:233 -> a
-    17:18:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):244 -> a
-    19:19:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):244:244 -> a
-    20:20:java.lang.String illegalClassFilePostfix(int):239:239 -> a
-    20:20:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):246 -> a
-    21:21:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):246:246 -> a
-    22:27:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):252:257 -> a
-    28:28:int getMajorVersion():425:425 -> a
-    28:28:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):257 -> a
-    29:43:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):257:271 -> a
-    44:52:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):270:278 -> a
-    53:53:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):414:414 -> a
-    53:53:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):278 -> a
-    54:56:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):258:260 -> a
-    57:57:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):259:259 -> a
-    58:63:void visitSource(java.lang.String,java.lang.String):285:290 -> a
+    1:1:com.android.tools.r8.graph.JarClassFileReader$ReparseContext access$1000(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> a
+    2:2:boolean access$1376(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int):165:165 -> a
+    3:8:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):208:213 -> a
+    9:9:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):208:208 -> a
+    10:15:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):219:224 -> a
+    16:16:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):240:240 -> a
+    17:18:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):228:229 -> a
+    17:18:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):240 -> a
+    19:19:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):240:240 -> a
+    20:20:java.lang.String illegalClassFilePostfix(int):235:235 -> a
+    20:20:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):242 -> a
+    21:21:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):242:242 -> a
+    22:27:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):248:253 -> a
+    28:28:int getMajorVersion():408:408 -> a
+    28:28:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):253 -> a
+    29:43:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):253:267 -> a
+    44:52:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):266:274 -> a
+    53:53:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):397:397 -> a
+    53:53:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):274 -> a
+    54:56:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):254:256 -> a
+    57:57:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):255:255 -> a
+    58:63:void visitSource(java.lang.String,java.lang.String):281:286 -> a
     64:67:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createSourceDebugExtensionAnnotation(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexItemFactory):175:178 -> a
-    64:67:void visitSource(java.lang.String,java.lang.String):289 -> a
-    68:68:void visitSource(java.lang.String,java.lang.String):288:288 -> a
-    69:76:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):297:304 -> a
-    77:83:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):310:316 -> a
-    84:84:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):321:321 -> a
-    85:87:void visitEnd():338:340 -> a
-    88:88:void visitEnd():339:339 -> a
-    89:89:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):414:414 -> a
-    89:89:void visitEnd():339 -> a
-    90:90:void checkReachabilitySensitivity():371:371 -> a
-    90:90:void visitEnd():342 -> a
-    91:101:boolean hasReachabilitySensitiveField():388:398 -> a
-    91:101:void checkReachabilitySensitivity():371 -> a
-    91:101:void visitEnd():342 -> a
-    102:111:void checkReachabilitySensitivity():372:381 -> a
-    102:111:void visitEnd():342 -> a
-    112:128:void visitEnd():343:359 -> a
-    129:149:void visitEnd():344:364 -> a
-    150:153:void addDefaultAnnotation(java.lang.String,com.android.tools.r8.graph.DexValue):407:410 -> a
-    150:153:void access$1600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):169 -> a
-    1:1:int access$1100(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> b
-    2:5:java.util.List getAnnotations():418:421 -> b
-    1:1:java.util.Set access$1200(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> c
-    1:1:java.util.List access$1400(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> d
-    1:1:java.util.List access$1500(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> e
-    1:1:com.android.tools.r8.graph.JarApplicationReader access$300(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> f
-    1:1:com.android.tools.r8.graph.DexType access$400(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> g
-    1:1:java.util.Set access$500(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> h
-    1:1:java.util.List access$600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> i
-    1:1:java.util.List access$700(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> j
-    1:1:com.android.tools.r8.graph.ClassKind access$800(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> k
-    1:1:com.android.tools.r8.origin.Origin access$900(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> l
-com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> a.a.a.a.g.fc:
+    64:67:void visitSource(java.lang.String,java.lang.String):285 -> a
+    68:68:void visitSource(java.lang.String,java.lang.String):284:284 -> a
+    69:69:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):293:293 -> a
+    70:70:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):299:299 -> a
+    71:71:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):304:304 -> a
+    72:74:void visitEnd():321:323 -> a
+    75:75:void visitEnd():322:322 -> a
+    76:76:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):397:397 -> a
+    76:76:void visitEnd():322 -> a
+    77:77:void checkReachabilitySensitivity():354:354 -> a
+    77:77:void visitEnd():325 -> a
+    78:88:boolean hasReachabilitySensitiveField():371:381 -> a
+    78:88:void checkReachabilitySensitivity():354 -> a
+    78:88:void visitEnd():325 -> a
+    89:98:void checkReachabilitySensitivity():355:364 -> a
+    89:98:void visitEnd():325 -> a
+    99:115:void visitEnd():326:342 -> a
+    116:136:void visitEnd():327:347 -> a
+    137:140:void addDefaultAnnotation(java.lang.String,com.android.tools.r8.graph.DexValue):390:393 -> a
+    137:140:void access$1600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):165 -> a
+    1:1:int access$1100(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> b
+    2:5:java.util.List getAnnotations():401:404 -> b
+    1:1:java.util.Set access$1200(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> c
+    1:1:java.util.List access$1400(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> d
+    1:1:java.util.List access$1500(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> e
+    1:1:com.android.tools.r8.graph.JarApplicationReader access$300(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> f
+    1:1:com.android.tools.r8.graph.DexType access$400(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> g
+    1:1:java.util.Set access$500(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> h
+    1:1:java.util.List access$600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> i
+    1:1:java.util.List access$700(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> j
+    1:1:com.android.tools.r8.graph.ClassKind access$800(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> k
+    1:1:com.android.tools.r8.origin.Origin access$900(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> l
+com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> a.a.a.a.g.Yb:
     com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor parent -> b
     java.lang.Object value -> f
     boolean $assertionsDisabled -> h
@@ -16206,79 +15869,79 @@
     int access -> c
     java.lang.String desc -> e
     java.lang.String name -> d
-    1:1:void <clinit>():448:448 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):459:459 -> <init>
-    2:14:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):455:467 -> <init>
-    15:15:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):466:466 -> <init>
-    16:16:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):543:543 -> <init>
-    16:16:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):466 -> <init>
+    1:1:void <clinit>():422:422 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):433:433 -> <init>
+    2:14:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):429:441 -> <init>
+    15:15:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):440:440 -> <init>
+    16:16:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):516:516 -> <init>
+    16:16:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):440 -> <init>
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
-    1:7:void visitEnd():485:491 -> a
-    8:38:com.android.tools.r8.graph.DexValue getStaticValue(java.lang.Object,com.android.tools.r8.graph.DexType):509:539 -> a
-    8:38:void visitEnd():491 -> a
-    39:48:void visitEnd():492:501 -> a
-    49:49:void visitEnd():499:499 -> a
-    50:53:java.util.List getAnnotations():547:550 -> a
-    50:53:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):473 -> a
-    54:54:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):473:473 -> a
-    1:4:java.util.List getAnnotations():547:550 -> b
-com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> a.a.a.a.g.gc:
-    java.util.List parameterFlags -> r
-    int annotableParameterCount -> o
-    java.util.List parameterNames -> q
-    com.android.tools.r8.graph.Code code -> u
-    int parameterCount -> l
-    java.util.List parameterAnnotationsLists -> p
-    com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor parent -> k
-    java.lang.String name -> j
-    com.android.tools.r8.graph.DexValue defaultAnnotation -> n
-    boolean $assertionsDisabled -> v
-    com.android.tools.r8.graph.MethodAccessFlags flags -> t
-    com.android.tools.r8.graph.DexMethod method -> s
-    java.util.List annotations -> m
-    1:1:void <clinit>():554:554 -> <clinit>
-    1:1:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):571:571 -> <init>
-    2:26:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):559:583 -> <init>
-    27:27:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):582:582 -> <init>
-    28:28:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):756:756 -> <init>
-    28:28:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):582 -> <init>
-    29:31:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):585:587 -> <init>
-    32:32:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):586:586 -> <init>
-    33:33:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):756:756 -> <init>
-    33:33:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):586 -> <init>
+    1:6:void visitEnd():459:464 -> a
+    7:37:com.android.tools.r8.graph.DexValue getStaticValue(java.lang.Object,com.android.tools.r8.graph.DexType):482:512 -> a
+    7:37:void visitEnd():464 -> a
+    38:47:void visitEnd():465:474 -> a
+    48:48:void visitEnd():472:472 -> a
+    49:52:java.util.List getAnnotations():520:523 -> a
+    49:52:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):447 -> a
+    53:53:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):447:447 -> a
+    1:4:java.util.List getAnnotations():520:523 -> b
+com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> a.a.a.a.g.Zb:
+    boolean $assertionsDisabled -> o
+    com.android.tools.r8.graph.DexMethod method -> l
+    com.android.tools.r8.graph.MethodAccessFlags flags -> m
+    int annotableParameterCount -> h
+    com.android.tools.r8.graph.Code code -> n
+    int parameterCount -> e
+    com.android.tools.r8.graph.DexValue defaultAnnotation -> g
+    com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor parent -> d
+    java.util.List annotations -> f
+    java.util.List parameterNames -> j
+    java.util.List parameterAnnotationsLists -> i
+    java.lang.String name -> c
+    java.util.List parameterFlags -> k
+    1:1:void <clinit>():527:527 -> <clinit>
+    1:1:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):544:544 -> <init>
+    2:26:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):532:556 -> <init>
+    27:27:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):555:555 -> <init>
+    28:28:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):728:728 -> <init>
+    28:28:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):555 -> <init>
+    29:31:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):558:560 -> <init>
+    32:32:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):559:559 -> <init>
+    33:33:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):728:728 -> <init>
+    33:33:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):559 -> <init>
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean) -> a
-    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):593:593 -> a
-    2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():598:598 -> a
-    3:4:void lambda$visitAnnotationDefault$0(java.util.List,java.util.List):599:600 -> a
-    5:11:void visitAnnotableParameterCount(int,boolean):613:619 -> a
-    12:23:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):624:635 -> a
-    24:24:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):634:634 -> a
+    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):566:566 -> a
+    2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():571:571 -> a
+    3:4:void lambda$visitAnnotationDefault$0(java.util.List,java.util.List):572:573 -> a
+    5:11:void visitAnnotableParameterCount(int,boolean):586:592 -> a
+    12:23:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):597:608 -> a
+    24:24:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):607:607 -> a
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> b
-    1:8:void visitParameter(java.lang.String,int):661:668 -> b
-    9:9:void visitCode():673:673 -> b
+    1:8:void visitParameter(java.lang.String,int):634:641 -> b
+    9:9:void visitCode():646:646 -> b
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> c
-    1:17:void visitEnd():678:694 -> c
-    18:18:void com.android.tools.r8.graph.ParameterAnnotationsList.<init>(com.android.tools.r8.graph.DexAnnotationSet[]):54:54 -> c
-    18:18:void visitEnd():694 -> c
-    19:24:void visitEnd():696:701 -> c
-    25:31:void visitEnd():700:706 -> c
-    32:40:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createMethodParametersAnnotation(com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexItemFactory):184:192 -> c
-    32:40:void visitEnd():703 -> c
-    41:56:void visitEnd():703:718 -> c
-    57:59:boolean isReachabilitySensitive():739:741 -> c
-    57:59:void visitEnd():718 -> c
-    60:64:void visitEnd():718:722 -> c
-    65:75:void visitEnd():720:730 -> c
-    76:76:void visitEnd():727:727 -> c
-    77:85:void visitEnd():725:733 -> c
-    1:4:java.util.List getAnnotations():749:752 -> d
-com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> a.a.a.a.g.hc:
+    1:16:void visitEnd():651:666 -> c
+    17:17:void com.android.tools.r8.graph.ParameterAnnotationsList.<init>(com.android.tools.r8.graph.DexAnnotationSet[]):54:54 -> c
+    17:17:void visitEnd():666 -> c
+    18:23:void visitEnd():668:673 -> c
+    24:30:void visitEnd():672:678 -> c
+    31:39:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createMethodParametersAnnotation(com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexItemFactory):184:192 -> c
+    31:39:void visitEnd():675 -> c
+    40:55:void visitEnd():675:690 -> c
+    56:58:boolean isReachabilitySensitive():711:713 -> c
+    56:58:void visitEnd():690 -> c
+    59:63:void visitEnd():690:694 -> c
+    64:74:void visitEnd():692:702 -> c
+    75:75:void visitEnd():699:699 -> c
+    76:84:void visitEnd():697:705 -> c
+    1:4:java.util.List getAnnotations():721:724 -> d
+com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> a.a.a.a.g._b:
     byte[] classCache -> a
     com.android.tools.r8.graph.DexProgramClass owner -> b
     java.util.List codeList -> c
-    1:8:void <init>():905:912 -> <init>
-com.android.tools.r8.graph.JarCode -> a.a.a.a.g.mc:
+    1:8:void <init>():877:884 -> <init>
+com.android.tools.r8.graph.JarCode -> a.a.a.a.g.ec:
     com.android.tools.r8.org.objectweb.asm.tree.MethodNode node -> e
     com.android.tools.r8.graph.JarApplicationReader application -> g
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> f
@@ -16299,55 +15962,55 @@
     21:28:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):206:213 -> a
     29:29:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):212:212 -> a
     30:31:void registerArgumentReferences(com.android.tools.r8.graph.ArgumentUse):220:221 -> a
-    32:62:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):229:259 -> a
-    63:75:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):298:310 -> a
-    76:76:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400:400 -> a
-    76:76:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):310 -> a
-    77:78:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):312:313 -> a
-    79:79:java.util.function.BiFunction createCodeLocator(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):318:318 -> a
+    32:60:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):229:257 -> a
+    61:73:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):296:308 -> a
+    74:74:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391:391 -> a
+    74:74:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):308 -> a
+    75:76:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):310:311 -> a
+    77:77:java.util.function.BiFunction createCodeLocator(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):316:316 -> a
     1:9:boolean computeEquals(java.lang.Object):95:103 -> b
     10:15:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position):150:155 -> b
     16:20:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position):168:172 -> b
     16:20:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position):157 -> b
-    21:22:boolean hasJsr(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):322:323 -> b
-    23:25:boolean hasJsr(com.android.tools.r8.org.objectweb.asm.tree.MethodNode):331:333 -> b
-    23:25:boolean hasJsr(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):323 -> b
+    21:22:boolean hasJsr(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):320:321 -> b
+    23:25:boolean hasJsr(com.android.tools.r8.org.objectweb.asm.tree.MethodNode):329:331 -> b
+    23:25:boolean hasJsr(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):321 -> b
     1:2:int computeHashCode():89:90 -> g
     com.android.tools.r8.graph.JarCode asJarCode() -> j
     1:3:boolean isEmptyVoidMethod():110:112 -> p
     boolean isJarCode() -> q
     1:2:com.android.tools.r8.org.objectweb.asm.tree.MethodNode getNode():73:74 -> s
     1:2:void markReachabilitySensitive():68:69 -> t
-    1:6:java.lang.String toString():264:269 -> toString
-    1:9:void triggerDelayedParsingIfNeccessary():278:286 -> u
-    10:22:boolean verifyNoReparseContext(com.android.tools.r8.graph.DexProgramClass):394:406 -> u
-    10:22:void triggerDelayedParsingIfNeccessary():286 -> u
-    23:23:void triggerDelayedParsingIfNeccessary():286:286 -> u
-com.android.tools.r8.graph.JarCode$1 -> a.a.a.a.g.jc:
-com.android.tools.r8.graph.JarCode$DefaultCodeLocator -> a.a.a.a.g.kc:
+    1:6:java.lang.String toString():262:267 -> toString
+    1:9:void triggerDelayedParsingIfNeccessary():276:284 -> u
+    10:22:boolean verifyNoReparseContext(com.android.tools.r8.graph.DexProgramClass):392:404 -> u
+    10:22:void triggerDelayedParsingIfNeccessary():284 -> u
+    23:23:void triggerDelayedParsingIfNeccessary():284:284 -> u
+com.android.tools.r8.graph.JarCode$1 -> a.a.a.a.g.bc:
+com.android.tools.r8.graph.JarCode$DefaultCodeLocator -> a.a.a.a.g.cc:
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> a
     com.android.tools.r8.graph.JarApplicationReader application -> b
     int methodIndex -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():341:341 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):346:346 -> <init>
-    1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.JarCode$1):341 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):344:348 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.JarCode$1):341 -> <init>
-    1:1:java.lang.Object apply(java.lang.Object,java.lang.Object):341:341 -> apply
-    2:3:com.android.tools.r8.graph.JarCode apply(java.lang.String,java.lang.String):353:354 -> apply
-    2:3:java.lang.Object apply(java.lang.Object,java.lang.Object):341 -> apply
-com.android.tools.r8.graph.JarCode$SecondVisitor -> a.a.a.a.g.lc:
+    1:1:void <clinit>():339:339 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):344:344 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.JarCode$1):339 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):342:346 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.JarCode$1):339 -> <init>
+    1:1:java.lang.Object apply(java.lang.Object,java.lang.Object):339:339 -> apply
+    2:3:com.android.tools.r8.graph.JarCode apply(java.lang.String,java.lang.String):351:352 -> apply
+    2:3:java.lang.Object apply(java.lang.Object,java.lang.Object):339 -> apply
+com.android.tools.r8.graph.JarCode$SecondVisitor -> a.a.a.a.g.dc:
     java.util.function.BiFunction codeLocator -> c
     boolean useJsrInliner -> d
-    1:3:void <init>(java.util.function.BiFunction,boolean):367:369 -> <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[]):376:386 -> a
-com.android.tools.r8.graph.KeyedDexItem -> a.a.a.a.g.nc:
+    1:3:void <init>(java.util.function.BiFunction,boolean):365:367 -> <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[]):374:384 -> a
+com.android.tools.r8.graph.KeyedDexItem -> a.a.a.a.g.fc:
     1:1:void <init>():6:6 -> <init>
     1:1:boolean equals(java.lang.Object):15:15 -> equals
     1:1:int hashCode():20:20 -> hashCode
     com.android.tools.r8.graph.PresortedComparable getKey() -> o
-com.android.tools.r8.graph.LazyCfCode -> a.a.a.a.g.rc:
+com.android.tools.r8.graph.LazyCfCode -> a.a.a.a.g.jc:
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> f
     com.android.tools.r8.graph.JarApplicationReader application -> d
     com.android.tools.r8.graph.CfCode code -> e
@@ -16358,14 +16021,14 @@
     1:1:com.android.tools.r8.graph.DexMethod access$000(com.android.tools.r8.graph.LazyCfCode):78:78 -> a
     2:2:void access$100(com.android.tools.r8.graph.LazyCfCode,com.android.tools.r8.graph.CfCode):78:78 -> a
     3:4:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):138:139 -> a
-    5:5:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400:400 -> a
+    5:5:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391:391 -> a
     5:5:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):139 -> a
     6:11:void setCode(com.android.tools.r8.graph.CfCode):143:148 -> a
     12:13:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):179:180 -> a
     14:16:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):191:193 -> a
     17:17:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):199:199 -> a
     1:1:boolean computeEquals(java.lang.Object):158:158 -> b
-    1:1:boolean estimatedSizeForInliningAtMost(int):173:173 -> c
+    2:2:boolean estimatedSizeForInliningAtMost(int):173:173 -> b
     1:1:int computeHashCode():153:153 -> g
     1:19:com.android.tools.r8.graph.CfCode asCfCode():113:131 -> h
     20:26:boolean verifyNoReparseContext(com.android.tools.r8.graph.DexProgramClass):840:846 -> h
@@ -16378,7 +16041,7 @@
     2:3:boolean com.android.tools.r8.graph.CfCode.isEmptyVoidMethod():206:207 -> p
     2:3:boolean isEmptyVoidMethod():163 -> p
     1:1:java.lang.String toString():204:204 -> toString
-com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> a.a.a.a.g.oc:
+com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> a.a.a.a.g.gc:
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> c
     com.android.tools.r8.graph.JarApplicationReader application -> d
     boolean usrJsrInliner -> f
@@ -16388,21 +16051,21 @@
     1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader,boolean):221:221 -> <init>
     2:10:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader,boolean):216:224 -> <init>
     1:10:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):230:239 -> a
-com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> a.a.a.a.g.pc:
+com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> a.a.a.a.g.hc:
     1:1:void <init>(java.lang.String):82:82 -> <init>
-com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> a.a.a.a.g.qc:
-    java.util.Map canonicalDebugLocalInfo -> q
-    java.util.Map labelMap -> r
-    int maxStack -> l
-    java.util.List localVariables -> p
-    int maxLocals -> m
-    java.util.List tryCatchRanges -> o
-    com.android.tools.r8.graph.LazyCfCode code -> s
-    boolean $assertionsDisabled -> u
-    com.android.tools.r8.graph.DexItemFactory factory -> k
-    com.android.tools.r8.graph.DexMethod method -> t
-    java.util.List instructions -> n
-    com.android.tools.r8.graph.JarApplicationReader application -> j
+com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> a.a.a.a.g.ic:
+    boolean $assertionsDisabled -> n
+    com.android.tools.r8.graph.DexItemFactory factory -> d
+    com.android.tools.r8.graph.DexMethod method -> m
+    com.android.tools.r8.graph.JarApplicationReader application -> c
+    int maxLocals -> f
+    java.util.List localVariables -> i
+    java.util.Map canonicalDebugLocalInfo -> j
+    java.util.List tryCatchRanges -> h
+    java.util.Map labelMap -> k
+    int maxStack -> e
+    java.util.List instructions -> g
+    com.android.tools.r8.graph.LazyCfCode code -> l
     1:1:void <clinit>():245:245 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.LazyCfCode):259:259 -> <init>
     2:12:void <init>(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.LazyCfCode):253:263 -> <init>
@@ -16452,7 +16115,7 @@
     295:295:void visitTypeInsn(int,java.lang.String):635:635 -> a
     296:296:void visitTypeInsn(int,java.lang.String):632:632 -> a
     297:298:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):650:651 -> a
-    299:299:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> a
+    299:299:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> a
     299:299:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):651 -> a
     300:303:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):651:654 -> a
     304:304:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):659:659 -> a
@@ -16470,13 +16133,13 @@
     378:383:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):777:782 -> a
     384:388:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):787:791 -> a
     389:389:void visitMultiANewArrayInsn(java.lang.String,int):796:796 -> a
-    390:390:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> a
+    390:390:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> a
     390:390:void visitMultiANewArrayInsn(java.lang.String,int):796 -> a
     391:391:void visitMultiANewArrayInsn(java.lang.String,int):796:796 -> a
     392:392: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):803:803 -> a
     393:396: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):802:805 -> a
     397:400: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):811:814 -> a
-    401:401:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> a
+    401:401:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> a
     401:401: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):815 -> a
     402:402: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):816:816 -> a
     403:409: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):812:818 -> a
@@ -16540,7 +16203,7 @@
     4:8:void visitVarInsn(int,int):601:605 -> d
     9:35:void visitVarInsn(int,int):597:623 -> d
     36:36:void visitVarInsn(int,int):616:616 -> d
-com.android.tools.r8.graph.LazyLoadedDexApplication -> a.a.a.a.g.vc:
+com.android.tools.r8.graph.LazyLoadedDexApplication -> a.a.a.a.g.nc:
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> k
     boolean $assertionsDisabled -> l
     com.android.tools.r8.utils.ClasspathClassCollection classpathClasses -> j
@@ -16559,8 +16222,8 @@
     1:1:com.android.tools.r8.graph.DirectMappedDexApplication toDirect():232:232 -> g
     1:1:com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses loadAllClasses():171:171 -> h
     1:1:java.lang.String toString():237:237 -> toString
-com.android.tools.r8.graph.LazyLoadedDexApplication$1 -> a.a.a.a.g.sc:
-com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> a.a.a.a.g.tc:
+com.android.tools.r8.graph.LazyLoadedDexApplication$1 -> a.a.a.a.g.kc:
+com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> a.a.a.a.g.lc:
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathClasses -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList programClasses -> a
     boolean $assertionsDisabled -> d
@@ -16575,7 +16238,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList getLibraryClasses():163:163 -> b
     boolean lambda$new$2(com.android.tools.r8.graph.DexType) -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList getProgramClasses():155:155 -> c
-com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> a.a.a.a.g.uc:
+com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> a.a.a.a.g.mc:
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> l
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver resolver -> m
     com.android.tools.r8.utils.ClasspathClassCollection classpathClasses -> k
@@ -16587,7 +16250,7 @@
     3:3:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder setLibraryClassCollection(com.android.tools.r8.utils.LibraryClassCollection):205:205 -> a
     4:10:com.android.tools.r8.graph.LazyLoadedDexApplication build():211:217 -> a
     com.android.tools.r8.graph.DexApplication$Builder self() -> e
-com.android.tools.r8.graph.MethodAccessFlags -> a.a.a.a.g.wc:
+com.android.tools.r8.graph.MethodAccessFlags -> a.a.a.a.g.oc:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(int,int):61:61 -> <init>
@@ -16626,7 +16289,7 @@
     1:1:com.android.tools.r8.graph.MethodAccessFlags copy():66:66 -> y
     1:1:int com.android.tools.r8.graph.AccessFlags.materialize():61:61 -> z
     1:1:int getAsCfAccessFlags():106 -> z
-com.android.tools.r8.graph.ObjectToOffsetMapping -> a.a.a.a.g.yc:
+com.android.tools.r8.graph.ObjectToOffsetMapping -> a.a.a.a.g.qc:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap types -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap methods -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap fields -> e
@@ -16667,13 +16330,13 @@
     1:1:java.util.Collection getStrings():179:179 -> i
     1:1:java.util.Collection getTypes():167:167 -> j
     1:1:boolean hasJumboStrings():191:191 -> k
-com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> a.a.a.a.g.xc:
+com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> a.a.a.a.g.pc:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap depthOfClasses -> b
     1:1:void <init>(com.android.tools.r8.graph.DexApplication):103:103 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.DexApplication):101:105 -> <init>
     1:22:int getDepth(com.android.tools.r8.graph.DexProgramClass):109:130 -> a
-com.android.tools.r8.graph.OffsetToObjectMapping -> a.a.a.a.g.zc:
+com.android.tools.r8.graph.OffsetToObjectMapping -> a.a.a.a.g.rc:
     com.android.tools.r8.graph.DexProto[] protos -> c
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethodHandle[] methodHandles -> h
@@ -16713,39 +16376,38 @@
     1:2:void initializeProtos(int):28:29 -> l
     1:2:void initializeStrings(int):43:44 -> m
     1:2:void initializeTypes(int):38:39 -> n
-com.android.tools.r8.graph.OptimizationInfo -> a.a.a.a.g.Bc:
+com.android.tools.r8.graph.OptimizationInfo -> a.a.a.a.g.tc:
     com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage getParameterUsages(int) -> a
     com.android.tools.r8.graph.UpdatableOptimizationInfo mutableCopy() -> a
-    java.util.BitSet getNonNullParamOnNormalExits() -> b
-    boolean checksNullReceiverBeforeAnySideEffect() -> c
-    int getReturnedArgument() -> d
-    com.android.tools.r8.graph.DexString getReturnedConstantString() -> e
-    boolean neverInline() -> f
-    boolean neverReturnsNormally() -> g
-    boolean returnsConstant() -> h
-    boolean returnsConstantString() -> i
-    boolean useIdentifierNameString() -> j
-    boolean triggersClassInitBeforeAnySideEffect() -> k
-    boolean returnsConstantNumber() -> l
-    boolean returnsArgument() -> m
-    boolean neverReturnsNull() -> n
-    boolean isReachabilitySensitive() -> o
-    boolean forceInline() -> p
-    boolean mayHaveSideEffects() -> q
-    long getReturnedConstantNumber() -> r
-    com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility() -> s
-    java.util.Set getInitializedClassesOnNormalExit() -> t
-    boolean isInitializerEnablingJavaAssertions() -> u
-    com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo() -> v
-    java.util.BitSet getNonNullParamOrThrow() -> w
-com.android.tools.r8.graph.OptimizationInfo$InlinePreference -> a.a.a.a.g.Ac:
+    com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo() -> b
+    boolean returnsConstantString() -> c
+    boolean triggersClassInitBeforeAnySideEffect() -> d
+    java.util.BitSet getNonNullParamOrThrow() -> e
+    boolean returnsArgument() -> f
+    boolean isInitializerEnablingJavaAssertions() -> g
+    boolean checksNullReceiverBeforeAnySideEffect() -> h
+    boolean forceInline() -> i
+    boolean mayHaveSideEffects() -> j
+    boolean neverInline() -> k
+    com.android.tools.r8.graph.DexString getReturnedConstantString() -> l
+    boolean useIdentifierNameString() -> m
+    boolean isReachabilitySensitive() -> n
+    boolean neverReturnsNull() -> o
+    com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility() -> p
+    int getReturnedArgument() -> q
+    boolean returnsConstant() -> r
+    java.util.BitSet getNonNullParamOnNormalExits() -> s
+    boolean neverReturnsNormally() -> t
+    boolean returnsConstantNumber() -> u
+    long getReturnedConstantNumber() -> v
+com.android.tools.r8.graph.OptimizationInfo$InlinePreference -> a.a.a.a.g.sc:
     com.android.tools.r8.graph.OptimizationInfo$InlinePreference ForceInline -> b
     com.android.tools.r8.graph.OptimizationInfo$InlinePreference NeverInline -> a
     com.android.tools.r8.graph.OptimizationInfo$InlinePreference Default -> c
-    1:3:void <clinit>():16:18 -> <clinit>
-    4:4:void <clinit>():15:15 -> <clinit>
-    1:1:void <init>(java.lang.String,int):15:15 -> <init>
-com.android.tools.r8.graph.ParameterAnnotationsList -> a.a.a.a.g.Cc:
+    1:3:void <clinit>():15:17 -> <clinit>
+    4:4:void <clinit>():14:14 -> <clinit>
+    1:1:void <init>(java.lang.String,int):14:14 -> <init>
+com.android.tools.r8.graph.ParameterAnnotationsList -> a.a.a.a.g.uc:
     com.android.tools.r8.graph.ParameterAnnotationsList EMPTY_PARAMETER_ANNOTATIONS_LIST -> c
     com.android.tools.r8.graph.DexAnnotationSet[] values -> a
     int missingParameterAnnotations -> b
@@ -16760,16 +16422,16 @@
     13:13:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):192 -> a
     14:14:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):194:194 -> a
     1:3:void forEachAnnotation(java.util.function.Consumer):102:104 -> b
-    1:5:com.android.tools.r8.graph.DexAnnotationSet get(int):145:149 -> c
-    1:2:boolean isMissing(int):132:133 -> d
-    1:13:com.android.tools.r8.graph.ParameterAnnotationsList withParameterCount(int):154:166 -> e
+    4:5:boolean isMissing(int):132:133 -> b
+    1:13:com.android.tools.r8.graph.ParameterAnnotationsList withParameterCount(int):154:166 -> c
     1:2:boolean equals(java.lang.Object):77:78 -> equals
     1:1:int countNonMissing():122:122 -> g
+    1:5:com.android.tools.r8.graph.DexAnnotationSet get(int):145:149 -> get
     1:1:com.android.tools.r8.graph.ParameterAnnotationsList empty():45:45 -> h
     1:1:int hashCode():69:69 -> hashCode
-    1:1:boolean isEmpty():97:97 -> i
-    1:1:int size():114:114 -> j
-com.android.tools.r8.graph.ParameterUsagesInfo -> a.a.a.a.g.Fc:
+    1:1:boolean isEmpty():97:97 -> isEmpty
+    1:1:int size():114:114 -> size
+com.android.tools.r8.graph.ParameterUsagesInfo -> a.a.a.a.g.xc:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList parametersUsages -> a
     1:1:void <clinit>():26:26 -> <clinit>
@@ -16777,7 +16439,7 @@
     6:6:void <init>(java.util.List):32:32 -> <init>
     1:1:java.lang.Integer lambda$new$0(com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage):33:33 -> a
     2:3:com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage getParameterUsage(int):37:38 -> a
-com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage -> a.a.a.a.g.Dc:
+com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage -> a.a.a.a.g.vc:
     java.util.List callsReceiver -> c
     boolean hasFieldRead -> e
     boolean isAssignedToField -> f
@@ -16787,7 +16449,7 @@
     boolean hasFieldAssignment -> d
     1:10:void <init>(int,java.util.Set,java.util.List,boolean,boolean,boolean,boolean):70:79 -> <init>
     1:1:boolean notUsed():83:83 -> a
-com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsageBuilder -> a.a.a.a.g.Ec:
+com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsageBuilder -> a.a.a.a.g.wc:
     boolean $assertionsDisabled -> i
     java.util.Set ifZeroTestTypes -> c
     java.util.List callsOnReceiver -> d
@@ -16818,15 +16480,15 @@
     31:32:boolean note(com.android.tools.r8.ir.code.Return):184:185 -> a
     31:32:boolean note(com.android.tools.r8.ir.code.Instruction):124 -> a
     33:33:com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage build():130:130 -> a
-com.android.tools.r8.graph.Presorted -> a.a.a.a.g.Gc:
-com.android.tools.r8.graph.PresortedComparable -> a.a.a.a.g.Hc:
+com.android.tools.r8.graph.Presorted -> a.a.a.a.g.yc:
+com.android.tools.r8.graph.PresortedComparable -> a.a.a.a.g.zc:
     int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens) -> a
     int slowCompareTo(java.lang.Object) -> a
     1:1:boolean isSorted(java.util.List):15:15 -> a
     2:2:boolean isSorted(java.lang.Object[],java.util.function.Function):19:19 -> a
     3:5:boolean isSorted(java.util.List,java.util.function.Function):25:27 -> a
     6:6:int slowCompare(com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):44:44 -> a
-com.android.tools.r8.graph.ProgramClassVisitor -> a.a.a.a.g.Ic:
+com.android.tools.r8.graph.ProgramClassVisitor -> a.a.a.a.g.Ac:
     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>
@@ -16839,17 +16501,11 @@
     16:17:void accept(com.android.tools.r8.graph.DexTypeList):50:51 -> b
     16:17:void accept(com.android.tools.r8.graph.DexClass):60 -> b
     18:19:void accept(com.android.tools.r8.graph.DexClass):61:62 -> b
-com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> a.a.a.a.g.Jc:
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):12:12 -> <init>
-    com.android.tools.r8.graph.ClassHierarchyTraversal self() -> a
-    1:1:void visit(java.lang.Iterable,java.util.function.Consumer):7:7 -> a
-    2:2:com.android.tools.r8.graph.TopDownClassHierarchyTraversal forAllClasses(com.android.tools.r8.graph.AppView):21:21 -> a
-    3:29:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):43:69 -> a
-    1:1:com.android.tools.r8.graph.TopDownClassHierarchyTraversal forProgramClasses(com.android.tools.r8.graph.AppView):30:30 -> b
-    2:3:com.android.tools.r8.graph.ClassHierarchyTraversal com.android.tools.r8.graph.ClassHierarchyTraversal.excludeInterfaces():38:39 -> b
-    2:3:com.android.tools.r8.graph.ClassHierarchyTraversal excludeInterfaces():0 -> b
-com.android.tools.r8.graph.UpdatableOptimizationInfo -> a.a.a.a.g.Kc:
-com.android.tools.r8.graph.UseRegistry -> a.a.a.a.g.Mc:
+com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> a.a.a.a.g.Bc:
+    1:19:void visit(com.android.tools.r8.graph.AppView,java.lang.Iterable,java.util.function.Consumer):20:38 -> a
+    20:38:void addAncestorsToWorklist(com.android.tools.r8.graph.DexProgramClass,java.util.Deque,java.util.Set,com.android.tools.r8.graph.AppView):48:66 -> a
+com.android.tools.r8.graph.UpdatableOptimizationInfo -> a.a.a.a.g.Cc:
+com.android.tools.r8.graph.UseRegistry -> a.a.a.a.g.Ec:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexItemFactory factory -> a
     1:1:void <clinit>():15:15 -> <clinit>
@@ -16880,7 +16536,7 @@
     boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> d
     boolean registerTypeReference(com.android.tools.r8.graph.DexType) -> d
     boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> e
-com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> a.a.a.a.g.Lc:
+com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> a.a.a.a.g.Dc:
     com.android.tools.r8.graph.UseRegistry$MethodHandleUse ARGUMENT_TO_LAMBDA_METAFACTORY -> a
     com.android.tools.r8.graph.UseRegistry$MethodHandleUse NOT_ARGUMENT_TO_LAMBDA_METAFACTORY -> b
     1:2:void <clinit>():20:21 -> <clinit>
@@ -16894,58 +16550,54 @@
     boolean $assertionsDisabled -> g
     com.android.tools.r8.ir.code.IRCode code -> b
     int markingColor -> e
-    1:13:void <clinit>():49:61 -> <clinit>
-    1:1:void <init>():78:78 -> <init>
-    1:1:void <init>(com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1):49 -> <init>
-    2:8:void <init>():75:81 -> <init>
-    2:8:void <init>(com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1):49 -> <init>
-    9:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):84:84 -> <init>
-    10:22:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):75:87 -> <init>
-    1:26:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):96:121 -> a
-    27:76:com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption getAssumptionForDominator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):180:229 -> a
-    27:76:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):122 -> a
-    77:88:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):123:134 -> a
-    89:89:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):133:133 -> a
-    90:92:void returnMarkingColor():248:250 -> a
-    90:92:void finish():244 -> a
-    1:1:void notifyCodeHasChanged():238:238 -> b
-    2:4:void returnMarkingColor():248:250 -> b
-    2:4:void notifyCodeHasChanged():239 -> b
-    1:1:com.android.tools.r8.ir.analysis.ClassInitializationAnalysis trivial():92:92 -> c
+    1:13:void <clinit>():40:52 -> <clinit>
+    1:1:void <init>():69:69 -> <init>
+    1:1:void <init>(com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1):40 -> <init>
+    2:8:void <init>():66:72 -> <init>
+    2:8:void <init>(com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1):40 -> <init>
+    9:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):75:75 -> <init>
+    10:22:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):66:78 -> <init>
+    1:24:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):87:110 -> a
+    25:73:com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption getAssumptionForDominator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):169:217 -> a
+    25:73:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):111 -> a
+    74:85:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):112:123 -> a
+    86:86:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):122:122 -> a
+    87:89:void returnMarkingColor():236:238 -> a
+    87:89:void finish():232 -> a
+    1:1:void notifyCodeHasChanged():226:226 -> b
+    2:4:void returnMarkingColor():236:238 -> b
+    2:4:void notifyCodeHasChanged():227 -> b
+    1:1:com.android.tools.r8.ir.analysis.ClassInitializationAnalysis trivial():83:83 -> c
 com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1 -> a.a.a.a.h.a.a:
-    1:1:void <init>():62:62 -> <init>
+    1:1:void <init>():53:53 -> <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 -> a.a.a.a.h.a.b:
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption NONE -> b
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption INSTRUCTION_DOES_NOT_THROW -> a
-    1:2:void <clinit>():52:53 -> <clinit>
-    3:3:void <clinit>():51:51 -> <clinit>
-    1:1:void <init>(java.lang.String,int):51:51 -> <init>
+    1:2:void <clinit>():43:44 -> <clinit>
+    3:3:void <clinit>():42:42 -> <clinit>
+    1:1:void <init>(java.lang.String,int):42:42 -> <init>
 com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils -> a.a.a.a.h.a.c:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():254:254 -> <clinit>
-    1:1:boolean forInstanceGet(com.android.tools.r8.ir.code.InstanceGet,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):262:262 -> a
-    2:2:boolean forInstancePut(com.android.tools.r8.ir.code.InstancePut,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):271:271 -> a
-    3:15:boolean forInstanceGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):280:292 -> a
-    16:23:boolean forInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,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):301:308 -> a
-    24:50:boolean forInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):318:344 -> a
-    51:56:boolean forInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,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):353:358 -> a
-    57:91:boolean forInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):368:402 -> a
-    92:118:boolean forInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):412:438 -> a
-    119:124:boolean forNewInstance(com.android.tools.r8.ir.code.NewInstance,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):447:452 -> a
-    125:125:boolean forStaticGet(com.android.tools.r8.ir.code.StaticGet,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):461:461 -> a
-    126:126:boolean forStaticPut(com.android.tools.r8.ir.code.StaticPut,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):470:470 -> a
-    127:170:boolean isTypeInitializedBy(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):493:536 -> a
-    171:171:boolean isTypeInitializedBy(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
-    172:173:void enqueue(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Deque):545:546 -> a
-    174:175:void enqueueInitializedClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set,java.util.Deque):552:553 -> a
-    1:7:boolean forStaticGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):479:485 -> b
+    1:1:void <clinit>():242:242 -> <clinit>
+    1:1:boolean forInstanceGet(com.android.tools.r8.ir.code.InstanceGet,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):250:250 -> a
+    2:2:boolean forInstancePut(com.android.tools.r8.ir.code.InstancePut,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):259:259 -> a
+    3:14:boolean forInstanceGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):268:279 -> a
+    15:21:boolean forInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,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):288:294 -> a
+    22:26:boolean forInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,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):303:307 -> a
+    27:53:boolean forInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,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):316:342 -> a
+    54:72:boolean forInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,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):351:369 -> a
+    73:73:boolean forNewInstance(com.android.tools.r8.ir.code.NewInstance,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):378:378 -> a
+    74:74:boolean forStaticGet(com.android.tools.r8.ir.code.StaticGet,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):387:387 -> a
+    75:75:boolean forStaticPut(com.android.tools.r8.ir.code.StaticPut,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):396:396 -> a
+    76:79:boolean isTypeInitializedBy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):418:421 -> a
+    1:6:boolean forStaticGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):405:410 -> b
 com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> a.a.a.a.h.a.d:
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query DIRECTLY_OR_INDIRECTLY -> b
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query DIRECTLY -> a
-    1:2:void <clinit>():57:58 -> <clinit>
-    3:3:void <clinit>():56:56 -> <clinit>
-    1:1:void <init>(java.lang.String,int):56:56 -> <init>
+    1:2:void <clinit>():48:49 -> <clinit>
+    3:3:void <clinit>():47:47 -> <clinit>
+    1:1:void <init>(java.lang.String,int):47:47 -> <init>
 com.android.tools.r8.ir.analysis.EscapeAnalysis -> a.a.a.a.h.a.f:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():26:26 -> <clinit>
@@ -16956,49 +16608,28 @@
     62:67:com.android.tools.r8.ir.code.Value getPropagatedSubject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):117:122 -> a
     62:67:java.util.Set escape(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):72 -> a
     68:72:java.util.Set escape(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):74:78 -> a
-com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis -> a.a.a.a.h.a.h:
-    1:15:java.util.Set computeInitializedClassesOnNormalExit(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):38:52 -> a
-com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor -> a.a.a.a.h.a.g:
-    com.android.tools.r8.graph.AppView appView -> a
-    java.util.Set initializedClassesOnNormalExit -> c
-    com.android.tools.r8.graph.DexType context -> b
-    boolean $assertionsDisabled -> d
-    1:1:void <clinit>():55:55 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):61:61 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):59:63 -> <init>
-    1:1:void markInitializedOnNormalExit(java.lang.Iterable):71:71 -> a
-    2:37:void markInitializedOnNormalExit(com.android.tools.r8.graph.DexType):75:110 -> a
-    38:43:java.lang.Void handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction):116:121 -> a
-    38:43:java.lang.Object handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction):55 -> a
-    44:52:java.lang.Void handleInvoke(com.android.tools.r8.ir.code.Invoke):129:137 -> a
-    44:52:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):55 -> a
-    53:56:java.lang.Void handleInvoke(com.android.tools.r8.ir.code.Invoke):136:139 -> a
-    53:56:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):55 -> a
-    57:57:java.lang.Void visit(com.android.tools.r8.ir.code.NewInstance):148:148 -> a
-    57:57:java.lang.Object visit(com.android.tools.r8.ir.code.NewInstance):55 -> a
-    1:1:java.util.Set build():67:67 -> ba
-com.android.tools.r8.ir.analysis.TypeChecker -> a.a.a.a.h.a.i:
+com.android.tools.r8.ir.analysis.TypeChecker -> a.a.a.a.h.a.g:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():32:32 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.AppView):36:37 -> <init>
-    1:5:boolean check(com.android.tools.r8.ir.code.IRCode):41:45 -> a
-    6:6:boolean check(com.android.tools.r8.ir.code.InstancePut):62:62 -> a
-    6:6:boolean check(com.android.tools.r8.ir.code.IRCode):45 -> a
-    7:8:boolean check(com.android.tools.r8.ir.code.IRCode):48:49 -> a
-    9:9:boolean check(com.android.tools.r8.ir.code.StaticPut):66:66 -> a
-    9:9:boolean check(com.android.tools.r8.ir.code.IRCode):49 -> a
-    10:11:boolean check(com.android.tools.r8.ir.code.IRCode):52:53 -> a
-    12:15:boolean check(com.android.tools.r8.ir.code.Throw):94:97 -> a
-    12:15:boolean check(com.android.tools.r8.ir.code.IRCode):53 -> a
-    16:18:boolean check(com.android.tools.r8.ir.code.Throw):96:98 -> a
-    16:18:boolean check(com.android.tools.r8.ir.code.IRCode):53 -> a
-    19:19:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):70:70 -> a
-    20:20:boolean com.android.tools.r8.ir.code.Instruction.isFieldPut():768:768 -> a
-    20:20:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):70 -> a
-    21:29:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):70:78 -> a
-    30:40:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):77:87 -> a
-    41:43:boolean isSubtypeOf(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):103:105 -> a
+    1:1:void <clinit>():31:31 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AppView):35:36 -> <init>
+    1:5:boolean check(com.android.tools.r8.ir.code.IRCode):40:44 -> a
+    6:6:boolean check(com.android.tools.r8.ir.code.InstancePut):61:61 -> a
+    6:6:boolean check(com.android.tools.r8.ir.code.IRCode):44 -> a
+    7:8:boolean check(com.android.tools.r8.ir.code.IRCode):47:48 -> a
+    9:9:boolean check(com.android.tools.r8.ir.code.StaticPut):65:65 -> a
+    9:9:boolean check(com.android.tools.r8.ir.code.IRCode):48 -> a
+    10:11:boolean check(com.android.tools.r8.ir.code.IRCode):51:52 -> a
+    12:15:boolean check(com.android.tools.r8.ir.code.Throw):93:96 -> a
+    12:15:boolean check(com.android.tools.r8.ir.code.IRCode):52 -> a
+    16:18:boolean check(com.android.tools.r8.ir.code.Throw):95:97 -> a
+    16:18:boolean check(com.android.tools.r8.ir.code.IRCode):52 -> a
+    19:19:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):69:69 -> a
+    20:20:boolean com.android.tools.r8.ir.code.Instruction.isFieldPut():766:766 -> a
+    20:20:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):69 -> a
+    21:29:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):69:77 -> a
+    30:40:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):76:86 -> a
+    41:43:boolean isSubtypeOf(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):102:104 -> a
 com.android.tools.r8.ir.analysis.constant.Bottom -> a.a.a.a.h.a.a.a:
     com.android.tools.r8.ir.analysis.constant.Bottom INSTANCE -> a
     1:1:void <clinit>():7:7 -> <clinit>
@@ -17083,271 +16714,272 @@
     boolean isTop() -> e
     1:1:com.android.tools.r8.ir.analysis.constant.Top getInstance():13:13 -> g
 com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement -> a.a.a.a.h.a.b.a:
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement memberTypeLattice -> r
-    com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> s
-    boolean $assertionsDisabled -> t
-    1:1:void <clinit>():14:14 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):32:35 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsValueType():65:65 -> F
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement memberTypeLattice -> u
+    boolean $assertionsDisabled -> v
+    1:1:void <clinit>():13:13 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.Nullability):19:20 -> <init>
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsValueType():50:50 -> E
     com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement asArrayTypeLatticeElement() -> a
-    1:1:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement create(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.Nullability):23:23 -> a
-    2:2:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement lambda$create$0(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):25:25 -> a
-    3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():61:61 -> a
-    3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayBaseTypeLattice():69 -> a
-    3:3:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):39 -> a
-    4:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayBaseTypeLattice():70:71 -> a
-    4:5:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):39 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():61:61 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayBaseTypeLattice():71 -> a
-    6:6:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):39 -> a
-    7:8:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):41:42 -> a
-    9:33:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.toDexType(com.android.tools.r8.graph.DexItemFactory):38:62 -> a
-    9:33:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):42 -> a
-    34:35:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):44:45 -> a
-    36:36:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():61:61 -> a
-    36:36:int getNesting():52 -> a
-    36:36:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):47 -> a
-    37:39:int getNesting():53:55 -> a
-    37:39:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):47 -> a
-    40:40:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():61:61 -> a
-    40:40:int getNesting():55 -> a
-    40:40:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):47 -> a
-    41:41:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):47:47 -> a
-    42:42:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> a
-    42:42:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.AppView):132 -> a
-    43:43:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> a
-    43:43:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.AppView):132 -> a
-    44:55:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.AppView):132:143 -> a
-    56:57:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):78:79 -> a
-    58:62:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):84:88 -> a
-    63:63:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):93:93 -> a
-    64:74:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):153:163 -> a
-    75:87:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):159:171 -> a
-    88:90:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.objectArrayType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):306:308 -> a
-    88:90:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):174 -> a
-    91:93:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.objectArrayType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):307:309 -> a
-    91:93:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):174 -> a
-    94:95:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):301:302 -> a
-    94:95:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):172 -> a
-    boolean isArrayType() -> e
-    1:4:boolean equals(java.lang.Object):116:119 -> equals
-    5:5:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> equals
-    5:5:boolean equals(java.lang.Object):120 -> equals
-    6:6:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> equals
-    6:6:boolean equals(java.lang.Object):120 -> equals
-    7:7:boolean equals(java.lang.Object):123:123 -> equals
-    1:1:int hashCode():128:128 -> hashCode
-    1:1:java.lang.String toString():108:108 -> toString
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():46:46 -> a
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayBaseTypeLattice():54 -> a
+    1:1:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):24 -> a
+    2:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayBaseTypeLattice():55:56 -> a
+    2:3:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):24 -> a
+    4:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():46:46 -> a
+    4:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayBaseTypeLattice():56 -> a
+    4:4:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):24 -> a
+    5:6:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):26:27 -> a
+    7:31:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.toDexType(com.android.tools.r8.graph.DexItemFactory):38:62 -> a
+    7:31:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):27 -> a
+    32:33:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):29:30 -> a
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement.getClassType():48:48 -> a
+    34:34:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):30 -> a
+    35:35:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():46:46 -> a
+    35:35:int getNesting():37 -> a
+    35:35:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):32 -> a
+    36:38:int getNesting():38:40 -> a
+    36:38:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):32 -> a
+    39:39:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():46:46 -> a
+    39:39:int getNesting():40 -> a
+    39:39:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):32 -> a
+    40:40:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):32:32 -> a
+    41:41:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():46:46 -> a
+    41:41:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):124 -> a
+    42:42:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():46:46 -> a
+    42:42:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):125 -> a
+    43:43:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):126:126 -> a
+    44:44:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():82:82 -> a
+    44:44:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):130 -> a
+    45:45:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():82:82 -> a
+    45:45:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):130 -> a
+    46:61:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):130:145 -> a
+    62:64:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.objectArrayType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.analysis.type.Nullability):294:296 -> a
+    62:64:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):148 -> a
+    65:67:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.objectArrayType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.analysis.type.Nullability):295:297 -> a
+    65:67:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):148 -> a
+    68:69:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.objectClassType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.analysis.type.Nullability):288:289 -> a
+    68:69:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):146 -> a
+    70:73:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability):63:66 -> a
+    74:74:boolean isBasedOnMissingClass(com.android.tools.r8.graph.DexDefinitionSupplier):81:81 -> a
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNonNullable():76:76 -> c
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNullable():71:71 -> d
+    1:4:boolean equals(java.lang.Object):104:107 -> equals
+    5:5:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():82:82 -> equals
+    5:5:boolean equals(java.lang.Object):108 -> equals
+    6:6:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():82:82 -> equals
+    6:6:boolean equals(java.lang.Object):108 -> equals
+    7:10:boolean equals(java.lang.Object):111:114 -> equals
+    boolean isArrayType() -> f
+    1:1:int hashCode():119:119 -> hashCode
+    1:1:java.lang.String toString():96:96 -> toString
 com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement -> a.a.a.a.h.a.b.b:
     com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement INSTANCE -> p
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement getInstance():10:10 -> B
-    boolean isBoolean() -> f
+    1:1:com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement getInstance():10:10 -> C
+    boolean isBoolean() -> g
     1:1:int hashCode():30:30 -> hashCode
 com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement -> a.a.a.a.h.a.b.c:
     com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement INSTANCE -> o
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>():9:9 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement getInstance():18:18 -> B
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkCast(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> a
-    boolean isBottom() -> g
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():14:14 -> A
+    1:1:com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement getInstance():18:18 -> C
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkCast(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType) -> a
+    boolean isBottom() -> h
     1:1:int hashCode():43:43 -> hashCode
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():14:14 -> z
 com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement -> a.a.a.a.h.a.b.d:
     com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement INSTANCE -> p
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement getInstance():10:10 -> B
-    boolean isByte() -> h
+    1:1:com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement getInstance():10:10 -> C
     1:1:int hashCode():30:30 -> hashCode
+    boolean isByte() -> i
 com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement -> a.a.a.a.h.a.b.e:
     com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement INSTANCE -> p
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement getInstance():10:10 -> B
+    1:1:com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement getInstance():10:10 -> C
     1:1:int hashCode():30:30 -> hashCode
-    boolean isChar() -> i
+    boolean isChar() -> j
 com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement -> a.a.a.a.h.a.b.h:
-    com.android.tools.r8.graph.AppView appViewForLazyInterfacesComputation -> s
-    boolean $assertionsDisabled -> v
-    com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> t
-    java.util.Set lazyInterfaces -> r
-    com.android.tools.r8.graph.DexType type -> u
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set,com.android.tools.r8.ir.analysis.type.NullabilityVariants,com.android.tools.r8.graph.AppView):53:58 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getClassType():62:62 -> F
-    1:13:java.util.Set getInterfaces():66:78 -> G
-    14:14:java.util.Set getInterfaces():77:77 -> G
-    1:2:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set):32:33 -> a
-    3:3:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement lambda$create$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set,com.android.tools.r8.ir.analysis.type.NullabilityVariants):36:36 -> a
-    4:4:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement lambda$create$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.NullabilityVariants):44:44 -> a
-    5:5:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> a
-    5:5:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.AppView):137 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.AppView):137 -> a
-    7:21:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.AppView):137:151 -> a
-    22:22:com.android.tools.r8.graph.DexType getClassType():62:62 -> a
-    22:22:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.AppView):152 -> a
-    23:23:com.android.tools.r8.graph.DexType getClassType():62:62 -> a
-    23:23:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.AppView):152 -> a
-    24:34:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.AppView):152:162 -> a
-    35:36:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):83:84 -> a
-    37:41:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):90:94 -> a
-    42:42:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):100:100 -> a
-    43:43:com.android.tools.r8.graph.DexType getClassType():62:62 -> a
-    43:43:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):100 -> a
-    44:46:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):100:102 -> a
-    47:124:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):182:259 -> a
-    125:125:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):183:183 -> a
-    126:126:java.util.Set lambda$computeLeastUpperBoundOfInterfaces$3(com.android.tools.r8.graph.DexType):205:205 -> a
+    com.android.tools.r8.graph.DexDefinitionSupplier definitionsForLazyInterfacesComputation -> v
+    java.util.Set lazyInterfaces -> u
+    boolean $assertionsDisabled -> w
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set):28:28 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier):33:33 -> <init>
+    3:6:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set,com.android.tools.r8.graph.DexDefinitionSupplier):41:44 -> <init>
+    1:12:java.util.Set getInterfaces():53:64 -> C
+    13:13:java.util.Set getInterfaces():63:63 -> C
+    1:1:com.android.tools.r8.graph.DexType getClassType():48:48 -> E
+    1:1:com.android.tools.r8.graph.DexType getClassType():48:48 -> a
+    1:1:boolean isBasedOnMissingClass(com.android.tools.r8.graph.DexDefinitionSupplier):88 -> a
+    2:4:boolean isBasedOnMissingClass(com.android.tools.r8.graph.DexDefinitionSupplier):88:90 -> a
+    5:5:com.android.tools.r8.graph.DexType getClassType():48:48 -> a
+    5:5:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):122 -> a
+    6:6:com.android.tools.r8.graph.DexType getClassType():48:48 -> a
+    6:6:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):122 -> a
+    7:15:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):122:130 -> a
+    16:16:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():82:82 -> a
+    16:16:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):132 -> a
+    17:17:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():82:82 -> a
+    17:17:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):132 -> a
+    18:19:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):132:133 -> a
+    20:23:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability):69:72 -> a
+    24:98:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Set,java.util.Set):153:227 -> a
+    99:99:java.util.Set lambda$computeLeastUpperBoundOfInterfaces$1(com.android.tools.r8.graph.DexType):173:173 -> a
     com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement asClassTypeLatticeElement() -> b
-    1:2:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):41:42 -> b
-    3:3:boolean lambda$isBasedOnMissingClass$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):102:102 -> b
-    4:4:java.util.Set lambda$computeLeastUpperBoundOfInterfaces$4(com.android.tools.r8.graph.DexType):221:221 -> b
-    1:4:boolean equals(java.lang.Object):269:272 -> equals
-    5:5:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> equals
-    5:5:boolean equals(java.lang.Object):273 -> equals
-    6:6:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> equals
-    6:6:boolean equals(java.lang.Object):273 -> equals
-    7:18:boolean equals(java.lang.Object):276:287 -> equals
-    1:1:int hashCode():133:133 -> hashCode
-    boolean isClassType() -> j
-    1:11:java.lang.String toString():117:127 -> toString
+    1:1:boolean lambda$isBasedOnMissingClass$0(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):90:90 -> b
+    2:2:java.util.Set lambda$computeLeastUpperBoundOfInterfaces$2(com.android.tools.r8.graph.DexType):189:189 -> b
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNonNullable():83:83 -> c
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNullable():78:78 -> d
+    1:1:int hashCode():117:117 -> hashCode
+    boolean isClassType() -> k
+    1:1:java.lang.String toString():105:105 -> toString
+    2:2:java.lang.String com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.toString():111:111 -> toString
+    2:2:java.lang.String toString():106 -> toString
+    3:3:java.lang.String com.android.tools.r8.graph.DexType.toString():360:360 -> toString
+    3:3:java.lang.String com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.toString():111 -> toString
+    3:3:java.lang.String toString():106 -> toString
+    4:4:java.lang.String com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.toString():111:111 -> toString
+    4:4:java.lang.String toString():106 -> toString
+    5:8:java.lang.String toString():106:109 -> toString
+    9:12:java.lang.String toString():108:111 -> toString
 com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker -> a.a.a.a.h.a.b.f:
     com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker RIGHT -> b
     com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker LEFT -> a
-    1:2:void <clinit>():166:167 -> <clinit>
-    3:3:void <clinit>():165:165 -> <clinit>
-    1:1:void <init>(java.lang.String,int):165:165 -> <init>
+    1:2:void <clinit>():137:138 -> <clinit>
+    3:3:void <clinit>():136:136 -> <clinit>
+    1:1:void <init>(java.lang.String,int):136:136 -> <init>
 com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceWithMarker -> a.a.a.a.h.a.b.g:
     com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker marker -> b
     com.android.tools.r8.graph.DexType itf -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker):174:176 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker):145:147 -> <init>
 com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement -> a.a.a.a.h.a.b.i:
     com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement getInstance():10:10 -> B
+    1:1:com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement getInstance():10:10 -> C
     1:1:int hashCode():25:25 -> hashCode
-    boolean isDouble() -> l
+    boolean isDouble() -> m
 com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement -> a.a.a.a.h.a.b.j:
     com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement getInstance():10:10 -> B
+    1:1:com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement getInstance():10:10 -> C
     1:1:int hashCode():25:25 -> hashCode
-    boolean isFloat() -> n
+    boolean isFloat() -> o
 com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement -> a.a.a.a.h.a.b.k:
     com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement getInstance():10:10 -> B
+    1:1:com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement getInstance():10:10 -> C
     1:1:int hashCode():25:25 -> hashCode
-    boolean isInt() -> o
+    boolean isInt() -> p
 com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement -> a.a.a.a.h.a.b.l:
     com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement getInstance():10:10 -> B
+    1:1:com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement getInstance():10:10 -> C
     1:1:int hashCode():25:25 -> hashCode
-    boolean isLong() -> p
+    boolean isLong() -> q
 com.android.tools.r8.ir.analysis.type.Nullability -> a.a.a.a.h.a.b.m:
     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
     com.android.tools.r8.ir.analysis.type.Nullability DEFINITELY_NOT_NULL -> b
-    1:4:void <clinit>():25:28 -> <clinit>
-    1:1:void <init>():30:30 -> <init>
-    1:10:com.android.tools.r8.ir.analysis.type.Nullability join(com.android.tools.r8.ir.analysis.type.Nullability):49:58 -> a
-    11:11:com.android.tools.r8.ir.analysis.type.Nullability bottom():78:78 -> a
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability definitelyNotNull():70:70 -> b
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability definitelyNull():66:66 -> c
-    1:1:boolean isDefinitelyNotNull():37:37 -> d
-    1:1:boolean isDefinitelyNull():33:33 -> e
-    1:1:boolean isMaybeNull():41:41 -> f
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability maybeNull():74:74 -> g
-    1:13:java.lang.String toString():83:95 -> toString
-com.android.tools.r8.ir.analysis.type.NullabilityVariants -> a.a.a.a.h.a.b.n:
-    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement definitelyNotNullVariant -> c
-    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement definitelyNullVariant -> b
-    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement maybeNullVariant -> a
-    boolean $assertionsDisabled -> d
-    1:1:void <clinit>():10:10 -> <clinit>
-    1:1:void <init>():10:10 -> <init>
-    1:3:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement create(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.Function):18:20 -> a
-    4:10:void set(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement):25:31 -> a
-    11:17:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement get(com.android.tools.r8.ir.analysis.type.Nullability):36:42 -> a
-    18:31:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateElement(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.BiFunction):48:61 -> a
-com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement -> a.a.a.a.h.a.b.o:
+    1:3:void <clinit>():21:23 -> <clinit>
+    1:1:void <init>():25:25 -> <init>
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability join(com.android.tools.r8.ir.analysis.type.Nullability):43:43 -> a
+    2:2:com.android.tools.r8.ir.analysis.type.Nullability definitelyNotNull():59:59 -> a
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability definitelyNull():55:55 -> b
+    1:1:boolean isDefinitelyNotNull():32:32 -> c
+    1:1:boolean isDefinitelyNull():28:28 -> d
+    1:1:boolean isMaybeNull():36:36 -> e
+    1:1:boolean isNullable():51:51 -> f
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability maybeNull():63:63 -> g
+    1:10:java.lang.String toString():68:77 -> toString
+com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement -> a.a.a.a.h.a.b.n:
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():15:15 -> <init>
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():19:19 -> A
     1:14:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):104:117 -> a
     15:15:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):115:115 -> a
     16:18:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):111:113 -> a
     19:19:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):109:109 -> a
     20:32:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement):125:137 -> a
-    com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement asPrimitiveTypeLatticeElement() -> c
-    boolean isPrimitive() -> t
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():19:19 -> z
-com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement -> a.a.a.a.h.a.b.q:
-    com.android.tools.r8.ir.analysis.type.Nullability nullability -> o
-    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement NULL_BOTTOM_INSTANCE -> q
-    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement NULL_INSTANCE -> p
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement.create():23:23 -> <clinit>
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement.access$200():11 -> <clinit>
-    1:1:void <clinit>():57 -> <clinit>
-    2:2:void <clinit>():57:57 -> <clinit>
-    3:3:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement.createBottom():27:27 -> <clinit>
-    3:3:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement.access$300():11 -> <clinit>
-    3:3:void <clinit>():59 -> <clinit>
-    4:4:void <clinit>():59:59 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.analysis.type.Nullability):63:64 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement access$000():9:9 -> B
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement access$100():9:9 -> C
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNotNull():79:79 -> D
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getNullTypeLatticeElement():73:73 -> E
-    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability) -> a
-    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement asReferenceTypeLatticeElement() -> d
-    boolean isReference() -> u
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():69:69 -> z
-com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement -> a.a.a.a.h.a.b.p:
-    1:1:void <init>(com.android.tools.r8.ir.analysis.type.Nullability):14:14 -> <init>
-    1:1:boolean com.android.tools.r8.ir.analysis.type.Nullability.isNullable():45:45 -> a
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):19 -> a
-    2:2:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):19:19 -> a
-    1:1:boolean equals(java.lang.Object):50:50 -> equals
-    1:1:int hashCode():42:42 -> hashCode
-    boolean isNullType() -> q
-    1:1:java.lang.String toString():37:37 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():118:118 -> toString
-    2:2:java.lang.String toString():37 -> toString
-    3:3:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement -> a.a.a.a.h.a.b.r:
+    com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement asPrimitiveTypeLatticeElement() -> e
+    boolean isPrimitive() -> u
+com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement -> a.a.a.a.h.a.b.o:
+    com.android.tools.r8.graph.DexType type -> o
+    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement NULL_INSTANCE -> s
+    com.android.tools.r8.ir.analysis.type.Nullability nullability -> p
+    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement nonNullVariant -> r
+    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement primaryOrNullVariant -> q
+    boolean $assertionsDisabled -> t
+    1:4:void <clinit>():12:15 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):27:29 -> <init>
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():82:82 -> A
+    1:1:java.util.Set getInterfaces():90:90 -> C
+    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getNullTypeLatticeElement():86:86 -> D
+    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability):62:62 -> a
+    2:2:void linkVariant(com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement,com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement):67:67 -> a
+    3:3:com.android.tools.r8.ir.analysis.type.Nullability nullability():82:82 -> a
+    3:3:void linkVariant(com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement,com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement):67 -> a
+    4:6:void linkVariant(com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement,com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement):67:69 -> a
+    7:7:com.android.tools.r8.ir.analysis.type.Nullability nullability():82:82 -> a
+    7:7:void linkVariant(com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement,com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement):70 -> a
+    8:12:void linkVariant(com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement,com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement):70:74 -> a
+    13:13:com.android.tools.r8.ir.analysis.type.Nullability nullability():82:82 -> a
+    13:13:void linkVariant(com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement,com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement):74 -> a
+    14:16:void linkVariant(com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement,com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement):74:76 -> a
+    1:26:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):33:58 -> b
+    27:27:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):44:44 -> b
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNullable():100:100 -> d
+    2:2:boolean isNullType():95:95 -> d
+    2:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNullable():100 -> d
+    3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNullable():100:100 -> d
+    1:4:boolean equals(java.lang.Object):119:122 -> equals
+    5:5:com.android.tools.r8.ir.analysis.type.Nullability nullability():82:82 -> equals
+    5:5:boolean equals(java.lang.Object):123 -> equals
+    6:6:com.android.tools.r8.ir.analysis.type.Nullability nullability():82:82 -> equals
+    6:6:boolean equals(java.lang.Object):123 -> equals
+    7:15:boolean equals(java.lang.Object):126:134 -> equals
+    1:1:int hashCode():139:139 -> hashCode
+    2:2:boolean isNullType():95:95 -> hashCode
+    2:2:int hashCode():139 -> hashCode
+    3:4:int hashCode():139:140 -> hashCode
+    1:1:boolean isNullType():95:95 -> r
+    1:1:java.lang.String toString():111:111 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():360:360 -> toString
+    2:2:java.lang.String toString():111 -> toString
+    3:3:java.lang.String toString():111:111 -> toString
+    boolean isReference() -> v
+com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement -> a.a.a.a.h.a.b.p:
     com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement INSTANCE -> p
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement getInstance():10:10 -> B
+    1:1:com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement getInstance():10:10 -> C
     1:1:int hashCode():30:30 -> hashCode
-    boolean isShort() -> v
-com.android.tools.r8.ir.analysis.type.SingleTypeLatticeElement -> a.a.a.a.h.a.b.s:
+    boolean isShort() -> w
+com.android.tools.r8.ir.analysis.type.SingleTypeLatticeElement -> a.a.a.a.h.a.b.q:
     com.android.tools.r8.ir.analysis.type.SingleTypeLatticeElement SINGLE_INSTANCE -> p
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>():13:13 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.SingleTypeLatticeElement getInstance():17:17 -> B
+    1:1:com.android.tools.r8.ir.analysis.type.SingleTypeLatticeElement getInstance():17:17 -> C
     1:1:int hashCode():37:37 -> hashCode
-    boolean isSingle() -> w
-com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement -> a.a.a.a.h.a.b.t:
+    boolean isSingle() -> x
+com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement -> a.a.a.a.h.a.b.r:
     com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement INSTANCE -> o
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>():9:9 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement getInstance():18:18 -> B
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkCast(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> a
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():14:14 -> A
+    1:1:com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement getInstance():18:18 -> C
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkCast(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType) -> a
     1:1:int hashCode():43:43 -> hashCode
-    boolean isTop() -> x
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():14:14 -> z
-com.android.tools.r8.ir.analysis.type.TypeAnalysis -> a.a.a.a.h.a.b.v:
+    boolean isTop() -> y
+com.android.tools.r8.ir.analysis.type.TypeAnalysis -> a.a.a.a.h.a.b.t:
     com.android.tools.r8.graph.AppView appView -> c
     java.util.Deque worklist -> e
     boolean $assertionsDisabled -> f
@@ -17369,16 +17001,19 @@
     38:58:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):108:128 -> a
     38:58:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):66 -> a
     59:85:void updateTypeOfValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):142:168 -> a
-    86:90:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):174:178 -> a
+    86:89:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):174:177 -> a
+    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement.getClassType():48:48 -> a
+    90:90:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):177 -> a
+    91:91:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):178:178 -> a
     1:4:void widening(java.lang.Iterable):71:74 -> b
-com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode -> a.a.a.a.h.a.b.u:
+com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode -> a.a.a.a.h.a.b.s:
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode UNSET -> a
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode WIDENING -> b
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode NARROWING -> c
     1:3:void <clinit>():30:32 -> <clinit>
     4:4:void <clinit>():29:29 -> <clinit>
     1:1:void <init>(java.lang.String,int):29:29 -> <init>
-com.android.tools.r8.ir.analysis.type.TypeLatticeElement -> a.a.a.a.h.a.b.w:
+com.android.tools.r8.ir.analysis.type.TypeLatticeElement -> a.a.a.a.h.a.b.u:
     com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement FLOAT -> h
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement NULL -> m
@@ -17393,77 +17028,75 @@
     com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement BOOLEAN -> c
     com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement SHORT -> e
     com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement LONG -> j
-    1:15:void <clinit>():17:31 -> <clinit>
-    1:1:void <init>():17:17 -> <init>
-    1:2:int requiredRegisters():295:296 -> A
+    1:15:void <clinit>():15:29 -> <clinit>
+    1:1:void <init>():15:15 -> <init>
+    com.android.tools.r8.ir.analysis.type.Nullability nullability() -> A
+    1:2:int requiredRegisters():282:283 -> B
     com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement asArrayTypeLatticeElement() -> a
-    boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView) -> a
-    1:29:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):50:78 -> a
-    30:31:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):301:302 -> a
-    30:31:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):79 -> a
-    32:40:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):82:90 -> a
-    41:41:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):57:57 -> a
-    42:50:boolean equalUpToNullability(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):140:148 -> a
-    51:52:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):314:315 -> a
-    53:53:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):326:326 -> a
-    54:58:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):331:335 -> a
-    59:60:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):33:34 -> a
-    59:60:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):336 -> a
-    61:61:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):99:99 -> a
-    61:61:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
-    61:61:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):336 -> a
-    62:89:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):70:97 -> a
-    62:89:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
-    62:89:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):336 -> a
-    90:90:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):93:93 -> a
-    90:90:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
-    90:90:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):336 -> a
-    91:95:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean) -> a
-    91:95:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
-    91:95:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):336 -> a
-    96:110:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):75:89 -> a
-    96:110:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
-    96:110:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):336 -> a
-    111:111:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):338:338 -> a
-    112:113:com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkCast(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):348:349 -> a
+    boolean isBasedOnMissingClass(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
+    1:29:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):66:94 -> a
+    30:31:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement objectClassType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.analysis.type.Nullability):288:289 -> a
+    30:31:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):94 -> a
+    32:42:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):97:107 -> a
+    43:43:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):73:73 -> a
+    44:45:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement classClassType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.analysis.type.Nullability):302:303 -> a
+    46:46:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier):314:314 -> a
+    47:51:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):322:326 -> a
+    52:53:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):33:34 -> a
+    52:53:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):327 -> a
+    54:54:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):99:99 -> a
+    54:54:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
+    54:54:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):327 -> a
+    55:82:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):70:97 -> a
+    55:82:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
+    55:82:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):327 -> a
+    83:83:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):93:93 -> a
+    83:83:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
+    83:83:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):327 -> a
+    84:88:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):91:95 -> a
+    84:88:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
+    84:88:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):327 -> a
+    89:103:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):75:89 -> a
+    89:103:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
+    89:103:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):327 -> a
+    104:105:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):330:331 -> a
+    106:107:com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkCast(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):341:342 -> a
     com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement asClassTypeLatticeElement() -> b
-    1:1:boolean lessThanOrEqual(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):127:127 -> b
-    2:3:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):301:302 -> b
-    com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement asPrimitiveTypeLatticeElement() -> c
-    1:5:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):111:115 -> c
-    6:7:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):320:321 -> c
-    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement asReferenceTypeLatticeElement() -> d
-    boolean isArrayType() -> e
-    boolean isBoolean() -> f
-    boolean isBottom() -> g
-    boolean isByte() -> h
-    boolean isChar() -> i
-    boolean isClassType() -> j
-    1:1:boolean isDefinitelyNull():287:287 -> k
-    boolean isDouble() -> l
-    1:4:boolean isFineGrainedType():263:266 -> m
-    boolean isFloat() -> n
-    boolean isInt() -> o
-    boolean isLong() -> p
-    boolean isNullType() -> q
-    1:1:boolean isNullable():34:34 -> r
-    2:2:boolean com.android.tools.r8.ir.analysis.type.Nullability.isNullable():45:45 -> r
-    2:2:boolean isNullable():34 -> r
-    1:8:boolean isPreciseType():252:259 -> s
-    boolean isPrimitive() -> t
-    boolean isReference() -> u
-    boolean isShort() -> v
-    boolean isSingle() -> w
-    boolean isTop() -> x
-    boolean isWide() -> y
-    com.android.tools.r8.ir.analysis.type.Nullability nullability() -> z
-com.android.tools.r8.ir.analysis.type.WideTypeLatticeElement -> a.a.a.a.h.a.b.x:
+    1:1:boolean lessThanOrEqual(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):144:144 -> b
+    2:3:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement objectClassType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.analysis.type.Nullability):288:289 -> b
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNonNullable():52:52 -> c
+    2:6:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):128:132 -> c
+    7:8:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement stringClassType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.analysis.type.Nullability):308:309 -> c
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNullable():43:43 -> d
+    com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement asPrimitiveTypeLatticeElement() -> e
+    boolean isArrayType() -> f
+    boolean isBoolean() -> g
+    boolean isBottom() -> h
+    boolean isByte() -> i
+    boolean isChar() -> j
+    boolean isClassType() -> k
+    1:1:boolean isDefinitelyNull():278:278 -> l
+    boolean isDouble() -> m
+    1:4:boolean isFineGrainedType():254:257 -> n
+    boolean isFloat() -> o
+    boolean isInt() -> p
+    boolean isLong() -> q
+    boolean isNullType() -> r
+    1:1:boolean isNullable():32:32 -> s
+    1:8:boolean isPreciseType():243:250 -> t
+    boolean isPrimitive() -> u
+    boolean isReference() -> v
+    boolean isShort() -> w
+    boolean isSingle() -> x
+    boolean isTop() -> y
+    boolean isWide() -> z
+com.android.tools.r8.ir.analysis.type.WideTypeLatticeElement -> a.a.a.a.h.a.b.v:
     com.android.tools.r8.ir.analysis.type.WideTypeLatticeElement WIDE_INSTANCE -> p
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>():13:13 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.WideTypeLatticeElement getInstance():17:17 -> B
+    1:1:com.android.tools.r8.ir.analysis.type.WideTypeLatticeElement getInstance():17:17 -> C
     1:1:int hashCode():37:37 -> hashCode
-    boolean isWide() -> y
+    boolean isWide() -> z
 com.android.tools.r8.ir.code.Add -> a.a.a.a.h.b.a:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
     boolean isAdd() -> Ja
@@ -17471,74 +17104,69 @@
     float foldFloat(float,float) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):27:27 -> a
-    2:2:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):52:52 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):47:47 -> a
     com.android.tools.r8.ir.code.Add asAdd() -> b
-    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):47:47 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):72:72 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):87:87 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):37:37 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):67:67 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):57:57 -> d
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):82:82 -> d
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):62:62 -> e
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):77:77 -> e
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):42:42 -> f
+    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):42:42 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):67:67 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):82:82 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):32:32 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):62:62 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):52:52 -> d
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):77:77 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):57:57 -> e
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):72:72 -> e
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):37:37 -> f
     boolean isCommutative() -> mc
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():122:122 -> qc
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():117:117 -> qc
 com.android.tools.r8.ir.code.AlwaysMaterializingDefinition -> a.a.a.a.h.b.b:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):19:19 -> <init>
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):24:24 -> a
-    2:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):35:37 -> a
-    5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):36:36 -> a
-    6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):42:42 -> a
-    7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):62:62 -> a
+    1:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):30:32 -> a
+    4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):31:31 -> a
+    5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):37:37 -> a
+    6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):57:57 -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> b
-    1:1:int maxInValueRegister():52:52 -> gc
+    1:1:int maxInValueRegister():47:47 -> gc
     int maxOutValueRegister() -> hc
 com.android.tools.r8.ir.code.AlwaysMaterializingNop -> a.a.a.a.h.b.c:
     1:1:void <init>():20:20 -> <init>
     boolean hasInvariantOutType() -> Ea
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):25:25 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):35:35 -> a
-    3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):40:40 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):61:61 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):45:45 -> b
-    1:1:int maxInValueRegister():50:50 -> gc
-    1:1:int maxOutValueRegister():55:55 -> hc
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):30:30 -> a
+    2:2:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):35:35 -> a
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):56:56 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):40:40 -> b
+    1:1:int maxInValueRegister():45:45 -> gc
+    1:1:int maxOutValueRegister():50:50 -> hc
 com.android.tools.r8.ir.code.AlwaysMaterializingUser -> a.a.a.a.h.b.d:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):19:19 -> <init>
     boolean hasInvariantOutType() -> Ea
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):24:24 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):35:35 -> a
-    3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):40:40 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):62:62 -> a
-    5:5:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):67:67 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):30:30 -> a
+    2:2:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):35:35 -> a
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):57:57 -> a
+    4:4:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):62:62 -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> b
-    1:2:int maxInValueRegister():50:51 -> gc
-    1:1:int maxOutValueRegister():56:56 -> hc
+    1:2:int maxInValueRegister():45:46 -> gc
+    1:1:int maxOutValueRegister():51:51 -> hc
 com.android.tools.r8.ir.code.And -> a.a.a.a.h.b.e:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
     boolean isAnd() -> Ka
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):23:23 -> a
-    2:2:com.android.tools.r8.code.Instruction CreateInt(int,int,int):43:43 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):53:53 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):68:68 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):73:73 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):38:38 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):48:48 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):63:63 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):68:68 -> b
     com.android.tools.r8.ir.code.And asAnd() -> c
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):58:58 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):63:63 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):48:48 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):53:53 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):58:58 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):43:43 -> d
     boolean isCommutative() -> mc
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():88:88 -> qc
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():83:83 -> qc
 com.android.tools.r8.ir.code.Argument -> a.a.a.a.h.b.f:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():22:22 -> <clinit>
@@ -17547,15 +17175,14 @@
     boolean isArgument() -> La
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):31:31 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:55 -> a
-    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):76:76 -> a
-    4:4:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):87:87 -> a
-    5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):92:92 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):97:97 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):60:60 -> b
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):50:50 -> a
+    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):71:71 -> a
+    3:3:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):82:82 -> a
+    4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):87:87 -> a
+    5:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):92:92 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):55:55 -> b
     com.android.tools.r8.ir.code.Argument asArgument() -> d
-    1:1:int maxInValueRegister():44:44 -> gc
+    1:1:int maxInValueRegister():39:39 -> gc
     int maxOutValueRegister() -> hc
 com.android.tools.r8.ir.code.ArithmeticBinop -> a.a.a.a.h.b.g:
     boolean $assertionsDisabled -> i
@@ -17591,116 +17218,113 @@
     boolean instructionTypeCanThrow() -> Ia
     boolean isArrayGet() -> Na
     boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):44:44 -> a
-    2:2:com.android.tools.r8.ir.code.Value dest():48:48 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66 -> a
-    3:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:100 -> a
-    38:38:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):98:98 -> a
-    39:41:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:79 -> a
-    42:63:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):73:94 -> a
-    64:64:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):91:91 -> a
-    65:65:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):88:88 -> a
-    66:66:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):85:85 -> a
-    67:87:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:102 -> a
-    88:88:com.android.tools.r8.ir.code.MemberType getMemberType():61:61 -> a
-    89:89:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):147:147 -> a
-    90:96:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):159:165 -> a
-    97:98:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):170:171 -> a
-    99:99:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):176:176 -> a
-    100:101:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):181:182 -> a
-    102:102:com.android.tools.r8.ir.code.MemberType getMemberType():61:61 -> a
-    102:102:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):184 -> a
-    103:143:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):184:224 -> a
-    144:145:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):220:221 -> a
-    146:146:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):220:220 -> a
-    147:147:com.android.tools.r8.ir.code.Value dest():48:48 -> a
-    147:147:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):222 -> a
-    148:148:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):222:222 -> a
-    149:150:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):216:217 -> a
-    151:151:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):216:216 -> a
-    152:152:com.android.tools.r8.ir.code.Value dest():48:48 -> a
-    152:152:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):218 -> a
-    153:153:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):218:218 -> a
-    154:155:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):212:213 -> a
-    156:158:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):212:214 -> a
-    159:160:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):208:209 -> a
-    161:163:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):208:210 -> a
-    164:165:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):204:205 -> a
-    166:168:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):204:206 -> a
-    169:170:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):200:201 -> a
-    171:173:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):200:202 -> a
-    174:176:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):191:193 -> a
-    177:177:com.android.tools.r8.ir.code.MemberType getMemberType():61:61 -> a
-    177:177:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):224 -> a
-    178:178:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):224:224 -> a
-    179:183:com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkConstraint(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):229:233 -> a
-    184:184:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):239:239 -> a
-    185:185:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):244:244 -> a
-    186:186:com.android.tools.r8.ir.code.Value dest():48:48 -> a
-    186:186:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):244 -> a
-    187:187:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):244:244 -> a
-    188:188:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):244:244 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):115:115 -> b
+    1:1:com.android.tools.r8.ir.code.Value dest():43:43 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61 -> a
+    2:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61:95 -> a
+    37:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):93:93 -> a
+    38:40:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:74 -> a
+    41:62:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:89 -> a
+    63:63:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86:86 -> a
+    64:64:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83:83 -> a
+    65:65:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):80:80 -> a
+    66:86:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:97 -> a
+    87:87:com.android.tools.r8.ir.code.MemberType getMemberType():56:56 -> a
+    88:88:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):142:142 -> a
+    89:95:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):154:160 -> a
+    96:97:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):165:166 -> a
+    98:98:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):171:171 -> a
+    99:100:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):176:177 -> a
+    101:101:com.android.tools.r8.ir.code.MemberType getMemberType():56:56 -> a
+    101:101:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):179 -> a
+    102:142:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):179:219 -> a
+    143:144:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):215:216 -> a
+    145:145:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):215:215 -> a
+    146:146:com.android.tools.r8.ir.code.Value dest():43:43 -> a
+    146:146:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):217 -> a
+    147:147:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):217:217 -> a
+    148:149:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):211:212 -> a
+    150:150:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):211:211 -> a
+    151:151:com.android.tools.r8.ir.code.Value dest():43:43 -> a
+    151:151:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):213 -> a
+    152:152:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):213:213 -> a
+    153:154:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):207:208 -> a
+    155:157:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):207:209 -> a
+    158:159:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):203:204 -> a
+    160:162:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):203:205 -> a
+    163:164:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):199:200 -> a
+    165:167:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):199:201 -> a
+    168:169:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):195:196 -> a
+    170:172:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):195:197 -> a
+    173:175:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):186:188 -> a
+    176:176:com.android.tools.r8.ir.code.MemberType getMemberType():56:56 -> a
+    176:176:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):219 -> a
+    177:177:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):219:219 -> a
+    178:182:com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkConstraint(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):224:228 -> a
+    183:183:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):234:234 -> a
+    184:184:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):239:239 -> a
+    185:185:com.android.tools.r8.ir.code.Value dest():43:43 -> a
+    185:185:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):239 -> a
+    186:186:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):239:239 -> a
+    187:187:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):239:239 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):110:110 -> b
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> f
     int maxInValueRegister() -> gc
     int maxOutValueRegister() -> hc
-    1:1:com.android.tools.r8.ir.code.Value array():52:52 -> lc
-    1:1:com.android.tools.r8.ir.code.Value dest():48:48 -> mc
-    1:1:com.android.tools.r8.ir.code.Value index():56:56 -> nc
+    1:1:com.android.tools.r8.ir.code.Value array():47:47 -> lc
+    1:1:com.android.tools.r8.ir.code.Value dest():43:43 -> mc
+    1:1:com.android.tools.r8.ir.code.Value index():51:51 -> nc
 com.android.tools.r8.ir.code.ArrayLength -> a.a.a.a.h.b.i:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
     boolean hasInvariantOutType() -> Ea
     boolean instructionTypeCanThrow() -> Ia
     boolean isArrayLength() -> Oa
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):29:29 -> a
-    2:2:com.android.tools.r8.ir.code.Value dest():33:33 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52 -> a
-    3:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52:54 -> a
-    6:13:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):74:81 -> a
-    14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):94:94 -> a
-    15:16:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):99:100 -> a
-    17:17:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):105:105 -> a
-    18:18:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):110:110 -> a
-    19:19:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):120:120 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):88:88 -> b
+    1:1:com.android.tools.r8.ir.code.Value dest():28:28 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47 -> a
+    2:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47:49 -> a
+    5:12:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):69:76 -> a
+    13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):89:89 -> a
+    14:15:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):94:95 -> a
+    16:16:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):100:100 -> a
+    17:17:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):105:105 -> a
+    18:18:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):115:115 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> b
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> g
     int maxInValueRegister() -> gc
     int maxOutValueRegister() -> hc
-    1:1:com.android.tools.r8.ir.code.Value array():37:37 -> lc
+    1:1:com.android.tools.r8.ir.code.Value array():32:32 -> lc
 com.android.tools.r8.ir.code.ArrayPut -> a.a.a.a.h.b.j:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.MemberType type -> h
     1:1:void <clinit>():29:29 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):39:43 -> <init>
     boolean hasInvariantOutType() -> Ea
-    1:5:boolean instructionInstanceCanThrow():125:129 -> Ha
+    1:5:boolean instructionInstanceCanThrow():120:124 -> Ha
     boolean instructionTypeCanThrow() -> Ia
     boolean isArrayPut() -> Pa
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):48:48 -> a
-    2:2:com.android.tools.r8.ir.code.MemberType getMemberType():65:65 -> a
-    3:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:102 -> a
-    36:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):100:100 -> a
-    37:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81:81 -> a
-    38:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:96 -> a
-    58:58:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):93:93 -> a
-    59:59:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):90:90 -> a
-    60:60:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):87:87 -> a
-    61:81:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):84:104 -> a
-    82:82:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):168:168 -> a
-    83:83:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):173:173 -> a
-    84:84:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):183:183 -> a
-    85:85:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):188:188 -> a
-    86:86:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):193:193 -> a
-    87:87:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):193:193 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):152:152 -> b
+    1:1:com.android.tools.r8.ir.code.MemberType getMemberType():60:60 -> a
+    2:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:97 -> a
+    35:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):95:95 -> a
+    36:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:76 -> a
+    37:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:91 -> a
+    57:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):88:88 -> a
+    58:58:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):85:85 -> a
+    59:59:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:82 -> a
+    60:80:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79:99 -> a
+    81:81:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):163:163 -> a
+    82:82:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):168:168 -> a
+    83:83:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):178:178 -> a
+    84:84:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):183:183 -> a
+    85:85:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):188:188 -> a
+    86:86:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):188:188 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):147:147 -> b
     int maxInValueRegister() -> gc
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> h
-    1:1:int maxOutValueRegister():114:114 -> hc
-    1:1:com.android.tools.r8.ir.code.Value array():52:52 -> lc
-    1:1:com.android.tools.r8.ir.code.Value index():56:56 -> mc
-    1:1:com.android.tools.r8.ir.code.Value value():60:60 -> nc
+    1:1:int maxOutValueRegister():109:109 -> hc
+    1:1:com.android.tools.r8.ir.code.Value array():47:47 -> lc
+    1:1:com.android.tools.r8.ir.code.Value index():51:51 -> mc
+    1:1:com.android.tools.r8.ir.code.Value value():55:55 -> nc
 com.android.tools.r8.ir.code.BasicBlock -> a.a.a.a.h.b.p:
     int color -> n
     int estimatedPredecessorsCount -> l
@@ -17775,7 +17399,7 @@
     64:69:void close(com.android.tools.r8.ir.conversion.IRBuilder):625:630 -> a
     70:77:boolean verifyNoValuesAfterThrowingInstruction():1439:1446 -> a
     70:77:void close(com.android.tools.r8.ir.conversion.IRBuilder):630 -> a
-    78:78:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
+    78:78:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
     78:78:boolean verifyNoValuesAfterThrowingInstruction():1446 -> a
     78:78:void close(com.android.tools.r8.ir.conversion.IRBuilder):630 -> a
     79:79:boolean verifyNoValuesAfterThrowingInstruction():1446:1446 -> a
@@ -17819,7 +17443,7 @@
     279:296:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1538:1555 -> a
     297:305:int splitCriticalExceptionEdges(int,com.android.tools.r8.ir.code.ValueNumberGenerator,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1580:1588 -> a
     297:305:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1554 -> a
-    306:306:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
+    306:306:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
     306:306:int splitCriticalExceptionEdges(int,com.android.tools.r8.ir.code.ValueNumberGenerator,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1589 -> a
     306:306:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1554 -> a
     307:309:int splitCriticalExceptionEdges(int,com.android.tools.r8.ir.code.ValueNumberGenerator,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1589:1591 -> a
@@ -17831,7 +17455,7 @@
     311:342:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1554 -> a
     343:381:int splitCriticalExceptionEdges(int,com.android.tools.r8.ir.code.ValueNumberGenerator,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1599:1637 -> a
     343: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):1554 -> a
-    382:382:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
+    382:382:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
     382:382:int splitCriticalExceptionEdges(int,com.android.tools.r8.ir.code.ValueNumberGenerator,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1638 -> 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):1554 -> a
     383:383:int splitCriticalExceptionEdges(int,com.android.tools.r8.ir.code.ValueNumberGenerator,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1638:1638 -> a
@@ -17841,10 +17465,10 @@
     31:31:java.util.LinkedList getInstructions():529:529 -> b
     31:31:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):330 -> b
     32:32:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):330:330 -> b
-    33:33:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():81:81 -> b
+    33:33:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> b
     33:33:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):332 -> b
     34:34:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):332:332 -> b
-    35:35:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():81:81 -> b
+    35:35:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> b
     35:35:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):333 -> b
     36:39:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):333:336 -> b
     40:44:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):395:399 -> b
@@ -17870,12 +17494,12 @@
     130:130:java.util.LinkedList getInstructions():529:529 -> b
     130:130:java.util.Set cleanForRemoval():787 -> b
     131:131:java.util.Set cleanForRemoval():787:787 -> b
-    132:132:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> b
+    132:132:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
     132:132:java.util.Set cleanForRemoval():788 -> b
-    133:133:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> b
+    133:133:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
     133:133:java.util.Set cleanForRemoval():789 -> b
     134:134:java.util.Set cleanForRemoval():789:789 -> b
-    135:135:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> b
+    135:135:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
     135:135:java.util.Set cleanForRemoval():790 -> b
     136:146:java.util.Set cleanForRemoval():790:800 -> b
     147:148:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):890:891 -> b
@@ -17973,7 +17597,7 @@
     5:5:int doHash(java.lang.Object):1760:1760 -> a
     6:6:int doHash(com.android.tools.r8.ir.code.Phi):1775:1775 -> a
     6:6:int doHash(java.lang.Object):1760 -> a
-    7:7:int com.android.tools.r8.ir.code.Value.hashCode():705:705 -> a
+    7:7:int com.android.tools.r8.ir.code.Value.hashCode():686:686 -> a
     7:7:int doHash(com.android.tools.r8.ir.code.Phi):1776 -> a
     7:7:int doHash(java.lang.Object):1760 -> a
 com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo -> a.a.a.a.h.b.o:
@@ -17989,139 +17613,212 @@
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.code.Position position -> d
     com.android.tools.r8.ir.code.BasicBlock block -> a
-    1:1:void <clinit>():27:27 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.BasicBlock):34:34 -> <init>
-    2:6:void <init>(com.android.tools.r8.ir.code.BasicBlock):32:36 -> <init>
-    7:7:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):39:39 -> <init>
-    8:17:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):32:41 -> <init>
-    18:19:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):45:46 -> <init>
-    boolean lambda$inlineInvoke$2(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.BasicBlock):33:33 -> <init>
+    2:6:void <init>(com.android.tools.r8.ir.code.BasicBlock):31:35 -> <init>
+    7:7:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):38:38 -> <init>
+    8:17:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):31:40 -> <init>
+    18:19:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):44:45 -> <init>
+    boolean lambda$inlineInvoke$1(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
     boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    1:1:void setInsertionPosition(com.android.tools.r8.ir.code.Position):83:83 -> a
-    2:2:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):167:167 -> a
-    3:3:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():81:81 -> a
-    3:3:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):170 -> a
-    4:7:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):170:173 -> a
-    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    8:8:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):173 -> a
-    9:10:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):173:174 -> a
-    11:11:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    11:11:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):174 -> a
-    12:13:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):174:175 -> a
-    14:14:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    14:14:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):175 -> a
-    15:15:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    15:15:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):175 -> a
-    16:23:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):175:182 -> a
-    24:24:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):168:168 -> a
-    25:45:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set):191:211 -> a
-    46:52:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set):210:216 -> a
-    53:53:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    53:53:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set):216 -> a
-    54:55:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set):216:217 -> a
-    56:56:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():81:81 -> a
-    56:56:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set):217 -> a
-    57:70:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set):217:230 -> a
-    71:71:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set):192:192 -> a
-    72:81: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,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.BasicBlock):232:241 -> a
-    82:89:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):249:256 -> a
-    90:90:boolean hasNext():51:51 -> a
-    90:90:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):256 -> a
-    91:94:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):256:259 -> a
-    95:95:boolean hasPrevious():67:67 -> a
-    95:95:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):263 -> a
-    96:119:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):263:286 -> a
-    120:127:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):295:302 -> a
-    128:160:void splitBlockAndCopyCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):328:360 -> a
-    161:164:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):398:401 -> a
-    165:165:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    165:165:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):401 -> a
-    166:167:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):401:402 -> a
-    168:168:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    168:168:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):402 -> a
-    169:170:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):402:403 -> a
-    171:171:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):414:414 -> a
-    172:174:boolean canThrow(com.android.tools.r8.ir.code.IRCode):308:310 -> a
-    172:174:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):415 -> a
-    175:182:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):295:302 -> a
-    175:182:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):420 -> a
-    183:199:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):421:437 -> a
-    200:200:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():81:81 -> a
-    200:200:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):437 -> a
-    201:203:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):437:439 -> a
-    204:204:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():81:81 -> a
-    204:204:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):444 -> a
-    205:208:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):444:447 -> a
-    209:244:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):446:481 -> a
-    245:245:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():81:81 -> a
-    245:245:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):485 -> a
-    246:250:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):485:489 -> a
-    251:251:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():81:81 -> a
-    251:251:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):490 -> a
-    252:259:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):490:497 -> a
-    260:260:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):45:45 -> a
-    260:260:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):497 -> a
-    261:274:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):497:510 -> a
-    275:275:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    275:275:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):511 -> a
-    276:277:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):512:513 -> a
-    278:278:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    278:278:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):514 -> a
-    279:281:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):514:516 -> a
-    282:282:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):45:45 -> a
-    282:282:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):516 -> a
-    283:283:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):519:519 -> a
-    284:284:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    284:284:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):518 -> a
-    285:334:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):517:566 -> a
-    335:351:void appendCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):375:391 -> a
-    335:351:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):567 -> a
-    352:365:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):574:587 -> a
-    366:366:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):586:586 -> a
-    367:393:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):595:621 -> a
-    394:394:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):132:132 -> a
-    394:394:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):626 -> a
-    395:395:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):627:627 -> a
-    396:396:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):45:45 -> a
-    396:396:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):627 -> a
-    397:415:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):627:645 -> a
-    1:1:void add(java.lang.Object):27:27 -> add
-    1:6:void add(com.android.tools.r8.ir.code.Instruction):96:101 -> b
-    1:7:void removeOrReplaceByDebugLocalRead():155:161 -> c
-    8:8:void removeOrReplaceByDebugLocalRead():156:156 -> c
-    1:1:boolean hasNext():51:51 -> hasNext
-    1:1:boolean hasPrevious():67:67 -> hasPrevious
-    1:1:java.lang.Object next():27:27 -> next
-    2:3:com.android.tools.r8.ir.code.Instruction next():56:57 -> next
-    1:1:int nextIndex():62:62 -> nextIndex
-    1:1:java.lang.Object previous():27:27 -> previous
-    2:3:com.android.tools.r8.ir.code.Instruction previous():72:73 -> previous
-    1:1:int previousIndex():78:78 -> previousIndex
-    1:4:void remove():130:133 -> remove
-    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> remove
-    5:5:void remove():133 -> remove
-    6:8:void remove():133:135 -> remove
-    9:9:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():81:81 -> remove
-    9:9:void remove():135 -> remove
-    10:11:void remove():135:136 -> remove
-    12:12:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():81:81 -> remove
-    12:12:void remove():136 -> remove
-    13:22:void remove():136:145 -> remove
-    23:23:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> remove
-    23:23:void remove():145 -> remove
-    24:25:void remove():145:146 -> remove
-    26:26:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> remove
-    26:26:void remove():146 -> remove
-    27:31:void remove():146:150 -> remove
-    32:32:void remove():131:131 -> remove
-    1:1:void set(java.lang.Object):27:27 -> set
-    2:4:void set(com.android.tools.r8.ir.code.Instruction):114:116 -> set
-    2:4:void set(java.lang.Object):27 -> set
+    1:1:void setInsertionPosition(com.android.tools.r8.ir.code.Position):82:82 -> a
+    2:2:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):166:166 -> a
+    3:3:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> a
+    3:3:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):169 -> a
+    4:7:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):169:172 -> a
+    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    8:8:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):172 -> a
+    9:10:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):172:173 -> a
+    11:11:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    11:11:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):173 -> a
+    12:13:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):173:174 -> a
+    14:14:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    14:14:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):174 -> a
+    15:15:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    15:15:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):174 -> a
+    16:23:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):174:181 -> a
+    24:24:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):167:167 -> a
+    25:32:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):186:193 -> a
+    25:32:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> a
+    33:33:boolean hasNext():50:50 -> a
+    33:33:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):193 -> a
+    33:33:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> a
+    34:37:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):193:196 -> a
+    34:37:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> a
+    38:38:boolean hasPrevious():66:66 -> a
+    38:38:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):200 -> a
+    38:38:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> a
+    39:62:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):200:223 -> a
+    39:62:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> a
+    63:69:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):233:239 -> a
+    70:77:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):186:193 -> a
+    78:78:boolean hasNext():50:50 -> a
+    78:78:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):193 -> a
+    79:82:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):193:196 -> a
+    83:83:boolean hasPrevious():66:66 -> a
+    83:83:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):200 -> a
+    84:107:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):200:223 -> a
+    108:140:void splitBlockAndCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):261:293 -> a
+    141:144:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):327:330 -> a
+    145:145:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    145:145:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):330 -> a
+    146:147:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):330:331 -> a
+    148:148:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    148:148:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):331 -> a
+    149:150:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):331:332 -> a
+    151:151:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):343:343 -> a
+    152:154:boolean canThrow(com.android.tools.r8.ir.code.IRCode):245:247 -> a
+    152:154:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):344 -> a
+    155:162:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):186:193 -> a
+    155:162:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> a
+    155:162:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):349 -> a
+    163:163:boolean hasNext():50:50 -> a
+    163:163:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):193 -> a
+    163:163:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> a
+    163:163:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):349 -> a
+    164:167:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):193:196 -> a
+    164:167:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> a
+    164:167:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):349 -> a
+    168:168:boolean hasPrevious():66:66 -> a
+    168:168:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):200 -> a
+    168:168:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> a
+    168:168:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):349 -> a
+    169:192:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):200:223 -> a
+    169:192:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> a
+    169:192:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):349 -> a
+    193:199:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):233:239 -> a
+    193:199:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):349 -> a
+    200:216:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):350:366 -> a
+    217:217:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> a
+    217:217:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):366 -> a
+    218:220:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):366:368 -> a
+    221:221:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> a
+    221:221:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):373 -> a
+    222:225:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):373:376 -> a
+    226:261:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):375:410 -> a
+    262:262:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> a
+    262:262:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):414 -> a
+    263:267:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):414:418 -> a
+    268:268:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> a
+    268:268:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):419 -> a
+    269:276:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):419:426 -> a
+    277:277:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):45:45 -> a
+    277:277:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):426 -> a
+    278:291:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):426:439 -> a
+    292:292:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    292:292:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):440 -> a
+    293:294:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):441:442 -> a
+    295:295:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    295:295:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):443 -> a
+    296:298:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):443:445 -> a
+    299:299:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):45:45 -> a
+    299:299:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):445 -> a
+    300:300:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):448:448 -> a
+    301:301:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    301:301:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):447 -> a
+    302:351:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):446:495 -> a
+    352:368:void appendCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):304:320 -> a
+    352:368:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):496 -> a
+    369:382:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):503:516 -> a
+    383:383:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):515:515 -> a
+    384:410:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):524:550 -> a
+    411:411:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):132:132 -> a
+    411:411:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):555 -> a
+    412:412:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):556:556 -> a
+    413:413:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):45:45 -> a
+    413:413:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):556 -> a
+    414:432:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):556:574 -> a
+    1:1:void add(java.lang.Object):26:26 -> add
+    2:7:void add(com.android.tools.r8.ir.code.Instruction):95:100 -> add
+    2:7:void add(java.lang.Object):26 -> add
+    1:4:void removeOrReplaceByDebugLocalRead():154:157 -> b
+    5:8:void remove():129:132 -> b
+    5:8:void removeOrReplaceByDebugLocalRead():158 -> b
+    9:9:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
+    9:9:void remove():132 -> b
+    9:9:void removeOrReplaceByDebugLocalRead():158 -> b
+    10:12:void remove():132:134 -> b
+    10:12:void removeOrReplaceByDebugLocalRead():158 -> b
+    13:13:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> b
+    13:13:void remove():134 -> b
+    13:13:void removeOrReplaceByDebugLocalRead():158 -> b
+    14:15:void remove():134:135 -> b
+    14:15:void removeOrReplaceByDebugLocalRead():158 -> b
+    16:16:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> b
+    16:16:void remove():135 -> b
+    16:16:void removeOrReplaceByDebugLocalRead():158 -> b
+    17:26:void remove():135:144 -> b
+    17:26:void removeOrReplaceByDebugLocalRead():158 -> b
+    27:27:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
+    27:27:void remove():144 -> b
+    27:27:void removeOrReplaceByDebugLocalRead():158 -> b
+    28:29:void remove():144:145 -> b
+    28:29:void removeOrReplaceByDebugLocalRead():158 -> b
+    30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
+    30:30:void remove():145 -> b
+    30:30:void removeOrReplaceByDebugLocalRead():158 -> b
+    31:35:void remove():145:149 -> b
+    31:35:void removeOrReplaceByDebugLocalRead():158 -> b
+    36:36:void remove():130:130 -> b
+    36:36:void removeOrReplaceByDebugLocalRead():158 -> b
+    37:37:void removeOrReplaceByDebugLocalRead():160:160 -> b
+    38:38:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):166:166 -> b
+    38:38:void removeOrReplaceByDebugLocalRead():160 -> b
+    39:39:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> b
+    39:39:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):169 -> b
+    39:39:void removeOrReplaceByDebugLocalRead():160 -> b
+    40:43:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):169:172 -> b
+    40:43:void removeOrReplaceByDebugLocalRead():160 -> b
+    44:44:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
+    44:44:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):172 -> b
+    44:44:void removeOrReplaceByDebugLocalRead():160 -> b
+    45:46:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):172:173 -> b
+    45:46:void removeOrReplaceByDebugLocalRead():160 -> b
+    47:47:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
+    47:47:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):173 -> b
+    47:47:void removeOrReplaceByDebugLocalRead():160 -> b
+    48:49:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):173:174 -> b
+    48:49:void removeOrReplaceByDebugLocalRead():160 -> b
+    50:50:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
+    50:50:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):174 -> b
+    50:50:void removeOrReplaceByDebugLocalRead():160 -> b
+    51:58:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):174:181 -> b
+    51:58:void removeOrReplaceByDebugLocalRead():160 -> b
+    59:59:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):167:167 -> b
+    59:59:void removeOrReplaceByDebugLocalRead():160 -> b
+    60:60:void removeOrReplaceByDebugLocalRead():155:155 -> b
+    1:1:boolean hasNext():50:50 -> hasNext
+    1:1:boolean hasPrevious():66:66 -> hasPrevious
+    1:2:com.android.tools.r8.ir.code.Instruction next():55:56 -> next
+    1:2:java.lang.Object next():26 -> next
+    1:1:int nextIndex():61:61 -> nextIndex
+    1:2:com.android.tools.r8.ir.code.Instruction previous():71:72 -> previous
+    1:2:java.lang.Object previous():26 -> previous
+    1:1:int previousIndex():77:77 -> previousIndex
+    1:4:void remove():129:132 -> remove
+    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> remove
+    5:5:void remove():132 -> remove
+    6:8:void remove():132:134 -> remove
+    9:9:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> remove
+    9:9:void remove():134 -> remove
+    10:11:void remove():134:135 -> remove
+    12:12:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> remove
+    12:12:void remove():135 -> remove
+    13:22:void remove():135:144 -> remove
+    23:23:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> remove
+    23:23:void remove():144 -> remove
+    24:25:void remove():144:145 -> remove
+    26:26:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> remove
+    26:26:void remove():145 -> remove
+    27:31:void remove():145:149 -> remove
+    32:32:void remove():130:130 -> remove
+    1:1:void set(java.lang.Object):26:26 -> set
+    2:4:void set(com.android.tools.r8.ir.code.Instruction):113:115 -> set
+    2:4:void set(java.lang.Object):26 -> set
 com.android.tools.r8.ir.code.BasicBlockIterator -> a.a.a.a.h.b.r:
     java.util.ListIterator listIterator -> a
     com.android.tools.r8.ir.code.BasicBlock current -> b
     1:3:void <init>(com.android.tools.r8.ir.code.IRCode):16:18 -> <init>
-    4:6:void <init>(com.android.tools.r8.ir.code.IRCode,int):21:23 -> <init>
     1:1:void add(java.lang.Object):10:10 -> add
     2:2:void add(com.android.tools.r8.ir.code.BasicBlock):60:60 -> add
     2:2:void add(java.lang.Object):10 -> add
@@ -18141,18 +17838,18 @@
 com.android.tools.r8.ir.code.Binop -> a.a.a.a.h.b.s:
     com.android.tools.r8.ir.code.NumericType type -> h
     1:3: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):25:27 -> <init>
-    4:7:void com.android.tools.r8.ir.code.Instruction.addInValue(com.android.tools.r8.ir.code.Value):86:89 -> <init>
+    4:7:void com.android.tools.r8.ir.code.Instruction.addInValue(com.android.tools.r8.ir.code.Value):84:87 -> <init>
     4:7: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):28 -> <init>
-    8:11:void com.android.tools.r8.ir.code.Instruction.addInValue(com.android.tools.r8.ir.code.Value):86:89 -> <init>
+    8:11:void com.android.tools.r8.ir.code.Instruction.addInValue(com.android.tools.r8.ir.code.Value):84:87 -> <init>
     8:11: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):29 -> <init>
-    12:15:void com.android.tools.r8.ir.code.Instruction.addInValue(com.android.tools.r8.ir.code.Value):86:89 -> <init>
+    12:15:void com.android.tools.r8.ir.code.Instruction.addInValue(com.android.tools.r8.ir.code.Value):84:87 -> <init>
     12:15: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):31 -> <init>
-    16:19:void com.android.tools.r8.ir.code.Instruction.addInValue(com.android.tools.r8.ir.code.Value):86:89 -> <init>
+    16:19:void com.android.tools.r8.ir.code.Instruction.addInValue(com.android.tools.r8.ir.code.Value):84:87 -> <init>
     16:19: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):32 -> <init>
     boolean hasInvariantOutType() -> Ea
     boolean isBinop() -> Qa
     1:8:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):52:59 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():853:853 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():824:824 -> a
     9:9:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):59 -> a
     10:10:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):59:59 -> a
     11:11:int foldIntegers(int,int):100:100 -> a
@@ -18234,64 +17931,62 @@
     boolean hasInvariantOutType() -> Ea
     boolean instructionTypeCanThrow() -> Ia
     boolean isCheckCast() -> Ra
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):37:37 -> a
-    2:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:66 -> a
-    16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):110:110 -> a
-    17:17:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):115:115 -> a
-    18:19:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):160:161 -> a
-    20:20:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):173:173 -> a
-    21:21:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):178:178 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):74:74 -> b
-    2:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):120:124 -> b
-    7:7:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> b
-    7:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):126 -> b
-    8:8:boolean verifyTypes(com.android.tools.r8.graph.AppView):126:126 -> b
-    9:9:com.android.tools.r8.graph.DexType getType():41:41 -> b
-    9:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):128 -> b
-    10:27:boolean verifyTypes(com.android.tools.r8.graph.AppView):128:145 -> b
-    28:28:boolean com.android.tools.r8.ir.analysis.type.Nullability.lessThanOrEqual(com.android.tools.r8.ir.analysis.type.Nullability):62:62 -> b
-    28:28:boolean verifyTypes(com.android.tools.r8.graph.AppView):145 -> b
-    29:32:boolean verifyTypes(com.android.tools.r8.graph.AppView):145:148 -> b
+    1:14:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):48:61 -> a
+    15:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):105:105 -> a
+    16:16:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):110:110 -> a
+    17:18:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):155:156 -> a
+    19:19:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):168:168 -> a
+    20:20:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):173:173 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):69:69 -> b
+    2:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):115:119 -> b
+    7:7:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
+    7:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):121 -> b
+    8:8:boolean verifyTypes(com.android.tools.r8.graph.AppView):121:121 -> b
+    9:9:com.android.tools.r8.graph.DexType getType():36:36 -> b
+    9:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):123 -> b
+    10:27:boolean verifyTypes(com.android.tools.r8.graph.AppView):123:140 -> b
+    28:28:boolean com.android.tools.r8.ir.analysis.type.Nullability.lessThanOrEqual(com.android.tools.r8.ir.analysis.type.Nullability):47:47 -> b
+    28:28:boolean verifyTypes(com.android.tools.r8.graph.AppView):140 -> b
+    29:32:boolean verifyTypes(com.android.tools.r8.graph.AppView):140:143 -> b
     int maxInValueRegister() -> gc
     int maxOutValueRegister() -> hc
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> j
-    1:1:com.android.tools.r8.graph.DexType getType():41:41 -> lc
-    1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():81:81 -> mc
-    1:1:com.android.tools.r8.ir.code.Value object():45 -> mc
-    2:2:com.android.tools.r8.ir.code.Value object():45:45 -> mc
-    1:1:java.lang.String toString():104:104 -> toString
+    1:1:com.android.tools.r8.graph.DexType getType():36:36 -> lc
+    1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> mc
+    1:1:com.android.tools.r8.ir.code.Value object():40 -> mc
+    2:2:com.android.tools.r8.ir.code.Value object():40:40 -> mc
+    1:1:java.lang.String toString():99:99 -> toString
 com.android.tools.r8.ir.code.Cmp -> a.a.a.a.h.b.z:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Cmp$Bias bias -> i
     1:1:void <clinit>():27:27 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):36:37 -> <init>
     boolean isCmp() -> Sa
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):42:42 -> a
-    2:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:80 -> a
-    30:54:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:82 -> a
-    55:63:java.lang.String biasToString(com.android.tools.r8.ir.code.Cmp$Bias):86:94 -> a
-    64:78:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):159:173 -> a
-    79:90:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):171:182 -> a
-    91:102:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):180:191 -> a
-    103:103:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    103:103:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):192 -> a
-    104:104:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):192:192 -> a
-    105:109:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):191:195 -> a
-    110:110:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    110:110:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):196 -> a
-    111:112:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):196:197 -> a
-    113:119:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):196:202 -> a
-    120:123:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):201:204 -> a
-    124:130:com.android.tools.r8.ir.analysis.constant.LatticeElement buildLatticeResult(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.LongInterval,com.android.tools.r8.utils.LongInterval):209:215 -> a
-    131:131:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):230:230 -> a
-    132:132:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):235:235 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):132:132 -> b
+    1:28:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):48:75 -> a
+    29:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:77 -> a
+    54:62:java.lang.String biasToString(com.android.tools.r8.ir.code.Cmp$Bias):81:89 -> a
+    63:77:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):154:168 -> a
+    78:89:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):166:177 -> a
+    90:101:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):175:186 -> a
+    102:102:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    102:102:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):187 -> a
+    103:103:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):187:187 -> a
+    104:108:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):186:190 -> a
+    109:109:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    109:109:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):191 -> a
+    110:111:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):191:192 -> a
+    112:118:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):191:197 -> a
+    119:122:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):196:199 -> a
+    123:129:com.android.tools.r8.ir.analysis.constant.LatticeElement buildLatticeResult(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.LongInterval,com.android.tools.r8.utils.LongInterval):204:210 -> a
+    130:130:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):225:225 -> a
+    131:131:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):230:230 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):127:127 -> b
     int maxInValueRegister() -> gc
     int maxOutValueRegister() -> hc
     com.android.tools.r8.ir.code.Cmp asCmp() -> k
     boolean isCommutative() -> mc
-    1:17:java.lang.String toString():100:116 -> toString
-    18:40:java.lang.String toString():105:127 -> toString
+    1:17:java.lang.String toString():95:111 -> toString
+    18:40:java.lang.String toString():100:122 -> toString
 com.android.tools.r8.ir.code.Cmp$Bias -> a.a.a.a.h.b.y:
     com.android.tools.r8.ir.code.Cmp$Bias LT -> c
     com.android.tools.r8.ir.code.Cmp$Bias NONE -> a
@@ -18309,44 +18004,39 @@
     boolean instructionTypeCanThrow() -> Ia
     boolean isOutConstant() -> Rb
     boolean isConstClass() -> Ta
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):33:33 -> a
-    2:4:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstClass):37:39 -> a
-    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    5:5:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstClass):40 -> a
-    6:8:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstClass):40:42 -> a
-    9:9:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstClass):46:46 -> a
-    10:10:com.android.tools.r8.graph.DexType getValue():54:54 -> a
-    10:10:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstClass):46 -> a
-    11:11:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstClass):46:46 -> a
-    12:12:com.android.tools.r8.ir.code.Value dest():50:50 -> a
-    12:12:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59 -> a
-    13:14:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:60 -> a
-    15:15:com.android.tools.r8.graph.DexType getValue():54:54 -> a
-    15:15:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93 -> a
-    16:23:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93:100 -> a
-    24:24:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):114:114 -> a
-    25:25:com.android.tools.r8.graph.DexType getValue():54:54 -> a
-    25:25:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93 -> a
-    25:25:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):114 -> a
-    26:33:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93:100 -> a
-    26:33:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):114 -> a
-    34:34:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):140:140 -> a
-    35:35:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):145:145 -> a
-    36:36:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):151:151 -> a
-    37:37:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):156:156 -> a
-    38:38:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):161:161 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):124:124 -> b
-    1:1:int maxInValueRegister():65:65 -> gc
+    1:1:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstClass):41:41 -> a
+    2:2:com.android.tools.r8.graph.DexType getValue():49:49 -> a
+    2:2:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstClass):41 -> a
+    3:3:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstClass):41:41 -> a
+    4:4:com.android.tools.r8.ir.code.Value dest():45:45 -> a
+    4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54 -> a
+    5:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:55 -> a
+    7:7:com.android.tools.r8.graph.DexType getValue():49:49 -> a
+    7:7:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):88 -> a
+    8:15:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):88:95 -> a
+    16:16:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):109:109 -> a
+    17:17:com.android.tools.r8.graph.DexType getValue():49:49 -> a
+    17:17:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):88 -> a
+    17:17:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):109 -> a
+    18:25:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):88:95 -> a
+    18:25:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):109 -> a
+    26:26:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):135:135 -> a
+    27:27:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):140:140 -> a
+    28:28:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):146:146 -> a
+    29:29:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):151:151 -> a
+    30:30:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):156:156 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):119:119 -> b
+    1:1:int maxInValueRegister():60:60 -> gc
     int maxOutValueRegister() -> hc
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> l
-    1:1:com.android.tools.r8.graph.DexType getValue():54:54 -> lc
-    1:1:java.lang.String toString():76:76 -> toString
+    1:1:com.android.tools.r8.graph.DexType getValue():49:49 -> lc
+    1:1:java.lang.String toString():71:71 -> toString
 com.android.tools.r8.ir.code.ConstInstruction -> a.a.a.a.h.b.B:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):32:32 -> <init>
     boolean hasInvariantOutType() -> Ea
     boolean isConstInstruction() -> Ua
     1:6:com.android.tools.r8.ir.code.ConstInstruction copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstInstruction):14:19 -> a
-    7:7:com.android.tools.r8.ir.code.ConstMethodType com.android.tools.r8.ir.code.ConstMethodType.copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodType):43:43 -> a
+    7:7:com.android.tools.r8.ir.code.ConstMethodType com.android.tools.r8.ir.code.ConstMethodType.copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodType):38:38 -> a
     7:7:com.android.tools.r8.ir.code.ConstInstruction copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstInstruction):19 -> a
     8:15:com.android.tools.r8.ir.code.ConstInstruction copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstInstruction):20:27 -> a
     16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):53:53 -> a
@@ -18360,26 +18050,25 @@
     boolean instructionTypeCanThrow() -> Ia
     boolean isOutConstant() -> Rb
     boolean isConstMethodHandle() -> Va
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):32:32 -> a
-    2:2:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):45:45 -> a
-    3:3:com.android.tools.r8.graph.DexMethodHandle getValue():53:53 -> a
-    3:3:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):45 -> a
-    4:4:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):45:45 -> a
-    5:5:com.android.tools.r8.ir.code.Value dest():49:49 -> a
-    5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58 -> a
-    6:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:59 -> a
-    8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):64:64 -> a
-    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):81:81 -> a
-    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):117:117 -> a
-    11:11:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):116:116 -> a
-    12:12:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):123:123 -> a
-    13:13:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):128:128 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):69:69 -> b
-    1:1:int maxInValueRegister():74:74 -> gc
+    1:1:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):40:40 -> a
+    2:2:com.android.tools.r8.graph.DexMethodHandle getValue():48:48 -> a
+    2:2:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):40 -> a
+    3:3:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):40:40 -> a
+    4:4:com.android.tools.r8.ir.code.Value dest():44:44 -> a
+    4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53 -> a
+    5:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:54 -> a
+    7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):59:59 -> a
+    8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):76:76 -> a
+    9:9:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):112:112 -> a
+    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):111:111 -> a
+    11:11:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):118:118 -> a
+    12:12:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):123:123 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):64:64 -> b
+    1:1:int maxInValueRegister():69:69 -> gc
     int maxOutValueRegister() -> hc
-    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():53:53 -> lc
+    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():48:48 -> lc
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> n
-    1:1:java.lang.String toString():91:91 -> toString
+    1:1:java.lang.String toString():86:86 -> toString
 com.android.tools.r8.ir.code.ConstMethodType -> a.a.a.a.h.b.D:
     com.android.tools.r8.graph.DexProto methodType -> h
     boolean $assertionsDisabled -> i
@@ -18388,21 +18077,20 @@
     boolean instructionTypeCanThrow() -> Ia
     boolean isOutConstant() -> Rb
     boolean isConstMethodType() -> Wa
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):30:30 -> a
-    2:2:com.android.tools.r8.ir.code.Value dest():47:47 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56 -> a
-    3:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56:57 -> a
-    5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):62:62 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):109:109 -> a
-    7:7:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):108:108 -> a
-    8:8:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):115:115 -> a
-    9:9:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):120:120 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67:67 -> b
-    1:1:int maxInValueRegister():72:72 -> gc
+    1:1:com.android.tools.r8.ir.code.Value dest():42:42 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):51 -> a
+    2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):51:52 -> a
+    4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):57:57 -> a
+    5:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):104:104 -> a
+    6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):103:103 -> a
+    7:7:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):110:110 -> a
+    8:8:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):115:115 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):62:62 -> b
+    1:1:int maxInValueRegister():67:67 -> gc
     int maxOutValueRegister() -> hc
-    1:1:com.android.tools.r8.graph.DexProto getValue():51:51 -> lc
+    1:1:com.android.tools.r8.graph.DexProto getValue():46:46 -> lc
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> o
-    1:1:java.lang.String toString():83:83 -> toString
+    1:1:java.lang.String toString():78:78 -> toString
 com.android.tools.r8.ir.code.ConstNumber -> a.a.a.a.h.b.E:
     boolean $assertionsDisabled -> i
     long value -> h
@@ -18410,147 +18098,130 @@
     1:6:void <init>(com.android.tools.r8.ir.code.Value,long):37:42 -> <init>
     boolean isOutConstant() -> Rb
     boolean isConstNumber() -> Xa
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):47:47 -> a
-    2:3:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):51:52 -> a
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    4:4:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):53 -> a
-    5:7:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):53:55 -> a
-    8:8:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstNumber):59:59 -> a
-    9:9:long getRawValue():92:92 -> a
-    9:9:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstNumber):59 -> a
-    10:10:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstNumber):59:59 -> a
-    11:11:com.android.tools.r8.ir.code.Value dest():63:63 -> a
-    11:11:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):117 -> a
-    12:13:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):117:118 -> a
-    14:14:com.android.tools.r8.ir.code.Value dest():63:63 -> a
-    14:14:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):122 -> a
-    15:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):122:143 -> a
-    37:45:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):124:132 -> a
-    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    46:46:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):307 -> a
-    47:47:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):307:307 -> a
-    48:52:boolean isIntegerNegativeOne(com.android.tools.r8.ir.code.NumericType):108:112 -> a
-    53:53:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):150:150 -> a
-    54:57:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):155:158 -> a
-    58:58:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):164:164 -> a
-    59:76:int estimatedDexSize(com.android.tools.r8.ir.code.ValueType,long):202:219 -> a
-    59:76:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):164 -> a
-    77:107:int estimatedCfSize(com.android.tools.r8.ir.code.ValueType,long):168:198 -> a
-    77:107:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):164 -> a
-    108:108:int estimatedCfSize(com.android.tools.r8.ir.code.ValueType,long):191:191 -> a
-    108:108:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):164 -> a
-    109:109:int estimatedCfSize(com.android.tools.r8.ir.code.ValueType,long):185:185 -> a
-    109:109:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):164 -> a
-    110:111:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):293:294 -> a
-    112:115:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):299:302 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):252:256 -> b
-    6:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):312:313 -> b
-    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> b
-    8:8:boolean verifyTypes(com.android.tools.r8.graph.AppView):314 -> b
-    9:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):314:314 -> b
-    10:10:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> b
-    10:10:boolean verifyTypes(com.android.tools.r8.graph.AppView):315 -> b
-    11:11:boolean verifyTypes(com.android.tools.r8.graph.AppView):315:315 -> b
-    12:12:boolean verifyTypes(com.android.tools.r8.graph.AppView):313:313 -> b
-    1:1:int maxInValueRegister():229:229 -> gc
+    1:2:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):46:47 -> a
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    3:3:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):48 -> a
+    4:6:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):48:50 -> a
+    7:7:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstNumber):54:54 -> a
+    8:8:long getRawValue():87:87 -> a
+    8:8:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstNumber):54 -> a
+    9:9:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstNumber):54:54 -> a
+    10:10:com.android.tools.r8.ir.code.Value dest():58:58 -> a
+    10:10:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):112 -> a
+    11:12:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):112:113 -> a
+    13:13:com.android.tools.r8.ir.code.Value dest():58:58 -> a
+    13:13:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):117 -> a
+    14:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):117:138 -> a
+    36:44:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):119:127 -> a
+    45:49:boolean isIntegerNegativeOne(com.android.tools.r8.ir.code.NumericType):103:107 -> a
+    50:50:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    50:50:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):298 -> a
+    51:51:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):298:298 -> a
+    52:52:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):145:145 -> a
+    53:56:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):150:153 -> a
+    57:57:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):159:159 -> a
+    58:75:int estimatedDexSize(com.android.tools.r8.ir.code.ValueType,long):197:214 -> a
+    58:75:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):159 -> a
+    76:106:int estimatedCfSize(com.android.tools.r8.ir.code.ValueType,long):163:193 -> a
+    76:106:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):159 -> a
+    107:107:int estimatedCfSize(com.android.tools.r8.ir.code.ValueType,long):186:186 -> a
+    107:107:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):159 -> a
+    108:108:int estimatedCfSize(com.android.tools.r8.ir.code.ValueType,long):180:180 -> a
+    108:108:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):159 -> a
+    109:110:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):284:285 -> a
+    111:114:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):290:293 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):243:247 -> b
+    6:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):303:304 -> b
+    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
+    8:8:boolean verifyTypes(com.android.tools.r8.graph.AppView):305 -> b
+    9:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):305:305 -> b
+    10:10:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
+    10:10:boolean verifyTypes(com.android.tools.r8.graph.AppView):306 -> b
+    11:11:boolean verifyTypes(com.android.tools.r8.graph.AppView):306:306 -> b
+    12:12:boolean verifyTypes(com.android.tools.r8.graph.AppView):304:304 -> b
+    1:1:int maxInValueRegister():224:224 -> gc
     int maxOutValueRegister() -> hc
-    1:1:com.android.tools.r8.ir.code.Value dest():63:63 -> lc
-    1:2:double getDoubleValue():87:88 -> mc
-    1:2:float getFloatValue():82:83 -> nc
-    1:2:int getIntValue():71:72 -> oc
-    3:5:int getIntValue():71:73 -> oc
+    1:1:com.android.tools.r8.ir.code.Value dest():58:58 -> lc
+    1:2:double getDoubleValue():82:83 -> mc
+    1:2:float getFloatValue():77:78 -> nc
+    1:2:int getIntValue():66:67 -> oc
+    3:5:int getIntValue():66:68 -> oc
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> p
-    1:2:long getLongValue():77:78 -> pc
-    1:1:long getRawValue():92:92 -> qc
-    1:1:boolean is16Bit():268:268 -> rc
-    1:1:boolean is8Bit():260:260 -> sc
-    1:1:boolean isIntegerOne():104:104 -> tc
-    1:2:java.lang.String toString():240:241 -> toString
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> toString
-    3:3:java.lang.String toString():241 -> toString
-    4:6:java.lang.String toString():241:243 -> toString
-    1:1:boolean isIntegerZero():100:100 -> uc
-    1:1:boolean isZero():96:96 -> vc
-    1:1:boolean negativeIs16Bit():272:272 -> wc
-    1:1:boolean negativeIs8Bit():264:264 -> xc
+    1:2:long getLongValue():72:73 -> pc
+    1:1:long getRawValue():87:87 -> qc
+    1:1:boolean is16Bit():259:259 -> rc
+    1:1:boolean is8Bit():251:251 -> sc
+    1:1:boolean isIntegerOne():99:99 -> tc
+    1:1:java.lang.String toString():235:235 -> toString
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> toString
+    2:2:java.lang.String toString():235 -> toString
+    3:3:java.lang.String toString():235:235 -> toString
+    1:1:boolean isIntegerZero():95:95 -> uc
+    1:1:boolean isZero():91:91 -> vc
+    1:1:boolean negativeIs16Bit():263:263 -> wc
+    1:1:boolean negativeIs8Bit():255:255 -> xc
 com.android.tools.r8.ir.code.ConstString -> a.a.a.a.h.b.F:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexString value -> h
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):27:29 -> <init>
-    1:11:boolean instructionInstanceCanThrow():106:116 -> Ha
-    1:1:boolean instructionTypeCanThrow():86:86 -> Ia
+    1:11:boolean instructionInstanceCanThrow():101:111 -> Ha
+    1:1:boolean instructionTypeCanThrow():81:81 -> Ia
     boolean isOutConstant() -> Rb
     boolean isConstString() -> Ya
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):34:34 -> a
-    2:3:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):38:39 -> a
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    4:4:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):40 -> a
-    5:7:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):40:42 -> a
-    8:8:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):46:46 -> a
-    9:9:com.android.tools.r8.graph.DexString getValue():54:54 -> a
-    9:9:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):46 -> a
-    10:10:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):46:46 -> a
-    11:11:com.android.tools.r8.ir.code.Value dest():50:50 -> a
-    11:11:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59 -> a
-    12:13:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:60 -> a
-    14:14:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):125:125 -> a
-    15:15:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):130:130 -> a
-    16:16:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):135:135 -> a
-    17:17:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):141:141 -> a
-    18:18:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):146:146 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):65:65 -> b
-    1:1:int maxInValueRegister():70:70 -> gc
+    1:2:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):33:34 -> a
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    3:3:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):35 -> a
+    4:6:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):35:37 -> a
+    7:7:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):41:41 -> a
+    8:8:com.android.tools.r8.graph.DexString getValue():49:49 -> a
+    8:8:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):41 -> a
+    9:9:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):41:41 -> a
+    10:10:com.android.tools.r8.ir.code.Value dest():45:45 -> a
+    10:10:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54 -> a
+    11:12:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:55 -> a
+    13:13:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):120:120 -> a
+    14:14:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):125:125 -> a
+    15:15:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):130:130 -> a
+    16:16:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):136:136 -> a
+    17:17:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):141:141 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):60:60 -> b
+    1:1:int maxInValueRegister():65:65 -> gc
     int maxOutValueRegister() -> hc
-    1:1:com.android.tools.r8.graph.DexString getValue():54:54 -> lc
+    1:1:com.android.tools.r8.graph.DexString getValue():49:49 -> lc
     com.android.tools.r8.ir.code.ConstString asConstString() -> q
-    1:1:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.ir.code.ConstantValueUtils -> a.a.a.a.h.b.G:
-    boolean $assertionsDisabled -> a
-    1:1:void <clinit>():12:12 -> <clinit>
-    1:13:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):20:32 -> a
-    14:14:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):41:41 -> a
-    15:15:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    15:15:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):42 -> a
-    16:16:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):42:42 -> a
-    17:17:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    17:17:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):43 -> a
-    18:22:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):43:47 -> a
-    23:31:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):46:54 -> a
-com.android.tools.r8.ir.code.DebugLocalRead -> a.a.a.a.h.b.H:
+    1:1:java.lang.String toString():76:76 -> toString
+com.android.tools.r8.ir.code.DebugLocalRead -> a.a.a.a.h.b.G:
     1:1:void <init>():20:20 -> <init>
     boolean hasInvariantOutType() -> Ea
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):25:25 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):40:40 -> a
-    3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):45:45 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):66:66 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):35:35 -> a
+    2:2:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):40:40 -> a
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):61:61 -> a
     boolean isDebugLocalRead() -> ab
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):50:50 -> b
-    1:1:int maxInValueRegister():55:55 -> gc
-    1:1:int maxOutValueRegister():60:60 -> hc
-com.android.tools.r8.ir.code.DebugLocalUninitialized -> a.a.a.a.h.b.I:
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):45:45 -> b
+    1:1:int maxInValueRegister():50:50 -> gc
+    1:1:int maxOutValueRegister():55:55 -> hc
+com.android.tools.r8.ir.code.DebugLocalUninitialized -> a.a.a.a.h.b.H:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):26:26 -> a
     boolean isDebugLocalUninitialized() -> bb
-com.android.tools.r8.ir.code.DebugLocalWrite -> a.a.a.a.h.b.J:
+com.android.tools.r8.ir.code.DebugLocalWrite -> a.a.a.a.h.b.I:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():27:27 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):30:31 -> <init>
     boolean isOutConstant() -> Rb
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
-    2:2:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):62:62 -> a
-    3:3:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):67:67 -> a
-    4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):73:73 -> a
-    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):73 -> a
-    6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):73:73 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):56:56 -> b
+    1:1:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):57:57 -> a
+    2:2:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):62:62 -> a
+    3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):68:68 -> a
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):68 -> a
+    5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):68:68 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):51:51 -> b
     boolean isDebugLocalWrite() -> cb
     com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite() -> r
-com.android.tools.r8.ir.code.DebugLocalsChange -> a.a.a.a.h.b.K:
+com.android.tools.r8.ir.code.DebugLocalsChange -> a.a.a.a.h.b.J:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap starting -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap ending -> h
@@ -18558,97 +18229,37 @@
     1:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):27:30 -> <init>
     boolean hasInvariantOutType() -> Ea
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):35:35 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:58 -> a
-    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):99:99 -> a
-    4:13:boolean apply(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):104:113 -> a
-    14:14:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):120:120 -> a
-    15:15:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):130:130 -> a
-    1:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):63:68 -> b
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:53 -> a
+    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):94:94 -> a
+    3:12:boolean apply(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):99:108 -> a
+    13:13:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):115:115 -> a
+    14:14:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):125:125 -> a
+    1:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):58:63 -> b
     boolean isDebugLocalsChange() -> db
-    1:1:int maxInValueRegister():73:73 -> gc
-    1:1:int maxOutValueRegister():78:78 -> hc
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():39:39 -> lc
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():43:43 -> mc
+    1:1:int maxInValueRegister():68:68 -> gc
+    1:1:int maxOutValueRegister():73:73 -> hc
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():34:34 -> lc
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():38:38 -> mc
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> s
-    1:6:java.lang.String toString():88:93 -> toString
-com.android.tools.r8.ir.code.DebugPosition -> a.a.a.a.h.b.L:
+    1:6:java.lang.String toString():83:88 -> toString
+com.android.tools.r8.ir.code.DebugPosition -> a.a.a.a.h.b.K:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():20:20 -> <init>
     boolean hasInvariantOutType() -> Ea
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):25:25 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):40:40 -> a
-    3:3:void com.android.tools.r8.ir.conversion.DexBuilder.addDebugPosition(com.android.tools.r8.ir.code.DebugPosition):609:609 -> a
-    3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):41 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):62:62 -> a
-    5:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):82:84 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):46:46 -> b
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):35:35 -> a
+    2:2:void com.android.tools.r8.ir.conversion.DexBuilder.addDebugPosition(com.android.tools.r8.ir.code.DebugPosition):585:585 -> a
+    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):36 -> a
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):57:57 -> a
+    4:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):77:79 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):41:41 -> b
     boolean isDebugPosition() -> eb
-    1:1:int maxInValueRegister():51:51 -> gc
-    1:1:int maxOutValueRegister():56:56 -> hc
+    1:1:int maxInValueRegister():46:46 -> gc
+    1:1:int maxOutValueRegister():51:51 -> hc
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> t
-com.android.tools.r8.ir.code.DefaultInstructionVisitor -> a.a.a.a.h.b.M:
-    1:1:void <init>():7:7 -> <init>
-    java.lang.Object visit(com.android.tools.r8.ir.code.MoveException) -> A
-    java.lang.Object visit(com.android.tools.r8.ir.code.Mul) -> B
-    java.lang.Object visit(com.android.tools.r8.ir.code.Neg) -> C
-    java.lang.Object visit(com.android.tools.r8.ir.code.NewArrayEmpty) -> D
-    java.lang.Object visit(com.android.tools.r8.ir.code.NewArrayFilledData) -> E
-    java.lang.Object visit(com.android.tools.r8.ir.code.NonNull) -> F
-    java.lang.Object visit(com.android.tools.r8.ir.code.Not) -> G
-    java.lang.Object visit(com.android.tools.r8.ir.code.NumberConversion) -> H
-    java.lang.Object visit(com.android.tools.r8.ir.code.And) -> I
-    java.lang.Object visit(com.android.tools.r8.ir.code.Or) -> J
-    java.lang.Object visit(com.android.tools.r8.ir.code.Pop) -> K
-    java.lang.Object visit(com.android.tools.r8.ir.code.Rem) -> L
-    java.lang.Object visit(com.android.tools.r8.ir.code.Return) -> M
-    java.lang.Object visit(com.android.tools.r8.ir.code.Shl) -> N
-    java.lang.Object visit(com.android.tools.r8.ir.code.Shr) -> O
-    java.lang.Object visit(com.android.tools.r8.ir.code.Store) -> P
-    java.lang.Object visit(com.android.tools.r8.ir.code.Sub) -> Q
-    java.lang.Object visit(com.android.tools.r8.ir.code.Swap) -> R
-    java.lang.Object visit(com.android.tools.r8.ir.code.Switch) -> S
-    java.lang.Object visit(com.android.tools.r8.ir.code.Argument) -> T
-    java.lang.Object visit(com.android.tools.r8.ir.code.Throw) -> U
-    java.lang.Object visit(com.android.tools.r8.ir.code.Ushr) -> V
-    java.lang.Object visit(com.android.tools.r8.ir.code.Xor) -> W
-    java.lang.Object visit(com.android.tools.r8.ir.code.ArrayGet) -> X
-    java.lang.Object visit(com.android.tools.r8.ir.code.ArrayLength) -> Y
-    java.lang.Object visit(com.android.tools.r8.ir.code.ArrayPut) -> Z
-    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 visit(com.android.tools.r8.ir.code.Add) -> a
-    java.lang.Object com.android.tools.r8.ir.code.InstructionVisitor.visit(com.android.tools.r8.ir.code.NewInstance) -> a
-    java.lang.Object visit(com.android.tools.r8.ir.code.CheckCast) -> aa
-    java.lang.Object visit(com.android.tools.r8.ir.code.AlwaysMaterializingDefinition) -> b
-    java.lang.Object visit(com.android.tools.r8.ir.code.Cmp) -> c
-    java.lang.Object visit(com.android.tools.r8.ir.code.ConstClass) -> d
-    java.lang.Object visit(com.android.tools.r8.ir.code.ConstMethodHandle) -> e
-    java.lang.Object visit(com.android.tools.r8.ir.code.ConstMethodType) -> f
-    java.lang.Object visit(com.android.tools.r8.ir.code.ConstNumber) -> g
-    java.lang.Object visit(com.android.tools.r8.ir.code.ConstString) -> h
-    java.lang.Object visit(com.android.tools.r8.ir.code.DebugLocalRead) -> i
-    java.lang.Object visit(com.android.tools.r8.ir.code.DebugLocalsChange) -> j
-    java.lang.Object visit(com.android.tools.r8.ir.code.DebugLocalUninitialized) -> k
-    java.lang.Object visit(com.android.tools.r8.ir.code.DebugLocalWrite) -> l
-    java.lang.Object visit(com.android.tools.r8.ir.code.AlwaysMaterializingNop) -> m
-    java.lang.Object visit(com.android.tools.r8.ir.code.DebugPosition) -> n
-    java.lang.Object visit(com.android.tools.r8.ir.code.DexItemBasedConstString) -> o
-    java.lang.Object visit(com.android.tools.r8.ir.code.Div) -> p
-    java.lang.Object visit(com.android.tools.r8.ir.code.Dup) -> q
-    java.lang.Object visit(com.android.tools.r8.ir.code.Dup2) -> r
-    java.lang.Object visit(com.android.tools.r8.ir.code.Goto) -> s
-    java.lang.Object visit(com.android.tools.r8.ir.code.If) -> t
-    java.lang.Object visit(com.android.tools.r8.ir.code.Inc) -> u
-    java.lang.Object visit(com.android.tools.r8.ir.code.InstanceOf) -> v
-    java.lang.Object visit(com.android.tools.r8.ir.code.Load) -> w
-    java.lang.Object visit(com.android.tools.r8.ir.code.AlwaysMaterializingUser) -> x
-    java.lang.Object visit(com.android.tools.r8.ir.code.Monitor) -> y
-    java.lang.Object visit(com.android.tools.r8.ir.code.Move) -> z
-com.android.tools.r8.ir.code.DexItemBasedConstString -> a.a.a.a.h.b.N:
+com.android.tools.r8.ir.code.DexItemBasedConstString -> a.a.a.a.h.b.L:
     com.android.tools.r8.graph.DexReference item -> h
     boolean $assertionsDisabled -> k
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> j
@@ -18657,54 +18268,52 @@
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexReference,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):28:28 -> <init>
     2:5:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexReference,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo):36:39 -> <init>
     boolean instructionInstanceCanThrow() -> Ha
-    1:1:boolean instructionTypeCanThrow():102:102 -> Ia
+    1:1:boolean instructionTypeCanThrow():97:97 -> Ia
     boolean isOutConstant() -> Rb
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):44:44 -> a
-    2:2:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):48:48 -> a
-    3:3:com.android.tools.r8.graph.DexReference getItem():53:53 -> a
-    3:3:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):49 -> a
-    4:4:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):49:49 -> a
-    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72 -> a
-    6:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:73 -> a
-    8:8:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):125:125 -> a
-    9:9:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):130:130 -> a
-    10:10:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):136:136 -> a
-    11:11:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):141:141 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):81:81 -> b
+    1:1:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):43:43 -> a
+    2:2:com.android.tools.r8.graph.DexReference getItem():48:48 -> a
+    2:2:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):44 -> a
+    3:3:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):44:44 -> a
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67 -> a
+    5:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:68 -> a
+    7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):120:120 -> a
+    8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):125:125 -> a
+    9:9:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):131:131 -> a
+    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):136:136 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):76:76 -> b
     boolean isDexItemBasedConstString() -> fb
-    1:1:int maxInValueRegister():86:86 -> gc
+    1:1:int maxInValueRegister():81:81 -> gc
     int maxOutValueRegister() -> hc
-    1:1:com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo getClassNameComputationInfo():57:57 -> lc
-    1:1:com.android.tools.r8.graph.DexReference getItem():53:53 -> mc
-    1:1:java.lang.String toString():97:97 -> toString
+    1:1:com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo getClassNameComputationInfo():52:52 -> lc
+    1:1:com.android.tools.r8.graph.DexReference getItem():48:48 -> mc
+    1:1:java.lang.String toString():92:92 -> toString
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> u
-com.android.tools.r8.ir.code.Div -> a.a.a.a.h.b.O:
+com.android.tools.r8.ir.code.Div -> a.a.a.a.h.b.M:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    1:1:boolean instructionTypeCanThrow():129:129 -> Ia
+    1:1:boolean instructionTypeCanThrow():124:124 -> Ia
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):29:29 -> a
-    2:2:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):64:64 -> a
-    3:3:int foldIntegers(int,int):109:109 -> a
-    4:4:long foldLongs(long,long):114:114 -> a
-    5:9:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):134:138 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):59:59 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):84:84 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):99:99 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):49:49 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):79:79 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):69:69 -> d
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):94:94 -> d
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):74:74 -> e
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):89:89 -> e
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):54:54 -> f
+    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):59:59 -> a
+    2:2:int foldIntegers(int,int):104:104 -> a
+    3:3:long foldLongs(long,long):109:109 -> a
+    4:8:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):129:133 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):54:54 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):79:79 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:94 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):44:44 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):74:74 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):64:64 -> d
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):89:89 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):69:69 -> e
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):84:84 -> e
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):49:49 -> f
     boolean isDiv() -> gb
     boolean isCommutative() -> mc
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():143:143 -> qc
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():138:138 -> qc
     com.android.tools.r8.ir.code.Div asDiv() -> v
-com.android.tools.r8.ir.code.DominatorTree -> a.a.a.a.h.b.T:
+com.android.tools.r8.ir.code.DominatorTree -> a.a.a.a.h.b.Q:
     com.android.tools.r8.ir.code.BasicBlock[] sorted -> a
     com.android.tools.r8.ir.code.BasicBlock[] doms -> b
     boolean obsolete -> e
@@ -18715,58 +18324,57 @@
     1:1:void <init>(com.android.tools.r8.ir.code.IRCode):37:37 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):40:40 -> <init>
     3:50:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):30:77 -> <init>
-    51:52:void numberBlocks():220:221 -> <init>
+    51:52:void numberBlocks():222:223 -> <init>
     51:52:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):79 -> <init>
-    53:82:void build():236:265 -> <init>
+    53:82:void build():238:267 -> <init>
     53:82:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):80 -> <init>
     83:83:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):84:84 -> <init>
-    84:85:boolean recordChangesToControlFlowEdges(java.util.List):300:301 -> <init>
+    84:85:boolean recordChangesToControlFlowEdges(java.util.List):302:303 -> <init>
     84:85:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):84 -> <init>
     1:1:boolean dominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):103:103 -> a
     2:8:boolean strictlyDominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):118:124 -> a
     2:8:boolean dominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):107 -> a
     9:16:com.android.tools.r8.ir.code.BasicBlock closestDominator(java.util.Collection):141:148 -> a
     17:22:java.util.List dominatedBlocks(com.android.tools.r8.ir.code.BasicBlock):155:160 -> a
-    23:24:java.lang.Iterable dominatorBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree$Inclusive):173:174 -> a
-    25:25:com.android.tools.r8.ir.code.BasicBlock[] getSortedBlocks():216:216 -> a
+    23:24:java.lang.Iterable dominatorBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree$Inclusive):177:178 -> a
+    25:25:com.android.tools.r8.ir.code.BasicBlock[] getSortedBlocks():218:218 -> a
     1:2:com.android.tools.r8.ir.code.BasicBlock immediateDominator(com.android.tools.r8.ir.code.BasicBlock):91:92 -> b
-    3:30:java.util.Iterator lambda$dominatorBlocks$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree$Inclusive):175:202 -> b
-    31:34:java.lang.Iterable normalExitDominatorBlocks():209:212 -> b
-    35:35:boolean postorderCompareLess(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):227:227 -> b
-    35:35:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):276 -> b
-    36:36:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):277:277 -> b
-    37:37:boolean postorderCompareLess(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):227:227 -> b
-    37:37:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):279 -> b
-    38:38:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):280:280 -> b
-    1:1:void onPredecessorsMayChange(com.android.tools.r8.ir.code.BasicBlock):313:313 -> c
-    1:1:void onSuccessorsMayChange(com.android.tools.r8.ir.code.BasicBlock):308:308 -> d
-    1:9:java.lang.String toString():288:296 -> toString
-com.android.tools.r8.ir.code.DominatorTree$1 -> a.a.a.a.h.b.P:
+    3:30:java.util.Iterator lambda$dominatorBlocks$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree$Inclusive):179:206 -> b
+    31:31:boolean postorderCompareLess(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):229:229 -> b
+    31:31:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):278 -> b
+    32:32:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):279:279 -> b
+    33:33:boolean postorderCompareLess(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):229:229 -> b
+    33:33:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):281 -> b
+    34:34:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):282:282 -> b
+    1:1:void onPredecessorsMayChange(com.android.tools.r8.ir.code.BasicBlock):315:315 -> c
+    1:1:void onSuccessorsMayChange(com.android.tools.r8.ir.code.BasicBlock):310:310 -> d
+    1:9:java.lang.String toString():290:298 -> toString
+com.android.tools.r8.ir.code.DominatorTree$1 -> a.a.a.a.h.b.N:
     com.android.tools.r8.ir.code.DominatorTree this$0 -> c
     com.android.tools.r8.ir.code.BasicBlock val$dominated -> b
     boolean $assertionsDisabled -> d
     com.android.tools.r8.ir.code.BasicBlock current -> a
-    1:1:void <clinit>():176:176 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.code.DominatorTree,com.android.tools.r8.ir.code.BasicBlock):176:177 -> <init>
-    1:1:boolean hasNext():181:181 -> hasNext
-    1:1:boolean hasNext():181:181 -> next
-    1:1:com.android.tools.r8.ir.code.BasicBlock next():186 -> next
-    1:1:java.lang.Object next():176 -> next
-    2:7:com.android.tools.r8.ir.code.BasicBlock next():189:194 -> next
-    2:7:java.lang.Object next():176 -> next
-com.android.tools.r8.ir.code.DominatorTree$Assumption -> a.a.a.a.h.b.Q:
+    1:1:void <clinit>():180:180 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.code.DominatorTree,com.android.tools.r8.ir.code.BasicBlock):180:181 -> <init>
+    1:1:boolean hasNext():185:185 -> hasNext
+    1:1:boolean hasNext():185:185 -> next
+    1:1:com.android.tools.r8.ir.code.BasicBlock next():190 -> next
+    1:1:java.lang.Object next():180 -> next
+    2:7:com.android.tools.r8.ir.code.BasicBlock next():193:198 -> next
+    2:7:java.lang.Object next():180 -> next
+com.android.tools.r8.ir.code.DominatorTree$Assumption -> a.a.a.a.h.b.O:
     com.android.tools.r8.ir.code.DominatorTree$Assumption MAY_HAVE_UNREACHABLE_BLOCKS -> b
     com.android.tools.r8.ir.code.DominatorTree$Assumption NO_UNREACHABLE_BLOCKS -> a
     1:2:void <clinit>():19:20 -> <clinit>
     3:3:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(java.lang.String,int):18:18 -> <init>
-com.android.tools.r8.ir.code.DominatorTree$Inclusive -> a.a.a.a.h.b.S:
+com.android.tools.r8.ir.code.DominatorTree$Inclusive -> a.a.a.a.h.b.P:
     com.android.tools.r8.ir.code.DominatorTree$Inclusive YES -> a
     com.android.tools.r8.ir.code.DominatorTree$Inclusive NO -> b
     1:2:void <clinit>():24:25 -> <clinit>
     3:3:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(java.lang.String,int):23:23 -> <init>
-com.android.tools.r8.ir.code.Dup -> a.a.a.a.h.b.V:
+com.android.tools.r8.ir.code.Dup -> a.a.a.a.h.b.T:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():17:17 -> <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):20:20 -> <init>
@@ -18774,30 +18382,29 @@
     2:3:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):20 -> <init>
     boolean hasInvariantOutType() -> Ea
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):30:30 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:62 -> a
-    3:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):67:70 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):92:92 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):76:76 -> b
-    1:6:void setOutValue(com.android.tools.r8.ir.code.Value):35:40 -> e
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:57 -> a
+    2:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):62:65 -> a
+    6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):87:87 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:71 -> b
+    1:6:void setOutValue(com.android.tools.r8.ir.code.Value):30:35 -> e
     int maxInValueRegister() -> gc
     boolean isDup() -> hb
-    1:1:int maxOutValueRegister():86:86 -> hc
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> lc
-    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():45 -> lc
-    1:1:com.android.tools.r8.ir.code.StackValue outBottom():49 -> lc
-    2:2:com.android.tools.r8.ir.code.StackValue[] getStackValues():45:45 -> lc
-    2:2:com.android.tools.r8.ir.code.StackValue outBottom():49 -> lc
-    3:3:com.android.tools.r8.ir.code.StackValue outBottom():49:49 -> lc
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> mc
-    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():45 -> mc
-    1:1:com.android.tools.r8.ir.code.StackValue outTop():53 -> mc
-    2:2:com.android.tools.r8.ir.code.StackValue[] getStackValues():45:45 -> mc
-    2:2:com.android.tools.r8.ir.code.StackValue outTop():53 -> mc
-    3:3:com.android.tools.r8.ir.code.StackValue outTop():53:53 -> mc
-    1:1:com.android.tools.r8.ir.code.StackValue src():57:57 -> nc
+    1:1:int maxOutValueRegister():81:81 -> hc
+    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> lc
+    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():40 -> lc
+    1:1:com.android.tools.r8.ir.code.StackValue outBottom():44 -> lc
+    2:2:com.android.tools.r8.ir.code.StackValue[] getStackValues():40:40 -> lc
+    2:2:com.android.tools.r8.ir.code.StackValue outBottom():44 -> lc
+    3:3:com.android.tools.r8.ir.code.StackValue outBottom():44:44 -> lc
+    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> mc
+    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():40 -> mc
+    1:1:com.android.tools.r8.ir.code.StackValue outTop():48 -> mc
+    2:2:com.android.tools.r8.ir.code.StackValue[] getStackValues():40:40 -> mc
+    2:2:com.android.tools.r8.ir.code.StackValue outTop():48 -> mc
+    3:3:com.android.tools.r8.ir.code.StackValue outTop():48:48 -> mc
+    1:1:com.android.tools.r8.ir.code.StackValue src():52:52 -> nc
     com.android.tools.r8.ir.code.Dup asDup() -> w
-com.android.tools.r8.ir.code.Dup2 -> a.a.a.a.h.b.U:
+com.android.tools.r8.ir.code.Dup2 -> a.a.a.a.h.b.S:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):27:27 -> <init>
@@ -18805,16 +18412,15 @@
     2:7: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):27 -> <init>
     boolean hasInvariantOutType() -> Ea
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):44:44 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):80:80 -> a
-    3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):85:85 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):106:106 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):90:90 -> b
-    1:6:void setOutValue(com.android.tools.r8.ir.code.Value):49:54 -> e
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
+    2:2:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80:80 -> a
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):101:101 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85:85 -> b
+    1:6:void setOutValue(com.android.tools.r8.ir.code.Value):44:49 -> e
     int maxInValueRegister() -> gc
-    1:1:int maxOutValueRegister():100:100 -> hc
+    1:1:int maxOutValueRegister():95:95 -> hc
     boolean isDup2() -> ib
-com.android.tools.r8.ir.code.FieldInstruction -> a.a.a.a.h.b.W:
+com.android.tools.r8.ir.code.FieldInstruction -> a.a.a.a.h.b.U:
     com.android.tools.r8.graph.DexField field -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.MemberType type -> h
@@ -18826,21 +18432,21 @@
     1:1:com.android.tools.r8.graph.DexField getField():31:31 -> lc
     1:1:com.android.tools.r8.ir.code.MemberType getType():27:27 -> mc
     com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> x
-com.android.tools.r8.ir.code.FixedRegisterValue -> a.a.a.a.h.b.X:
+com.android.tools.r8.ir.code.FixedRegisterValue -> a.a.a.a.h.b.V:
     int register -> s
     boolean $assertionsDisabled -> t
     1:1:void <clinit>():11:11 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,int):16:18 -> <init>
     boolean isConstant() -> C
     boolean isFixedRegisterValue() -> E
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():958:958 -> W
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():916:916 -> W
     1:1:com.android.tools.r8.ir.code.ValueType outType():23 -> W
     2:23:com.android.tools.r8.ir.code.ValueType outType():24:45 -> W
     24:25:com.android.tools.r8.ir.code.ValueType outType():42:43 -> W
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> b
     1:1:int getRegister():49:49 -> ba
     1:1:java.lang.String toString():69:69 -> toString
-com.android.tools.r8.ir.code.Goto -> a.a.a.a.h.b.Y:
+com.android.tools.r8.ir.code.Goto -> a.a.a.a.h.b.W:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -18848,19 +18454,18 @@
     2:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):21 -> <init>
     3:3:void <init>(com.android.tools.r8.ir.code.BasicBlock):22:22 -> <init>
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):27:27 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):49:49 -> a
-    3:4:void print(com.android.tools.r8.utils.CfgPrinter):74:75 -> a
-    5:10:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):99:104 -> a
-    11:11:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):112:112 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:80 -> b
-    1:1:int maxInValueRegister():54:54 -> gc
-    1:1:int maxOutValueRegister():60:60 -> hc
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):44:44 -> a
+    2:3:void print(com.android.tools.r8.utils.CfgPrinter):69:70 -> a
+    4:9:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):94:99 -> a
+    10:10:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):107:107 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> b
+    1:1:int maxInValueRegister():49:49 -> gc
+    1:1:int maxOutValueRegister():55:55 -> hc
     boolean isGoto() -> kb
-    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():31:34 -> mc
-    1:4:java.lang.String toString():66:69 -> toString
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():26:29 -> mc
+    1:4:java.lang.String toString():61:64 -> toString
     com.android.tools.r8.ir.code.Goto asGoto() -> y
-com.android.tools.r8.ir.code.IRCode -> a.a.a.a.h.b.ba:
+com.android.tools.r8.ir.code.IRCode -> a.a.a.a.h.b.Z:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.code.ValueNumberGenerator valueNumberGenerator -> c
     com.android.tools.r8.graph.DexEncodedMethod method -> a
@@ -18891,7 +18496,7 @@
     25:28:boolean lambda$verifyNoImpreciseOrBottomTypes$3(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):695:698 -> a
     29:34:java.util.List collectArguments(boolean):773:778 -> a
     29:34:java.util.List collectArguments():769 -> a
-    35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
+    35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
     35:35:java.util.List collectArguments(boolean):778 -> a
     35:35:java.util.List collectArguments():769 -> a
     36:41:java.util.List collectArguments(boolean):780:785 -> a
@@ -18906,10 +18511,10 @@
     52:63:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):967:978 -> a
     1:52:java.util.Map computeLiveAtEntrySets():146:197 -> b
     53:57:java.util.Map computeLiveAtEntrySets():196:200 -> b
-    58:58:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> b
+    58:58:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
     58:58:java.util.Map computeLiveAtEntrySets():201 -> b
     59:72:java.util.Map computeLiveAtEntrySets():203:216 -> b
-    73:73:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():81:81 -> b
+    73:73:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> b
     73:73:java.util.Map computeLiveAtEntrySets():220 -> b
     74:98:java.util.Map computeLiveAtEntrySets():220:244 -> b
     99:99:boolean com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets.equals(java.lang.Object):68:68 -> b
@@ -18923,7 +18528,7 @@
     113:113:boolean verifyValue(com.android.tools.r8.ir.code.Value):570 -> b
     114:114:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):580:580 -> b
     114:114:boolean verifyValue(com.android.tools.r8.ir.code.Value):570 -> b
-    115:115:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> b
+    115:115:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> b
     115:115:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):580 -> b
     115:115:boolean verifyValue(com.android.tools.r8.ir.code.Value):570 -> b
     116:118:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):581:583 -> b
@@ -18935,18 +18540,17 @@
     1:7:java.util.List computeNormalExitBlocks():727:733 -> c
     8:8:boolean isMarkingColorInUse(int):897:897 -> c
     1:4:boolean consistentBlockNumbering():633:636 -> d
-    5:5:java.util.ListIterator listIterator(int):741:741 -> d
+    5:5:void returnMarkingColor(int):891:891 -> d
+    6:7:void clearMarks(int):378:379 -> d
+    6:7:void returnMarkingColor(int):892 -> d
+    8:8:void returnMarkingColor(int):893:893 -> d
     1:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():822:823 -> e
-    3:3:void returnMarkingColor(int):891:891 -> e
-    4:5:void clearMarks(int):378:379 -> e
-    4:5:void returnMarkingColor(int):892 -> e
-    6:6:void returnMarkingColor(int):893:893 -> e
     1:1:boolean doAllThrowingInstructionsHavePositions():832:832 -> f
     1:1:com.android.tools.r8.ir.code.BasicBlock entryBlock():139:139 -> g
     1:1:int getHighestBlockNumber():818:818 -> h
     1:1:int getNextInstructionNumber():765:765 -> i
     1:6:com.android.tools.r8.ir.code.Value getThis():790:795 -> j
-    7:7:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> j
+    7:7:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> j
     7:7:com.android.tools.r8.ir.code.Value getThis():795 -> j
     8:8:com.android.tools.r8.ir.code.Value getThis():796:796 -> j
     1:9:java.util.Set getUnreachableBlocks():914:922 -> k
@@ -18970,12 +18574,12 @@
     1:2:boolean isConsistentSSA():470:471 -> o
     3:19:boolean consistentDefUseChains():528:544 -> o
     3:19:boolean isConsistentSSA():471 -> o
-    20:20:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> o
+    20:20:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> o
     20:20:boolean consistentDefUseChains():545 -> o
     20:20:boolean isConsistentSSA():471 -> o
     21:22:boolean consistentDefUseChains():547:548 -> o
     21:22:boolean isConsistentSSA():471 -> o
-    23:23:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():81:81 -> o
+    23:23:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> o
     23:23:boolean consistentDefUseChains():550 -> o
     23:23:boolean isConsistentSSA():471 -> o
     24:37:boolean consistentDefUseChains():550:563 -> o
@@ -18983,7 +18587,7 @@
     38:39:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):588:589 -> o
     38:39:boolean consistentDefUseChains():563 -> o
     38:39:boolean isConsistentSSA():471 -> o
-    40:40:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():81:81 -> o
+    40:40:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():79:79 -> o
     40:40:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):589 -> o
     40:40:boolean consistentDefUseChains():563 -> o
     40:40:boolean isConsistentSSA():471 -> o
@@ -19023,16 +18627,16 @@
     1:12:boolean verifyNoImpreciseOrBottomTypes():680:691 -> y
     13:14:boolean verifySSATypeLattice(java.util.function.Predicate):704:705 -> y
     13:14:boolean verifyNoImpreciseOrBottomTypes():691 -> y
-    15:15:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> y
+    15:15:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> y
     15:15:boolean verifySSATypeLattice(java.util.function.Predicate):706 -> y
     15:15:boolean verifyNoImpreciseOrBottomTypes():691 -> y
     16:20:boolean verifySSATypeLattice(java.util.function.Predicate):708:712 -> y
     16:20:boolean verifyNoImpreciseOrBottomTypes():691 -> y
     1:14:boolean verifySplitCriticalEdges():296:309 -> z
-com.android.tools.r8.ir.code.IRCode$BlockMarker -> a.a.a.a.h.b.Z:
+com.android.tools.r8.ir.code.IRCode$BlockMarker -> a.a.a.a.h.b.X:
     com.android.tools.r8.ir.code.BasicBlock block -> a
     1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):80:81 -> <init>
-com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> a.a.a.a.h.b.aa:
+com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> a.a.a.a.h.b.Y:
     java.util.Deque liveStackValues -> c
     java.util.Set liveValues -> a
     java.util.Set liveLocalValues -> b
@@ -19041,7 +18645,7 @@
     1:5:void <init>(java.util.Set,java.util.Set,java.util.Deque):53:57 -> <init>
     1:2:boolean equals(java.lang.Object):67:68 -> equals
     1:1:int hashCode():62:62 -> hashCode
-com.android.tools.r8.ir.code.IRCodeInstructionsIterator -> a.a.a.a.h.b.ca:
+com.android.tools.r8.ir.code.IRCodeInstructionsIterator -> a.a.a.a.h.b.aa:
     java.util.ListIterator blockIterator -> a
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> b
     boolean $assertionsDisabled -> c
@@ -19051,7 +18655,7 @@
     1:1:void add(java.lang.Object):10:10 -> add
     2:2:void add(com.android.tools.r8.ir.code.Instruction):69:69 -> add
     2:2:void add(java.lang.Object):10 -> add
-    1:1:void removeOrReplaceByDebugLocalRead():89:89 -> c
+    1:1:void removeOrReplaceByDebugLocalRead():89:89 -> b
     1:1:boolean hasNext():22:22 -> hasNext
     1:1:boolean hasPrevious():40:40 -> hasPrevious
     1:9:com.android.tools.r8.ir.code.Instruction next():27:35 -> next
@@ -19068,51 +18672,50 @@
     1:1:void set(java.lang.Object):10:10 -> set
     2:2:void set(com.android.tools.r8.ir.code.Instruction):79:79 -> set
     2:2:void set(java.lang.Object):10 -> set
-com.android.tools.r8.ir.code.If -> a.a.a.a.h.b.ea:
+com.android.tools.r8.ir.code.If -> a.a.a.a.h.b.ca:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.If$Type type -> i
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.Value):73:74 -> <init>
     3:4:void <init>(com.android.tools.r8.ir.code.If$Type,java.util.List):78:79 -> <init>
     1:3:boolean verifyTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.If$Type):65:67 -> a
-    4:4:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):84:84 -> a
-    5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):132:132 -> a
-    6:6:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode):137:137 -> a
-    7:8:void print(com.android.tools.r8.utils.CfgPrinter):171:172 -> a
-    9:10:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber):187:188 -> a
-    11:11:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    11:11:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber):188 -> a
-    12:13:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber):188:189 -> a
-    14:16:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.ConstNumber):193:195 -> a
-    17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    17:17:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.ConstNumber):195 -> a
-    18:19:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.ConstNumber):195:196 -> a
-    20:20:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):236:236 -> a
-    21:28:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):241:248 -> a
-    1:2:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):126:127 -> b
-    3:8:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):177:182 -> b
-    9:24:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):206:221 -> b
-    25:33:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):211:219 -> b
-    34:34:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):217:217 -> b
-    35:35:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):215:215 -> b
-    36:36:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):213:213 -> b
-    37:37:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):209:209 -> b
-    1:4:void setTrueTarget(com.android.tools.r8.ir.code.BasicBlock):110:113 -> c
-    1:1:int maxInValueRegister():160:160 -> gc
-    1:1:int maxOutValueRegister():165:165 -> hc
+    4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):127:127 -> a
+    5:5:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode):132:132 -> a
+    6:7:void print(com.android.tools.r8.utils.CfgPrinter):166:167 -> a
+    8:9:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber):182:183 -> a
+    10:10:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    10:10:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber):183 -> a
+    11:12:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber):183:184 -> a
+    13:15:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.ConstNumber):188:190 -> a
+    16:16:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    16:16:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.ConstNumber):190 -> a
+    17:18:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.ConstNumber):190:191 -> a
+    19:19:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):231:231 -> a
+    20:27:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):236:243 -> a
+    1:2:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):121:122 -> b
+    3:8:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):172:177 -> b
+    9:24:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):201:216 -> b
+    25:33:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):206:214 -> b
+    34:34:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):212:212 -> b
+    35:35:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):210:210 -> b
+    36:36:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):208:208 -> b
+    37:37:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):204:204 -> b
+    1:4:void setTrueTarget(com.android.tools.r8.ir.code.BasicBlock):105:108 -> c
+    1:1:int maxInValueRegister():155:155 -> gc
+    1:1:int maxOutValueRegister():160:160 -> hc
     boolean isIf() -> lb
-    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():118:121 -> lc
-    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():103:106 -> mc
-    1:1:com.android.tools.r8.ir.code.If$Type getType():92:92 -> nc
-    1:2:void invert():96:97 -> oc
-    3:4:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):126:127 -> oc
-    3:4:void invert():98 -> oc
-    5:5:void invert():99:99 -> oc
-    1:1:boolean isZeroTest():88:88 -> pc
-    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():200:202 -> qc
-    1:8:java.lang.String toString():147:154 -> toString
+    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():113:116 -> lc
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():98:101 -> mc
+    1:1:com.android.tools.r8.ir.code.If$Type getType():87:87 -> nc
+    1:2:void invert():91:92 -> oc
+    3:4:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):121:122 -> oc
+    3:4:void invert():93 -> oc
+    5:5:void invert():94:94 -> oc
+    1:1:boolean isZeroTest():83:83 -> pc
+    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():195:197 -> qc
+    1:8:java.lang.String toString():142:149 -> toString
     com.android.tools.r8.ir.code.If asIf() -> z
-com.android.tools.r8.ir.code.If$Type -> a.a.a.a.h.b.da:
+com.android.tools.r8.ir.code.If$Type -> a.a.a.a.h.b.ba:
     com.android.tools.r8.ir.code.If$Type GT -> c
     com.android.tools.r8.ir.code.If$Type LE -> d
     com.android.tools.r8.ir.code.If$Type EQ -> a
@@ -19130,109 +18733,102 @@
     19:27:com.android.tools.r8.ir.code.If$Type inverted():49:57 -> a
     28:28:com.android.tools.r8.ir.code.If$Type inverted():47:47 -> a
     1:1:com.android.tools.r8.ir.code.If$Type[] values():22:22 -> b
-com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> a.a.a.a.h.b.fa:
+com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> a.a.a.a.h.b.da:
     void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver) -> a
     com.android.tools.r8.ir.code.MemberType getMemberType() -> a
-com.android.tools.r8.ir.code.Inc -> a.a.a.a.h.b.ga:
+com.android.tools.r8.ir.code.Inc -> a.a.a.a.h.b.ea:
     boolean $assertionsDisabled -> i
     int increment -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,int):25:27 -> <init>
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):32:32 -> a
-    2:2:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):65:65 -> a
-    3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:70 -> a
-    4:4:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):76:76 -> a
-    5:15:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):81:91 -> a
-    1:2:void addInValue(com.android.tools.r8.ir.code.Value):38:39 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49:49 -> b
+    1:1:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):60:60 -> a
+    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:65 -> a
+    3:3:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):71:71 -> a
+    4:14:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):76:86 -> a
+    1:2:void addInValue(com.android.tools.r8.ir.code.Value):33:34 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):44:44 -> b
     int maxInValueRegister() -> gc
     int maxOutValueRegister() -> hc
-    1:1:java.lang.String toString():97:97 -> toString
-com.android.tools.r8.ir.code.InstanceGet -> a.a.a.a.h.b.ha:
+    1:1:java.lang.String toString():92:92 -> toString
+com.android.tools.r8.ir.code.InstanceGet -> a.a.a.a.h.b.fa:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():38:38 -> <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):41:41 -> <init>
     com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> A
     boolean instructionTypeCanThrow() -> Ia
-    1:1:com.android.tools.r8.ir.code.Value dest():50:50 -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65 -> a
-    2:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:97 -> a
-    35:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):95:95 -> a
-    36:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:76 -> a
-    37:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:91 -> a
-    57:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):88:88 -> a
-    58:58:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):85:85 -> a
-    59:59:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:82 -> a
-    60:80:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79:99 -> a
-    81:102:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):110:131 -> a
-    103:103:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):156:156 -> a
-    104:104:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InstanceGet):159:159 -> a
-    104:104:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):46 -> a
-    105:105:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):176:176 -> a
-    106:106:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):182:182 -> a
-    107:108:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):187:188 -> a
-    109:110:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):193:194 -> a
-    111:111:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):193:193 -> a
-    112:112:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):199:199 -> a
-    113:113:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):209:209 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):146:150 -> b
+    1:1:com.android.tools.r8.ir.code.Value dest():45:45 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60 -> a
+    2:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60:92 -> a
+    35:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):90:90 -> a
+    36:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:71 -> a
+    37:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:86 -> a
+    57:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83:83 -> a
+    58:58:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):80:80 -> a
+    59:59:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:77 -> a
+    60:80:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74:94 -> a
+    81:102:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):105:126 -> a
+    103:103:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):151:151 -> a
+    104:104:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):171:171 -> a
+    105:105:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):177:177 -> a
+    106:107:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):182:183 -> a
+    108:109:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):188:189 -> a
+    110:110:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):188:188 -> a
+    111:111:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):194:194 -> a
+    112:112:boolean definitelyTriggersClassInitialization(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):203:203 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):141:145 -> b
     int maxInValueRegister() -> gc
     int maxOutValueRegister() -> hc
     boolean isInstanceGet() -> mb
-    1:2:com.android.tools.r8.ir.code.Value object():54:55 -> nc
+    1:2:com.android.tools.r8.ir.code.Value object():49:50 -> nc
     boolean couldIntroduceAnAlias() -> sa
-    1:1:java.lang.String toString():171:171 -> toString
-com.android.tools.r8.ir.code.InstanceOf -> a.a.a.a.h.b.ia:
+    1:1:java.lang.String toString():166:166 -> toString
+com.android.tools.r8.ir.code.InstanceOf -> a.a.a.a.h.b.ga:
     com.android.tools.r8.graph.DexType type -> h
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):24:25 -> <init>
     com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> B
     boolean hasInvariantOutType() -> Ea
     boolean instructionTypeCanThrow() -> Ia
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):30:30 -> a
-    2:2:com.android.tools.r8.ir.code.Value dest():38:38 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47 -> a
-    3:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47:49 -> a
-    6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):85:85 -> a
-    7:7:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):90:90 -> a
-    8:9:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):100:101 -> a
-    10:10:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):106:106 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):69:69 -> b
+    1:1:com.android.tools.r8.ir.code.Value dest():33:33 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):42 -> a
+    2:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):42:44 -> a
+    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):80:80 -> a
+    6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):85:85 -> a
+    7:8:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):95:96 -> a
+    9:9:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):101:101 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):64:64 -> b
     int maxInValueRegister() -> gc
     int maxOutValueRegister() -> hc
-    1:1:com.android.tools.r8.graph.DexType type():34:34 -> lc
-    1:1:com.android.tools.r8.ir.code.Value value():42:42 -> mc
+    1:1:com.android.tools.r8.graph.DexType type():29:29 -> lc
+    1:1:com.android.tools.r8.ir.code.Value value():37:37 -> mc
     boolean isInstanceOf() -> nb
-com.android.tools.r8.ir.code.InstancePut -> a.a.a.a.h.b.ja:
+com.android.tools.r8.ir.code.InstancePut -> a.a.a.a.h.b.ha:
     boolean $assertionsDisabled -> k
-    1:1:void <clinit>():34:34 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):37:39 -> <init>
+    1:1:void <clinit>():33:33 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):36:38 -> <init>
     com.android.tools.r8.ir.code.InstancePut asInstancePut() -> C
     boolean instructionTypeCanThrow() -> Ia
-    1:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:89 -> a
-    33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):87:87 -> a
-    34:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:68 -> a
-    35:54:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:83 -> a
-    55:55:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):80:80 -> a
-    56:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:77 -> a
-    57:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74:74 -> a
-    58:78:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:91 -> a
-    79:89:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):101:111 -> a
-    90:90:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):142:142 -> a
-    91:91:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):162:162 -> a
-    92:93:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):167:168 -> a
-    94:94:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):167:167 -> a
-    95:95:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InstancePut):169:169 -> a
-    95:95:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):44 -> a
-    96:96:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):173:173 -> a
-    97:97:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):183:183 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):121:125 -> b
+    1:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52:83 -> a
+    33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81:81 -> a
+    34:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:62 -> a
+    35:54:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:77 -> a
+    55:55:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74:74 -> a
+    56:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:71 -> a
+    57:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:68 -> a
+    58:78:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:85 -> a
+    79:79:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):116:116 -> a
+    80:80:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):136:136 -> a
+    81:82:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):141:142 -> a
+    83:83:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):141:141 -> a
+    84:84:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):147:147 -> a
+    85:85:boolean definitelyTriggersClassInitialization(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):156:156 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):95:99 -> b
     int maxInValueRegister() -> gc
-    1:1:int maxOutValueRegister():135:135 -> hc
-    1:1:com.android.tools.r8.ir.code.Value object():48:48 -> nc
+    1:1:int maxOutValueRegister():109:109 -> hc
+    1:1:com.android.tools.r8.ir.code.Value object():42:42 -> nc
     boolean isInstancePut() -> ob
-    1:1:com.android.tools.r8.ir.code.Value value():52:52 -> oc
-    1:1:java.lang.String toString():157:157 -> toString
-com.android.tools.r8.ir.code.Instruction -> a.a.a.a.h.b.ka:
+    1:1:com.android.tools.r8.ir.code.Value value():46:46 -> oc
+    1:1:java.lang.String toString():131:131 -> toString
+com.android.tools.r8.ir.code.Instruction -> a.a.a.a.h.b.ia:
     java.util.List inValues -> b
     java.util.Set debugValues -> e
     boolean $assertionsDisabled -> g
@@ -19248,30 +18844,30 @@
     26:26:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):55:55 -> <init>
     27:49:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):39:61 -> <init>
     com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> A
-    1:2:com.android.tools.r8.ir.code.Position getPosition():67:68 -> Aa
+    1:2:com.android.tools.r8.ir.code.Position getPosition():65:66 -> Aa
     boolean isInvokeSuper() -> Ab
     com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> B
-    1:1:java.lang.String getPositionAsString():77:77 -> Ba
+    1:1:java.lang.String getPositionAsString():75:75 -> Ba
     boolean isInvokeVirtual() -> Bb
     com.android.tools.r8.ir.code.InstancePut asInstancePut() -> C
-    1:1:boolean hasBlock():277:277 -> Ca
+    1:1:boolean hasBlock():275:275 -> Ca
     boolean isJumpInstruction() -> Cb
     com.android.tools.r8.ir.code.Invoke asInvoke() -> D
-    1:1:java.util.List inValues():81:81 -> Da
-    1:1:boolean hasInValueWithLocalInfo():95 -> Da
-    2:3:boolean hasInValueWithLocalInfo():95:96 -> Da
+    1:1:java.util.List inValues():79:79 -> Da
+    1:1:boolean hasInValueWithLocalInfo():93 -> Da
+    2:3:boolean hasInValueWithLocalInfo():93:94 -> Da
     boolean isLoad() -> Db
     com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom() -> E
     boolean hasInvariantOutType() -> Ea
     boolean isLogicalBinop() -> Eb
     com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> F
-    1:1:boolean hasOutValue():104:104 -> Fa
+    1:1:boolean hasOutValue():102:102 -> Fa
     boolean isMonitor() -> Fb
     com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface() -> G
-    1:1:java.util.List inValues():81:81 -> Ga
+    1:1:java.util.List inValues():79:79 -> Ga
     boolean isMove() -> Gb
     com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod() -> H
-    1:1:boolean instructionInstanceCanThrow():508:508 -> Ha
+    1:1:boolean instructionInstanceCanThrow():506:506 -> Ha
     boolean isMoveException() -> Hb
     com.android.tools.r8.ir.code.InvokeMethodWithReceiver asInvokeMethodWithReceiver() -> I
     boolean instructionTypeCanThrow() -> Ia
@@ -19325,94 +18921,93 @@
     boolean isConstString() -> Ya
     boolean isStaticPut() -> Yb
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> Z
-    1:5:boolean isCreatingInstanceOrArray():1187:1191 -> Za
+    1:5:boolean isCreatingInstanceOrArray():1185:1189 -> Za
     boolean isStore() -> Zb
-    1:4:boolean isDebugInstruction():996:999 -> _a
+    1:4:boolean isDebugInstruction():994:997 -> _a
     boolean isSub() -> _b
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
     void buildDex(com.android.tools.r8.ir.conversion.DexBuilder) -> a
-    boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption) -> a
+    boolean definitelyTriggersClassInitialization(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) -> a
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
     boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator) -> a
     boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory) -> a
-    1:2:void setPosition(com.android.tools.r8.ir.code.Position):72:73 -> a
-    3:8:void addDebugValue(com.android.tools.r8.ir.code.Value):130:135 -> a
-    9:15:void clearUserInfo(com.android.tools.r8.ir.code.Instruction):140:146 -> a
-    16:19:void replaceValue(int,com.android.tools.r8.ir.code.Value):168:171 -> a
-    20:29:void replaceDebugValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):175:184 -> a
-    30:36:com.android.tools.r8.ir.code.Value removeDebugValue(com.android.tools.r8.graph.DebugLocalInfo):218:224 -> a
-    37:38:void setBlock(com.android.tools.r8.ir.code.BasicBlock):253:254 -> a
-    39:45:void print(com.android.tools.r8.utils.CfgPrinter):305:311 -> a
-    46:46:int com.android.tools.r8.ir.code.Value.getNumber():268:268 -> a
-    46:46:void print(com.android.tools.r8.utils.CfgPrinter):311 -> a
-    47:55:void print(com.android.tools.r8.utils.CfgPrinter):311:319 -> a
-    56:56:int com.android.tools.r8.ir.code.Value.getNumber():268:268 -> a
-    56:56:void print(com.android.tools.r8.utils.CfgPrinter):319 -> a
-    57:57:void print(com.android.tools.r8.utils.CfgPrinter):319:319 -> a
-    58:59:void setNumber(int):334:335 -> a
-    60:69:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):436:445 -> a
-    70:71:boolean identicalNonValueParts(com.android.tools.r8.ir.code.Instruction):344:345 -> a
-    70:71:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):442 -> a
-    72:72:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):448:448 -> a
-    73:76:boolean com.android.tools.r8.ir.code.InvokeDirect.sameConstructorReceiverValue(com.android.tools.r8.ir.code.Invoke):94:97 -> a
-    73:76:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):448 -> a
-    77:78:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):451:452 -> a
-    79:79:int getNumber():330:330 -> a
-    79:79:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):456 -> a
-    80:80:int getNumber():330:330 -> a
-    80:80:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):456 -> a
-    81:113:boolean identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):400:432 -> a
-    81:113:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):455 -> a
-    114:123:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):459:468 -> a
-    124:124:int getNumber():330:330 -> a
-    124:124:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):469 -> a
-    125:125:int getNumber():330:330 -> a
-    125:125:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):469 -> a
-    126:161:boolean identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):355:390 -> a
-    126:161:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):469 -> a
-    162:178:boolean identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):379:395 -> a
-    162:178:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):469 -> a
-    179:180:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):475:476 -> a
-    181:181:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):483:483 -> a
-    182:188:boolean identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):487:493 -> a
-    189:189:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):513:513 -> a
-    190:190:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):518:518 -> a
-    191:192:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):1206:1207 -> a
-    193:196:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):1213:1216 -> a
-    197:199:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):1221:1223 -> a
-    200:202:boolean verifyValidPositionInfo(boolean):1275:1277 -> a
+    1:2:void setPosition(com.android.tools.r8.ir.code.Position):70:71 -> a
+    3:8:void addDebugValue(com.android.tools.r8.ir.code.Value):128:133 -> a
+    9:15:void clearUserInfo(com.android.tools.r8.ir.code.Instruction):138:144 -> a
+    16:19:void replaceValue(int,com.android.tools.r8.ir.code.Value):166:169 -> a
+    20:29:void replaceDebugValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):173:182 -> a
+    30:36:com.android.tools.r8.ir.code.Value removeDebugValue(com.android.tools.r8.graph.DebugLocalInfo):216:222 -> a
+    37:38:void setBlock(com.android.tools.r8.ir.code.BasicBlock):251:252 -> a
+    39:45:void print(com.android.tools.r8.utils.CfgPrinter):303:309 -> a
+    46:46:int com.android.tools.r8.ir.code.Value.getNumber():266:266 -> a
+    46:46:void print(com.android.tools.r8.utils.CfgPrinter):309 -> a
+    47:55:void print(com.android.tools.r8.utils.CfgPrinter):309:317 -> a
+    56:56:int com.android.tools.r8.ir.code.Value.getNumber():266:266 -> a
+    56:56:void print(com.android.tools.r8.utils.CfgPrinter):317 -> a
+    57:57:void print(com.android.tools.r8.utils.CfgPrinter):317:317 -> a
+    58:59:void setNumber(int):332:333 -> a
+    60:69:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):434:443 -> a
+    70:71:boolean identicalNonValueParts(com.android.tools.r8.ir.code.Instruction):342:343 -> a
+    70:71:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):440 -> a
+    72:72:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):446:446 -> a
+    73:76:boolean com.android.tools.r8.ir.code.InvokeDirect.sameConstructorReceiverValue(com.android.tools.r8.ir.code.Invoke):84:87 -> a
+    73:76:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):446 -> a
+    77:78:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):449:450 -> a
+    79:79:int getNumber():328:328 -> a
+    79:79:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):454 -> a
+    80:80:int getNumber():328:328 -> a
+    80:80:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):454 -> a
+    81:113:boolean identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):398:430 -> a
+    81:113:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):453 -> a
+    114:123:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):457:466 -> a
+    124:124:int getNumber():328:328 -> a
+    124:124:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):467 -> a
+    125:125:int getNumber():328:328 -> a
+    125:125:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):467 -> a
+    126:161:boolean identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):353:388 -> a
+    126:161:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):467 -> a
+    162:178:boolean identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):377:393 -> a
+    162:178:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):467 -> a
+    179:180:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):473:474 -> a
+    181:181:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):481:481 -> a
+    182:188:boolean identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):485:491 -> a
+    189:189:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):511:511 -> a
+    190:190:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):516:516 -> a
+    191:192:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):1204:1205 -> a
+    193:196:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):1211:1214 -> a
+    197:199:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):1219:1221 -> a
+    200:202:boolean verifyValidPositionInfo(boolean):1272:1274 -> a
     com.android.tools.r8.ir.code.NonNull asNonNull() -> aa
     boolean isDebugLocalRead() -> ab
     boolean isSwap() -> ac
     com.android.tools.r8.ir.code.Add asAdd() -> b
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> b
-    1:4:void addInValue(com.android.tools.r8.ir.code.Value):86:89 -> b
-    5:8:void replaceValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):159:162 -> b
-    9:9:void printLIR(com.android.tools.r8.utils.CfgPrinter):326:326 -> b
-    10:21:boolean verifyTypes(com.android.tools.r8.graph.AppView):1228:1239 -> b
+    1:4:void addInValue(com.android.tools.r8.ir.code.Value):84:87 -> b
+    5:8:void replaceValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):157:160 -> b
+    9:9:void printLIR(com.android.tools.r8.utils.CfgPrinter):324:324 -> b
+    10:21:boolean verifyTypes(com.android.tools.r8.graph.AppView):1226:1237 -> b
     com.android.tools.r8.ir.code.Not asNot() -> ba
     boolean isDebugLocalUninitialized() -> bb
     boolean isSwitch() -> bc
     com.android.tools.r8.ir.code.And asAnd() -> c
     boolean needsValueInRegister(com.android.tools.r8.ir.code.Value) -> c
-    1:7:void moveDebugValues(com.android.tools.r8.ir.code.Instruction):190:196 -> c
+    1:7:void moveDebugValues(com.android.tools.r8.ir.code.Instruction):188:194 -> c
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> ca
     boolean isDebugLocalWrite() -> cb
     boolean isThrow() -> cc
     com.android.tools.r8.ir.code.Argument asArgument() -> d
-    1:9:void removeDebugValue(com.android.tools.r8.ir.code.Value):206:214 -> d
+    1:9:void removeDebugValue(com.android.tools.r8.ir.code.Value):204:212 -> d
     com.android.tools.r8.ir.code.Or asOr() -> da
     boolean isDebugLocalsChange() -> db
     boolean isUnop() -> dc
     com.android.tools.r8.ir.code.ArithmeticBinop asArithmeticBinop() -> e
-    1:4:void setOutValue(com.android.tools.r8.ir.code.Value):112:115 -> e
+    1:4:void setOutValue(com.android.tools.r8.ir.code.Value):110:113 -> e
     com.android.tools.r8.ir.code.Rem asRem() -> ea
     boolean isDebugPosition() -> eb
     boolean isUshr() -> ec
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> f
-    1:5:com.android.tools.r8.ir.code.Value swapOutValue(com.android.tools.r8.ir.code.Value):120:124 -> f
+    1:5:com.android.tools.r8.ir.code.Value swapOutValue(com.android.tools.r8.ir.code.Value):118:122 -> f
     com.android.tools.r8.ir.code.Return asReturn() -> fa
     boolean isDexItemBasedConstString() -> fb
     boolean isXor() -> fc
@@ -19427,15 +19022,15 @@
     com.android.tools.r8.ir.code.Binop asBinop() -> i
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> ia
     boolean isDup2() -> ib
-    1:1:com.android.tools.r8.ir.code.ValueType outType():151:151 -> ic
+    1:1:com.android.tools.r8.ir.code.ValueType outType():149:149 -> ic
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> j
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> ja
     boolean isFieldInstruction() -> jb
-    1:1:com.android.tools.r8.ir.code.Value outValue():108:108 -> jc
+    1:1:com.android.tools.r8.ir.code.Value outValue():106:106 -> jc
     com.android.tools.r8.ir.code.Cmp asCmp() -> k
     com.android.tools.r8.ir.code.Store asStore() -> ka
     boolean isGoto() -> kb
-    1:1:void removeOrReplaceByDebugLocalRead():266:266 -> kc
+    1:1:void removeOrReplaceByDebugLocalRead():264:264 -> kc
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> l
     com.android.tools.r8.ir.code.Sub asSub() -> la
     boolean isIf() -> lb
@@ -19452,51 +19047,50 @@
     com.android.tools.r8.ir.code.Xor asXor() -> pa
     boolean isIntroducingAnAlias() -> pb
     com.android.tools.r8.ir.code.ConstString asConstString() -> q
-    1:2:void clearBlock():261:262 -> qa
+    1:2:void clearBlock():259:260 -> qa
     boolean isInvoke() -> qb
     com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite() -> r
-    1:5:void clearDebugValues():233:237 -> ra
+    1:5:void clearDebugValues():231:235 -> ra
     boolean isInvokeCustom() -> rb
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> s
     boolean couldIntroduceAnAlias() -> sa
     boolean isInvokeDirect() -> sb
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> t
-    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():1182:1182 -> ta
+    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():1180:1180 -> ta
     boolean isInvokeInterface() -> tb
-    1:14:java.lang.String toString():286:299 -> toString
+    1:14:java.lang.String toString():284:297 -> toString
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> u
-    1:2:com.android.tools.r8.ir.code.BasicBlock getBlock():245:246 -> ua
+    1:2:com.android.tools.r8.ir.code.BasicBlock getBlock():243:244 -> ua
     boolean isInvokeMethod() -> ub
     com.android.tools.r8.ir.code.Div asDiv() -> v
-    1:1:java.util.Set getDebugValues():559:559 -> va
+    1:1:java.util.Set getDebugValues():557:557 -> va
     boolean isInvokeMethodWithReceiver() -> vb
     com.android.tools.r8.ir.code.Dup asDup() -> w
-    1:1:java.lang.String getInstructionName():281:281 -> wa
+    1:1:java.lang.String getInstructionName():279:279 -> wa
     boolean isInvokeMultiNewArray() -> wb
     com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> x
-    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():555:555 -> xa
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():553:553 -> xa
     boolean isInvokeNewArray() -> xb
     com.android.tools.r8.ir.code.Goto asGoto() -> y
-    1:1:int getNumber():330:330 -> ya
+    1:1:int getNumber():328:328 -> ya
     boolean isInvokePolymorphic() -> yb
     com.android.tools.r8.ir.code.If asIf() -> z
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> za
     boolean isInvokeStatic() -> zb
-com.android.tools.r8.ir.code.InstructionIterator -> a.a.a.a.h.b.la:
+com.android.tools.r8.ir.code.InstructionIterator -> a.a.a.a.h.b.ja:
     void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction) -> a
-    void removeOrReplaceByDebugLocalRead() -> c
-com.android.tools.r8.ir.code.InstructionListIterator -> a.a.a.a.h.b.ma:
+    void removeOrReplaceByDebugLocalRead() -> b
+com.android.tools.r8.ir.code.InstructionListIterator -> a.a.a.a.h.b.ka:
     com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType) -> a
-    void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set) -> a
     void setInsertionPosition(com.android.tools.r8.ir.code.Position) -> a
     com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator) -> a
     com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator) -> a
-    1:3:com.android.tools.r8.ir.code.Instruction peekNext():42:44 -> a
-    4:4:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode):90:90 -> a
-    5:5:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int):117:117 -> a
-    1:3:com.android.tools.r8.ir.code.Instruction peekPrevious():27:29 -> b
-com.android.tools.r8.ir.code.InstructionOrPhi -> a.a.a.a.h.b.na:
-com.android.tools.r8.ir.code.Invoke -> a.a.a.a.h.b.pa:
+    1:3:com.android.tools.r8.ir.code.Instruction peekPrevious():25:27 -> a
+    4:4:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode):70:70 -> a
+    5:5:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int):97:97 -> a
+    1:3:com.android.tools.r8.ir.code.Instruction peekNext():40:42 -> peekNext
+com.android.tools.r8.ir.code.InstructionOrPhi -> a.a.a.a.h.b.la:
+com.android.tools.r8.ir.code.Invoke -> a.a.a.a.h.b.na:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):61:61 -> <init>
@@ -19566,10 +19160,10 @@
     8:8:java.util.List arguments():103:103 -> qc
     8:8:boolean argumentsAreConsecutiveInputArguments():213 -> qc
     9:10:boolean argumentsAreConsecutiveInputArguments():213:214 -> qc
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> sa
+    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> sa
     1:1:boolean couldIntroduceAnAlias():186 -> sa
     1:1:java.lang.String getInstructionName():252:252 -> wa
-com.android.tools.r8.ir.code.Invoke$Type -> a.a.a.a.h.b.oa:
+com.android.tools.r8.ir.code.Invoke$Type -> a.a.a.a.h.b.ma:
     com.android.tools.r8.ir.code.Invoke$Type NEW_ARRAY -> f
     com.android.tools.r8.ir.code.Invoke$Type MULTI_NEW_ARRAY -> g
     com.android.tools.r8.ir.code.Invoke$Type[] $VALUES -> j
@@ -19588,115 +19182,92 @@
     19:29:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):42:52 -> a
     30:40:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):40:50 -> a
     41:44:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):44:47 -> a
-com.android.tools.r8.ir.code.InvokeCustom -> a.a.a.a.h.b.qa:
+com.android.tools.r8.ir.code.InvokeCustom -> a.a.a.a.h.b.oa:
     com.android.tools.r8.graph.DexCallSite callSite -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():20:20 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.ir.code.Value,java.util.List):25:27 -> <init>
     com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom() -> E
     boolean hasInvariantOutType() -> Ea
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():41:41 -> a
-    1:1:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):133 -> a
-    2:2:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):133:133 -> a
-    3:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:67 -> a
-    9:9:com.android.tools.r8.graph.DexCallSite getCallSite():41:41 -> a
-    9:9:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67 -> a
-    10:14:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:71 -> a
-    15:15:com.android.tools.r8.graph.DexCallSite getCallSite():41:41 -> a
-    15:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):73 -> a
-    16:23:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):73:80 -> a
-    24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):85:85 -> a
-    25:25:com.android.tools.r8.graph.DexCallSite getCallSite():41:41 -> a
-    25:25:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):85 -> a
-    26:26:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):85:85 -> a
-    27:27:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):106:106 -> a
-    28:28:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):113:113 -> a
-    29:29:com.android.tools.r8.graph.DexCallSite getCallSite():41:41 -> a
-    29:29:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):114 -> a
-    30:33:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):114:117 -> a
-    34:34:com.android.tools.r8.graph.DexCallSite getCallSite():41:41 -> a
-    34:34:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):118 -> a
-    35:38:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):118:121 -> a
-    39:39:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeCustom):174:174 -> a
-    39:39:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):32 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):90:90 -> b
-    1:1:com.android.tools.r8.graph.DexType getReturnType():37:37 -> mc
+    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():36:36 -> a
+    1:1:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):128 -> a
+    2:2:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):128:128 -> a
+    3:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:62 -> a
+    9:9:com.android.tools.r8.graph.DexCallSite getCallSite():36:36 -> a
+    9:9:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62 -> a
+    10:14:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:66 -> a
+    15:15:com.android.tools.r8.graph.DexCallSite getCallSite():36:36 -> a
+    15:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68 -> a
+    16:23:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:75 -> a
+    24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80:80 -> a
+    25:25:com.android.tools.r8.graph.DexCallSite getCallSite():36:36 -> a
+    25:25:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80 -> a
+    26:26:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80:80 -> a
+    27:27:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):101:101 -> a
+    28:28:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):108:108 -> a
+    29:29:com.android.tools.r8.graph.DexCallSite getCallSite():36:36 -> a
+    29:29:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):109 -> a
+    30:33:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):109:112 -> a
+    34:34:com.android.tools.r8.graph.DexCallSite getCallSite():36:36 -> a
+    34:34:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):113 -> a
+    35:38:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):113:116 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85:85 -> b
+    1:1:com.android.tools.r8.graph.DexType getReturnType():32:32 -> mc
     java.lang.String getTypeString() -> oc
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():41:41 -> qc
+    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():36:36 -> qc
     boolean isInvokeCustom() -> rb
-    1:1:java.lang.String toString():56:56 -> toString
+    1:1:java.lang.String toString():51:51 -> toString
     2:2:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> toString
-    2:2:java.lang.String toString():56 -> toString
-    3:3:java.lang.String toString():56:56 -> toString
-com.android.tools.r8.ir.code.InvokeDirect -> a.a.a.a.h.b.ra:
+    2:2:java.lang.String toString():51 -> toString
+    3:3:java.lang.String toString():51:51 -> toString
+com.android.tools.r8.ir.code.InvokeDirect -> a.a.a.a.h.b.pa:
     boolean $assertionsDisabled -> m
     boolean itf -> l
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):42:45 -> <init>
+    1:1:void <clinit>():28:28 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):33:33 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):37:40 -> <init>
     com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> F
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:85 -> a
-    20:20:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):118:118 -> a
-    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):131:131 -> a
-    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):136:136 -> a
-    23:23:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):146:146 -> a
-    24:40:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):153:169 -> a
-    41:41:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):118:118 -> a
-    41:41:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):170 -> a
-    42:62:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):176:196 -> a
-    63:63:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeDirect):179:179 -> a
-    63:63:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):51 -> a
-    64:105:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):212:253 -> a
-    106:106:boolean lambda$canBeDeadCode$0(java.util.List,com.android.tools.r8.ir.code.Instruction):247:247 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):102:102 -> b
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():56:56 -> nc
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:75 -> a
+    20:20:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexType):108:108 -> a
+    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):121:121 -> a
+    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):126:126 -> a
+    23:23:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):135:135 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92:92 -> b
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():46:46 -> nc
     java.lang.String getTypeString() -> oc
     boolean isInvokeDirect() -> sb
-com.android.tools.r8.ir.code.InvokeInterface -> a.a.a.a.h.b.sa:
+com.android.tools.r8.ir.code.InvokeInterface -> a.a.a.a.h.b.qa:
     boolean $assertionsDisabled -> l
-    1:1:void <clinit>():27:27 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):30:30 -> <init>
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):25:25 -> <init>
     com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface() -> G
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):51:69 -> a
-    20:22:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):90:92 -> a
-    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):104:104 -> a
-    24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):109:109 -> a
-    25:25:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):119:119 -> a
-    26:26:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeInterface):184:184 -> a
-    26:26:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):35 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):74:74 -> b
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():40:40 -> nc
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):41:59 -> a
+    20:22:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexType):80:82 -> a
+    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):94:94 -> a
+    24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):99:99 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):64:64 -> b
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():30:30 -> nc
     java.lang.String getTypeString() -> oc
     boolean isInvokeInterface() -> tb
-com.android.tools.r8.ir.code.InvokeMethod -> a.a.a.a.h.b.ta:
+com.android.tools.r8.ir.code.InvokeMethod -> a.a.a.a.h.b.ra:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexMethod method -> i
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):27:28 -> <init>
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):26:27 -> <init>
     boolean hasInvariantOutType() -> Ea
     com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod() -> H
     com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis) -> a
-    com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType) -> a
-    1:6:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):75:80 -> a
-    7:7:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    7:7:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):85 -> a
-    8:8:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):85:85 -> a
-    9:9:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    9:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):86 -> a
-    10:11:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):86:87 -> a
-    12:12:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    12:12:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):87 -> a
-    13:13:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):87:87 -> a
-    14:22:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):98:106 -> a
-    23:23:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):118:118 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):42:42 -> b
-    2:2:com.android.tools.r8.graph.DexMethod getInvokedMethod():37:37 -> b
-    2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):42 -> b
-    1:1:com.android.tools.r8.graph.DexType getReturnType():33:33 -> mc
-    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():37:37 -> qc
-    1:1:java.lang.String toString():47:47 -> toString
+    com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexType) -> a
+    1:9:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):74:82 -> a
+    10:10:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):94:94 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):41:41 -> b
+    2:2:com.android.tools.r8.graph.DexMethod getInvokedMethod():36:36 -> b
+    2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):41 -> b
+    1:1:com.android.tools.r8.graph.DexType getReturnType():32:32 -> mc
+    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():36:36 -> qc
+    1:1:java.lang.String toString():46:46 -> toString
     boolean isInvokeMethod() -> ub
-com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> a.a.a.a.h.b.ua:
+com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> a.a.a.a.h.b.sa:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):20:20 -> <init>
@@ -19706,143 +19277,131 @@
     1:4:boolean verifyTypes(com.android.tools.r8.graph.AppView):52:55 -> b
     1:1:com.android.tools.r8.ir.code.Value getReceiver():34:34 -> rc
     boolean isInvokeMethodWithReceiver() -> vb
-com.android.tools.r8.ir.code.InvokeMultiNewArray -> a.a.a.a.h.b.va:
+com.android.tools.r8.ir.code.InvokeMultiNewArray -> a.a.a.a.h.b.ta:
     com.android.tools.r8.graph.DexType type -> i
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,java.util.List):26:27 -> <init>
     boolean hasInvariantOutType() -> Ea
     com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> J
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):72:72 -> a
-    2:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):77:77 -> a
-    3:3:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):88:88 -> a
-    4:5:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):93:94 -> a
-    6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):99:99 -> a
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):67:67 -> a
+    2:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):72:72 -> a
+    3:3:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):83:83 -> a
+    4:5:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):88:89 -> a
+    6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):94:94 -> a
     7:7:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):99 -> a
-    8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):99:99 -> a
-    9:9:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):104:104 -> a
-    10:10:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeMultiNewArray):189:189 -> a
-    10:10:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):32 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> b
-    1:1:com.android.tools.r8.graph.DexType getArrayType():51:51 -> mc
-    1:1:com.android.tools.r8.graph.DexType getReturnType():56 -> mc
+    7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):94 -> a
+    8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):94:94 -> a
+    9:9:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):99:99 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):61:61 -> b
+    1:1:com.android.tools.r8.graph.DexType getArrayType():46:46 -> mc
+    1:1:com.android.tools.r8.graph.DexType getReturnType():51 -> mc
     java.lang.String getTypeString() -> oc
-    1:1:com.android.tools.r8.graph.DexType getArrayType():51:51 -> qc
+    1:1:com.android.tools.r8.graph.DexType getArrayType():46:46 -> qc
     boolean isInvokeMultiNewArray() -> wb
-com.android.tools.r8.ir.code.InvokeNewArray -> a.a.a.a.h.b.wa:
+com.android.tools.r8.ir.code.InvokeNewArray -> a.a.a.a.h.b.ua:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():22:22 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,java.util.List):27:28 -> <init>
     boolean hasInvariantOutType() -> Ea
     com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> K
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:81 -> a
-    20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):102:102 -> a
-    21:21:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):107:107 -> a
-    22:22:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):118:118 -> a
-    23:23:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):123:123 -> a
-    24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):128:128 -> a
-    25:25:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeNewArray):194:194 -> a
-    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):33 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):86:86 -> b
-    1:1:com.android.tools.r8.graph.DexType getArrayType():42:42 -> mc
-    1:1:com.android.tools.r8.graph.DexType getReturnType():38 -> mc
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:76 -> a
+    20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):97:97 -> a
+    21:21:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):102:102 -> a
+    22:22:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):113:113 -> a
+    23:23:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):118:118 -> a
+    24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):123:123 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):81:81 -> b
+    1:1:com.android.tools.r8.graph.DexType getArrayType():37:37 -> mc
+    1:1:com.android.tools.r8.graph.DexType getReturnType():33 -> mc
     java.lang.String getTypeString() -> oc
-    1:1:com.android.tools.r8.graph.DexType getArrayType():42:42 -> qc
-    1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():132:132 -> rc
-    1:1:java.lang.String toString():57:57 -> toString
+    1:1:com.android.tools.r8.graph.DexType getArrayType():37:37 -> qc
+    1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():127:127 -> rc
+    1:1:java.lang.String toString():52:52 -> toString
     boolean isInvokeNewArray() -> xb
-com.android.tools.r8.ir.code.InvokePolymorphic -> a.a.a.a.h.b.xa:
+com.android.tools.r8.ir.code.InvokePolymorphic -> a.a.a.a.h.b.va:
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexProto proto -> k
     1:1:void <clinit>():26:26 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):31:32 -> <init>
     com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> L
-    com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType) -> a
-    1:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:68 -> a
-    8:8:com.android.tools.r8.graph.DexProto getProto():56:56 -> a
-    8:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68 -> a
-    9:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:74 -> a
-    16:16:com.android.tools.r8.graph.DexProto getProto():56:56 -> a
-    16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75 -> a
-    17:24:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:82 -> a
-    25:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):87:93 -> a
-    32:32:com.android.tools.r8.graph.DexProto getProto():56:56 -> a
-    32:32:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):93 -> a
-    33:34:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):93:94 -> a
-    35:35:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):131:131 -> a
-    36:36:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):139:139 -> a
-    37:37:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokePolymorphic):199:199 -> a
-    37:37:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):37 -> a
-    1:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):99:101 -> b
-    1:1:com.android.tools.r8.graph.DexType getReturnType():42:42 -> mc
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():47:47 -> nc
+    com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexType) -> a
+    1:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:63 -> a
+    8:8:com.android.tools.r8.graph.DexProto getProto():51:51 -> a
+    8:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63 -> a
+    9:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:69 -> a
+    16:16:com.android.tools.r8.graph.DexProto getProto():51:51 -> a
+    16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70 -> a
+    17:24:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:77 -> a
+    25:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):82:88 -> a
+    32:32:com.android.tools.r8.graph.DexProto getProto():51:51 -> a
+    32:32:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):88 -> a
+    33:34:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):88:89 -> a
+    35:35:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):126:126 -> a
+    36:36:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):134:134 -> a
+    1:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:96 -> b
+    1:1:com.android.tools.r8.graph.DexType getReturnType():37:37 -> mc
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():42:42 -> nc
     java.lang.String getTypeString() -> oc
-    1:1:com.android.tools.r8.graph.DexProto getProto():56:56 -> rc
+    1:1:com.android.tools.r8.graph.DexProto getProto():51:51 -> rc
     boolean isInvokePolymorphic() -> yb
-com.android.tools.r8.ir.code.InvokeStatic -> a.a.a.a.h.b.ya:
+com.android.tools.r8.ir.code.InvokeStatic -> a.a.a.a.h.b.wa:
     boolean itf -> k
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():31:31 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):36:37 -> <init>
     3:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):41:42 -> <init>
     com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> M
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:81 -> a
-    20:21:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):102:103 -> a
-    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):116:116 -> a
-    23:23:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):124:124 -> a
-    24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):129:129 -> a
-    25:25:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):139:139 -> a
-    26:36:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):146:156 -> a
-    37:38:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):102:103 -> a
-    37:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):157 -> a
-    39:54:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):163:178 -> a
-    55:55:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):177:177 -> a
-    56:56:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):180:180 -> a
-    57:57:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):188:188 -> a
-    58:58:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):204:204 -> a
-    58:58:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):47 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):86:86 -> b
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():52:52 -> nc
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:76 -> a
+    20:21:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexType):97:98 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):111:111 -> a
+    23:23:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):119:119 -> a
+    24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):124:124 -> a
+    25:25:boolean definitelyTriggersClassInitialization(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):133:133 -> a
+    26:36:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):140:150 -> a
+    37:38:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexType):97:98 -> a
+    37:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):151 -> a
+    39:54:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):157:172 -> a
+    55:55:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):171:171 -> a
+    56:56:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):174:174 -> a
+    57:57:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):182:182 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):81:81 -> b
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():47:47 -> nc
     java.lang.String getTypeString() -> oc
     boolean isInvokeStatic() -> zb
-com.android.tools.r8.ir.code.InvokeSuper -> a.a.a.a.h.b.za:
+com.android.tools.r8.ir.code.InvokeSuper -> a.a.a.a.h.b.xa:
     boolean $assertionsDisabled -> m
     boolean itf -> l
     1:1:void <clinit>():27:27 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):32:33 -> <init>
     boolean isInvokeSuper() -> Ab
     com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> N
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:72 -> a
-    20:20:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):77:77 -> a
-    21:24:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):101:104 -> a
-    25:25:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):118:118 -> a
-    26:26:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):128:128 -> a
-    27:27:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeSuper):209:209 -> a
-    27:27:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):38 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):82:82 -> b
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():43:43 -> nc
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):49:67 -> a
+    20:20:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):72:72 -> a
+    21:24:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexType):96:99 -> a
+    25:25:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):113:113 -> a
+    26:26:boolean definitelyTriggersClassInitialization(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):122:122 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):77:77 -> b
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():38:38 -> nc
     java.lang.String getTypeString() -> oc
-com.android.tools.r8.ir.code.InvokeVirtual -> a.a.a.a.h.b.Aa:
+com.android.tools.r8.ir.code.InvokeVirtual -> a.a.a.a.h.b.ya:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():27:27 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):30:30 -> <init>
     boolean isInvokeVirtual() -> Bb
     com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual() -> O
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):51:69 -> a
-    20:22:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):90:92 -> a
-    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):104:104 -> a
-    24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):109:109 -> a
-    25:25:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):119:119 -> a
-    26:37:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):126:137 -> a
-    38:38:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):146:146 -> a
-    39:50:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):126:137 -> a
-    39:50:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):146 -> a
-    51:51:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeVirtual):214:214 -> a
-    51:51:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):35 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):74:74 -> b
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():40:40 -> nc
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):46:64 -> a
+    20:22:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexType):85:87 -> a
+    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):99:99 -> a
+    24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):104:104 -> a
+    25:25:boolean definitelyTriggersClassInitialization(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):113:113 -> a
+    26:41:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120:135 -> a
+    42:42:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):144:144 -> a
+    43:58:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120:135 -> a
+    43:58:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):144 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):69:69 -> b
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():35:35 -> nc
     java.lang.String getTypeString() -> oc
-com.android.tools.r8.ir.code.JumpInstruction -> a.a.a.a.h.b.Ba:
+com.android.tools.r8.ir.code.JumpInstruction -> a.a.a.a.h.b.za:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):16:16 -> <init>
@@ -19855,52 +19414,50 @@
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):53:53 -> a
     1:1:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):32:32 -> b
     com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> lc
-com.android.tools.r8.ir.code.LinearFlowInstructionIterator -> a.a.a.a.h.b.Ca:
+com.android.tools.r8.ir.code.LinearFlowInstructionIterator -> a.a.a.a.h.b.Aa:
     com.android.tools.r8.ir.code.InstructionListIterator currentBlockIterator -> b
     boolean $assertionsDisabled -> c
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> a
-    1:1:void <clinit>():15:15 -> <clinit>
-    1:8:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):24:31 -> <init>
-    1:1:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):37:37 -> a
-    2:2:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set):46:46 -> a
-    3:3:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):52:52 -> a
-    4:4:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):57:57 -> a
-    5:5:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):68:68 -> a
-    6:9:boolean isLinearEdge(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):83:86 -> a
-    10:20:com.android.tools.r8.ir.code.BasicBlock getBeginningOfTrivialLinearGotoChain(com.android.tools.r8.ir.code.BasicBlock):117:127 -> a
-    1:1:void add(java.lang.Object):15:15 -> add
-    2:2:void add(com.android.tools.r8.ir.code.Instruction):74:74 -> add
-    2:2:void add(java.lang.Object):15 -> add
-    1:1:void removeOrReplaceByDebugLocalRead():79:79 -> c
-    1:1:boolean hasNext():91:91 -> hasNext
-    1:4:boolean hasPrevious():132:135 -> hasPrevious
-    1:1:java.lang.Object next():15:15 -> next
-    2:19:com.android.tools.r8.ir.code.Instruction next():96:113 -> next
-    1:1:int nextIndex():157:157 -> nextIndex
-    1:1:java.lang.Object previous():15:15 -> previous
-    2:14:com.android.tools.r8.ir.code.Instruction previous():140:152 -> previous
-    1:1:int previousIndex():162:162 -> previousIndex
-    1:1:void remove():167:167 -> remove
-    1:1:void set(java.lang.Object):15:15 -> set
-    2:2:void set(com.android.tools.r8.ir.code.Instruction):172:172 -> set
-    2:2:void set(java.lang.Object):15 -> set
-com.android.tools.r8.ir.code.Load -> a.a.a.a.h.b.Da:
+    1:1:void <clinit>():13:13 -> <clinit>
+    1:8:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):22:29 -> <init>
+    1:1:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):35:35 -> a
+    2:2:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):40:40 -> a
+    3:3:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):45:45 -> a
+    4:4:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):56:56 -> a
+    5:8:boolean isLinearEdge(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):71:74 -> a
+    9:19:com.android.tools.r8.ir.code.BasicBlock getBeginningOfTrivialLinearGotoChain(com.android.tools.r8.ir.code.BasicBlock):105:115 -> a
+    1:1:void add(java.lang.Object):13:13 -> add
+    2:2:void add(com.android.tools.r8.ir.code.Instruction):62:62 -> add
+    2:2:void add(java.lang.Object):13 -> add
+    1:1:void removeOrReplaceByDebugLocalRead():67:67 -> b
+    1:1:boolean hasNext():79:79 -> hasNext
+    1:4:boolean hasPrevious():120:123 -> hasPrevious
+    1:1:java.lang.Object next():13:13 -> next
+    2:19:com.android.tools.r8.ir.code.Instruction next():84:101 -> next
+    1:1:int nextIndex():145:145 -> nextIndex
+    1:1:java.lang.Object previous():13:13 -> previous
+    2:14:com.android.tools.r8.ir.code.Instruction previous():128:140 -> previous
+    1:1:int previousIndex():150:150 -> previousIndex
+    1:1:void remove():155:155 -> remove
+    1:1:void set(java.lang.Object):13:13 -> set
+    2:2:void set(com.android.tools.r8.ir.code.Instruction):160:160 -> set
+    2:2:void set(java.lang.Object):13 -> set
+com.android.tools.r8.ir.code.Load -> a.a.a.a.h.b.Ba:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):23:23 -> <init>
     boolean isLoad() -> Db
     boolean hasInvariantOutType() -> Ea
     com.android.tools.r8.ir.code.Load asLoad() -> Q
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):28:28 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):63:63 -> a
-    3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:68 -> a
-    4:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):73:74 -> a
-    6:6:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):80:80 -> a
-    7:7:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):90:90 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):47:47 -> b
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):58:58 -> a
+    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:63 -> a
+    3:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):68:69 -> a
+    5:5:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):75:75 -> a
+    6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):85:85 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):42:42 -> b
     int maxInValueRegister() -> gc
-    1:1:int maxOutValueRegister():57:57 -> hc
-    1:1:com.android.tools.r8.ir.code.Value src():32:32 -> lc
-com.android.tools.r8.ir.code.LogicalBinop -> a.a.a.a.h.b.Ea:
+    1:1:int maxOutValueRegister():52:52 -> hc
+    1:1:com.android.tools.r8.ir.code.Value src():27:27 -> lc
+com.android.tools.r8.ir.code.LogicalBinop -> a.a.a.a.h.b.Ca:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):20:20 -> <init>
@@ -19923,7 +19480,7 @@
     1:5:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):44:48 -> c
     com.android.tools.r8.code.Instruction CreateLong(int,int,int) -> d
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> qc
-com.android.tools.r8.ir.code.MemberType -> a.a.a.a.h.b.Fa:
+com.android.tools.r8.ir.code.MemberType -> a.a.a.a.h.b.Da:
     com.android.tools.r8.ir.code.MemberType BYTE -> c
     com.android.tools.r8.ir.code.MemberType BOOLEAN -> b
     com.android.tools.r8.ir.code.MemberType SHORT -> e
@@ -19965,7 +19522,7 @@
     100:100:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):84:84 -> a
     100:100:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):105 -> a
     1:1:com.android.tools.r8.ir.code.MemberType[] values():11:11 -> b
-com.android.tools.r8.ir.code.Monitor -> a.a.a.a.h.b.Ha:
+com.android.tools.r8.ir.code.Monitor -> a.a.a.a.h.b.Fa:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.Monitor$Type type -> h
     1:1:void <clinit>():21:21 -> <clinit>
@@ -19974,48 +19531,46 @@
     boolean isMonitor() -> Fb
     boolean instructionTypeCanThrow() -> Ia
     com.android.tools.r8.ir.code.Monitor asMonitor() -> S
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
-    2:9:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:65 -> a
-    10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):103:103 -> a
-    11:11:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):125:125 -> a
-    12:12:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):130:130 -> a
-    13:13:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):135:135 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:71 -> b
+    1:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:60 -> a
+    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):98:98 -> a
+    10:10:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):120:120 -> a
+    11:11:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):125:125 -> a
+    12:12:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):130:130 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> b
     int maxInValueRegister() -> gc
-    1:1:int maxOutValueRegister():81:81 -> hc
-    1:1:boolean isEnter():44:44 -> lc
-    1:1:com.android.tools.r8.ir.code.Value object():40:40 -> mc
-    1:7:java.lang.String getInstructionName():108:114 -> wa
-com.android.tools.r8.ir.code.Monitor$Type -> a.a.a.a.h.b.Ga:
+    1:1:int maxOutValueRegister():76:76 -> hc
+    1:1:boolean isEnter():39:39 -> lc
+    1:1:com.android.tools.r8.ir.code.Value object():35:35 -> mc
+    1:7:java.lang.String getInstructionName():103:109 -> wa
+com.android.tools.r8.ir.code.Monitor$Type -> a.a.a.a.h.b.Ea:
     com.android.tools.r8.ir.code.Monitor$Type ENTER -> a
     com.android.tools.r8.ir.code.Monitor$Type[] $VALUES -> c
     com.android.tools.r8.ir.code.Monitor$Type EXIT -> b
     1:1:void <clinit>():24:24 -> <clinit>
     2:2:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(java.lang.String,int):23:23 -> <init>
-com.android.tools.r8.ir.code.Move -> a.a.a.a.h.b.Ia:
+com.android.tools.r8.ir.code.Move -> a.a.a.a.h.b.Ga:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
     boolean hasInvariantOutType() -> Ea
     boolean isMove() -> Gb
-    1:1:boolean isOutConstant():77:77 -> Rb
+    1:1:boolean isOutConstant():72:72 -> Rb
     com.android.tools.r8.ir.code.Move asMove() -> T
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):29:29 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47:47 -> a
-    3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):52:52 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):99:99 -> a
-    5:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):104:104 -> a
-    6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):114:114 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67:67 -> b
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):42:42 -> a
+    2:2:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):47:47 -> a
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):94:94 -> a
+    4:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):99:99 -> a
+    5:5:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):109:109 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):62:62 -> b
     int maxInValueRegister() -> gc
     int maxOutValueRegister() -> hc
-    1:1:com.android.tools.r8.ir.code.Value dest():33:33 -> lc
-    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> mc
+    1:1:com.android.tools.r8.ir.code.Value dest():28:28 -> lc
+    1:1:com.android.tools.r8.ir.code.Value src():32:32 -> mc
     boolean couldIntroduceAnAlias() -> sa
-    1:1:java.lang.String toString():72:72 -> toString
-    1:2:com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction():82:83 -> za
-com.android.tools.r8.ir.code.MoveException -> a.a.a.a.h.b.Ja:
+    1:1:java.lang.String toString():67:67 -> toString
+    1:2:com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction():77:78 -> za
+com.android.tools.r8.ir.code.MoveException -> a.a.a.a.h.b.Ha:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType exceptionType -> h
     com.android.tools.r8.utils.InternalOptions options -> i
@@ -20025,23 +19580,22 @@
     boolean isMoveException() -> Hb
     com.android.tools.r8.ir.code.MoveException asMoveException() -> U
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):32:32 -> a
-    2:2:com.android.tools.r8.ir.code.Value dest():36:36 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):41 -> a
-    3:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):41:42 -> a
-    5:6:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):79:80 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):86:86 -> a
-    8:8:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):91:91 -> a
-    9:9:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):107:107 -> a
-    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):112:112 -> a
-    1:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):58:61 -> b
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():990:990 -> b
-    5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):61 -> b
-    6:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):62:62 -> b
-    1:1:int maxInValueRegister():47:47 -> gc
+    1:1:com.android.tools.r8.ir.code.Value dest():31:31 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):36 -> a
+    2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):36:37 -> a
+    4:5:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):74:75 -> a
+    6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):81:81 -> a
+    7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):86:86 -> a
+    8:8:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):102:102 -> a
+    9:9:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):107:107 -> a
+    1:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):53:56 -> b
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():960:960 -> b
+    5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):56 -> b
+    6:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):57:57 -> b
+    1:1:int maxInValueRegister():42:42 -> gc
     int maxOutValueRegister() -> hc
-    1:1:com.android.tools.r8.graph.DexType getExceptionType():116:116 -> lc
-com.android.tools.r8.ir.code.Mul -> a.a.a.a.h.b.Ka:
+    1:1:com.android.tools.r8.graph.DexType getExceptionType():111:111 -> lc
+com.android.tools.r8.ir.code.Mul -> a.a.a.a.h.b.Ia:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
     boolean isMul() -> Ib
     com.android.tools.r8.ir.code.Mul asMul() -> V
@@ -20049,21 +19603,20 @@
     float foldFloat(float,float) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):27:27 -> a
-    2:2:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):64:64 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):56:56 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):84:84 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):99:99 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):40:40 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):79:79 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):69:69 -> d
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):94:94 -> d
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):74:74 -> e
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):89:89 -> e
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):48:48 -> f
+    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):59:59 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):51:51 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):79:79 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:94 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):35:35 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):74:74 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):64:64 -> d
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):89:89 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):69:69 -> e
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):84:84 -> e
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):43:43 -> f
     boolean isCommutative() -> mc
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():134:134 -> qc
-com.android.tools.r8.ir.code.Neg -> a.a.a.a.h.b.La:
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():129:129 -> qc
+com.android.tools.r8.ir.code.Neg -> a.a.a.a.h.b.Ja:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
@@ -20071,48 +19624,46 @@
     boolean isNeg() -> Jb
     com.android.tools.r8.ir.code.Neg asNeg() -> W
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.dest():22:22 -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):50 -> a
-    2:18:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):50:66 -> a
-    19:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:63 -> a
-    20:20:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60:60 -> a
-    21:21:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:57 -> a
-    22:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:68 -> a
-    37:37:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):32:32 -> a
-    38:56:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):83:101 -> a
-    57:57:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):106:106 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):44:44 -> b
-com.android.tools.r8.ir.code.NewArrayEmpty -> a.a.a.a.h.b.Ma:
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45 -> a
+    2:18:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:61 -> a
+    19:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:58 -> a
+    20:20:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:55 -> a
+    21:21:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52:52 -> a
+    22:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):49:63 -> a
+    37:55:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):78:96 -> a
+    56:56:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):101:101 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):39:39 -> b
+com.android.tools.r8.ir.code.NewArrayEmpty -> a.a.a.a.h.b.Ka:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexType type -> h
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):26:27 -> <init>
     boolean hasInvariantOutType() -> Ea
-    1:4:boolean instructionInstanceCanThrow():73:76 -> Ha
+    1:4:boolean instructionInstanceCanThrow():68:71 -> Ha
     boolean instructionTypeCanThrow() -> Ia
     boolean isNewArrayEmpty() -> Kb
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> X
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):32:32 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):50:50 -> a
-    3:3:com.android.tools.r8.ir.code.Value dest():41:41 -> a
-    3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):51 -> a
-    4:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):51:52 -> a
-    6:9:boolean instructionInstanceCanThrow():73:76 -> a
-    6:9:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):81 -> a
-    10:11:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):85:86 -> a
-    12:12:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):107:107 -> a
-    13:13:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):118:118 -> a
-    14:15:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):123:124 -> a
-    16:17:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):129:130 -> a
-    18:18:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):135:135 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):91:91 -> b
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:45 -> a
+    2:2:com.android.tools.r8.ir.code.Value dest():36:36 -> a
+    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):46 -> a
+    3:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):46:47 -> a
+    5:8:boolean instructionInstanceCanThrow():68:71 -> a
+    5:8:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):76 -> a
+    9:10:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):80:81 -> a
+    11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):102:102 -> a
+    12:12:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):113:113 -> a
+    13:14:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):118:119 -> a
+    15:16:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):124:125 -> a
+    17:17:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):130:130 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):86:86 -> b
     int maxInValueRegister() -> gc
     int maxOutValueRegister() -> hc
-    1:1:com.android.tools.r8.ir.code.Value size():45:45 -> lc
-    1:1:java.lang.String toString():37:37 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():118:118 -> toString
-    2:2:java.lang.String toString():37 -> toString
-    3:3:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.code.NewArrayFilledData -> a.a.a.a.h.b.Na:
+    1:1:com.android.tools.r8.ir.code.Value size():40:40 -> lc
+    1:1:java.lang.String toString():32:32 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():360:360 -> toString
+    2:2:java.lang.String toString():32 -> toString
+    3:3:java.lang.String toString():32:32 -> toString
+com.android.tools.r8.ir.code.NewArrayFilledData -> a.a.a.a.h.b.La:
     long size -> i
     short[] data -> j
     boolean $assertionsDisabled -> k
@@ -20123,50 +19674,44 @@
     boolean instructionTypeCanThrow() -> Ia
     boolean isNewArrayFilledData() -> Lb
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> Y
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):38:38 -> a
-    2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):51:52 -> a
-    4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):57:57 -> a
-    5:10:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):84:89 -> a
-    11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):113:113 -> a
-    12:12:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):118:118 -> a
-    1:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):62:68 -> b
+    1:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):46:47 -> a
+    3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):52:52 -> a
+    4:9:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):79:84 -> a
+    10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):108:108 -> a
+    11:11:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):113:113 -> a
+    1:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):57:63 -> b
     int maxInValueRegister() -> gc
-    1:1:int maxOutValueRegister():78:78 -> hc
-    1:1:com.android.tools.r8.code.FillArrayDataPayload createPayload():46:46 -> lc
-    1:1:com.android.tools.r8.ir.code.Value src():42:42 -> mc
-com.android.tools.r8.ir.code.NewInstance -> a.a.a.a.h.b.Oa:
+    1:1:int maxOutValueRegister():73:73 -> hc
+    1:1:com.android.tools.r8.code.FillArrayDataPayload createPayload():41:41 -> lc
+    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> mc
+com.android.tools.r8.ir.code.NewInstance -> a.a.a.a.h.b.Ma:
     boolean allowSpilling -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType clazz -> h
-    1:1:void <clinit>():26:26 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):32:32 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):29:34 -> <init>
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):29:29 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):26:31 -> <init>
     boolean hasInvariantOutType() -> Ea
     boolean instructionTypeCanThrow() -> Ia
     boolean isNewInstance() -> Mb
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> Z
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):39:39 -> a
-    2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):48:49 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):92:92 -> a
-    5:5:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):102:102 -> a
-    6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):107:107 -> a
-    7:7:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):113:113 -> a
-    8:8:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):118:118 -> a
-    9:9:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):128:128 -> a
-    10:37:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):135:162 -> a
-    38:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):140:140 -> a
-    39:39:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):165:165 -> a
-    40:40:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):174:174 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):59:59 -> b
-    1:1:int maxInValueRegister():64:64 -> gc
+    1:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):40:41 -> a
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):84:84 -> a
+    4:4:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):94:94 -> a
+    5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):99:99 -> a
+    6:6:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):105:105 -> a
+    7:7:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):110:110 -> a
+    8:8:boolean definitelyTriggersClassInitialization(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):119:119 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):51:51 -> b
+    1:1:int maxInValueRegister():56:56 -> gc
     int maxOutValueRegister() -> hc
-    1:1:com.android.tools.r8.ir.code.Value dest():43:43 -> lc
-    1:1:boolean isSpillingAllowed():182:182 -> mc
-    1:1:void markNoSpilling():178:178 -> nc
-    1:1:java.lang.String toString():54:54 -> toString
-com.android.tools.r8.ir.code.NextUntilIterator -> a.a.a.a.h.b.Pa:
+    1:1:com.android.tools.r8.ir.code.Value dest():35:35 -> lc
+    1:1:boolean isSpillingAllowed():128:128 -> mc
+    1:1:void markNoSpilling():124:124 -> nc
+    1:1:java.lang.String toString():46:46 -> toString
+com.android.tools.r8.ir.code.NextUntilIterator -> a.a.a.a.h.b.Na:
     1:3:java.lang.Object nextUntil(java.util.function.Predicate):18:20 -> b
-com.android.tools.r8.ir.code.NonNull -> a.a.a.a.h.b.Qa:
+com.android.tools.r8.ir.code.NonNull -> a.a.a.a.h.b.Oa:
     com.android.tools.r8.ir.code.Instruction origin -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
@@ -20174,69 +19719,66 @@
     boolean hasInvariantOutType() -> Ea
     boolean isNonNull() -> Nb
     boolean isOutConstant() -> Rb
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):30:30 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:72 -> a
-    3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):77:77 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):103:103 -> a
-    5:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):108:109 -> a
-    7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):119:119 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:67 -> a
+    2:2:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):72:72 -> a
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):98:98 -> a
+    4:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):103:103 -> a
+    5:5:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):113:113 -> a
     com.android.tools.r8.ir.code.NonNull asNonNull() -> aa
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):97:97 -> b
-    1:1:int maxInValueRegister():82:82 -> gc
-    1:1:int maxOutValueRegister():87:87 -> hc
-    1:1:com.android.tools.r8.ir.code.Value dest():34:34 -> lc
-    1:1:com.android.tools.r8.ir.code.Instruction origin():42:42 -> mc
-    1:1:com.android.tools.r8.ir.code.Value src():38:38 -> nc
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92:92 -> b
+    1:1:int maxInValueRegister():77:77 -> gc
+    1:1:int maxOutValueRegister():82:82 -> hc
+    1:1:com.android.tools.r8.ir.code.Value dest():29:29 -> lc
+    1:1:com.android.tools.r8.ir.code.Instruction origin():37:37 -> mc
+    1:1:com.android.tools.r8.ir.code.Value src():33:33 -> nc
     boolean isIntroducingAnAlias() -> pb
     boolean couldIntroduceAnAlias() -> sa
-    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():67:67 -> ta
-com.android.tools.r8.ir.code.Not -> a.a.a.a.h.b.Ra:
+    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():62:62 -> ta
+com.android.tools.r8.ir.code.Not -> a.a.a.a.h.b.Pa:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():19:19 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:25 -> <init>
     boolean isNot() -> Ob
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):30:30 -> a
-    2:16:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):40:54 -> a
-    17:17:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:59 -> a
-    18:18:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.dest():22:22 -> a
-    18:18:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61 -> a
-    19:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61:71 -> a
-    30:38:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:73 -> a
-    39:39:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):94:94 -> a
-    40:40:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):100:100 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> b
+    1:15:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):35:49 -> a
+    16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:54 -> a
+    17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.dest():22:22 -> a
+    17:17:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56 -> a
+    18:28:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56:66 -> a
+    29:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60:68 -> a
+    38:38:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):89:89 -> a
+    39:39:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):95:95 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):73:73 -> b
     com.android.tools.r8.ir.code.Not asNot() -> ba
-com.android.tools.r8.ir.code.NumberConversion -> a.a.a.a.h.b.Sa:
+com.android.tools.r8.ir.code.NumberConversion -> a.a.a.a.h.b.Qa:
     com.android.tools.r8.ir.code.NumericType to -> i
     com.android.tools.r8.ir.code.NumericType from -> h
     1:3:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):36:38 -> <init>
     boolean isNumberConversion() -> Pb
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.dest():22:22 -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53 -> a
-    2:75:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:126 -> a
-    76:87:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):111:122 -> a
-    88:88:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):116:116 -> a
-    89:89:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):113:113 -> a
-    90:101:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):96:107 -> a
-    102:102:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):101:101 -> a
-    103:103:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):98:98 -> a
-    104:115:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81:92 -> a
-    116:116:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86:86 -> a
-    117:117:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83:83 -> a
-    118:138:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:77 -> a
-    139:139:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74:74 -> a
-    140:140:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:71 -> a
-    141:141:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:68 -> a
-    142:142:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:65 -> a
-    143:143:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:62 -> a
-    144:213:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:128 -> a
-    214:214:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43:43 -> a
-    215:215:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):152:152 -> a
-    216:216:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):157:157 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):133:137 -> b
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):48 -> a
+    2:75:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):48:121 -> a
+    76:87:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):106:117 -> a
+    88:88:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):111:111 -> a
+    89:89:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):108:108 -> a
+    90:101:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):91:102 -> a
+    102:102:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):96:96 -> a
+    103:103:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):93:93 -> a
+    104:115:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:87 -> a
+    116:116:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81:81 -> a
+    117:117:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:78 -> a
+    118:138:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52:72 -> a
+    139:139:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:69 -> a
+    140:140:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:66 -> a
+    141:141:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:63 -> a
+    142:142:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60:60 -> a
+    143:143:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:57 -> a
+    144:213:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:123 -> a
+    214:214:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):147:147 -> a
+    215:215:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):152:152 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):128:132 -> b
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> ca
-com.android.tools.r8.ir.code.NumericType -> a.a.a.a.h.b.Ta:
+com.android.tools.r8.ir.code.NumericType -> a.a.a.a.h.b.Ra:
     com.android.tools.r8.ir.code.NumericType DOUBLE -> g
     com.android.tools.r8.ir.code.NumericType FLOAT -> f
     com.android.tools.r8.ir.code.NumericType LONG -> e
@@ -20262,23 +19804,22 @@
     52:52:com.android.tools.r8.ir.code.NumericType fromDexType(com.android.tools.r8.graph.DexType):49:49 -> a
     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
-com.android.tools.r8.ir.code.Or -> a.a.a.a.h.b.Ua:
+com.android.tools.r8.ir.code.Or -> a.a.a.a.h.b.Sa:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     boolean isOr() -> Qb
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):22:22 -> a
-    2:2:com.android.tools.r8.code.Instruction CreateInt(int,int,int):42:42 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):52:52 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):67:67 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):72:72 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):57:57 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):62:62 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):47:47 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):37:37 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):47:47 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):62:62 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67:67 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):52:52 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):57:57 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):42:42 -> d
     com.android.tools.r8.ir.code.Or asOr() -> da
     boolean isCommutative() -> mc
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():87:87 -> qc
-com.android.tools.r8.ir.code.Phi -> a.a.a.a.h.b.Wa:
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():82:82 -> qc
+com.android.tools.r8.ir.code.Phi -> a.a.a.a.h.b.Ua:
     com.android.tools.r8.ir.code.Phi$RegisterReadType readType -> u
     java.util.List operands -> t
     boolean isStackPhi -> v
@@ -20298,7 +19839,7 @@
     32:32:com.android.tools.r8.ir.code.BasicBlock getBlock():68:68 -> a
     32:32:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):106 -> a
     33:34:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):107:108 -> a
-    35:35:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():958:958 -> a
+    35:35:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():916:916 -> a
     35:35:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):108 -> a
     36:46:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):108:118 -> a
     47:76:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):96:125 -> a
@@ -20324,13 +19865,13 @@
     180:181:boolean verifyIsStackPhi(java.util.Set):379:380 -> a
     182:185:void lambda$verifyIsStackPhi$0(java.util.Set,com.android.tools.r8.ir.code.Value):382:385 -> a
     186:194:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):401:409 -> a
+    195:195:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.DexDefinitionSupplier):414:414 -> a
+    196:196:java.util.List getOperands():175:175 -> a
+    196:196:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.DexDefinitionSupplier):415 -> a
+    197:198:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.DexDefinitionSupplier):415:416 -> a
     1:2:void removeOperand(int):179:180 -> b
     3:14:void removeOperandsByIndex(java.util.List):184:195 -> b
     15:15:void removeDefinitionsUser(java.util.Map):321:321 -> b
-    16:16:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):414:414 -> b
-    17:17:java.util.List getOperands():175:175 -> b
-    17:17:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):415 -> b
-    18:19:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):415:416 -> b
     1:1:void clearDefinitionsUsers():325:325 -> ba
     com.android.tools.r8.ir.code.Phi asPhi() -> c
     1:1:void setIsStackPhi(boolean):375:375 -> c
@@ -20339,38 +19880,37 @@
     1:1:java.util.List getOperands():175:175 -> da
     1:1:boolean isTrivialPhi():216:216 -> ea
     1:9:java.lang.String printPhi():292:300 -> fa
-    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():958:958 -> fa
+    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():916:916 -> fa
     10:10:java.lang.String printPhi():300 -> fa
     11:12:java.lang.String printPhi():300:301 -> fa
     1:1:void removeTrivialPhi():231:231 -> ga
-com.android.tools.r8.ir.code.Phi$RegisterReadType -> a.a.a.a.h.b.Va:
+com.android.tools.r8.ir.code.Phi$RegisterReadType -> a.a.a.a.h.b.Ta:
     com.android.tools.r8.ir.code.Phi$RegisterReadType NORMAL -> a
     com.android.tools.r8.ir.code.Phi$RegisterReadType DEBUG -> b
     com.android.tools.r8.ir.code.Phi$RegisterReadType NORMAL_AND_DEBUG -> c
     1:3:void <clinit>():29:31 -> <clinit>
     4:4:void <clinit>():28:28 -> <clinit>
     1:1:void <init>(java.lang.String,int):28:28 -> <init>
-com.android.tools.r8.ir.code.Pop -> a.a.a.a.h.b.Xa:
+com.android.tools.r8.ir.code.Pop -> a.a.a.a.h.b.Va:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue):20:20 -> <init>
     boolean hasInvariantOutType() -> Ea
     boolean isPop() -> Sb
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):25:25 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):66:66 -> a
-    3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:71 -> a
-    4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):76:76 -> a
-    5:5:com.android.tools.r8.cf.code.CfStackInstruction com.android.tools.r8.cf.code.CfStackInstruction.popType(com.android.tools.r8.ir.code.ValueType):66:66 -> a
-    5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):76 -> a
-    6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):76:76 -> a
-    7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):81:81 -> a
-    1:1:void addInValue(com.android.tools.r8.ir.code.Value):30:30 -> b
-    2:5:void com.android.tools.r8.ir.code.Instruction.addInValue(com.android.tools.r8.ir.code.Value):86:89 -> b
-    2:5:void addInValue(com.android.tools.r8.ir.code.Value):31 -> b
-    6:6:void addInValue(com.android.tools.r8.ir.code.Value):34:34 -> b
-    7:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):50:50 -> b
-    1:1:int maxInValueRegister():55:55 -> gc
-    1:1:int maxOutValueRegister():60:60 -> hc
-com.android.tools.r8.ir.code.Position -> a.a.a.a.h.b.Ya:
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):61:61 -> a
+    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:66 -> a
+    3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):71:71 -> a
+    4:4:com.android.tools.r8.cf.code.CfStackInstruction com.android.tools.r8.cf.code.CfStackInstruction.popType(com.android.tools.r8.ir.code.ValueType):66:66 -> a
+    4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):71 -> a
+    5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):71:71 -> a
+    6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):76:76 -> a
+    1:1:void addInValue(com.android.tools.r8.ir.code.Value):25:25 -> b
+    2:5:void com.android.tools.r8.ir.code.Instruction.addInValue(com.android.tools.r8.ir.code.Value):84:87 -> b
+    2:5:void addInValue(com.android.tools.r8.ir.code.Value):26 -> b
+    6:6:void addInValue(com.android.tools.r8.ir.code.Value):29:29 -> b
+    7:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):45:45 -> b
+    1:1:int maxInValueRegister():50:50 -> gc
+    1:1:int maxOutValueRegister():55:55 -> hc
+com.android.tools.r8.ir.code.Position -> a.a.a.a.h.b.Wa:
     com.android.tools.r8.ir.code.Position NO_POSITION_SYNTHETIC -> g
     com.android.tools.r8.graph.DexString file -> b
     boolean $assertionsDisabled -> h
@@ -20394,90 +19934,86 @@
     1:5:int hashCode():118:122 -> hashCode
     1:19:java.lang.String toString(boolean):127:145 -> toString
     1:19:java.lang.String toString():150 -> toString
-com.android.tools.r8.ir.code.PreviousUntilIterator -> a.a.a.a.h.b.Za:
+com.android.tools.r8.ir.code.PreviousUntilIterator -> a.a.a.a.h.b.Xa:
     1:3:java.lang.Object previousUntil(java.util.function.Predicate):18:20 -> a
-com.android.tools.r8.ir.code.Rem -> a.a.a.a.h.b._a:
+com.android.tools.r8.ir.code.Rem -> a.a.a.a.h.b.Ya:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    1:1:boolean instructionTypeCanThrow():129:129 -> Ia
+    1:1:boolean instructionTypeCanThrow():124:124 -> Ia
     boolean isRem() -> Tb
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):29:29 -> a
-    2:2:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):64:64 -> a
-    3:3:int foldIntegers(int,int):109:109 -> a
-    4:4:long foldLongs(long,long):114:114 -> a
-    5:9:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):134:138 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):59:59 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):84:84 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):99:99 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):49:49 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):79:79 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):69:69 -> d
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):94:94 -> d
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):74:74 -> e
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):89:89 -> e
+    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):59:59 -> a
+    2:2:int foldIntegers(int,int):104:104 -> a
+    3:3:long foldLongs(long,long):109:109 -> a
+    4:8:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):129:133 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):54:54 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):79:79 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:94 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):44:44 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):74:74 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):64:64 -> d
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):89:89 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):69:69 -> e
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):84:84 -> e
     com.android.tools.r8.ir.code.Rem asRem() -> ea
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):54:54 -> f
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):49:49 -> f
     boolean isCommutative() -> mc
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():143:143 -> qc
-com.android.tools.r8.ir.code.Return -> a.a.a.a.h.b.ab:
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():138:138 -> qc
+com.android.tools.r8.ir.code.Return -> a.a.a.a.h.b.Za:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():24:24 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.Value):28:28 -> <init>
     boolean isReturn() -> Ub
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):33:33 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:70 -> a
-    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):109:109 -> a
-    4:5:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):114:115 -> a
-    6:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):122:124 -> a
-    9:9:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):121:121 -> a
-    1:15:com.android.tools.r8.code.Instruction createDexInstruction(com.android.tools.r8.ir.conversion.DexBuilder):51:65 -> b
-    16:23:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:82 -> b
-    24:26:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isValueTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):342:344 -> b
-    24:26:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):82 -> b
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:65 -> a
+    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):104:104 -> a
+    3:4:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):109:110 -> a
+    5:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):117:119 -> a
+    8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):116:116 -> a
+    1:15:com.android.tools.r8.code.Instruction createDexInstruction(com.android.tools.r8.ir.conversion.DexBuilder):46:60 -> b
+    16:23:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):70:77 -> b
+    24:26:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isValueTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):335:337 -> b
+    24:26:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):77 -> b
     com.android.tools.r8.ir.code.Return asReturn() -> fa
     int maxInValueRegister() -> gc
-    1:1:int maxOutValueRegister():92:92 -> hc
-    1:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getReturnType():41:42 -> mc
-    1:1:boolean isReturnVoid():37:37 -> nc
-    1:2:com.android.tools.r8.ir.code.Value returnValue():46:47 -> oc
-com.android.tools.r8.ir.code.Shl -> a.a.a.a.h.b.bb:
+    1:1:int maxOutValueRegister():87:87 -> hc
+    1:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getReturnType():36:37 -> mc
+    1:1:boolean isReturnVoid():32:32 -> nc
+    1:2:com.android.tools.r8.ir.code.Value returnValue():41:42 -> oc
+com.android.tools.r8.ir.code.Shl -> a.a.a.a.h.b._a:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     boolean isShl() -> Vb
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):22:22 -> a
-    2:2:com.android.tools.r8.code.Instruction CreateInt(int,int,int):48:48 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):58:58 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):73:73 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):63:63 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
-    1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):28:28 -> g
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):43:43 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):53:53 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):68:68 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):73:73 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):58:58 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):63:63 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):48:48 -> d
+    1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):23:23 -> g
     com.android.tools.r8.ir.code.Shl asShl() -> ga
     boolean isCommutative() -> mc
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> qc
-com.android.tools.r8.ir.code.Shr -> a.a.a.a.h.b.cb:
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():88:88 -> qc
+com.android.tools.r8.ir.code.Shr -> a.a.a.a.h.b.ab:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     boolean isShr() -> Wb
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):22:22 -> a
-    2:2:com.android.tools.r8.code.Instruction CreateInt(int,int,int):48:48 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):58:58 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):73:73 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):63:63 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
-    1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):28:28 -> g
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):43:43 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):53:53 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):68:68 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):73:73 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):58:58 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):63:63 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):48:48 -> d
+    1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):23:23 -> g
     com.android.tools.r8.ir.code.Shr asShr() -> ha
     boolean isCommutative() -> mc
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> qc
-com.android.tools.r8.ir.code.SingleConstant -> a.a.a.a.h.b.db:
-com.android.tools.r8.ir.code.StackValue -> a.a.a.a.h.b.eb:
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():88:88 -> qc
+com.android.tools.r8.ir.code.SingleConstant -> a.a.a.a.h.b.bb:
+com.android.tools.r8.ir.code.StackValue -> a.a.a.a.h.b.cb:
     boolean $assertionsDisabled -> u
     com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo typeInfo -> t
     int height -> s
@@ -20487,14 +20023,14 @@
     boolean needsRegister() -> R
     1:3:com.android.tools.r8.ir.code.StackValue create(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,int,com.android.tools.r8.graph.AppView):26:28 -> a
     4:4:com.android.tools.r8.ir.code.StackValue duplicate(int):41:41 -> a
-    5:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():958:958 -> a
+    5:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():916:916 -> a
     5:5:com.android.tools.r8.ir.code.StackValue duplicate(int):41 -> a
     6:6:com.android.tools.r8.ir.code.StackValue duplicate(int):41:41 -> a
     1:1:void setNeedsRegister(boolean):56:56 -> b
     1:1:int getHeight():33:33 -> ba
     1:1:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo():37:37 -> ca
     1:1:java.lang.String toString():61:61 -> toString
-com.android.tools.r8.ir.code.StackValues -> a.a.a.a.h.b.fb:
+com.android.tools.r8.ir.code.StackValues -> a.a.a.a.h.b.db:
     boolean $assertionsDisabled -> t
     com.android.tools.r8.ir.code.StackValue[] stackValues -> s
     1:1:void <clinit>():14:14 -> <clinit>
@@ -20505,87 +20041,81 @@
     1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():25:25 -> ba
     1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():59:59 -> s
     1:10:java.lang.String toString():40:49 -> toString
-com.android.tools.r8.ir.code.StaticGet -> a.a.a.a.h.b.gb:
+com.android.tools.r8.ir.code.StaticGet -> a.a.a.a.h.b.eb:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):39:39 -> <init>
     boolean instructionTypeCanThrow() -> Ia
     boolean isStaticGet() -> Xb
-    1:1:com.android.tools.r8.ir.code.Value dest():48:48 -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59 -> a
-    2:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:89 -> a
-    33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):87:87 -> a
-    34:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:68 -> a
-    35:54:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:83 -> a
-    55:55:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):80:80 -> a
-    56:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:77 -> a
-    57:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74:74 -> a
-    58:78:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:91 -> a
-    79:103:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):103:127 -> a
-    104:104:boolean lambda$canBeDeadCode$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):130:130 -> a
-    105:105:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):155:155 -> a
-    106:106:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):175:175 -> a
-    107:108:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):180:181 -> a
-    109:109:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):180:180 -> a
-    110:110:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):187:187 -> a
-    111:111:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):192:192 -> a
-    112:112:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):202:202 -> a
-    113:113:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.StaticGet):309:309 -> a
-    113:113:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):44 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):145:149 -> b
+    1:1:com.android.tools.r8.ir.code.Value dest():43:43 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54 -> a
+    2:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:84 -> a
+    33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:82 -> a
+    34:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:63 -> a
+    35:54:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:78 -> a
+    55:55:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
+    56:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:72 -> a
+    57:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:69 -> a
+    58:78:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:86 -> a
+    79:101:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):98:120 -> a
+    102:102:boolean lambda$canBeDeadCode$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):123:123 -> a
+    103:103:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):148:148 -> a
+    104:104:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):168:168 -> a
+    105:106:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):173:174 -> a
+    107:107:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):173:173 -> a
+    108:108:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):180:180 -> a
+    109:109:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):185:185 -> a
+    110:110:boolean definitelyTriggersClassInitialization(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):194:194 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):138:142 -> b
     int maxInValueRegister() -> gc
     int maxOutValueRegister() -> hc
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> ia
-    1:1:com.android.tools.r8.ir.code.Value dest():48:48 -> nc
+    1:1:com.android.tools.r8.ir.code.Value dest():43:43 -> nc
     boolean couldIntroduceAnAlias() -> sa
-    1:1:java.lang.String toString():160:160 -> toString
-com.android.tools.r8.ir.code.StaticPut -> a.a.a.a.h.b.hb:
+    1:1:java.lang.String toString():153:153 -> toString
+com.android.tools.r8.ir.code.StaticPut -> a.a.a.a.h.b.fb:
     boolean $assertionsDisabled -> k
-    1:1:void <clinit>():31:31 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):34:34 -> <init>
+    1:1:void <clinit>():30:30 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):33:33 -> <init>
     boolean instructionTypeCanThrow() -> Ia
     boolean isStaticPut() -> Yb
-    1:31:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):50:80 -> a
-    32:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:78 -> a
-    33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:59 -> a
-    34:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:74 -> a
-    54:54:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:71 -> a
-    55:55:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:68 -> a
-    56:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:65 -> a
-    57:77:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:82 -> a
-    78:88:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):104:114 -> a
-    89:89:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):134:134 -> a
-    90:90:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):154:154 -> a
-    91:92:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):159:160 -> a
-    93:93:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):159:159 -> a
-    94:94:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):170:170 -> a
-    95:95:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.StaticPut):314:314 -> a
-    95:95:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):39 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):124:128 -> b
+    1:31:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):44:74 -> a
+    32:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:72 -> a
+    33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:53 -> a
+    34:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):49:68 -> a
+    54:54:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:65 -> a
+    55:55:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:62 -> a
+    56:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:59 -> a
+    57:77:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56:76 -> a
+    78:78:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):108:108 -> a
+    79:79:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):128:128 -> a
+    80:81:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):133:134 -> a
+    82:82:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):133:133 -> a
+    83:83:boolean definitelyTriggersClassInitialization(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):143:143 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):98:102 -> b
     int maxInValueRegister() -> gc
-    1:1:int maxOutValueRegister():98:98 -> hc
+    1:1:int maxOutValueRegister():92:92 -> hc
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> ja
-    1:2:com.android.tools.r8.ir.code.Value inValue():43:44 -> nc
-    1:1:java.lang.String toString():139:139 -> toString
-com.android.tools.r8.ir.code.Store -> a.a.a.a.h.b.ib:
+    1:2:com.android.tools.r8.ir.code.Value inValue():37:38 -> nc
+    1:1:java.lang.String toString():113:113 -> toString
+com.android.tools.r8.ir.code.Store -> a.a.a.a.h.b.gb:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.StackValue):24:24 -> <init>
     boolean hasInvariantOutType() -> Ea
     boolean isStore() -> Zb
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):29:29 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):64:64 -> a
-    3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:69 -> a
-    4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):74:74 -> a
-    5:5:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):80:80 -> a
-    6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):85:85 -> a
-    7:7:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):90:90 -> a
-    8:8:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):100:100 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):48:48 -> b
-    1:2:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):105:106 -> c
-    1:1:int maxInValueRegister():53:53 -> gc
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):59:59 -> a
+    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:64 -> a
+    3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):69:69 -> a
+    4:4:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):75:75 -> a
+    5:5:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):80:80 -> a
+    6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):85:85 -> a
+    7:7:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):95:95 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):43:43 -> b
+    1:2:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):100:101 -> c
+    1:1:int maxInValueRegister():48:48 -> gc
     int maxOutValueRegister() -> hc
     com.android.tools.r8.ir.code.Store asStore() -> ka
-    1:1:com.android.tools.r8.ir.code.Value src():33:33 -> lc
-com.android.tools.r8.ir.code.Sub -> a.a.a.a.h.b.jb:
+    1:1:com.android.tools.r8.ir.code.Value src():28:28 -> lc
+com.android.tools.r8.ir.code.Sub -> a.a.a.a.h.b.hb:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):27:27 -> <init>
@@ -20594,41 +20124,40 @@
     float foldFloat(float,float) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):32:32 -> a
-    2:2:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):57:57 -> a
-    3:38:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):159:194 -> a
-    39:39:com.android.tools.r8.code.Instruction CreateInt(int,int,int):42:42 -> a
-    39:39:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):195 -> a
-    40:40:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):197:197 -> a
-    41:65:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:89 -> a
-    41:65:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):160 -> a
-    66:75:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:86 -> a
-    66:75:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):160 -> a
-    76:92:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83:99 -> a
-    76:92:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):160 -> a
-    93:114:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):96:117 -> a
-    93:114:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):160 -> a
-    115:124:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):105:114 -> a
-    115:124:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):160 -> a
-    125:134:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):111:120 -> a
-    125:134:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):160 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):52:52 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):77:77 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:94 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):42:42 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):72:72 -> c
-    3:15:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):140:152 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):62:62 -> d
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):89:89 -> d
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):67:67 -> e
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):83:83 -> e
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):47:47 -> f
-    1:3:boolean negativeFitsInDexInstruction(com.android.tools.r8.ir.code.Value):118:120 -> i
+    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):52:52 -> a
+    2:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):154:189 -> a
+    38:38:com.android.tools.r8.code.Instruction CreateInt(int,int,int):37:37 -> a
+    38:38:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):190 -> a
+    39:39:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):192:192 -> a
+    40:64:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:89 -> a
+    40:64:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):155 -> a
+    65:74:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:86 -> a
+    65:74:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):155 -> a
+    75:91:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83:99 -> a
+    75:91:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):155 -> a
+    92:113:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):96:117 -> a
+    92:113:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):155 -> a
+    114:123:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):105:114 -> a
+    114:123:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):155 -> a
+    124:133:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):111:120 -> a
+    124:133:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):155 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):47:47 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):72:72 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):89:89 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):37:37 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):67:67 -> c
+    3:15:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):135:147 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):57:57 -> d
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):84:84 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):62:62 -> e
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):78:78 -> e
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):42:42 -> f
+    1:3:boolean negativeFitsInDexInstruction(com.android.tools.r8.ir.code.Value):113:115 -> i
     com.android.tools.r8.ir.code.Sub asSub() -> la
     boolean isCommutative() -> mc
-    1:8:int maxInOutValueRegisterSize():126:133 -> oc
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():212:212 -> qc
-com.android.tools.r8.ir.code.Swap -> a.a.a.a.h.b.kb:
+    1:8:int maxInOutValueRegisterSize():121:128 -> oc
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():207:207 -> qc
+com.android.tools.r8.ir.code.Swap -> a.a.a.a.h.b.ib:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):21:21 -> <init>
@@ -20636,96 +20165,93 @@
     2:5: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):21 -> <init>
     boolean hasInvariantOutType() -> Ea
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):33:33 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61:61 -> a
-    3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):66:66 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):87:87 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56:56 -> a
+    2:2:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):61:61 -> a
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):82:82 -> a
     boolean isSwap() -> ac
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:71 -> b
-    1:6:void setOutValue(com.android.tools.r8.ir.code.Value):38:43 -> e
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> b
+    1:6:void setOutValue(com.android.tools.r8.ir.code.Value):33:38 -> e
     int maxInValueRegister() -> gc
-    1:1:int maxOutValueRegister():81:81 -> hc
-com.android.tools.r8.ir.code.Switch -> a.a.a.a.h.b.lb:
+    1:1:int maxOutValueRegister():76:76 -> hc
+com.android.tools.r8.ir.code.Switch -> a.a.a.a.h.b.jb:
     int[] keys -> i
     int fallthroughBlockIndex -> k
     boolean $assertionsDisabled -> l
     int[] targetBlockIndices -> j
     1:1:void <clinit>():26:26 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.code.Value,int[],int[],int):37:41 -> <init>
-    6:13:boolean valid():50:57 -> <init>
+    6:13:boolean valid():45:52 -> <init>
     6:13:void <init>(com.android.tools.r8.ir.code.Value,int[],int[],int):41 -> <init>
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):46:46 -> a
-    2:2:long numberOfTargetsIfPacked(int[]):67:67 -> a
-    3:3:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):72:72 -> a
-    4:4:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode,long):78:78 -> a
-    5:5:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode):158:158 -> a
-    5:5:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):172 -> a
-    6:6:long packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):163:163 -> a
-    6:6:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):172 -> a
-    7:7:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):168:168 -> a
-    7:7:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):172 -> a
-    8:12:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):196:200 -> a
-    13:39:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):252:278 -> a
-    40:43:void print(com.android.tools.r8.utils.CfgPrinter):309:312 -> a
-    44:44:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):318:318 -> a
-    45:66:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):323:344 -> a
+    1:1:long numberOfTargetsIfPacked(int[]):62:62 -> a
+    2:2:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):67:67 -> a
+    3:3:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode,long):73:73 -> a
+    4:4:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode):153:153 -> a
+    4:4:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):167 -> a
+    5:5:long packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):158:158 -> a
+    5:5:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):167 -> a
+    6:6:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):163:163 -> a
+    6:6:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):167 -> a
+    7:11:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):191:195 -> a
+    12:38:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):247:273 -> a
+    39:42:void print(com.android.tools.r8.utils.CfgPrinter):304:307 -> a
+    43:43:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):313:313 -> a
+    44:65:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):318:339 -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> b
-    1:1:long estimatedSparseSize(com.android.tools.r8.utils.InternalOutputMode,long):96:96 -> b
-    2:2:int baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):113:113 -> b
-    2:2:long estimatedSparseSize(com.android.tools.r8.utils.InternalOutputMode,long):96 -> b
-    3:3:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142:142 -> b
-    3:3:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):83 -> b
-    4:4:int baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):113:113 -> b
-    4:4:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):83 -> b
-    5:6:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):85:86 -> b
-    7:7:int basePackedSize(com.android.tools.r8.utils.InternalOutputMode):102:102 -> b
-    7:7:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):87 -> b
-    8:8:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):92:92 -> b
-    9:9:int getKey(int):210:210 -> b
-    10:10:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):248:248 -> b
+    1:1:long estimatedSparseSize(com.android.tools.r8.utils.InternalOutputMode,long):91:91 -> b
+    2:2:int baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):108:108 -> b
+    2:2:long estimatedSparseSize(com.android.tools.r8.utils.InternalOutputMode,long):91 -> b
+    3:3:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):137:137 -> b
+    3:3:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):78 -> b
+    4:4:int baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):108:108 -> b
+    4:4:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):78 -> b
+    5:6:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):80:81 -> b
+    7:7:int basePackedSize(com.android.tools.r8.utils.InternalOutputMode):97:97 -> b
+    7:7:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):82 -> b
+    8:8:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):87:87 -> b
+    9:9:int getKey(int):205:205 -> b
+    10:10:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):243:243 -> b
     boolean isSwitch() -> bc
-    1:2:long packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):123:124 -> c
-    3:5:long packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):135:137 -> c
-    6:6:void setFallthroughBlockIndex(int):239:239 -> c
-    1:1:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142:142 -> d
-    2:2:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):147:147 -> d
-    3:3:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):243:243 -> d
-    4:4:int[] targetBlockIndices():218:218 -> d
-    4:4:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):243 -> d
-    5:5:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):243:243 -> d
+    1:2:long packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):118:119 -> c
+    3:5:long packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):130:132 -> c
+    6:6:void setFallthroughBlockIndex(int):234:234 -> c
+    1:1:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):137:137 -> d
+    2:2:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):142:142 -> d
+    3:3:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):238:238 -> d
+    4:4:int[] targetBlockIndices():213:213 -> d
+    4:4:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):238 -> d
+    5:5:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):238:238 -> d
     int maxInValueRegister() -> gc
     int maxOutValueRegister() -> hc
-    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():231:231 -> lc
+    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():226:226 -> lc
     com.android.tools.r8.ir.code.Switch asSwitch() -> ma
-    1:1:int getFallthroughBlockIndex():235:235 -> mc
-    1:1:int getFirstKey():176:176 -> nc
-    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():222:224 -> oc
-    1:1:int[] getKeys():214:214 -> pc
-    1:1:int numberOfKeys():206:206 -> qc
-    1:1:int[] targetBlockIndices():218:218 -> rc
-    1:1:com.android.tools.r8.ir.code.Value value():62:62 -> sc
-    1:11:java.lang.String toString():294:304 -> toString
-com.android.tools.r8.ir.code.Throw -> a.a.a.a.h.b.mb:
+    1:1:int getFallthroughBlockIndex():230:230 -> mc
+    1:1:int getFirstKey():171:171 -> nc
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():217:219 -> oc
+    1:1:int[] getKeys():209:209 -> pc
+    1:1:int numberOfKeys():201:201 -> qc
+    1:1:int[] targetBlockIndices():213:213 -> rc
+    1:1:com.android.tools.r8.ir.code.Value value():57:57 -> sc
+    1:11:java.lang.String toString():289:299 -> toString
+com.android.tools.r8.ir.code.Throw -> a.a.a.a.h.b.kb:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
     boolean instructionTypeCanThrow() -> Ia
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):25:25 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):34:34 -> a
-    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):71:71 -> a
-    4:4:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):76:76 -> a
-    5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):81:81 -> a
-    6:20:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):86:100 -> a
-    21:22:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.Value.getDefinition():233:234 -> a
-    21:22:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):101 -> a
-    23:24:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):102:103 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):55:55 -> b
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):29:29 -> a
+    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):66:66 -> a
+    3:3:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):71:71 -> a
+    4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):76:76 -> a
+    5:19:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):81:95 -> a
+    20:21:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.Value.getDefinition():231:232 -> a
+    20:21:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):96 -> a
+    22:23:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):97:98 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):50:50 -> b
     boolean isThrow() -> cc
     int maxInValueRegister() -> gc
-    1:1:int maxOutValueRegister():44:44 -> hc
-    1:1:com.android.tools.r8.ir.code.Value exception():29:29 -> mc
+    1:1:int maxOutValueRegister():39:39 -> hc
+    1:1:com.android.tools.r8.ir.code.Value exception():24:24 -> mc
     com.android.tools.r8.ir.code.Throw asThrow() -> na
-com.android.tools.r8.ir.code.Unop -> a.a.a.a.h.b.nb:
+com.android.tools.r8.ir.code.Unop -> a.a.a.a.h.b.lb:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
     boolean hasInvariantOutType() -> Ea
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):52:52 -> a
@@ -20735,24 +20261,23 @@
     int maxInValueRegister() -> gc
     int maxOutValueRegister() -> hc
     1:1:com.android.tools.r8.ir.code.Value source():26:26 -> lc
-com.android.tools.r8.ir.code.Ushr -> a.a.a.a.h.b.ob:
+com.android.tools.r8.ir.code.Ushr -> a.a.a.a.h.b.mb:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):22:22 -> a
-    2:2:com.android.tools.r8.code.Instruction CreateInt(int,int,int):48:48 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):58:58 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):73:73 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):63:63 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):43:43 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):53:53 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):68:68 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):73:73 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):58:58 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):63:63 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):48:48 -> d
     boolean isUshr() -> ec
-    1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):28:28 -> g
+    1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):23:23 -> g
     boolean isCommutative() -> mc
     com.android.tools.r8.ir.code.Ushr asUshr() -> oa
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> qc
-com.android.tools.r8.ir.code.Value -> a.a.a.a.h.b.rb:
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():88:88 -> qc
+com.android.tools.r8.ir.code.Value -> a.a.a.a.h.b.pb:
     boolean knownToBeBoolean -> m
     int needsRegister -> j
     boolean isThis -> k
@@ -20771,157 +20296,155 @@
     java.util.LinkedList phiUsers -> e
     com.android.tools.r8.ir.code.Value$DebugData debugData -> o
     java.util.LinkedList users -> c
-    1:164:void <clinit>():35:198 -> <clinit>
-    1:1:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):218:218 -> <init>
-    2:21:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):202:221 -> <init>
-    1:1:boolean isConstNumber():748:748 -> A
-    1:1:boolean isConstString():752:752 -> B
-    1:1:boolean isConstant():770:770 -> C
-    1:1:boolean isDexItemBasedConstString():756:756 -> D
+    1:164:void <clinit>():33:196 -> <clinit>
+    1:1:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):216:216 -> <init>
+    2:21:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):200:219 -> <init>
+    1:1:boolean isConstNumber():729:729 -> A
+    1:1:boolean isConstString():733:733 -> B
+    1:1:boolean isConstant():751:751 -> C
+    1:1:boolean isDexItemBasedConstString():737:737 -> D
     boolean isFixedRegisterValue() -> E
-    1:1:boolean isLinked():369:369 -> F
-    1:3:boolean isNeverNull():785:787 -> G
+    1:1:boolean isLinked():367:367 -> F
+    1:3:boolean isNeverNull():766:768 -> G
     boolean isPhi() -> H
-    1:1:boolean isThis():835:835 -> I
-    1:1:boolean isUninitializedLocal():520:520 -> J
-    1:1:boolean isUsed():445:445 -> K
+    1:1:boolean isThis():816:816 -> I
+    1:1:boolean isUninitializedLocal():501:501 -> J
+    1:1:boolean isUsed():443:443 -> K
     boolean isValueOnStack() -> L
-    1:3:boolean isZero():932:934 -> M
-    1:8:boolean knownToBeBoolean():810:817 -> N
-    1:3:void markAsArgument():796:798 -> O
-    1:3:void markAsThis():824:826 -> P
-    1:1:void markNonDebugLocalRead():131:131 -> Q
-    1:3:boolean needsRegister():660:662 -> R
-    1:1:int numberOfAllNonDebugUsers():433:433 -> S
-    1:1:int numberOfAllUsers():441 -> S
-    2:2:int numberOfAllUsers():441:441 -> S
-    1:1:int numberOfDebugUsers():437:437 -> T
-    1:5:int numberOfPhiUsers():425:429 -> U
-    1:5:int numberOfUsers():417:421 -> V
-    1:1:com.android.tools.r8.ir.code.ValueType outType():739:739 -> W
-    1:1:int requiredRegisters():272:272 -> X
-    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():396:397 -> Y
-    1:4:java.util.Set uniquePhiUsers():406:409 -> Z
+    1:3:boolean isZero():890:892 -> M
+    1:8:boolean knownToBeBoolean():791:798 -> N
+    1:3:void markAsArgument():777:779 -> O
+    1:3:void markAsThis():805:807 -> P
+    1:1:void markNonDebugLocalRead():129:129 -> Q
+    1:3:boolean needsRegister():641:643 -> R
+    1:1:int numberOfAllNonDebugUsers():431:431 -> S
+    1:1:int numberOfAllUsers():439 -> S
+    2:2:int numberOfAllUsers():439:439 -> S
+    1:1:int numberOfDebugUsers():435:435 -> T
+    1:5:int numberOfPhiUsers():423:427 -> U
+    1:5:int numberOfUsers():415:419 -> V
+    1:1:com.android.tools.r8.ir.code.ValueType outType():720:720 -> W
+    1:1:int requiredRegisters():270:270 -> X
+    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():394:395 -> Y
+    1:4:java.util.Set uniquePhiUsers():404:407 -> Z
     boolean lambda$fullyRemovePhiUser$1(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi) -> 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):39:52 -> a
-    15:15:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):41:41 -> a
-    16:75:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):57:116 -> a
-    76:77:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):111:112 -> a
-    78:79:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):106:107 -> a
-    80:81:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):101:102 -> a
-    82:86:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):93:97 -> a
-    87:88:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):88:89 -> a
-    89:90:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):83:84 -> a
-    91:107:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):62:78 -> a
-    108:112:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):75:79 -> a
-    113:113:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):122:122 -> a
-    114:114:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueTypeConstraint):126:126 -> a
-    114:114:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):122 -> a
-    115:117:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):284:286 -> a
-    118:121:boolean hasSameOrNoLocal(com.android.tools.r8.ir.code.Value):295:298 -> a
-    122:123:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):338:339 -> a
-    124:125:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):343:344 -> a
-    124:125:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):339 -> a
-    126:134:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():166:174 -> a
-    126:134:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):344 -> a
-    126:134:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):339 -> a
-    135:135:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():172:172 -> a
-    135:135:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):344 -> a
-    135:135:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):339 -> a
-    136:136:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():169:169 -> a
-    136:136:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):344 -> a
-    136:136:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):339 -> a
-    137:137:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):339:339 -> a
-    138:149:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):449:460 -> a
-    150:151:void addPhiUser(com.android.tools.r8.ir.code.Phi):500:501 -> a
-    152:153:java.util.Set affectedValues():551:552 -> a
-    154:154:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    154:154:java.util.Set affectedValues():553 -> a
-    155:155:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    155:155:java.util.Set affectedValues():554 -> a
-    156:160:java.util.Set affectedValues():554:558 -> a
-    161:188:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):590:617 -> a
-    189:198:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):624:633 -> a
-    199:212:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):179:192 -> a
-    199:212:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):633 -> a
-    213:213:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):180:180 -> a
-    213:213:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):633 -> a
-    214:214:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):633:633 -> a
-    215:223:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):638:646 -> a
-    224:225:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):651:652 -> a
-    226:226:void setKnownToBeBoolean(boolean):806:806 -> a
-    227:227:void setValueRange(com.android.tools.r8.utils.LongInterval):839:839 -> a
-    228:228:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):871:871 -> a
-    229:229:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):877:877 -> a
-    230:246:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):897:913 -> a
-    247:247:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> a
-    247:247:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):916 -> a
-    248:254:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):918:924 -> a
-    255:255:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):954:954 -> a
-    1:4:java.util.Set uniqueUsers():389:392 -> aa
+    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):37:50 -> a
+    15:15:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):39:39 -> a
+    16:75:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):55:114 -> a
+    76:77:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):109:110 -> a
+    78:79:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):104:105 -> a
+    80:81:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):99:100 -> a
+    82:86:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):91:95 -> a
+    87:88:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):86:87 -> a
+    89:90:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):81:82 -> a
+    91:107:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):60:76 -> a
+    108:112:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):73:77 -> a
+    113:113:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):120:120 -> a
+    114:114:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueTypeConstraint):124:124 -> a
+    114:114:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):120 -> a
+    115:117:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):282:284 -> a
+    118:121:boolean hasSameOrNoLocal(com.android.tools.r8.ir.code.Value):293:296 -> a
+    122:123:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):336:337 -> a
+    124:125:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):341:342 -> a
+    124:125:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):337 -> a
+    126:134:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():164:172 -> a
+    126:134:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):342 -> a
+    126:134:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):337 -> a
+    135:135:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():170:170 -> a
+    135:135:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):342 -> a
+    135:135:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):337 -> a
+    136:136:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():167:167 -> a
+    136:136:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):342 -> a
+    136:136:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):337 -> a
+    137:137:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):337:337 -> a
+    138:139:void addPhiUser(com.android.tools.r8.ir.code.Phi):481:482 -> a
+    140:141:java.util.Set affectedValues():532:533 -> a
+    142:142:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    142:142:java.util.Set affectedValues():534 -> a
+    143:143:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    143:143:java.util.Set affectedValues():535 -> a
+    144:148:java.util.Set affectedValues():535:539 -> a
+    149:176:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):571:598 -> a
+    177:186:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):605:614 -> a
+    187:200:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):177:190 -> a
+    187:200:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):614 -> a
+    201:201:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):178:178 -> a
+    201:201:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):614 -> a
+    202:202:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):614:614 -> a
+    203:211:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):619:627 -> a
+    212:213:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):632:633 -> a
+    214:214:void setKnownToBeBoolean(boolean):787:787 -> a
+    215:215:void setValueRange(com.android.tools.r8.utils.LongInterval):820:820 -> a
+    216:216:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):852:852 -> a
+    217:230:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.Set):858:871 -> a
+    231:231:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> a
+    231:231:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.Set):874 -> a
+    232:238:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.Set):876:882 -> a
+    239:239:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):912:912 -> a
+    1:4:java.util.Set uniqueUsers():387:390 -> aa
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> b
     boolean lambda$fullyRemoveUser$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> b
-    1:4:void linkTo(com.android.tools.r8.ir.code.Value):348:351 -> b
-    5:6:void removePhiUser(com.android.tools.r8.ir.code.Phi):505:506 -> b
-    7:8:void addDebugUser(com.android.tools.r8.ir.code.Instruction):515:516 -> b
-    9:10:void setNeedsRegister(boolean):666:667 -> b
-    11:11:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):944:944 -> b
+    1:4:void linkTo(com.android.tools.r8.ir.code.Value):346:349 -> b
+    5:6:void removePhiUser(com.android.tools.r8.ir.code.Phi):486:487 -> b
+    7:8:void addDebugUser(com.android.tools.r8.ir.code.Instruction):496:497 -> b
+    9:10:void setNeedsRegister(boolean):647:648 -> b
+    11:11:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):902:902 -> b
     com.android.tools.r8.ir.code.Phi asPhi() -> c
-    1:2:void addUser(com.android.tools.r8.ir.code.Instruction):475:476 -> c
-    3:4:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):510:511 -> c
-    5:17:void replaceUsers(com.android.tools.r8.ir.code.Value):565:577 -> c
+    1:2:void addUser(com.android.tools.r8.ir.code.Instruction):456:457 -> c
+    3:4:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):491:492 -> c
+    5:17:void replaceUsers(com.android.tools.r8.ir.code.Value):546:558 -> c
     boolean lambda$replaceSelectiveUsers$2(com.android.tools.r8.ir.code.Value) -> d
-    1:5:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):528:532 -> d
-    6:7:boolean canBeNull():791:792 -> d
-    1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):480:481 -> e
-    3:8:void clearUsers():490:495 -> e
-    1:2:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):485:486 -> f
-    3:8:void clearUsersInfo():540:545 -> f
-    1:2:void computeNeedsRegister():671:672 -> g
-    1:1:java.util.Set debugUsers():413:413 -> h
-    1:1:int hashCode():705:705 -> hashCode
-    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():401:402 -> i
-    1:17:com.android.tools.r8.ir.code.Value getAliasedValue():247:263 -> j
-    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():743:744 -> k
-    1:7:java.util.List getDebugLocalEnds():315:321 -> l
-    1:7:java.util.List getDebugLocalStarts():302:308 -> m
-    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():656:656 -> n
-    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():276:276 -> o
-    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():381:381 -> p
-    1:1:int getNumber():268:268 -> q
-    1:1:com.android.tools.r8.ir.code.Value getPreviousConsecutive():385:385 -> r
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():958:958 -> s
-    1:11:com.android.tools.r8.utils.LongInterval getValueRange():855:865 -> t
-    1:8:java.lang.String toString():710:717 -> toString
-    9:9:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():108:108 -> toString
-    9:9:java.lang.String toString():718 -> toString
-    10:27:java.lang.String toString():718:735 -> toString
-    1:1:boolean hasLocalInfo():280:280 -> u
-    1:1:boolean hasUsersInfo():536:536 -> v
-    1:1:boolean hasValueRange():843:843 -> w
-    1:8:boolean internalComputeNeedsRegister():676:683 -> x
-    1:1:boolean isArgument():802:802 -> y
-    1:1:boolean isConstClass():766:766 -> z
-com.android.tools.r8.ir.code.Value$DebugData -> a.a.a.a.h.b.pb:
+    1:5:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):509:513 -> d
+    6:7:boolean canBeNull():772:773 -> d
+    1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):461:462 -> e
+    3:8:void clearUsers():471:476 -> e
+    1:2:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):466:467 -> f
+    3:8:void clearUsersInfo():521:526 -> f
+    1:2:void computeNeedsRegister():652:653 -> g
+    1:1:java.util.Set debugUsers():411:411 -> h
+    1:1:int hashCode():686:686 -> hashCode
+    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():399:400 -> i
+    1:17:com.android.tools.r8.ir.code.Value getAliasedValue():245:261 -> j
+    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():724:725 -> k
+    1:7:java.util.List getDebugLocalEnds():313:319 -> l
+    1:7:java.util.List getDebugLocalStarts():300:306 -> m
+    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():637:637 -> n
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():274:274 -> o
+    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():379:379 -> p
+    1:1:int getNumber():266:266 -> q
+    1:1:com.android.tools.r8.ir.code.Value getPreviousConsecutive():383:383 -> r
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():916:916 -> s
+    1:11:com.android.tools.r8.utils.LongInterval getValueRange():836:846 -> t
+    1:8:java.lang.String toString():691:698 -> toString
+    9:9:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():106:106 -> toString
+    9:9:java.lang.String toString():699 -> toString
+    10:27:java.lang.String toString():699:716 -> toString
+    1:1:boolean hasLocalInfo():278:278 -> u
+    1:1:boolean hasUsersInfo():517:517 -> v
+    1:1:boolean hasValueRange():824:824 -> w
+    1:8:boolean internalComputeNeedsRegister():657:664 -> x
+    1:1:boolean isArgument():783:783 -> y
+    1:1:boolean isConstClass():747:747 -> z
+com.android.tools.r8.ir.code.Value$DebugData -> a.a.a.a.h.b.nb:
     java.util.Map users -> b
     com.android.tools.r8.graph.DebugLocalInfo local -> a
-    1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):141:141 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):139:142 -> <init>
-com.android.tools.r8.ir.code.Value$DebugUse -> a.a.a.a.h.b.qb:
+    1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):139:139 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):137:140 -> <init>
+com.android.tools.r8.ir.code.Value$DebugUse -> a.a.a.a.h.b.ob:
     com.android.tools.r8.ir.code.Value$DebugUse START -> b
     com.android.tools.r8.ir.code.Value$DebugUse[] $VALUES -> e
     com.android.tools.r8.ir.code.Value$DebugUse LIVE -> a
     com.android.tools.r8.ir.code.Value$DebugUse LIVE_FINAL -> d
     com.android.tools.r8.ir.code.Value$DebugUse END -> c
     boolean $assertionsDisabled -> f
-    1:2:void <clinit>():149:150 -> <clinit>
-    3:3:void <clinit>():149:149 -> <clinit>
-    1:1:void <init>(java.lang.String,int):149:149 -> <init>
-com.android.tools.r8.ir.code.ValueNumberGenerator -> a.a.a.a.h.b.sb:
+    1:2:void <clinit>():147:148 -> <clinit>
+    3:3:void <clinit>():147:147 -> <clinit>
+    1:1:void <init>(java.lang.String,int):147:147 -> <init>
+com.android.tools.r8.ir.code.ValueNumberGenerator -> a.a.a.a.h.b.qb:
     int nextValueNumber -> a
     1:2:void <init>():6:7 -> <init>
     1:1:int next():10:10 -> a
-com.android.tools.r8.ir.code.ValueType -> a.a.a.a.h.b.tb:
+com.android.tools.r8.ir.code.ValueType -> a.a.a.a.h.b.rb:
     com.android.tools.r8.ir.code.ValueType DOUBLE -> e
     com.android.tools.r8.ir.code.ValueType FLOAT -> c
     com.android.tools.r8.ir.code.ValueType LONG -> d
@@ -20958,7 +20481,7 @@
     1:1:boolean isWide():29:29 -> c
     1:1:int requiredRegisters():33:33 -> d
     1:1:com.android.tools.r8.ir.code.ValueType[] values():13:13 -> e
-com.android.tools.r8.ir.code.ValueTypeConstraint -> a.a.a.a.h.b.ub:
+com.android.tools.r8.ir.code.ValueTypeConstraint -> a.a.a.a.h.b.sb:
     com.android.tools.r8.ir.code.ValueTypeConstraint FLOAT -> c
     com.android.tools.r8.ir.code.ValueTypeConstraint INT -> b
     com.android.tools.r8.ir.code.ValueTypeConstraint OBJECT -> a
@@ -20998,23 +20521,22 @@
     126:126:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):138:138 -> a
     1:1:boolean isWide():32:32 -> b
     1:1:int requiredRegisters():42:42 -> c
-com.android.tools.r8.ir.code.WideConstant -> a.a.a.a.h.b.vb:
-com.android.tools.r8.ir.code.Xor -> a.a.a.a.h.b.wb:
+com.android.tools.r8.ir.code.WideConstant -> a.a.a.a.h.b.tb:
+com.android.tools.r8.ir.code.Xor -> a.a.a.a.h.b.ub:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):22:22 -> a
-    2:2:com.android.tools.r8.code.Instruction CreateInt(int,int,int):42:42 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):52:52 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):67:67 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):72:72 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):57:57 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):62:62 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):47:47 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):37:37 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):47:47 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):62:62 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67:67 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):52:52 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):57:57 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):42:42 -> d
     boolean isXor() -> fc
     boolean isCommutative() -> mc
     com.android.tools.r8.ir.code.Xor asXor() -> pa
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():87:87 -> qc
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():82:82 -> qc
 com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver -> a.a.a.a.h.c.c:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
@@ -21050,7 +20572,7 @@
     1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$600(com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.graph.DexEncodedMethod):64:64 -> a
     2:2:void access$700(com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):64:64 -> a
     3:21:com.android.tools.r8.ir.conversion.CallGraph build(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):156:174 -> a
-    22:29:void fillCallSiteSets(com.android.tools.r8.shaking.AppInfoWithLiveness):195:202 -> a
+    22:29:void fillCallSiteSets(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness):195:202 -> a
     22:29:com.android.tools.r8.ir.conversion.CallGraph build(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):174 -> a
     30:30:int lambda$build$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):158:158 -> a
     31:31:boolean hasDoubleCallSite(com.android.tools.r8.graph.DexMethod):191:191 -> a
@@ -21111,7 +20633,7 @@
     1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$300(com.android.tools.r8.ir.conversion.CallGraph$CycleEliminator$CallEdge):245:245 -> a
     1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$400(com.android.tools.r8.ir.conversion.CallGraph$CycleEliminator$CallEdge):245:245 -> b
 com.android.tools.r8.ir.conversion.CallGraph$InvokeExtractor -> a.a.a.a.h.c.f:
-    com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> c
+    com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness appInfo -> c
     com.android.tools.r8.graph.GraphLense graphLense -> d
     com.android.tools.r8.ir.conversion.CallGraph graph -> f
     boolean $assertionsDisabled -> g
@@ -21192,114 +20714,114 @@
     java.util.Set emittedLabels -> e
     com.android.tools.r8.graph.DexEncodedMethod method -> b
     java.util.List localVariablesTable -> m
-    1:1:void <clinit>():71:71 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):127:127 -> <init>
-    2:46:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):86:130 -> <init>
+    1:1:void <clinit>():72:72 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):128:128 -> <init>
+    2:46:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):87:131 -> <init>
     void addArgument(com.android.tools.r8.ir.code.Argument) -> a
-    1:2:com.android.tools.r8.graph.DexField resolveField(com.android.tools.r8.graph.DexField):185:186 -> a
-    3:20:void computeInitializers():190:207 -> a
-    3:20:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):134 -> a
-    21:23:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):135:137 -> a
-    24:45:void rewriteNots():224:245 -> a
-    24:45:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):138 -> a
-    46:46:void rewriteNots():244:244 -> a
-    46:46:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):138 -> a
-    47:67:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):139:159 -> a
-    68:124:void rewriteIincPatterns():355:411 -> a
-    68:124:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):162 -> a
-    125:125:void rewriteIincPatterns():389:389 -> a
-    125:125:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):162 -> a
-    126:126:void rewriteIincPatterns():384:384 -> a
-    126:126:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):162 -> a
-    127:128:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):164:165 -> a
-    129:148:com.android.tools.r8.graph.CfCode buildCfCode():260:279 -> a
-    129:148:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    149:176:com.android.tools.r8.graph.CfCode buildCfCode():278:305 -> a
-    149:176:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    177:179:int stackHeightAtBlockEntry(com.android.tools.r8.ir.code.BasicBlock):252:254 -> a
-    177:179:com.android.tools.r8.graph.CfCode buildCfCode():308 -> a
-    177:179:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    180:181:void com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.setHeight(int):122:123 -> a
-    180:181:com.android.tools.r8.graph.CfCode buildCfCode():308 -> a
-    180:181:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    182:182:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):418:418 -> a
-    182:182:com.android.tools.r8.graph.CfCode buildCfCode():309 -> a
-    182:182:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    183:183:boolean hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):346:346 -> a
-    183:183:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):419 -> a
-    183:183:com.android.tools.r8.graph.CfCode buildCfCode():309 -> a
-    183:183:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    184:188:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):335:339 -> a
-    184:188:boolean hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):347 -> a
-    184:188:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):419 -> a
-    184:188:com.android.tools.r8.graph.CfCode buildCfCode():309 -> a
-    184:188:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    189:191:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):423:425 -> a
-    189:191:com.android.tools.r8.graph.CfCode buildCfCode():309 -> a
-    189:191:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    192:225:void addFrame(com.android.tools.r8.ir.code.BasicBlock):539:572 -> a
-    192:225:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):425 -> a
-    192:225:com.android.tools.r8.graph.CfCode buildCfCode():309 -> a
-    192:225:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    226:258:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):426:458 -> a
-    226:258:com.android.tools.r8.graph.CfCode buildCfCode():309 -> a
-    226:258:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    259:276:void updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):467:484 -> a
-    259:276:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):460 -> a
-    259:276:com.android.tools.r8.graph.CfCode buildCfCode():309 -> a
-    259:276:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    277:277:void add(com.android.tools.r8.cf.code.CfInstruction):641:641 -> a
-    277:277:void updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):484 -> a
-    277:277:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):460 -> a
-    277:277:com.android.tools.r8.graph.CfCode buildCfCode():309 -> a
-    277:277:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    278:278:void updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):485:485 -> a
-    278:278:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):460 -> a
-    278:278:com.android.tools.r8.graph.CfCode buildCfCode():309 -> a
-    278:278:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    279:279:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):461:461 -> a
-    279:279:com.android.tools.r8.graph.CfCode buildCfCode():309 -> a
-    279:279:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    280:280:com.android.tools.r8.graph.CfCode buildCfCode():311:311 -> a
-    280:280:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    281:281:boolean com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.isEmpty():107:107 -> a
-    281:281:com.android.tools.r8.graph.CfCode buildCfCode():311 -> a
-    281:281:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    282:298:com.android.tools.r8.graph.CfCode buildCfCode():311:327 -> a
-    282:298:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    299:299:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167:167 -> a
-    300:305:boolean verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexDefinitionSupplier):172:177 -> a
-    300:305:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
-    306:307:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):576:577 -> a
-    308:338:com.android.tools.r8.cf.code.CfFrame$FrameType findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):586:616 -> a
-    308:338:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):579 -> a
-    339:339:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):580:580 -> a
-    340:340:com.android.tools.r8.cf.code.CfFrame$FrameType findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):593:593 -> a
-    340:340:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):579 -> a
-    341:343:void emitLabel(com.android.tools.r8.cf.code.CfLabel):624:626 -> a
-    344:344:com.android.tools.r8.cf.code.CfLabel getLabel(com.android.tools.r8.ir.code.BasicBlock):633:633 -> a
-    345:345:int getLocalRegister(com.android.tools.r8.ir.code.Value):637:637 -> a
-    346:346:void add(com.android.tools.r8.cf.code.CfInstruction):641:641 -> a
-    1:7:java.util.List computeInitializers(com.android.tools.r8.ir.code.Value):211:217 -> b
-    8:27:void updateLocals(com.android.tools.r8.cf.code.CfLabel):490:509 -> b
-    28:33:void updateLocals(com.android.tools.r8.cf.code.CfLabel):508:513 -> b
-    34:34:com.android.tools.r8.cf.code.CfInstruction getLastInstruction():535:535 -> b
-    34:34:com.android.tools.r8.cf.code.CfLabel ensureLabel():525 -> b
-    35:38:com.android.tools.r8.cf.code.CfLabel ensureLabel():526:529 -> b
-    39:39:void add(com.android.tools.r8.cf.code.CfInstruction):641:641 -> b
-    39:39:com.android.tools.r8.cf.code.CfLabel ensureLabel():530 -> b
-    40:40:com.android.tools.r8.cf.code.CfLabel lambda$getLabel$0(com.android.tools.r8.ir.code.BasicBlock):633:633 -> b
-    1:5:boolean localsChanged():517:521 -> c
+    1:2:com.android.tools.r8.graph.DexField resolveField(com.android.tools.r8.graph.DexField):186:187 -> a
+    3:20:void computeInitializers():191:208 -> a
+    3:20:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):135 -> a
+    21:23:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136:138 -> a
+    24:45:void rewriteNots():225:246 -> a
+    24:45:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):139 -> a
+    46:46:void rewriteNots():245:245 -> a
+    46:46:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):139 -> a
+    47:67:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):140:160 -> a
+    68:124:void rewriteIincPatterns():356:412 -> a
+    68:124:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):163 -> a
+    125:125:void rewriteIincPatterns():390:390 -> a
+    125:125:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):163 -> a
+    126:126:void rewriteIincPatterns():385:385 -> a
+    126:126:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):163 -> a
+    127:128:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):165:166 -> a
+    129:148:com.android.tools.r8.graph.CfCode buildCfCode():261:280 -> a
+    129:148:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    149:176:com.android.tools.r8.graph.CfCode buildCfCode():279:306 -> a
+    149:176:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    177:179:int stackHeightAtBlockEntry(com.android.tools.r8.ir.code.BasicBlock):253:255 -> a
+    177:179:com.android.tools.r8.graph.CfCode buildCfCode():309 -> a
+    177:179:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    180:181:void com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.setHeight(int):123:124 -> a
+    180:181:com.android.tools.r8.graph.CfCode buildCfCode():309 -> a
+    180:181:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    182:182:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):419:419 -> a
+    182:182:com.android.tools.r8.graph.CfCode buildCfCode():310 -> a
+    182:182:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    183:183:boolean hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):347:347 -> a
+    183:183:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):420 -> a
+    183:183:com.android.tools.r8.graph.CfCode buildCfCode():310 -> a
+    183:183:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    184:188:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):336:340 -> a
+    184:188:boolean hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):348 -> a
+    184:188:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):420 -> a
+    184:188:com.android.tools.r8.graph.CfCode buildCfCode():310 -> a
+    184:188:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    189:191:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):424:426 -> a
+    189:191:com.android.tools.r8.graph.CfCode buildCfCode():310 -> a
+    189:191:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    192:225:void addFrame(com.android.tools.r8.ir.code.BasicBlock):540:573 -> a
+    192:225:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):426 -> a
+    192:225:com.android.tools.r8.graph.CfCode buildCfCode():310 -> a
+    192:225:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    226:258:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):427:459 -> a
+    226:258:com.android.tools.r8.graph.CfCode buildCfCode():310 -> a
+    226:258:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    259:276:void updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):468:485 -> a
+    259:276:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):461 -> a
+    259:276:com.android.tools.r8.graph.CfCode buildCfCode():310 -> a
+    259:276:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    277:277:void add(com.android.tools.r8.cf.code.CfInstruction):642:642 -> a
+    277:277:void updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):485 -> a
+    277:277:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):461 -> a
+    277:277:com.android.tools.r8.graph.CfCode buildCfCode():310 -> a
+    277:277:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    278:278:void updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):486:486 -> a
+    278:278:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):461 -> a
+    278:278:com.android.tools.r8.graph.CfCode buildCfCode():310 -> a
+    278:278:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    279:279:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):462:462 -> a
+    279:279:com.android.tools.r8.graph.CfCode buildCfCode():310 -> a
+    279:279:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    280:280:com.android.tools.r8.graph.CfCode buildCfCode():312:312 -> a
+    280:280:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    281:281:boolean com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.isEmpty():108:108 -> a
+    281:281:com.android.tools.r8.graph.CfCode buildCfCode():312 -> a
+    281:281:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    282:298:com.android.tools.r8.graph.CfCode buildCfCode():312:328 -> a
+    282:298:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    299:299:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):168:168 -> a
+    300:305:boolean verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexDefinitionSupplier):173:178 -> a
+    300:305:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):168 -> a
+    306:306:com.android.tools.r8.cf.code.CfInstruction getLastInstruction():536:536 -> a
+    306:306:com.android.tools.r8.cf.code.CfLabel ensureLabel():526 -> a
+    307:310:com.android.tools.r8.cf.code.CfLabel ensureLabel():527:530 -> a
+    311:311:void add(com.android.tools.r8.cf.code.CfInstruction):642:642 -> a
+    311:311:com.android.tools.r8.cf.code.CfLabel ensureLabel():531 -> a
+    312:313:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):577:578 -> a
+    314:344:com.android.tools.r8.cf.code.CfFrame$FrameType findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):587:617 -> a
+    314:344:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):580 -> a
+    345:345:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):581:581 -> a
+    346:346:com.android.tools.r8.cf.code.CfFrame$FrameType findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):594:594 -> a
+    346:346:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):580 -> a
+    347:349:void emitLabel(com.android.tools.r8.cf.code.CfLabel):625:627 -> a
+    350:350:com.android.tools.r8.cf.code.CfLabel getLabel(com.android.tools.r8.ir.code.BasicBlock):634:634 -> a
+    351:351:int getLocalRegister(com.android.tools.r8.ir.code.Value):638:638 -> a
+    352:352:void add(com.android.tools.r8.cf.code.CfInstruction):642:642 -> a
+    1:7:java.util.List computeInitializers(com.android.tools.r8.ir.code.Value):212:218 -> b
+    8:27:void updateLocals(com.android.tools.r8.cf.code.CfLabel):491:510 -> b
+    28:33:void updateLocals(com.android.tools.r8.cf.code.CfLabel):509:514 -> b
+    34:38:boolean localsChanged():518:522 -> b
+    39:39:com.android.tools.r8.cf.code.CfLabel lambda$getLabel$0(com.android.tools.r8.ir.code.BasicBlock):634:634 -> b
 com.android.tools.r8.ir.conversion.CfBuilder$1 -> a.a.a.a.h.c.k:
 com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> a.a.a.a.h.c.l:
     int height -> b
     boolean $assertionsDisabled -> c
     int maxHeight -> a
-    1:1:void <clinit>():102:102 -> <clinit>
-    1:3:void <init>():102:104 -> <init>
-    1:3:void <init>(com.android.tools.r8.ir.conversion.CfBuilder$1):102 -> <init>
-    1:2:void pop(com.android.tools.r8.ir.code.Value):117:118 -> a
-    1:3:void push(com.android.tools.r8.ir.code.Value):111:113 -> b
+    1:1:void <clinit>():103:103 -> <clinit>
+    1:3:void <init>():103:105 -> <init>
+    1:3:void <init>(com.android.tools.r8.ir.conversion.CfBuilder$1):103 -> <init>
+    1:2:void pop(com.android.tools.r8.ir.code.Value):118:119 -> a
+    1:3:void push(com.android.tools.r8.ir.code.Value):112:114 -> b
 com.android.tools.r8.ir.conversion.CfSourceCode -> a.a.a.a.h.c.p:
     com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList cachedTryHandlerList -> h
     com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo currentBlockInfo -> a
@@ -21321,78 +20843,78 @@
     1:1:void <clinit>():53:53 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.InternalOutputMode):211:211 -> <init>
     2:173:void <init>(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.InternalOutputMode):56:227 -> <init>
-    int getMoveExceptionRegister(int) -> a
     void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder) -> a
     void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder) -> a
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> a
-    1:1:int instructionCount():232:232 -> a
-    2:6:boolean canThrowHelper(com.android.tools.r8.cf.code.CfInstruction):260:264 -> a
-    7:10:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):269:272 -> a
-    11:37:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):271:297 -> a
-    38:38:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):304:304 -> a
-    39:39:boolean com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.validFor(int):73:73 -> a
-    39:39:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):304 -> a
-    40:42:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):305:307 -> a
-    43:46:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):306:309 -> a
-    47:50:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):350:353 -> a
-    51:51:boolean isStatic():382:382 -> a
-    51:51:void buildArgumentInstructions(com.android.tools.r8.ir.conversion.IRBuilder):362 -> a
-    51:51:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):354 -> a
-    52:67:void buildArgumentInstructions(com.android.tools.r8.ir.conversion.IRBuilder):363:378 -> a
-    52:67:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):354 -> a
-    68:70:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):355:357 -> a
-    71:98:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):397:424 -> a
-    99:120:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):433:454 -> a
-    121:121:int instructionCount():232:232 -> a
-    121:121:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):456 -> a
-    122:124:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):457:459 -> a
-    125:128:void endLocals(com.android.tools.r8.ir.conversion.IRBuilder):605:608 -> a
-    125:128:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):478 -> a
-    129:141:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):461:473 -> a
-    142:142:void build(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.conversion.IRBuilder):497:497 -> a
-    142:142:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):481 -> a
-    143:149:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):483:489 -> a
-    150:153:void startLocals(com.android.tools.r8.ir.conversion.IRBuilder):614:617 -> a
-    150:153:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):492 -> a
-    154:155:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):501:502 -> a
-    156:160:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):108:112 -> a
-    156:160:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):502 -> a
-    161:176:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):116:131 -> a
-    161:176:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):112 -> a
-    161:176:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):502 -> a
-    177:177:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):504:504 -> a
-    178:178:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):117:117 -> a
-    178:178:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):112 -> a
-    178:178:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):502 -> a
-    179:180:int getLabelOffset(com.android.tools.r8.cf.code.CfLabel):513:514 -> a
-    181:191:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):518:528 -> a
-    192:192:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):527:527 -> a
-    193:216:com.android.tools.r8.graph.DexType convertUninitialized(com.android.tools.r8.cf.code.CfFrame$FrameType):532:555 -> a
-    217:217:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int):569:569 -> a
-    218:223:com.android.tools.r8.ir.code.Position getCanonicalPosition(com.android.tools.r8.ir.code.Position):679:684 -> a
-    224:224:com.android.tools.r8.ir.code.Position getCanonicalPosition(com.android.tools.r8.ir.code.Position):679:679 -> a
+    1:5:boolean canThrowHelper(com.android.tools.r8.cf.code.CfInstruction):260:264 -> a
+    6:9:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):269:272 -> a
+    10:36:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):271:297 -> a
+    37:37:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):304:304 -> a
+    38:38:boolean com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.validFor(int):73:73 -> a
+    38:38:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):304 -> a
+    39:41:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):305:307 -> a
+    42:45:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):306:309 -> a
+    46:49:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):350:353 -> a
+    50:50:boolean isStatic():382:382 -> a
+    50:50:void buildArgumentInstructions(com.android.tools.r8.ir.conversion.IRBuilder):362 -> a
+    50:50:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):354 -> a
+    51:66:void buildArgumentInstructions(com.android.tools.r8.ir.conversion.IRBuilder):363:378 -> a
+    51:66:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):354 -> a
+    67:69:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):355:357 -> a
+    70:97:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):397:424 -> a
+    98:119:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):433:454 -> a
+    120:120:int instructionCount():232:232 -> a
+    120:120:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):456 -> a
+    121:123:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):457:459 -> a
+    124:127:void endLocals(com.android.tools.r8.ir.conversion.IRBuilder):605:608 -> a
+    124:127:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):478 -> a
+    128:140:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):461:473 -> a
+    141:141:void build(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.conversion.IRBuilder):497:497 -> a
+    141:141:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):481 -> a
+    142:148:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):483:489 -> a
+    149:152:void startLocals(com.android.tools.r8.ir.conversion.IRBuilder):614:617 -> a
+    149:152:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):492 -> a
+    153:154:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):501:502 -> a
+    155:159:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):108:112 -> a
+    155:159:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):502 -> a
+    160:175:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):116:131 -> a
+    160:175:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):112 -> a
+    160:175:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):502 -> a
+    176:176:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):504:504 -> a
+    177:177:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):117:117 -> a
+    177:177:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):112 -> a
+    177:177:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):502 -> a
+    178:179:int getLabelOffset(com.android.tools.r8.cf.code.CfLabel):513:514 -> a
+    180:190:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):518:528 -> a
+    191:191:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):527:527 -> a
+    192:215:com.android.tools.r8.graph.DexType convertUninitialized(com.android.tools.r8.cf.code.CfFrame$FrameType):532:555 -> a
+    216:216:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int):569:569 -> a
+    217:217:boolean verifyCurrentInstructionCanThrow():647:647 -> a
+    218:231:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):657:670 -> a
+    232:237:com.android.tools.r8.ir.code.Position getCanonicalPosition(com.android.tools.r8.ir.code.Position):679:684 -> a
+    238:238:com.android.tools.r8.ir.code.Position getCanonicalPosition(com.android.tools.r8.ir.code.Position):679:679 -> a
     void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder) -> b
-    int instructionOffset(int) -> b
+    int getMoveExceptionRegister(int) -> b
     void setUp() -> b
     1:2:boolean isControlFlow(com.android.tools.r8.cf.code.CfInstruction):623:624 -> b
-    1:1:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):579:579 -> c
-    2:2:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):574:574 -> c
-    2:2:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):580 -> c
-    3:5:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):582:584 -> c
-    6:8:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):631:633 -> c
-    9:14:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):632:637 -> c
-    15:15:boolean verifyCurrentInstructionCanThrow():647:647 -> c
-    1:14:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):657:670 -> d
-    15:15:com.android.tools.r8.ir.code.Position getCurrentPosition():675:675 -> d
+    int instructionOffset(int) -> c
+    1:1:int instructionCount():232:232 -> c
+    2:4:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):631:633 -> c
+    5:10:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):632:637 -> c
+    int instructionIndex(int) -> d
+    1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():675:675 -> d
+    boolean verifyRegister(int) -> e
     1:1:int getCurrentInstructionIndex():509:509 -> e
-    2:2:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):574:574 -> e
-    boolean verifyRegister(int) -> f
-    1:1:boolean localsChanged():601:601 -> f
-    int instructionIndex(int) -> g
-    1:9:void setLocalVariableLists():588:596 -> g
-    10:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps.emptyMap():198:198 -> g
-    10:10:void setLocalVariableLists():597 -> g
-    11:11:void setLocalVariableLists():597:597 -> g
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):579:579 -> f
+    2:2:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):574:574 -> f
+    2:2:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):580 -> f
+    3:5:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):582:584 -> f
+    6:6:boolean localsChanged():601:601 -> f
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):574:574 -> g
+    2:10:void setLocalVariableLists():588:596 -> g
+    11:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps.emptyMap():198:198 -> g
+    11:11:void setLocalVariableLists():597 -> g
+    12:12:void setLocalVariableLists():597:597 -> g
     1:1:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList getLocalVariables(int):313:313 -> h
     2:2:boolean com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList.validFor(int):163:163 -> h
     2:2:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList getLocalVariables(int):313 -> h
@@ -21583,345 +21105,337 @@
     java.util.List switchPayloadInfos -> d
     com.android.tools.r8.ir.regalloc.RegisterAllocator registerAllocator -> b
     java.util.Set ifsNeedingRewrite -> f
-    1:1:void <clinit>():82:82 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):124:125 -> <init>
-    3:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions):128:128 -> <init>
-    4:43:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions):94:133 -> <init>
-    1:1:com.android.tools.r8.ir.conversion.DexBuilder$Info access$000(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):82:82 -> a
-    2:2:boolean access$202(com.android.tools.r8.ir.conversion.DexBuilder,boolean):82:82 -> a
-    3:6:boolean identicalInstructionsAfterBuildingDexCode(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):141:144 -> a
-    7:9:com.android.tools.r8.ir.conversion.DexBuilder$Info buildInfoForComparison(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):149:151 -> a
-    10:38:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):339:367 -> a
-    39:41:boolean isTrivialFallthroughTarget(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):329:331 -> a
-    39:41:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):368 -> a
-    42:104:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):370:432 -> a
-    105:106:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):589:590 -> a
-    105:106:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):433 -> a
-    107:109:boolean isNonMaterializingConstNumber(com.android.tools.r8.ir.code.Instruction):597:599 -> a
-    107:109:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):591 -> a
-    107:109:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):433 -> a
-    110:110:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):592:592 -> a
-    110:110:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):433 -> a
-    111:155:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):435:479 -> a
+    1:1:void <clinit>():83:83 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):125:127 -> <init>
+    4:4:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions):130:130 -> <init>
+    5:45:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions):95:135 -> <init>
+    1:1:com.android.tools.r8.ir.conversion.DexBuilder$Info access$000(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):83:83 -> a
+    2:2:boolean access$202(com.android.tools.r8.ir.conversion.DexBuilder,boolean):83:83 -> a
+    3:6:boolean identicalInstructionsAfterBuildingDexCode(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):143:146 -> a
+    7:9:com.android.tools.r8.ir.conversion.DexBuilder$Info buildInfoForComparison(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):151:153 -> a
+    10:38:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):315:343 -> a
+    39:41:boolean isTrivialFallthroughTarget(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):305:307 -> a
+    39:41:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):344 -> a
+    42:104:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):346:408 -> a
+    105:106:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):565:566 -> a
+    105:106:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):409 -> a
+    107:109:boolean isNonMaterializingConstNumber(com.android.tools.r8.ir.code.Instruction):573:575 -> a
+    107:109:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):567 -> a
+    107:109:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):409 -> a
+    110:110:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):568:568 -> a
+    110:110:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):409 -> a
+    111:155:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):411:455 -> a
     156:156:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):401:401 -> a
-    156:156:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):480 -> a
-    157:170:void rewriteIfs():496:509 -> a
-    157:170:com.android.tools.r8.graph.DexCode build():183 -> a
-    171:179:void reset():159:167 -> a
-    171:179:com.android.tools.r8.graph.DexCode build():186 -> a
-    180:218:com.android.tools.r8.graph.DexCode build():190:228 -> a
+    156:156:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):456 -> a
+    157:170:void rewriteIfs():472:485 -> a
+    157:170:com.android.tools.r8.graph.DexCode build():185 -> a
+    171:179:void reset():161:169 -> a
+    171:179:com.android.tools.r8.graph.DexCode build():188 -> a
+    180:218:com.android.tools.r8.graph.DexCode build():192:230 -> a
     219:219:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    219:219:com.android.tools.r8.graph.DexCode build():229 -> a
-    220:231:com.android.tools.r8.graph.DexCode build():230:241 -> a
-    232:232:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():926:926 -> a
-    232:232:com.android.tools.r8.graph.DexCode build():241 -> a
-    233:251:com.android.tools.r8.graph.DexCode build():242:260 -> a
-    252:252:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    252:252:com.android.tools.r8.graph.DexCode build():261 -> a
-    253:254:com.android.tools.r8.graph.DexCode build():264:265 -> a
-    255:255:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    255:255:com.android.tools.r8.graph.DexCode build():266 -> a
-    256:256:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    256:256:com.android.tools.r8.graph.DexCode build():268 -> a
-    257:257:com.android.tools.r8.graph.DexCode build():269:269 -> a
-    258:258:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    258:258:com.android.tools.r8.graph.DexCode build():270 -> a
-    259:269:com.android.tools.r8.graph.DexCode build():273:283 -> a
-    270:270:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    270:270:com.android.tools.r8.graph.DexCode build():284 -> a
-    271:271:com.android.tools.r8.graph.DexCode build():285:285 -> a
-    272:283:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):717:728 -> a
-    272:283:com.android.tools.r8.graph.DexCode build():288 -> a
-    284:284:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):672:672 -> a
-    284:284:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):728 -> a
-    284:284:com.android.tools.r8.graph.DexCode build():288 -> a
-    285:291:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):728:734 -> a
-    285:291:com.android.tools.r8.graph.DexCode build():288 -> a
-    292:292:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):672:672 -> a
-    292:292:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):734 -> a
-    292:292:com.android.tools.r8.graph.DexCode build():288 -> a
-    293:295:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):734:736 -> a
-    293:295:com.android.tools.r8.graph.DexCode build():288 -> a
-    296:296:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    296:296:com.android.tools.r8.graph.DexCode build():289 -> a
-    297:305:com.android.tools.r8.graph.DexCode build():290:298 -> a
-    306:306:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    306:306:com.android.tools.r8.graph.DexCode build():299 -> a
-    307:310:com.android.tools.r8.graph.DexCode build():300:303 -> a
-    311:311:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    311:311:com.android.tools.r8.graph.DexCode build():304 -> a
-    312:312:com.android.tools.r8.graph.DexCode build():305:305 -> a
-    313:313:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    313:313:com.android.tools.r8.graph.DexCode build():305 -> a
-    314:314:com.android.tools.r8.graph.DexCode build():305:305 -> a
-    315:315:int com.android.tools.r8.code.FillArrayDataPayload.getSize():75:75 -> a
-    315:315:com.android.tools.r8.graph.DexCode build():306 -> a
-    316:316:com.android.tools.r8.graph.DexCode build():307:307 -> a
-    317:319:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():743:745 -> a
-    317:319:com.android.tools.r8.graph.DexCode build():311 -> a
-    320:325:com.android.tools.r8.graph.DexCode$Try[] getDexTryItems(java.util.List,java.util.Map):846:851 -> a
-    320:325:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():747 -> a
-    320:325:com.android.tools.r8.graph.DexCode build():311 -> a
-    326:326:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():748:748 -> a
-    326:326:com.android.tools.r8.graph.DexCode build():311 -> a
-    327:344:com.android.tools.r8.graph.DexCode$TryHandler[] getDexTryHandlers(java.util.Map):857:874 -> a
-    327:344:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():748 -> a
-    327:344:com.android.tools.r8.graph.DexCode build():311 -> a
-    345:353:com.android.tools.r8.graph.DexCode build():314:322 -> a
-    354:354:int allocatedRegister(com.android.tools.r8.ir.code.Value,int):525:525 -> a
-    355:358:void addGoto(com.android.tools.r8.ir.code.Goto):535:538 -> a
-    359:373:boolean needsNopBetweenMoveAndInstanceOf(com.android.tools.r8.code.InstanceOf):543:557 -> a
-    359:373:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.code.InstanceOf):567 -> a
-    374:376:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.code.InstanceOf):568:570 -> a
-    377:378:void addIf(com.android.tools.r8.ir.code.If):575:576 -> a
-    379:379:void addMove(com.android.tools.r8.ir.code.Move):580:580 -> a
-    380:380:void addNop(com.android.tools.r8.ir.code.Instruction):603:603 -> a
-    381:384:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):613:616 -> a
-    385:388:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):614:617 -> a
-    389:390:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction[]):621:622 -> a
-    391:393:void addSwitch(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.code.Format31t):626:628 -> a
-    394:395:void addFillArrayData(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.code.FillArrayData):632:633 -> a
-    396:397:void addArgument(com.android.tools.r8.ir.code.Argument):637:638 -> a
-    398:402:void addReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.code.Instruction):642:646 -> a
-    403:403:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):651:651 -> a
-    404:405:void setSingleInfo(com.android.tools.r8.ir.conversion.DexBuilder$Info):683:684 -> a
-    404:405:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):653 -> a
-    406:408:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):656:658 -> a
-    409:409:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):672:672 -> a
-    409:409:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):658 -> a
-    410:414:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):658:662 -> a
-    415:418:void setInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):676:679 -> a
-    415:418:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):663 -> a
-    419:419:int instructionNumberToIndex(int):667:667 -> a
-    420:420:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):672:672 -> a
-    420:420:com.android.tools.r8.ir.conversion.DexBuilder$Info access$100(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.Instruction):82 -> a
-    421:432:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):688:699 -> a
-    433:433:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):672:672 -> a
-    433:433:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):699 -> a
-    434:434:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):699:699 -> a
-    435:440:com.android.tools.r8.ir.code.BasicBlock computeNextBlock(com.android.tools.r8.ir.code.BasicBlock):707:712 -> a
-    435:440:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):700 -> a
-    441:444:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):700:703 -> a
-    445:501:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):754:810 -> a
-    502:502:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):672:672 -> a
-    502:502:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):811 -> a
-    503:520:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):811:828 -> a
-    1:1:void needsIfRewriting(com.android.tools.r8.ir.code.BasicBlock):515:515 -> b
-    1:1:void access$300(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):82 -> b
-    2:3:void requestOutgoingRegisters(int):519:520 -> b
-    4:4:int argumentOrAllocateRegister(com.android.tools.r8.ir.code.Value,int):531:531 -> b
-    5:5:void addNothing(com.android.tools.r8.ir.code.Instruction):584:584 -> b
-    6:8:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):834:836 -> b
-    9:9:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):672:672 -> b
-    9:9:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):837 -> b
-    10:13:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):838:841 -> b
-    14:14:com.android.tools.r8.utils.InternalOptions getOptions():880:880 -> b
-    1:1:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):672:672 -> c
-    2:2:com.android.tools.r8.ir.regalloc.RegisterAllocator getRegisterAllocator():884:884 -> c
-    1:1:boolean isBuildingForComparison():155:155 -> d
+    219:219:com.android.tools.r8.graph.DexCode build():231 -> a
+    220:230:com.android.tools.r8.graph.DexCode build():232:242 -> a
+    231:231:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():896:896 -> a
+    231:231:com.android.tools.r8.graph.DexCode build():242 -> a
+    232:238:com.android.tools.r8.graph.DexCode build():243:249 -> a
+    239:239:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
+    239:239:com.android.tools.r8.graph.DexCode build():250 -> a
+    240:247:com.android.tools.r8.graph.DexCode build():252:259 -> a
+    248:248:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
+    248:248:com.android.tools.r8.graph.DexCode build():260 -> a
+    249:249:com.android.tools.r8.graph.DexCode build():261:261 -> a
+    250:261:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):693:704 -> a
+    250:261:com.android.tools.r8.graph.DexCode build():264 -> a
+    262:262:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):648:648 -> a
+    262:262:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):704 -> a
+    262:262:com.android.tools.r8.graph.DexCode build():264 -> a
+    263:269:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):704:710 -> a
+    263:269:com.android.tools.r8.graph.DexCode build():264 -> a
+    270:270:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):648:648 -> a
+    270:270:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):710 -> a
+    270:270:com.android.tools.r8.graph.DexCode build():264 -> a
+    271:273:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):710:712 -> a
+    271:273:com.android.tools.r8.graph.DexCode build():264 -> a
+    274:274:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
+    274:274:com.android.tools.r8.graph.DexCode build():265 -> a
+    275:283:com.android.tools.r8.graph.DexCode build():266:274 -> a
+    284:284:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
+    284:284:com.android.tools.r8.graph.DexCode build():275 -> a
+    285:288:com.android.tools.r8.graph.DexCode build():276:279 -> a
+    289:289:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
+    289:289:com.android.tools.r8.graph.DexCode build():280 -> a
+    290:290:com.android.tools.r8.graph.DexCode build():281:281 -> a
+    291:291:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    291:291:com.android.tools.r8.graph.DexCode build():281 -> a
+    292:292:com.android.tools.r8.graph.DexCode build():281:281 -> a
+    293:293:int com.android.tools.r8.code.FillArrayDataPayload.getSize():75:75 -> a
+    293:293:com.android.tools.r8.graph.DexCode build():282 -> a
+    294:294:com.android.tools.r8.graph.DexCode build():283:283 -> a
+    295:297:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():719:721 -> a
+    295:297:com.android.tools.r8.graph.DexCode build():287 -> a
+    298:303:com.android.tools.r8.graph.DexCode$Try[] getDexTryItems(java.util.List,java.util.Map):822:827 -> a
+    298:303:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():723 -> a
+    298:303:com.android.tools.r8.graph.DexCode build():287 -> a
+    304:304:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():724:724 -> a
+    304:304:com.android.tools.r8.graph.DexCode build():287 -> a
+    305:322:com.android.tools.r8.graph.DexCode$TryHandler[] getDexTryHandlers(java.util.Map):833:850 -> a
+    305:322:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():724 -> a
+    305:322:com.android.tools.r8.graph.DexCode build():287 -> a
+    323:331:com.android.tools.r8.graph.DexCode build():290:298 -> a
+    332:332:int allocatedRegister(com.android.tools.r8.ir.code.Value,int):501:501 -> a
+    333:336:void addGoto(com.android.tools.r8.ir.code.Goto):511:514 -> a
+    337:351:boolean needsNopBetweenMoveAndInstanceOf(com.android.tools.r8.code.InstanceOf):519:533 -> a
+    337:351:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.code.InstanceOf):543 -> a
+    352:354:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.code.InstanceOf):544:546 -> a
+    355:356:void addIf(com.android.tools.r8.ir.code.If):551:552 -> a
+    357:357:void addMove(com.android.tools.r8.ir.code.Move):556:556 -> a
+    358:358:void addNop(com.android.tools.r8.ir.code.Instruction):579:579 -> a
+    359:362:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):589:592 -> a
+    363:366:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):590:593 -> a
+    367:368:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction[]):597:598 -> a
+    369:371:void addSwitch(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.code.Format31t):602:604 -> a
+    372:373:void addFillArrayData(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.code.FillArrayData):608:609 -> a
+    374:375:void addArgument(com.android.tools.r8.ir.code.Argument):613:614 -> a
+    376:380:void addReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.code.Instruction):618:622 -> a
+    381:381:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):627:627 -> a
+    382:383:void setSingleInfo(com.android.tools.r8.ir.conversion.DexBuilder$Info):659:660 -> a
+    382:383:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):629 -> a
+    384:386:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):632:634 -> a
+    387:387:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):648:648 -> a
+    387:387:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):634 -> a
+    388:392:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):634:638 -> a
+    393:396:void setInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):652:655 -> a
+    393:396:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):639 -> a
+    397:397:int instructionNumberToIndex(int):643:643 -> a
+    398:398:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):648:648 -> a
+    398:398:com.android.tools.r8.ir.conversion.DexBuilder$Info access$100(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.Instruction):83 -> a
+    399:410:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):664:675 -> a
+    411:411:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):648:648 -> a
+    411:411:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):675 -> a
+    412:412:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):675:675 -> a
+    413:418:com.android.tools.r8.ir.code.BasicBlock computeNextBlock(com.android.tools.r8.ir.code.BasicBlock):683:688 -> a
+    413:418:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):676 -> a
+    419:422:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):676:679 -> a
+    423:479:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):730:786 -> a
+    480:480:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):648:648 -> a
+    480:480:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):787 -> a
+    481:498:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):787:804 -> a
+    1:1:void needsIfRewriting(com.android.tools.r8.ir.code.BasicBlock):491:491 -> b
+    1:1:void access$300(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):83 -> b
+    2:3:void requestOutgoingRegisters(int):495:496 -> b
+    4:4:int argumentOrAllocateRegister(com.android.tools.r8.ir.code.Value,int):507:507 -> b
+    5:5:void addNothing(com.android.tools.r8.ir.code.Instruction):560:560 -> b
+    6:8:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):810:812 -> b
+    9:9:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):648:648 -> b
+    9:9:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):813 -> b
+    10:13:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):814:817 -> b
+    14:14:com.android.tools.r8.utils.InternalOptions getOptions():856:856 -> b
+    1:1:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):648:648 -> c
+    2:2:com.android.tools.r8.ir.regalloc.RegisterAllocator getRegisterAllocator():860:860 -> c
+    1:1:boolean isBuildingForComparison():157:157 -> d
 com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> a.a.a.a.h.c.C:
-    1:1:void <init>(com.android.tools.r8.ir.code.Instruction):1053:1053 -> <init>
+    1:1:void <init>(com.android.tools.r8.ir.code.Instruction):1029:1029 -> <init>
     void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List) -> a
     int computeSize(com.android.tools.r8.ir.conversion.DexBuilder) -> a
-    1:1:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1082:1082 -> a
+    1:1:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1058:1058 -> a
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
 com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> a.a.a.a.h.c.D:
     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):1528:1530 -> <init>
+    1:3:void <init>(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.code.FillArrayData):1504:1506 -> <init>
 com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> a.a.a.a.h.c.E:
     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):960:961 -> <init>
-    1:1:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):981:981 -> a
+    1:2:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):936:937 -> <init>
+    1:1:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):957:957 -> a
     2:2:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    2:2:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):981 -> a
-    3:3:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):982:982 -> a
-    4:4:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):987:987 -> a
-    5:6:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):992:993 -> a
-    1:1:int getSize():966:966 -> d
-    1:1:int maxSize():976:976 -> e
-    1:1:int minSize():971:971 -> f
+    2:2:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):957 -> a
+    3:3:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):958:958 -> a
+    4:4:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):963:963 -> a
+    5:6:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):968:969 -> a
+    1:1:int getSize():942:942 -> d
+    1:1:int maxSize():952:952 -> e
+    1:1:int minSize():947:947 -> f
 com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> a.a.a.a.h.c.F:
     boolean $assertionsDisabled -> f
     int size -> e
-    1:1:void <clinit>():1086:1086 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Goto):1091:1091 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Goto):1088:1088 -> <init>
-    1:1:com.android.tools.r8.ir.code.Goto getJump():1095:1095 -> a
-    1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1159 -> a
-    2:13:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1160:1171 -> a
+    1:1:void <clinit>():1062:1062 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Goto):1067:1067 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Goto):1064:1064 -> <init>
+    1:1:com.android.tools.r8.ir.code.Goto getJump():1071:1071 -> a
+    1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1135 -> a
+    2:13:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1136:1147 -> a
     14:14:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    14:14:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1171 -> a
-    15:24:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1172:1181 -> a
+    14:14:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1147 -> a
+    15:24:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1148:1157 -> a
     25:25:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    25:25:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1181 -> a
-    26:48:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1182:1204 -> a
-    49:53:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1193:1197 -> a
-    54:72:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1188:1206 -> a
+    25:25:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1157 -> a
+    26:48:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1158:1180 -> a
+    49:53:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1169:1173 -> a
+    54:72:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1164:1182 -> a
     73:73:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    73:73:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1206 -> a
-    74:74:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1207:1207 -> a
-    75:75:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1118:1118 -> a
-    76:76:com.android.tools.r8.ir.code.Goto getJump():1095:1095 -> a
-    76:76:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1119 -> a
-    77:111:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1120:1154 -> a
-    112:112:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1213:1213 -> a
-    1:2:int getSize():1100:1101 -> d
-    1:1:int maxSize():1112:1112 -> e
-    1:1:int minSize():1106:1106 -> f
+    73:73:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1182 -> a
+    74:74:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1183:1183 -> a
+    75:75:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1094:1094 -> a
+    76:76:com.android.tools.r8.ir.code.Goto getJump():1071:1071 -> a
+    76:76:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1095 -> a
+    77:111:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1096:1130 -> a
+    112:112:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1189:1189 -> a
+    1:2:int getSize():1076:1077 -> d
+    1:1:int maxSize():1088:1088 -> e
+    1:1:int minSize():1082:1082 -> f
 com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> a.a.a.a.h.c.G:
     boolean $assertionsDisabled -> f
     int size -> e
-    1:1:void <clinit>():1217:1217 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.If):1222:1222 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.If):1219:1219 -> <init>
-    1:1:com.android.tools.r8.ir.code.Instruction getIR():1217:1217 -> a
-    2:2:void setMaxOffset(int):1217:1217 -> a
-    3:4:int getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1226:1227 -> a
-    5:5:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1248:1248 -> a
-    5:5:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331 -> a
-    6:6:int getMaxOffset():1217:1217 -> a
-    6:6:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1249 -> a
-    6:6:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331 -> a
-    7:7:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1250:1250 -> a
-    7:7:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331 -> a
-    8:8:int getOffset():1217:1217 -> a
-    8:8:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1252 -> a
-    8:8:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331 -> a
-    9:9:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1252:1252 -> a
-    9:9:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331 -> a
-    10:10:int getOffset():1217:1217 -> a
-    10:10:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1257 -> a
-    10:10:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331 -> a
-    11:11:int getOffset():1217:1217 -> a
-    11:11:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1258 -> a
-    11:11:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331 -> a
-    12:15:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1332:1335 -> a
-    16:52:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1263:1299 -> a
-    53:53:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1296:1296 -> a
-    54:54:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1293:1293 -> a
-    55:55:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1290:1290 -> a
-    56:56:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1287:1287 -> a
-    57:94:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1284:1321 -> a
-    95:95:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1318:1318 -> a
-    96:96:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1315:1315 -> a
-    97:97:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1312:1312 -> a
-    98:98:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1309:1309 -> a
-    99:99:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1306:1306 -> a
-    100:100:int getOffset():1217:1217 -> a
-    100:100:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1325 -> a
+    1:1:void <clinit>():1193:1193 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.If):1198:1198 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.If):1195:1195 -> <init>
+    1:1:com.android.tools.r8.ir.code.Instruction getIR():1193:1193 -> a
+    2:2:void setMaxOffset(int):1193:1193 -> a
+    3:4:int getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1202:1203 -> a
+    5:5:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1224:1224 -> a
+    5:5:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    6:6:int getMaxOffset():1193:1193 -> a
+    6:6:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1225 -> a
+    6:6:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    7:7:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1226:1226 -> a
+    7:7:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    8:8:int getOffset():1193:1193 -> a
+    8:8:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1228 -> a
+    8:8:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    9:9:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1228:1228 -> a
+    9:9:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    10:10:int getOffset():1193:1193 -> a
+    10:10:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1233 -> a
+    10:10:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    11:11:int getOffset():1193:1193 -> a
+    11:11:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1234 -> a
+    11:11:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    12:15:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1308:1311 -> a
+    16:52:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1239:1275 -> a
+    53:53:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1272:1272 -> a
+    54:54:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1269:1269 -> a
+    55:55:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1266:1266 -> a
+    56:56:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1263:1263 -> a
+    57:94:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1260:1297 -> a
+    95:95:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1294:1294 -> a
+    96:96:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1291:1291 -> a
+    97:97:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1288:1288 -> a
+    98:98:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1285:1285 -> a
+    99:99:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1282:1282 -> a
+    100:100:int getOffset():1193:1193 -> a
+    100:100:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1301 -> a
     101:101:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    101:101:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1325 -> a
-    102:102:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1326:1326 -> a
-    103:108:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1355:1360 -> a
-    1:1:void com.android.tools.r8.ir.conversion.DexBuilder$Info.setMinOffset(int):934:934 -> b
-    1:1:void setMinOffset(int):1217 -> b
-    2:2:int getMaxOffset():1217:1217 -> b
-    3:5:boolean branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1242:1244 -> b
-    1:1:int getOffset():1217:1217 -> c
-    2:2:void setOffset(int):1217:1217 -> c
-    3:6:int[] getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1231:1234 -> c
-    1:1:int getSize():1350:1350 -> d
+    101:101:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1301 -> a
+    102:102:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1302:1302 -> a
+    103:108:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1331:1336 -> a
+    1:1:void com.android.tools.r8.ir.conversion.DexBuilder$Info.setMinOffset(int):910:910 -> b
+    1:1:void setMinOffset(int):1193 -> b
+    2:2:int getMaxOffset():1193:1193 -> b
+    3:5:boolean branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1218:1220 -> b
+    1:1:int getOffset():1193:1193 -> c
+    2:2:void setOffset(int):1193:1193 -> c
+    3:6:int[] getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1207:1210 -> c
+    1:1:int getSize():1326:1326 -> d
     int maxSize() -> e
     int minSize() -> f
-    1:1:com.android.tools.r8.ir.code.Instruction getIR():1217:1217 -> g
-    1:1:com.android.tools.r8.ir.code.If getBranch():1238 -> g
-    2:2:com.android.tools.r8.ir.code.If getBranch():1238:1238 -> g
+    1:1:com.android.tools.r8.ir.code.Instruction getIR():1193:1193 -> g
+    1:1:com.android.tools.r8.ir.code.If getBranch():1214 -> g
+    2:2:com.android.tools.r8.ir.code.If getBranch():1214:1214 -> g
 com.android.tools.r8.ir.conversion.DexBuilder$Info -> a.a.a.a.h.c.H:
     com.android.tools.r8.ir.code.Instruction ir -> a
     int offset -> b
     int maxOffset -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():888:888 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Instruction):897:897 -> <init>
-    2:9:void <init>(com.android.tools.r8.ir.code.Instruction):892:899 -> <init>
+    1:1:void <clinit>():864:864 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Instruction):873:873 -> <init>
+    2:9:void <init>(com.android.tools.r8.ir.code.Instruction):868:875 -> <init>
     void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List) -> a
     int computeSize(com.android.tools.r8.ir.conversion.DexBuilder) -> a
     boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder) -> a
-    1:2:void setMaxOffset(int):944:945 -> a
-    3:3:com.android.tools.r8.ir.code.Instruction getIR():949:949 -> a
-    1:1:void setMinOffset(int):934:934 -> b
-    2:3:int getMaxOffset():939:940 -> b
-    1:2:int getOffset():919:920 -> c
-    3:4:void setOffset(int):924:925 -> c
+    1:2:void setMaxOffset(int):920:921 -> a
+    3:3:com.android.tools.r8.ir.code.Instruction getIR():925:925 -> a
+    1:1:void setMinOffset(int):910:910 -> b
+    2:3:int getMaxOffset():915:916 -> b
+    1:2:int getOffset():895:896 -> c
+    3:4:void setOffset(int):900:901 -> c
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
 com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> a.a.a.a.h.c.I:
     boolean $assertionsDisabled -> f
     int size -> e
-    1:1:void <clinit>():1364:1364 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Move):1369:1369 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Move):1366:1366 -> <init>
-    1:1:com.android.tools.r8.ir.code.Instruction getIR():1364:1364 -> a
-    2:2:void setMaxOffset(int):1364:1364 -> a
-    3:3:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1377:1377 -> a
-    3:3:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1396 -> a
-    4:4:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1381:1381 -> a
-    4:4:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1397 -> a
-    5:13:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1399:1407 -> a
-    14:17:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1386:1389 -> a
-    18:18:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1377:1377 -> a
-    18:18:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1390 -> a
-    19:19:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1377:1377 -> a
-    19:19:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1390 -> a
-    20:20:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1381:1381 -> a
-    20:20:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1391 -> a
-    21:21:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1381:1381 -> a
-    21:21:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1391 -> a
-    22:23:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1412:1413 -> a
-    24:24:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1377:1377 -> a
-    24:24:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1414 -> a
-    25:25:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1381:1381 -> a
-    25:25:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1415 -> a
-    26:65:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1417:1456 -> a
-    66:73:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1434:1441 -> a
-    74:82:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1420:1428 -> a
-    83:83:int getOffset():1364:1364 -> a
-    83:83:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1458 -> a
+    1:1:void <clinit>():1340:1340 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Move):1345:1345 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Move):1342:1342 -> <init>
+    1:1:com.android.tools.r8.ir.code.Instruction getIR():1340:1340 -> a
+    2:2:void setMaxOffset(int):1340:1340 -> a
+    3:3:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1353:1353 -> a
+    3:3:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1372 -> a
+    4:4:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1357:1357 -> a
+    4:4:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1373 -> a
+    5:13:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1375:1383 -> a
+    14:17:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1362:1365 -> a
+    18:18:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1353:1353 -> a
+    18:18:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1366 -> a
+    19:19:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1353:1353 -> a
+    19:19:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1366 -> a
+    20:20:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1357:1357 -> a
+    20:20:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1367 -> a
+    21:21:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1357:1357 -> a
+    21:21:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1367 -> a
+    22:23:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1388:1389 -> a
+    24:24:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1353:1353 -> a
+    24:24:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1390 -> a
+    25:25:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1357:1357 -> a
+    25:25:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1391 -> a
+    26:65:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1393:1432 -> a
+    66:73:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1410:1417 -> a
+    74:82:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1396:1404 -> a
+    83:83:int getOffset():1340:1340 -> a
+    83:83:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1434 -> a
     84:84:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    84:84:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1458 -> a
-    85:85:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1459:1459 -> a
-    86:86:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1430:1430 -> a
-    1:1:void com.android.tools.r8.ir.conversion.DexBuilder$Info.setMinOffset(int):934:934 -> b
-    1:1:void setMinOffset(int):1364 -> b
-    2:2:int getMaxOffset():1364:1364 -> b
-    3:3:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1381:1381 -> b
-    1:1:int getOffset():1364:1364 -> c
-    2:2:void setOffset(int):1364:1364 -> c
-    3:3:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1377:1377 -> c
-    1:2:int getSize():1476:1477 -> d
-    1:1:int maxSize():1470:1470 -> e
-    1:1:int minSize():1464:1464 -> f
-    1:1:com.android.tools.r8.ir.code.Instruction getIR():1364:1364 -> g
-    1:1:com.android.tools.r8.ir.code.Move getMove():1373 -> g
-    2:2:com.android.tools.r8.ir.code.Move getMove():1373:1373 -> g
+    84:84:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1434 -> a
+    85:85:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1435:1435 -> a
+    86:86:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1406:1406 -> a
+    1:1:void com.android.tools.r8.ir.conversion.DexBuilder$Info.setMinOffset(int):910:910 -> b
+    1:1:void setMinOffset(int):1340 -> b
+    2:2:int getMaxOffset():1340:1340 -> b
+    3:3:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1357:1357 -> b
+    1:1:int getOffset():1340:1340 -> c
+    2:2:void setOffset(int):1340:1340 -> c
+    3:3:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1353:1353 -> c
+    1:2:int getSize():1452:1453 -> d
+    1:1:int maxSize():1446:1446 -> e
+    1:1:int minSize():1440:1440 -> f
+    1:1:com.android.tools.r8.ir.code.Instruction getIR():1340:1340 -> g
+    1:1:com.android.tools.r8.ir.code.Move getMove():1349 -> g
+    2:2:com.android.tools.r8.ir.code.Move getMove():1349:1349 -> g
 com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> a.a.a.a.h.c.J:
     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[]):1004:1010 -> <init>
-    1:1:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1015:1015 -> a
-    2:4:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1020:1022 -> a
+    1:7:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction[]):980:986 -> <init>
+    1:1:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):991:991 -> a
+    2:4:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):996:998 -> a
     5:5:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    5:5:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1023 -> a
-    6:6:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1024:1024 -> a
-    7:8:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1045:1046 -> a
-    1:1:int getSize():1040:1040 -> d
-    1:1:int maxSize():1035:1035 -> e
-    1:1:int minSize():1030:1030 -> f
+    5:5:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):999 -> a
+    6:6:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1000:1000 -> a
+    7:8:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1021:1022 -> a
+    1:1:int getSize():1016:1016 -> d
+    1:1:int maxSize():1011:1011 -> e
+    1:1:int minSize():1006:1006 -> f
 com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> a.a.a.a.h.c.K:
     com.android.tools.r8.ir.code.Switch ir -> a
     com.android.tools.r8.code.Format31t dex -> b
-    1:3:void <init>(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.code.Format31t):1517:1519 -> <init>
+    1:3:void <init>(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.code.Format31t):1493:1495 -> <init>
 com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> a.a.a.a.h.c.L:
     com.android.tools.r8.ir.code.CatchHandlers handlers -> a
     int start -> b
     int end -> c
-    1:4:void <init>(com.android.tools.r8.ir.code.CatchHandlers,int,int):1500:1503 -> <init>
-    1:1:int compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1508:1508 -> a
-    1:1:int compareTo(java.lang.Object):1494:1494 -> compareTo
+    1:4:void <init>(com.android.tools.r8.ir.code.CatchHandlers,int,int):1476:1479 -> <init>
+    1:1:int compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1484:1484 -> a
+    1:1:int compareTo(java.lang.Object):1470:1470 -> compareTo
 com.android.tools.r8.ir.conversion.DexSourceCode -> a.a.a.a.h.c.N:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.code.Position currentPosition -> i
@@ -21936,73 +21450,73 @@
     com.android.tools.r8.graph.DexEncodedMethod method -> b
     com.android.tools.r8.ir.conversion.SwitchPayloadResolver switchPayloadResolver -> d
     java.util.List debugEntries -> k
-    1:1:void <clinit>():59:59 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):83:83 -> <init>
-    2:24:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):65:87 -> <init>
+    1:1:void <clinit>():57:57 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):81:81 -> <init>
+    2:24:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):63:85 -> <init>
     25:29:java.util.List com.android.tools.r8.graph.DexDebugInfo.computeEntries(com.android.tools.r8.graph.DexMethod):28:32 -> <init>
-    25:29:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):89 -> <init>
-    30:35:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):89:94 -> <init>
+    25:29:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):87 -> <init>
+    30:35:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):87:92 -> <init>
     void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean) -> a
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int) -> a
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> a
-    1:1:int instructionCount():105:105 -> a
-    2:33:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):141:172 -> a
-    34:43:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):171:180 -> a
-    44:52:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):178:186 -> a
-    53:53:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):203:203 -> a
-    54:62:void updateCurrentCatchHandlers(int,com.android.tools.r8.graph.DexItemFactory):248:256 -> a
-    54:62:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):203 -> a
-    63:73:void updateDebugPosition(int,com.android.tools.r8.ir.conversion.IRBuilder):274:284 -> a
-    63:73:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):204 -> a
-    74:75:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):205:206 -> a
-    76:79:int getMoveExceptionRegister(int):216:219 -> a
-    80:81:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):291:292 -> a
-    82:90:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):291:299 -> a
-    91:91:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):294:294 -> a
-    92:93:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):321:322 -> a
-    94:94:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):321:321 -> a
-    95:98:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):328:331 -> a
-    99:99:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):328:328 -> a
-    100:100:boolean isMoveResult(com.android.tools.r8.code.Instruction):354:354 -> a
-    101:101:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):361:361 -> a
+    1:32:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):139:170 -> a
+    33:42:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):169:178 -> a
+    43:51:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):176:184 -> a
+    52:52:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):201:201 -> a
+    53:61:void updateCurrentCatchHandlers(int,com.android.tools.r8.graph.DexItemFactory):246:254 -> a
+    53:61:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):201 -> a
+    62:72:void updateDebugPosition(int,com.android.tools.r8.ir.conversion.IRBuilder):272:282 -> a
+    62:72:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):202 -> a
+    73:74:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):203:204 -> a
+    75:78:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):224:227 -> a
+    79:79:boolean verifyCurrentInstructionCanThrow():237:237 -> a
+    80:81:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):289:290 -> a
+    82:90:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):289:297 -> a
+    91:91:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):292:292 -> a
+    92:93:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):319:320 -> a
+    94:94:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):319:319 -> a
+    95:98:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):326:329 -> a
+    99:99:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):326:326 -> a
+    100:100:boolean isMoveResult(com.android.tools.r8.code.Instruction):350:350 -> a
+    101:101:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):357:357 -> a
     102:102:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    102:102:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):362 -> a
-    103:133:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):363:393 -> a
-    134:134:java.util.Set getUniqueTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):468:468 -> a
-    134:134:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):393 -> a
-    135:140:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):393:398 -> a
-    141:141:boolean isInvoke(com.android.tools.r8.code.Instruction):335:335 -> a
-    141:141:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):398 -> a
-    142:147:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):398:403 -> a
+    102:102:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):358 -> a
+    103:133:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):359:389 -> a
+    134:134:java.util.Set getUniqueTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):464:464 -> a
+    134:134:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):389 -> a
+    135:140:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):389:394 -> a
+    141:141:boolean isInvoke(com.android.tools.r8.code.Instruction):333:333 -> a
+    141:141:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):394 -> a
+    142:147:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):394:399 -> a
     148:148:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    148:148:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):404 -> a
-    149:163:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):404:418 -> a
-    164:173:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexCode$Try):440:449 -> a
-    174:175:void lambda$getCurrentCatchHandlers$0(java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):446:447 -> a
-    176:184:void forEachTryRange(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):454:462 -> a
-    185:186:java.util.List getTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):472:473 -> a
-    187:187:void lambda$getTryHandlerOffsets$1(java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):473:473 -> a
+    148:148:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):400 -> a
+    149:163:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):400:414 -> a
+    164:173:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexCode$Try):436:445 -> a
+    174:175:void lambda$getCurrentCatchHandlers$0(java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):442:443 -> a
+    176:184:void forEachTryRange(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):450:458 -> a
+    185:186:java.util.List getTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):468:469 -> a
+    187:187:void lambda$getTryHandlerOffsets$1(java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):469:469 -> a
     void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder) -> b
-    1:3:void setUp():126:128 -> b
+    1:3:void setUp():124:126 -> b
     4:4:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> b
-    4:4:void setUp():128 -> b
-    5:10:void setUp():128:133 -> b
-    11:11:int instructionOffset(int):315:315 -> b
-    12:12:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> b
-    12:12:int instructionOffset(int):315 -> b
-    com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int) -> c
-    1:1:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):211:211 -> c
-    2:2:boolean verifyCurrentInstructionCanThrow():239:239 -> c
-    1:2:void clear():304:305 -> clear
-    1:4:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):226:229 -> d
-    5:5:com.android.tools.r8.ir.code.Position getCurrentPosition():234:234 -> d
-    com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> e
-    1:1:boolean verifyRegister(int):100:100 -> f
-    1:1:int instructionIndex(int):310:310 -> g
-    1:3:com.android.tools.r8.graph.DexDebugEntry getDebugEntryAtOffset(int):262:264 -> h
-    1:1:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):431:431 -> i
-    2:2:boolean inTryRange(com.android.tools.r8.graph.DexCode$Try,int):426:426 -> i
-    2:2:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):432 -> i
+    4:4:void setUp():126 -> b
+    5:10:void setUp():126:131 -> b
+    11:14:int getMoveExceptionRegister(int):214:217 -> b
+    1:1:int instructionCount():103:103 -> c
+    2:2:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):209:209 -> c
+    3:3:int instructionOffset(int):313:313 -> c
+    4:4:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> c
+    4:4:int instructionOffset(int):313 -> c
+    1:2:void clear():302:303 -> clear
+    1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():232:232 -> d
+    2:2:int instructionIndex(int):308:308 -> d
+    1:1:boolean verifyRegister(int):98:98 -> e
+    com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int) -> f
+    com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> g
+    1:3:com.android.tools.r8.graph.DexDebugEntry getDebugEntryAtOffset(int):260:262 -> h
+    1:1:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):427:427 -> i
+    2:2:boolean inTryRange(com.android.tools.r8.graph.DexCode$Try,int):422:422 -> i
+    2:2:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):428 -> i
 com.android.tools.r8.ir.conversion.IRBuilder -> a.a.a.a.h.c.V:
     java.util.Queue ssaWorklist -> f
     int currentInstructionOffset -> j
@@ -22287,7 +21801,7 @@
     971:971:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2155:2155 -> a
     971:971:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1953 -> a
     972:976:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1954:1958 -> a
-    977:977:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():520:520 -> a
+    977:977:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():501:501 -> a
     977:977:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1958 -> a
     978:988:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1959:1969 -> a
     989:993:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1967:1971 -> a
@@ -22593,223 +22107,220 @@
     1:1:com.android.tools.r8.ir.code.BasicBlock access$100(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):179:179 -> a
     1:1:int access$400(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):179:179 -> b
 com.android.tools.r8.ir.conversion.IRConverter -> a.a.a.a.h.c.W:
-    com.android.tools.r8.utils.CfgPrinter printer -> n
-    com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer idempotentFunctionCallCanonicalizer -> y
     com.android.tools.r8.ir.conversion.OptimizationFeedback ignoreOptimizationFeedback -> C
     com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> f
-    com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization classInitializerDefaultsOptimization -> d
-    com.android.tools.r8.ir.optimize.ServiceLoaderRewriter serviceLoaderRewriter -> z
-    com.android.tools.r8.ir.desugar.Java8MethodRewriter java8MethodRewriter -> i
-    com.android.tools.r8.ir.desugar.StringConcatRewriter stringConcatRewriter -> e
-    com.android.tools.r8.ir.optimize.MemberValuePropagation memberValuePropagation -> p
-    com.android.tools.r8.utils.InternalOptions options -> m
-    com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> q
-    com.android.tools.r8.ir.desugar.InterfaceMethodRewriter interfaceMethodRewriter -> g
-    com.android.tools.r8.ir.optimize.Inliner inliner -> s
-    com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> t
+    com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet -> b
+    com.android.tools.r8.ir.optimize.classinliner.ClassInliner classInliner -> l
+    com.android.tools.r8.ir.optimize.Outliner outliner -> d
+    com.android.tools.r8.ir.optimize.string.StringOptimizer stringOptimizer -> w
+    com.android.tools.r8.ir.analysis.TypeChecker typeChecker -> y
     java.util.List onWaveDoneActions -> E
-    com.android.tools.r8.utils.Timing timing -> b
-    com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> o
-    com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> l
-    com.android.tools.r8.ir.optimize.classinliner.ClassInliner classInliner -> k
-    com.android.tools.r8.ir.optimize.Outliner outliner -> c
+    com.android.tools.r8.ir.optimize.NonNullTracker nonNullTracker -> s
+    com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter twrCloseResourceRewriter -> i
+    com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization uninstantiatedTypeOptimization -> x
+    com.android.tools.r8.ir.optimize.lambda.LambdaMerger lambdaMerger -> k
+    com.android.tools.r8.ir.optimize.Devirtualizer devirtualizer -> v
+    com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer idempotentFunctionCallCanonicalizer -> z
+    com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> g
+    com.android.tools.r8.utils.CfgPrinter printer -> o
+    com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization classInitializerDefaultsOptimization -> e
+    com.android.tools.r8.ir.desugar.StringConcatRewriter stringConcatRewriter -> f
+    com.android.tools.r8.ir.desugar.Java8MethodRewriter java8MethodRewriter -> j
+    com.android.tools.r8.ir.optimize.MemberValuePropagation memberValuePropagation -> q
     com.android.tools.r8.ir.optimize.DeadCodeRemover deadCodeRemover -> A
-    com.android.tools.r8.ir.optimize.string.StringOptimizer stringOptimizer -> v
-    com.android.tools.r8.ir.analysis.TypeChecker typeChecker -> x
+    com.android.tools.r8.utils.InternalOptions options -> n
+    com.android.tools.r8.ir.desugar.InterfaceMethodRewriter interfaceMethodRewriter -> h
+    com.android.tools.r8.utils.Timing timing -> c
     com.android.tools.r8.graph.DexString highestSortingString -> D
-    com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization uninstantiatedTypeOptimization -> w
+    com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> r
+    com.android.tools.r8.ir.optimize.Inliner inliner -> t
     com.android.tools.r8.ir.conversion.OptimizationFeedbackDelayed delayedOptimizationFeedback -> B
     boolean $assertionsDisabled -> F
-    com.android.tools.r8.ir.optimize.NonNullTracker nonNullTracker -> r
-    com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter twrCloseResourceRewriter -> h
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger lambdaMerger -> j
-    com.android.tools.r8.ir.optimize.Devirtualizer devirtualizer -> u
+    com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> p
+    com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> u
+    com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> m
     1:1:void <clinit>():107:107 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):159:159 -> <init>
-    2:37:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):143:178 -> <init>
-    38:38:boolean enableTwrCloseResourceDesugaring():261:261 -> <init>
-    38:38:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):178 -> <init>
-    39:97:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):179:237 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.shaking.RootSetBuilder$RootSet):160:160 -> <init>
+    2:39:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.shaking.RootSetBuilder$RootSet):143:180 -> <init>
+    40:40:boolean enableTwrCloseResourceDesugaring():264:264 -> <init>
+    40:40:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.shaking.RootSetBuilder$RootSet):180 -> <init>
+    41:100:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.shaking.RootSetBuilder$RootSet):181:240 -> <init>
     boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$16(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    1:4:java.util.Set getDesugaredCallSites():241:244 -> a
-    5:10:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):370:375 -> a
-    11:22:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):373:384 -> a
-    23:29:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):479:485 -> a
-    30:31:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):658:659 -> a
-    30:31:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):486 -> a
-    32:33:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):297:298 -> a
-    32:33:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):487 -> a
-    34:67:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):495:528 -> a
-    68:69:void staticizeClasses(com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.concurrent.ExecutorService):291:292 -> a
-    68:69:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):529 -> a
-    70:73:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):533:536 -> a
-    74:76:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):283:285 -> a
-    74:76:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):537 -> a
-    77:78:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):539:540 -> a
-    79:80:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):307:308 -> a
-    79:80:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):540 -> a
-    81:81:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):542:542 -> a
-    82:83:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):316:317 -> a
-    82:83:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):543 -> a
-    84:85:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):323:324 -> a
-    84:85:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):544 -> a
-    86:92:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):358:364 -> a
-    86:92:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):545 -> a
-    93:94:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):389:390 -> a
-    93:94:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):365 -> a
-    93:94:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):545 -> a
-    95:102:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithout(com.android.tools.r8.graph.DexType):100:107 -> a
-    95:102:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):391 -> a
-    95:102:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):365 -> a
-    95:102:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):545 -> a
-    103:103:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):391:391 -> a
-    103:103:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):365 -> a
-    103:103:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):545 -> a
-    104:104:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):547:547 -> a
-    105:106:void finalizeLambdaMerging(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):669:670 -> a
-    105:106:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):548 -> a
-    107:117:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):550:560 -> a
-    118:123:com.android.tools.r8.graph.DexType computeOutlineClassType():712:717 -> a
-    118:123:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):560 -> a
-    124:158:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):560:594 -> a
-    159:166:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):588:595 -> a
-    167:167:void lambda$optimize$5(com.android.tools.r8.ir.conversion.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.CallGraph,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):509:509 -> a
-    168:169:void lambda$optimize$6(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):557:558 -> a
-    170:176:void addWaveDoneAction(com.android.tools.r8.utils.Action):609:615 -> a
-    177:177:void addWaveDoneAction(com.android.tools.r8.utils.Action):613:613 -> a
-    178:178:void addWaveDoneAction(com.android.tools.r8.utils.Action):610:610 -> a
-    179:179:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):623:623 -> a
-    180:185:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):633:638 -> a
-    186:203:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):637:654 -> a
-    204:214:java.lang.Object lambda$forEachSelectedOutliningMethod$10(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):640:650 -> a
-    215:215:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):680:680 -> a
-    216:219:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):724:727 -> a
-    220:225:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):733:738 -> a
-    226:231:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):742:747 -> a
-    232:232:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():21:21 -> a
-    232:232:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):748 -> a
-    233:233:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):748:748 -> a
-    234:234:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):744:744 -> a
-    235:235:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$11(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):761:761 -> a
-    236:236:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():21:21 -> a
-    236:236:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$11(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):765 -> a
-    237:237:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$11(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):765:765 -> a
-    238:238:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$11(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):761:761 -> a
-    239:240:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):783:784 -> a
-    241:246:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):546:551 -> a
-    241:246:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):784 -> a
-    247:250:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):786:789 -> a
-    251:251:com.android.tools.r8.ir.optimize.InliningOracle lambda$rewriteCode$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):1016:1016 -> a
-    252:257:void computeMayHaveSideEffects(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1185:1190 -> a
-    258:266:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):1205:1213 -> a
-    258:266:void computeMayHaveSideEffects(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1191 -> a
-    267:272:void computeMayHaveSideEffects(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1192:1197 -> a
-    273:273:boolean lambda$computeMayHaveSideEffects$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1195:1195 -> a
-    274:275:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1227:1228 -> a
-    276:280:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1247:1251 -> a
-    276:280:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1229 -> a
-    281:281:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1231:1231 -> a
-    282:282:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1256:1256 -> a
-    282:282:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1232 -> a
-    283:288:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1295:1300 -> a
-    283:288:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1258 -> a
-    283:288:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1232 -> a
-    289:289:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():911:911 -> a
-    289:289:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1300 -> a
-    289:289:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1258 -> a
-    289:289:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1232 -> a
-    290:298:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1301:1309 -> a
-    290:298:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1258 -> a
-    290:298:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1232 -> a
-    299:306:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1259:1266 -> a
-    299:306:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1232 -> a
-    307:307:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1366:1366 -> a
-    308:308:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():862:862 -> a
-    308:308:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1366 -> a
-    309:320:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1369:1380 -> a
-    321:323:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1426:1428 -> a
-    321:323:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1381 -> a
-    324:324:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1384:1384 -> a
-    325:326:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1433:1434 -> a
-    325:326:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1385 -> a
-    327:328:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1438:1439 -> a
-    327:328:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1388 -> a
-    329:330:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1391:1392 -> a
-    331:335:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1412:1416 -> a
-    331:335:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1393 -> a
-    336:341:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1394:1399 -> a
-    342:353:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1448:1459 -> a
-    342:353:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1400 -> a
-    354:355:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$15(com.android.tools.r8.graph.DexItemFactory):1374:1375 -> a
-    356:356:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$15(com.android.tools.r8.graph.DexItemFactory):1373:1373 -> a
-    357:357:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1421:1421 -> a
-    358:359:void printPhase(java.lang.String):1491:1492 -> a
-    360:360:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1497:1497 -> a
-    361:361:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
-    361:361:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1498 -> a
-    362:367:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1499:1504 -> a
-    368:374:java.lang.String com.android.tools.r8.ir.code.IRCode.toString() -> a
-    368:374:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1505 -> a
-    375:384:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1506:1515 -> a
-    1:20:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):397:416 -> b
-    21:27:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):415:421 -> b
-    28:41:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):123:136 -> b
-    28:41:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):421 -> b
-    42:42:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):421:421 -> b
-    43:45:void lambda$optimize$7(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):566:568 -> b
-    46:46:boolean isInWave():619:619 -> b
-    47:48:void lambda$computeReachabilitySensitivity$9(com.android.tools.r8.graph.DexProgramClass):624:625 -> b
-    49:49:void lambda$computeReachabilitySensitivity$8(com.android.tools.r8.graph.DexEncodedMethod):625:625 -> b
-    50:53:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):756:759 -> b
-    54:66:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):758:770 -> b
-    67:69:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):807:809 -> b
-    70:83:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):808:821 -> b
-    84:89:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1481:1486 -> b
-    84:89:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):828 -> b
-    90:96:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):829:835 -> b
-    97:97:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():878:878 -> b
-    97:97:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):835 -> b
-    98:123:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):836:861 -> b
-    124:130:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback):1237:1243 -> b
-    124:130:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):862 -> b
-    131:204:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):870:943 -> b
-    205:221:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):942:958 -> b
-    222:224:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):794:796 -> b
-    222:224:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):959 -> b
-    225:277:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):962:1014 -> b
-    278:345:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1006:1073 -> b
-    346:377:void computeNonNullParamHints(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1123:1154 -> b
-    346:377:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1074 -> b
-    378:391:void computeNonNullParamHints(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1153:1166 -> b
-    378:391:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1074 -> b
-    392:398:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1172:1178 -> b
-    392:398:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1077 -> b
-    399:403:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1078:1082 -> b
-    404:409:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):556:561 -> b
-    404:409:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1082 -> b
-    410:429:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1083:1102 -> b
-    430:430:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():886:886 -> b
-    430:430:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1102 -> b
-    431:442:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1103:1114 -> b
-    443:448:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1113:1118 -> b
-    449:454:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1272:1277 -> b
-    455:459:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1275:1279 -> b
-    460:460:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1318:1318 -> b
-    461:461:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():899:899 -> b
-    461:461:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1318 -> b
-    462:477:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1322:1337 -> b
-    478:490:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1465:1477 -> b
-    478:490:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1346 -> b
-    491:494:boolean lambda$workaroundForwardingInitializerBug$14(com.android.tools.r8.ir.code.Instruction):1338:1341 -> b
-    1:1:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$0(com.android.tools.r8.graph.DexProgramClass):374:374 -> c
-    2:2:void clearDexMethodCompilationState():676:676 -> c
-    3:7:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1283:1287 -> c
-    1:7:boolean enableTryWithResourcesDesugaring():265:271 -> d
-    8:8:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$1(com.android.tools.r8.graph.DexProgramClass):413:413 -> d
-    1:2:boolean removeLambdaDeserializationMethods():275:276 -> e
-    1:3:void waveDone():603:605 -> f
-    1:1:void waveStart():599:599 -> g
+    1:4:java.util.Set getDesugaredCallSites():244:247 -> a
+    5:5:java.util.Set libraryMethodsReturningNonNull(com.android.tools.r8.graph.DexItemFactory):288:288 -> a
+    6:11:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):391:396 -> a
+    12:23:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):394:405 -> a
+    24:30:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):500:506 -> a
+    31:32:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):679:680 -> a
+    31:32:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):507 -> a
+    33:34:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):318:319 -> a
+    33:34:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):508 -> a
+    35:68:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):516:549 -> a
+    69:70:void staticizeClasses(com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.concurrent.ExecutorService):312:313 -> a
+    69:70:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):550 -> a
+    71:74:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):554:557 -> a
+    75:77:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):304:306 -> a
+    75:77:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):558 -> a
+    78:79:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):560:561 -> a
+    80:81:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):328:329 -> a
+    80:81:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):561 -> a
+    82:82:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):563:563 -> a
+    83:84:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):337:338 -> a
+    83:84:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):564 -> a
+    85:86:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):344:345 -> a
+    85:86:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):565 -> a
+    87:93:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):379:385 -> a
+    87:93:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):566 -> a
+    94:95:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):410:411 -> a
+    94:95:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):386 -> a
+    94:95:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):566 -> a
+    96:103:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithout(com.android.tools.r8.graph.DexType):83:90 -> a
+    96:103:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):412 -> a
+    96:103:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):386 -> a
+    96:103:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):566 -> a
+    104:104:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):412:412 -> a
+    104:104:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):386 -> a
+    104:104:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):566 -> a
+    105:105:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):568:568 -> a
+    106:107:void finalizeLambdaMerging(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):690:691 -> a
+    106:107:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):569 -> a
+    108:118:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):571:581 -> a
+    119:124:com.android.tools.r8.graph.DexType computeOutlineClassType():733:738 -> a
+    119:124:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):581 -> a
+    125:159:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):581:615 -> a
+    160:167:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):609:616 -> a
+    168:168:void lambda$optimize$5(com.android.tools.r8.ir.conversion.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.CallGraph,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):530:530 -> a
+    169:170:void lambda$optimize$6(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):578:579 -> a
+    171:177:void addWaveDoneAction(com.android.tools.r8.utils.Action):630:636 -> a
+    178:178:void addWaveDoneAction(com.android.tools.r8.utils.Action):634:634 -> a
+    179:179:void addWaveDoneAction(com.android.tools.r8.utils.Action):631:631 -> a
+    180:180:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):644:644 -> a
+    181:186:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):654:659 -> a
+    187:204:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):658:675 -> a
+    205:215:java.lang.Object lambda$forEachSelectedOutliningMethod$10(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):661:671 -> a
+    216:216:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):701:701 -> a
+    217:220:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):745:748 -> a
+    221:226:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):754:759 -> a
+    227:232:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):763:768 -> a
+    233:233:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():21:21 -> a
+    233:233:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):769 -> a
+    234:234:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):769:769 -> a
+    235:235:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):765:765 -> a
+    236:236:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$11(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):782:782 -> a
+    237:237:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():21:21 -> a
+    237:237:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$11(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):786 -> a
+    238:238:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$11(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):786:786 -> a
+    239:239:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$11(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):782:782 -> a
+    240:241:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):804:805 -> a
+    242:247:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):519:524 -> a
+    242:247:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):805 -> a
+    248:251:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):807:810 -> a
+    252:252:com.android.tools.r8.ir.optimize.InliningOracle lambda$rewriteCode$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):1032:1032 -> a
+    253:263:void computeMayHaveSideEffects(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1187:1197 -> a
+    264:264:boolean lambda$computeMayHaveSideEffects$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1195:1195 -> a
+    265:266:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1203:1204 -> a
+    267:271:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1223:1227 -> a
+    267:271:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1205 -> a
+    272:272:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1207:1207 -> a
+    273:273:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1232:1232 -> a
+    273:273:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1208 -> a
+    274:279:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1271:1276 -> a
+    274:279:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1234 -> a
+    274:279:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1208 -> a
+    280:280:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():882:882 -> a
+    280:280:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1276 -> a
+    280:280:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1234 -> a
+    280:280:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1208 -> a
+    281:289:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1277:1285 -> a
+    281:289:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1234 -> a
+    281:289:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1208 -> a
+    290:297:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1235:1242 -> a
+    290:297:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1208 -> a
+    298:298:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1342:1342 -> a
+    299:299:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():833:833 -> a
+    299:299:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1342 -> a
+    300:311:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1345:1356 -> a
+    312:314:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1402:1404 -> a
+    312:314:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1357 -> a
+    315:315:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1360:1360 -> a
+    316:317:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1409:1410 -> a
+    316:317:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1361 -> a
+    318:319:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1414:1415 -> a
+    318:319:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1364 -> a
+    320:321:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1367:1368 -> a
+    322:326:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1388:1392 -> a
+    322:326:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1369 -> a
+    327:332:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1370:1375 -> a
+    333:344:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1424:1435 -> a
+    333:344:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1376 -> a
+    345:345:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1397:1397 -> a
+    346:347:void printPhase(java.lang.String):1467:1468 -> a
+    348:348:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1473:1473 -> a
+    349:349:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
+    349:349:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1474 -> a
+    350:355:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1475:1480 -> a
+    356:362:java.lang.String com.android.tools.r8.ir.code.IRCode.toString():368:374 -> a
+    356:362:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1481 -> a
+    363:372:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1482:1491 -> a
+    1:20:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):418:437 -> b
+    21:27:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):436:442 -> b
+    28:41:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):106:119 -> b
+    28:41:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):442 -> b
+    42:42:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):442:442 -> b
+    43:45:void lambda$optimize$7(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):587:589 -> b
+    46:46:boolean isInWave():640:640 -> b
+    47:48:void lambda$computeReachabilitySensitivity$9(com.android.tools.r8.graph.DexProgramClass):645:646 -> b
+    49:49:void lambda$computeReachabilitySensitivity$8(com.android.tools.r8.graph.DexEncodedMethod):646:646 -> b
+    50:53:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):777:780 -> b
+    54:66:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):779:791 -> b
+    67:69:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):828:830 -> b
+    70:83:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):829:842 -> b
+    84:89:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1457:1462 -> b
+    84:89:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):849 -> b
+    90:96:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):850:856 -> b
+    97:97:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():849:849 -> b
+    97:97:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):856 -> b
+    98:123:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):857:882 -> b
+    124:130:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback):1213:1219 -> b
+    124:130:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):883 -> b
+    131:199:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):891:959 -> b
+    200:216:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):958:974 -> b
+    217:219:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):815:817 -> b
+    217:219:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):975 -> b
+    220:272:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):978:1030 -> b
+    273:340:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1022:1089 -> b
+    341:372:void computeNonNullParamHints(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1138:1169 -> b
+    341:372:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1090 -> b
+    373:386:void computeNonNullParamHints(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1168:1181 -> b
+    373:386:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1090 -> b
+    387:391:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1093:1097 -> b
+    392:397:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):529:534 -> b
+    392:397:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1097 -> b
+    398:417:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1098:1117 -> b
+    418:418:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():857:857 -> b
+    418:418:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1117 -> b
+    419:430:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1118:1129 -> b
+    431:436:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1128:1133 -> b
+    437:442:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1248:1253 -> b
+    443:447:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1251:1255 -> b
+    448:448:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1294:1294 -> b
+    449:449:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():870:870 -> b
+    449:449:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1294 -> b
+    450:465:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1298:1313 -> b
+    466:478:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1441:1453 -> b
+    466:478:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1322 -> b
+    479:482:boolean lambda$workaroundForwardingInitializerBug$14(com.android.tools.r8.ir.code.Instruction):1314:1317 -> b
+    483:484:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$15(com.android.tools.r8.graph.DexItemFactory):1350:1351 -> b
+    485:485:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$15(com.android.tools.r8.graph.DexItemFactory):1349:1349 -> b
+    1:1:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$0(com.android.tools.r8.graph.DexProgramClass):395:395 -> c
+    2:2:void clearDexMethodCompilationState():697:697 -> c
+    3:7:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1259:1263 -> c
+    1:7:boolean enableTryWithResourcesDesugaring():268:274 -> d
+    8:8:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$1(com.android.tools.r8.graph.DexProgramClass):434:434 -> d
+    1:4:java.util.Set libraryMethodsReturningReceiver():278:281 -> e
+    1:2:boolean removeLambdaDeserializationMethods():296:297 -> f
+    1:3:void waveDone():624:626 -> g
+    1:1:void waveStart():620:620 -> h
 com.android.tools.r8.ir.conversion.JarSourceCode -> a.a.a.a.h.c.aa:
     com.android.tools.r8.ir.code.Position currentPosition -> j
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode currentInstruction -> g
@@ -22840,309 +22351,312 @@
     1:103:void <clinit>():77:179 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.org.objectweb.asm.tree.MethodNode,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):212:212 -> <init>
     2:58:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.org.objectweb.asm.tree.MethodNode,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):167:223 -> <init>
-    1:1:int instructionCount():252:252 -> a
-    2:5:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):285:288 -> a
-    6:15:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap recordArgumentTypes(com.android.tools.r8.ir.conversion.IRBuilder):396:405 -> a
-    6:15:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):291 -> a
-    16:16:boolean isWide(com.android.tools.r8.org.objectweb.asm.Type):413:413 -> a
-    16:16:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap recordArgumentTypes(com.android.tools.r8.ir.conversion.IRBuilder):406 -> a
+    1:4:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):285:288 -> a
+    5:14:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap recordArgumentTypes(com.android.tools.r8.ir.conversion.IRBuilder):396:405 -> a
+    5:14:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):291 -> a
+    15:15:boolean isWide(com.android.tools.r8.org.objectweb.asm.Type):413:413 -> a
+    15:15:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap recordArgumentTypes(com.android.tools.r8.ir.conversion.IRBuilder):406 -> a
+    15:15:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):291 -> a
+    16:16:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap recordArgumentTypes(com.android.tools.r8.ir.conversion.IRBuilder):407:407 -> a
     16:16:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):291 -> a
-    17:17:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap recordArgumentTypes(com.android.tools.r8.ir.conversion.IRBuilder):407:407 -> a
-    17:17:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):291 -> a
-    18:18:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):292:292 -> a
-    19:19:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.<init>(int):95:95 -> a
-    19:19:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):292 -> a
-    20:54:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):293:327 -> a
-    55:63:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):301:309 -> a
-    64:80:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):305:321 -> a
-    81:102:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):317:338 -> a
-    103:110:void buildArgumentInstructions(com.android.tools.r8.ir.conversion.IRBuilder):376:383 -> a
-    103:110:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):342 -> a
-    111:111:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.conversion.IRBuilder.getTypeLattice(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):174:174 -> a
-    111:111:void buildArgumentInstructions(com.android.tools.r8.ir.conversion.IRBuilder):383 -> a
-    111:111:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):342 -> a
-    112:120:void buildArgumentInstructions(com.android.tools.r8.ir.conversion.IRBuilder):384:392 -> a
-    112:120:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):342 -> a
-    121:138:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):345:362 -> a
-    139:139:int actualArgumentCount():247:247 -> a
+    17:17:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):292:292 -> a
+    18:18:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.<init>(int):95:95 -> a
+    18:18:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):292 -> a
+    19:53:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):293:327 -> a
+    54:62:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):301:309 -> a
+    63:79:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):305:321 -> a
+    80:101:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):317:338 -> a
+    102:109:void buildArgumentInstructions(com.android.tools.r8.ir.conversion.IRBuilder):376:383 -> a
+    102:109:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):342 -> a
+    110:110:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.conversion.IRBuilder.getTypeLattice(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):174:174 -> a
+    110:110:void buildArgumentInstructions(com.android.tools.r8.ir.conversion.IRBuilder):383 -> a
+    110:110:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):342 -> a
+    111:119:void buildArgumentInstructions(com.android.tools.r8.ir.conversion.IRBuilder):384:392 -> a
+    111:119:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):342 -> a
+    120:137:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):345:362 -> a
+    138:138:int actualArgumentCount():247:247 -> a
+    138:138:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):362 -> a
+    139:139:int formalParameterCount():243:243 -> a
+    139:139:int actualArgumentCount():247 -> a
     139:139:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):362 -> a
     140:140:int formalParameterCount():243:243 -> a
     140:140:int actualArgumentCount():247 -> a
     140:140:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):362 -> a
-    141:141:int formalParameterCount():243:243 -> a
-    141:141:int actualArgumentCount():247 -> a
-    141:141:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):362 -> a
-    142:151:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):362:371 -> a
-    152:154:void lambda$computeBlockEntryJarStates$0(java.util.Queue,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.lang.Integer):450:452 -> a
-    155:160:void buildExceptionalPostlude(com.android.tools.r8.ir.conversion.IRBuilder):477:482 -> a
-    155:160:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):531 -> a
-    161:161:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode getInstruction(int):665:665 -> a
-    161:161:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):534 -> a
-    162:163:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):535:536 -> a
-    164:167:boolean verifyExceptionEdgesAreRecorded(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):586:589 -> a
-    164:167:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):536 -> a
-    168:168:boolean verifyExceptionEdgesAreRecorded(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):588:588 -> a
-    168:168:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):536 -> a
-    169:209:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):542:582 -> a
-    210:236:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):493:519 -> a
-    237:237:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode getInstruction(int):665:665 -> a
-    237:237:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):519 -> a
-    238:241:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):519:522 -> a
-    242:242:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):598:598 -> a
-    243:243:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):604:604 -> a
-    244:244:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int):611:611 -> a
-    245:245:int getMoveExceptionRegister():646:646 -> a
-    245:245:int getMoveExceptionRegister(int):641 -> a
-    246:247:boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo):656:657 -> a
-    248:248:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode getInstruction(int):665:665 -> a
-    248:248:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):747 -> a
-    249:286:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):749:786 -> a
-    287:287:int getOffset(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):856:856 -> a
-    288:288:int[] getSwitchTargets(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.List):881:881 -> a
-    289:289:int getOffset(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):856:856 -> a
-    289:289:int[] getSwitchTargets(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.List):882 -> a
-    290:292:int[] getSwitchTargets(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.List):882:884 -> a
-    293:322:com.android.tools.r8.ir.code.Invoke$Type invokeType(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode):1005:1034 -> a
-    293:322:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2607 -> a
-    323:323:com.android.tools.r8.ir.code.Invoke$Type invokeType(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode):1014:1014 -> a
-    323:323:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2607 -> a
-    324:342:com.android.tools.r8.ir.code.Invoke$Type invokeType(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode):1012:1030 -> a
-    324:342:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2607 -> a
-    343:343:com.android.tools.r8.ir.code.Invoke$Type invokeType(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode):1028:1028 -> a
-    343:343:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2607 -> a
-    344:347:com.android.tools.r8.ir.code.Invoke$Type invokeType(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode):1007:1010 -> a
-    344:347:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2607 -> a
-    348:398:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2610:2660 -> a
-    399:399:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2655:2655 -> a
-    400:401:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2646:2647 -> a
-    402:429:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2638:2665 -> a
-    430:434:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2663:2667 -> a
-    435:435:com.android.tools.r8.org.objectweb.asm.Type makeArrayType(com.android.tools.r8.org.objectweb.asm.Type):1039:1039 -> a
-    436:436:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1124:1124 -> a
-    437:437:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1122:1122 -> a
-    438:438:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1119:1119 -> a
-    439:440:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1115:1116 -> a
-    441:441:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1112:1112 -> a
-    442:442:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1109:1109 -> a
-    443:446:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1103:1106 -> a
-    447:447:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1100:1100 -> a
-    448:451:void updateStateForDupOneBelowTwo(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot):1612:1615 -> a
-    452:454:void updateStateForDupOneBelowOne(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot):1619:1621 -> a
-    455:463:void updateStateForInvoke(java.lang.String,boolean):1768:1776 -> a
-    464:511:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1867:1914 -> a
-    512:512:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1911:1911 -> a
-    513:514:void build(com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode,com.android.tools.r8.ir.conversion.IRBuilder):2891:2892 -> a
-    513:514:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1911 -> a
-    515:515:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1908:1908 -> a
-    516:516:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1905:1905 -> a
-    517:521:void build(com.android.tools.r8.org.objectweb.asm.tree.LookupSwitchInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2820:2824 -> a
-    517:521:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1905 -> a
-    522:522:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1902:1902 -> a
-    523:523:void build(com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2816:2816 -> a
-    523:523:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1902 -> a
-    524:524:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1899:1899 -> a
-    525:526:void build(com.android.tools.r8.org.objectweb.asm.tree.IincInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2811:2812 -> a
-    525:526:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1899 -> a
-    527:527:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1896:1896 -> a
-    528:557:void build(com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2777:2806 -> a
-    528:557:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1896 -> a
-    558:558:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1893:1893 -> a
-    559:559:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1890:1890 -> a
-    560:567:void build(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2725:2732 -> a
-    560:567:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1890 -> a
-    568:583:void build(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2731:2746 -> a
-    568:583:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1890 -> a
-    584:606:void build(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2745:2767 -> a
-    584:606:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1890 -> a
-    607:614:void build(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2757:2764 -> a
-    607:614:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1890 -> a
-    615:616:void build(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2751:2752 -> a
-    615:616:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1890 -> a
-    617:617:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1887:1887 -> a
-    618:618:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1884:1884 -> a
-    619:619:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1881:1881 -> a
-    620:642:void build(com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2571:2593 -> a
-    620:642:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1881 -> a
-    643:645:void build(com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2587:2589 -> a
-    643:645:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1881 -> a
-    646:648:void build(com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2581:2583 -> a
-    646:648:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1881 -> a
-    649:649:void build(com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2578:2578 -> a
+    141:150:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):362:371 -> a
+    151:153:void lambda$computeBlockEntryJarStates$0(java.util.Queue,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.lang.Integer):450:452 -> a
+    154:159:void buildExceptionalPostlude(com.android.tools.r8.ir.conversion.IRBuilder):477:482 -> a
+    154:159:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):531 -> a
+    160:160:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode getInstruction(int):665:665 -> a
+    160:160:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):534 -> a
+    161:162:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):535:536 -> a
+    163:166:boolean verifyExceptionEdgesAreRecorded(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):586:589 -> a
+    163:166:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):536 -> a
+    167:167:boolean verifyExceptionEdgesAreRecorded(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):588:588 -> a
+    167:167:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):536 -> a
+    168:208:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):542:582 -> a
+    209:235:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):493:519 -> a
+    236:236:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode getInstruction(int):665:665 -> a
+    236:236:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):519 -> a
+    237:240:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):519:522 -> a
+    241:241:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):598:598 -> a
+    242:242:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):604:604 -> a
+    243:243:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int):611:611 -> a
+    244:244:boolean verifyCurrentInstructionCanThrow():651:651 -> a
+    245:246:boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo):656:657 -> a
+    247:247:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode getInstruction(int):665:665 -> a
+    247:247:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):747 -> a
+    248:285:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):749:786 -> a
+    286:286:int getOffset(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):856:856 -> a
+    287:287:int[] getSwitchTargets(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.List):881:881 -> a
+    288:288:int getOffset(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):856:856 -> a
+    288:288:int[] getSwitchTargets(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.List):882 -> a
+    289:291:int[] getSwitchTargets(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.List):882:884 -> a
+    292:321:com.android.tools.r8.ir.code.Invoke$Type invokeType(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode):1005:1034 -> a
+    292:321:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2607 -> a
+    322:322:com.android.tools.r8.ir.code.Invoke$Type invokeType(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode):1014:1014 -> a
+    322:322:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2607 -> a
+    323:341:com.android.tools.r8.ir.code.Invoke$Type invokeType(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode):1012:1030 -> a
+    323:341:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2607 -> a
+    342:342:com.android.tools.r8.ir.code.Invoke$Type invokeType(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode):1028:1028 -> a
+    342:342:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2607 -> a
+    343:346:com.android.tools.r8.ir.code.Invoke$Type invokeType(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode):1007:1010 -> a
+    343:346:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2607 -> a
+    347:397:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2610:2660 -> a
+    398:398:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2655:2655 -> a
+    399:400:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2646:2647 -> a
+    401:428:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2638:2665 -> a
+    429:433:void lambda$build$2(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder,java.util.List,java.util.List):2663:2667 -> a
+    434:434:com.android.tools.r8.org.objectweb.asm.Type makeArrayType(com.android.tools.r8.org.objectweb.asm.Type):1039:1039 -> a
+    435:435:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1124:1124 -> a
+    436:436:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1122:1122 -> a
+    437:437:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1119:1119 -> a
+    438:439:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1115:1116 -> a
+    440:440:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1112:1112 -> a
+    441:441:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1109:1109 -> a
+    442:445:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1103:1106 -> a
+    446:446:boolean isCompatibleArrayElementType(int,com.android.tools.r8.org.objectweb.asm.Type):1100:1100 -> a
+    447:450:void updateStateForDupOneBelowTwo(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot):1612:1615 -> a
+    451:453:void updateStateForDupOneBelowOne(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot):1619:1621 -> a
+    454:462:void updateStateForInvoke(java.lang.String,boolean):1768:1776 -> a
+    463:510:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1867:1914 -> a
+    511:511:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1911:1911 -> a
+    512:513:void build(com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode,com.android.tools.r8.ir.conversion.IRBuilder):2891:2892 -> a
+    512:513:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1911 -> a
+    514:514:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1908:1908 -> a
+    515:515:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1905:1905 -> a
+    516:520:void build(com.android.tools.r8.org.objectweb.asm.tree.LookupSwitchInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2820:2824 -> a
+    516:520:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1905 -> a
+    521:521:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1902:1902 -> a
+    522:522:void build(com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2816:2816 -> a
+    522:522:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1902 -> a
+    523:523:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1899:1899 -> a
+    524:525:void build(com.android.tools.r8.org.objectweb.asm.tree.IincInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2811:2812 -> a
+    524:525:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1899 -> a
+    526:526:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1896:1896 -> a
+    527:556:void build(com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2777:2806 -> a
+    527:556:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1896 -> a
+    557:557:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1893:1893 -> a
+    558:558:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1890:1890 -> a
+    559:566:void build(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2725:2732 -> a
+    559:566:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1890 -> a
+    567:582:void build(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2731:2746 -> a
+    567:582:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1890 -> a
+    583:605:void build(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2745:2767 -> a
+    583:605:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1890 -> a
+    606:613:void build(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2757:2764 -> a
+    606:613:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1890 -> a
+    614:615:void build(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2751:2752 -> a
+    614:615:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1890 -> a
+    616:616:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1887:1887 -> a
+    617:617:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1884:1884 -> a
+    618:618:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1881:1881 -> a
+    619:641:void build(com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2571:2593 -> a
+    619:641:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1881 -> a
+    642:644:void build(com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2587:2589 -> a
+    642:644:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1881 -> a
+    645:647:void build(com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2581:2583 -> a
+    645:647:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1881 -> a
+    648:648:void build(com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2578:2578 -> a
+    648:648:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1881 -> a
+    649:649:void build(com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2575:2575 -> a
     649:649:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1881 -> a
-    650:650:void build(com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2575:2575 -> a
-    650:650:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1881 -> a
-    651:651:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1878:1878 -> a
-    652:684:void build(com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2534:2566 -> a
-    652:684:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1878 -> a
-    685:689:void build(com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2551:2555 -> a
-    685:689:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1878 -> a
-    690:694:void build(com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2543:2547 -> a
-    690:694:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1878 -> a
-    695:697:void build(com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2537:2539 -> a
-    695:697:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1878 -> a
-    698:698:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875:1875 -> a
-    699:726:void build(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2491:2518 -> a
-    699:726:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875 -> a
-    727:727:void build(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2512:2512 -> a
+    650:650:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1878:1878 -> a
+    651:683:void build(com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2534:2566 -> a
+    651:683:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1878 -> a
+    684:688:void build(com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2551:2555 -> a
+    684:688:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1878 -> a
+    689:693:void build(com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2543:2547 -> a
+    689:693:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1878 -> a
+    694:696:void build(com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2537:2539 -> a
+    694:696:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1878 -> a
+    697:697:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875:1875 -> a
+    698:725:void build(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2491:2518 -> a
+    698:725:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875 -> a
+    726:726:void build(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2512:2512 -> a
+    726:726:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875 -> a
+    727:727:void build(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2508:2508 -> a
     727:727:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875 -> a
-    728:728:void build(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2508:2508 -> a
-    728:728:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875 -> a
-    729:733:void build(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2500:2504 -> a
-    729:733:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875 -> a
-    734:767:void build(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2496:2529 -> a
-    734:767:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875 -> a
-    768:768:void build(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2515:2515 -> a
-    768:768:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875 -> a
-    769:769:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1872:1872 -> a
-    770:787:void build(com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2469:2486 -> a
-    770:787:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1872 -> a
-    788:789:void build(com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2472:2473 -> a
-    788:789:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1872 -> a
-    790:790:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869:1869 -> a
-    791:1211:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1929:2349 -> a
-    791:1211:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1212:1213:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1958:1959 -> a
-    1212:1213:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1214:1214:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1958:1958 -> a
-    1214:1214:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1215:1216:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1953:1954 -> a
-    1215:1216:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1217:1217:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1953:1953 -> a
+    728:732:void build(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2500:2504 -> a
+    728:732:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875 -> a
+    733:766:void build(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2496:2529 -> a
+    733:766:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875 -> a
+    767:767:void build(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2515:2515 -> a
+    767:767:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1875 -> a
+    768:768:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1872:1872 -> a
+    769:786:void build(com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2469:2486 -> a
+    769:786:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1872 -> a
+    787:788:void build(com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2472:2473 -> a
+    787:788:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1872 -> a
+    789:789:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869:1869 -> a
+    790:1210:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1929:2349 -> a
+    790:1210:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1211:1212:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1958:1959 -> a
+    1211:1212:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1213:1213:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1958:1958 -> a
+    1213:1213:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1214:1215:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1953:1954 -> a
+    1214:1215:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1216:1216:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1953:1953 -> a
+    1216:1216:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1217:1217:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1948:1948 -> a
     1217:1217:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1218:1218:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1948:1948 -> a
+    1218:1218:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1944:1944 -> a
     1218:1218:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1219:1219:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1944:1944 -> a
-    1219:1219:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1220:1510:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1935:2225 -> a
-    1220:1510:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1511:1515:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2212:2216 -> a
-    1511:1515:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1516:1520:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2203:2207 -> a
-    1516:1520:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1521:1532:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2186:2197 -> a
-    1521:1532:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1533:1537:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2173:2177 -> a
-    1533:1537:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1538:1553:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2150:2165 -> a
-    1538:1553:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1554:1563:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2118:2127 -> a
-    1554:1563:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1564:1586:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2088:2110 -> a
-    1564:1586:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1587:1602:void dupTwoBelowTwo(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.IRBuilder):2444:2459 -> a
-    1587:1602:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2112 -> a
-    1587:1602:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1603:1613:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2073:2083 -> a
-    1603:1613:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1614:1629:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2053:2068 -> a
-    1614:1629:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1630:1640:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2038:2048 -> a
-    1630:1640:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1641:1652:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2023:2034 -> a
-    1641:1652:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1653:1656:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2015:2018 -> a
-    1653:1656:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1657:1660:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2007:2010 -> a
-    1657:1660:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1661:1662:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2002:2003 -> a
-    1661:1662:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1663:1673:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1988:1998 -> a
-    1663:1673:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1674:1972:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1997:2295 -> a
-    1674:1972:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1973:1977:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2282:2286 -> a
-    1973:1977:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1978:1981:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2274:2277 -> a
-    1978:1981:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1982:1982:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2271:2271 -> a
+    1219:1509:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1935:2225 -> a
+    1219:1509:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1510:1514:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2212:2216 -> a
+    1510:1514:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1515:1519:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2203:2207 -> a
+    1515:1519:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1520:1531:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2186:2197 -> a
+    1520:1531:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1532:1536:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2173:2177 -> a
+    1532:1536:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1537:1552:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2150:2165 -> a
+    1537:1552:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1553:1562:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2118:2127 -> a
+    1553:1562:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1563:1585:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2088:2110 -> a
+    1563:1585:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1586:1601:void dupTwoBelowTwo(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.IRBuilder):2444:2459 -> a
+    1586:1601:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2112 -> a
+    1586:1601:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1602:1612:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2073:2083 -> a
+    1602:1612:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1613:1628:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2053:2068 -> a
+    1613:1628:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1629:1639:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2038:2048 -> a
+    1629:1639:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1640:1651:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2023:2034 -> a
+    1640:1651:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1652:1655:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2015:2018 -> a
+    1652:1655:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1656:1659:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2007:2010 -> a
+    1656:1659:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1660:1661:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2002:2003 -> a
+    1660:1661:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1662:1672:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1988:1998 -> a
+    1662:1672:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1673:1971:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1997:2295 -> a
+    1673:1971:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1972:1976:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2282:2286 -> a
+    1972:1976:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1977:1980:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2274:2277 -> a
+    1977:1980:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1981:1981:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2271:2271 -> a
+    1981:1981:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    1982:1982:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2268:2268 -> a
     1982:1982:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1983:1983:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2268:2268 -> a
+    1983:1983:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2265:2265 -> a
     1983:1983:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1984:1984:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2265:2265 -> a
+    1984:1984:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2262:2262 -> a
     1984:1984:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1985:1985:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2262:2262 -> a
+    1985:1985:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2259:2259 -> a
     1985:1985:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1986:1986:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2259:2259 -> a
+    1986:1986:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2256:2256 -> a
     1986:1986:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1987:1987:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2256:2256 -> a
+    1987:1987:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2253:2253 -> a
     1987:1987:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1988:1988:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2253:2253 -> a
+    1988:1988:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2250:2250 -> a
     1988:1988:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1989:1989:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2250:2250 -> a
+    1989:1989:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2247:2247 -> a
     1989:1989:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1990:1990:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2247:2247 -> a
+    1990:1990:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2244:2244 -> a
     1990:1990:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1991:1991:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2244:2244 -> a
+    1991:1991:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2241:2241 -> a
     1991:1991:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1992:1992:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2241:2241 -> a
+    1992:1992:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2238:2238 -> a
     1992:1992:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1993:1993:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2238:2238 -> a
+    1993:1993:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2235:2235 -> a
     1993:1993:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1994:1994:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2235:2235 -> a
+    1994:1994:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2232:2232 -> a
     1994:1994:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1995:1995:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2232:2232 -> a
-    1995:1995:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    1996:2091:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2229:2324 -> a
-    1996:2091:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    2092:2093:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2319:2320 -> a
-    2092:2093:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    2094:2095:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2314:2315 -> a
-    2094:2095:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    2096:2097:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2309:2310 -> a
-    2096:2097:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    2098:2099:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2304:2305 -> a
-    2098:2099:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    2100:2146:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2299:2345 -> a
-    2100:2146:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    2147:2148:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2339:2340 -> a
-    2147:2148:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    2149:2150:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2334:2335 -> a
-    2149:2150:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    2151:2153:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2328:2330 -> a
-    2151:2153:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
-    2154:2161:boolean isExitingThrow(com.android.tools.r8.org.objectweb.asm.tree.InsnNode):2354:2361 -> a
-    2154:2161:void addThrow(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,int,com.android.tools.r8.ir.conversion.IRBuilder):2365 -> a
-    2162:2162:void addThrow(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,int,com.android.tools.r8.ir.conversion.IRBuilder):2366:2366 -> a
-    2163:2163:int getOffset(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):856:856 -> a
-    2163:2163:void addThrow(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,int,com.android.tools.r8.ir.conversion.IRBuilder):2368 -> a
-    2164:2182:void addThrow(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,int,com.android.tools.r8.ir.conversion.IRBuilder):2369:2387 -> a
-    2183:2188:void addReturn(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.code.ValueTypeConstraint,int,com.android.tools.r8.ir.conversion.IRBuilder):2392:2397 -> a
-    2189:2199:void dupOneBelowTwo(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.IRBuilder):2402:2412 -> a
-    2200:2207:void dupOneBelowOne(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.IRBuilder):2416:2423 -> a
-    2208:2210:void buildConversion(com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.ir.conversion.IRBuilder):2463:2465 -> a
-    2211:2216:void build(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2599:2604 -> a
-    2217:2217:void build(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2601:2601 -> a
-    2218:2240:void buildInvoke(java.lang.String,com.android.tools.r8.org.objectweb.asm.Type,boolean,com.android.tools.r8.ir.conversion.IRBuilder,java.util.function.BiConsumer):2680:2702 -> a
-    2241:2241:void addArgument(java.util.List,java.util.List,com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.ir.conversion.JarState$Slot):2711:2711 -> a
-    2242:2242:boolean com.android.tools.r8.ir.conversion.JarState$Slot.isCompatibleWith(com.android.tools.r8.org.objectweb.asm.Type):158:158 -> a
-    2242:2242:void addArgument(java.util.List,java.util.List,com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.ir.conversion.JarState$Slot):2711 -> a
-    2243:2245:void addArgument(java.util.List,java.util.List,com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.ir.conversion.JarState$Slot):2711:2713 -> a
-    2246:2248:void build(com.android.tools.r8.org.objectweb.asm.tree.InvokeDynamicInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2717:2719 -> a
-    2249:2249:void lambda$build$3(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):2721:2721 -> a
-    2250:2250:void buildSwitch(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.List,int[],com.android.tools.r8.ir.conversion.IRBuilder):2829:2829 -> a
-    2251:2251:int getOffset(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):856:856 -> a
-    2251:2251:void buildSwitch(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.List,int[],com.android.tools.r8.ir.conversion.IRBuilder):2830 -> a
-    2252:2257:void buildSwitch(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.List,int[],com.android.tools.r8.ir.conversion.IRBuilder):2831:2836 -> a
-    2258:2304:void build(com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2841:2887 -> a
-    2305:2305:com.android.tools.r8.ir.code.Position lambda$getCanonicalPosition$4(java.lang.Integer):2926:2926 -> a
-    2306:2315:boolean isCallToPolymorphicSignatureMethod(java.lang.String,java.lang.String):3027:3036 -> a
-    int instructionOffset(int) -> b
+    1995:2090:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2229:2324 -> a
+    1995:2090:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    2091:2092:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2319:2320 -> a
+    2091:2092:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    2093:2094:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2314:2315 -> a
+    2093:2094:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    2095:2096:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2309:2310 -> a
+    2095:2096:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    2097:2098:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2304:2305 -> a
+    2097:2098:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    2099:2145:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2299:2345 -> a
+    2099:2145:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    2146:2147:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2339:2340 -> a
+    2146:2147:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    2148:2149:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2334:2335 -> a
+    2148:2149:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    2150:2152:void build(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2328:2330 -> a
+    2150:2152:void build(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1869 -> a
+    2153:2160:boolean isExitingThrow(com.android.tools.r8.org.objectweb.asm.tree.InsnNode):2354:2361 -> a
+    2153:2160:void addThrow(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,int,com.android.tools.r8.ir.conversion.IRBuilder):2365 -> a
+    2161:2161:void addThrow(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,int,com.android.tools.r8.ir.conversion.IRBuilder):2366:2366 -> a
+    2162:2162:int getOffset(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):856:856 -> a
+    2162:2162:void addThrow(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,int,com.android.tools.r8.ir.conversion.IRBuilder):2368 -> a
+    2163:2181:void addThrow(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,int,com.android.tools.r8.ir.conversion.IRBuilder):2369:2387 -> a
+    2182:2187:void addReturn(com.android.tools.r8.org.objectweb.asm.tree.InsnNode,com.android.tools.r8.ir.code.ValueTypeConstraint,int,com.android.tools.r8.ir.conversion.IRBuilder):2392:2397 -> a
+    2188:2198:void dupOneBelowTwo(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.IRBuilder):2402:2412 -> a
+    2199:2206:void dupOneBelowOne(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.IRBuilder):2416:2423 -> a
+    2207:2209:void buildConversion(com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.ir.conversion.IRBuilder):2463:2465 -> a
+    2210:2215:void build(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2599:2604 -> a
+    2216:2216:void build(com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2601:2601 -> a
+    2217:2239:void buildInvoke(java.lang.String,com.android.tools.r8.org.objectweb.asm.Type,boolean,com.android.tools.r8.ir.conversion.IRBuilder,java.util.function.BiConsumer):2680:2702 -> a
+    2240:2240:void addArgument(java.util.List,java.util.List,com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.ir.conversion.JarState$Slot):2711:2711 -> a
+    2241:2241:boolean com.android.tools.r8.ir.conversion.JarState$Slot.isCompatibleWith(com.android.tools.r8.org.objectweb.asm.Type):158:158 -> a
+    2241:2241:void addArgument(java.util.List,java.util.List,com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.ir.conversion.JarState$Slot):2711 -> a
+    2242:2244:void addArgument(java.util.List,java.util.List,com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.ir.conversion.JarState$Slot):2711:2713 -> a
+    2245:2247:void build(com.android.tools.r8.org.objectweb.asm.tree.InvokeDynamicInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2717:2719 -> a
+    2248:2248:void lambda$build$3(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):2721:2721 -> a
+    2249:2249:void buildSwitch(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.List,int[],com.android.tools.r8.ir.conversion.IRBuilder):2829:2829 -> a
+    2250:2250:int getOffset(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):856:856 -> a
+    2250:2250:void buildSwitch(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.List,int[],com.android.tools.r8.ir.conversion.IRBuilder):2830 -> a
+    2251:2256:void buildSwitch(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.List,int[],com.android.tools.r8.ir.conversion.IRBuilder):2831:2836 -> a
+    2257:2303:void build(com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):2841:2887 -> a
+    2304:2322:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):2898:2916 -> a
+    2323:2324:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):2902:2903 -> a
+    2325:2325:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):2902:2902 -> a
+    2326:2326:com.android.tools.r8.ir.code.Position lambda$getCanonicalPosition$4(java.lang.Integer):2926:2926 -> a
+    2327:2336:boolean isCallToPolymorphicSignatureMethod(java.lang.String,java.lang.String):3027:3036 -> a
     void setUp() -> b
     1:3:void lambda$computeBlockEntryJarStates$1(java.util.Queue,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.lang.Integer):457:459 -> b
     4:7:void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder):469:472 -> b
-    8:58:boolean canThrow(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):686:736 -> b
-    59:82:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):952:975 -> b
-    83:99:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):955:971 -> b
-    100:100:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):969:969 -> b
-    101:101:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):967:967 -> b
-    102:102:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):965:965 -> b
-    103:103:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):961:961 -> b
-    104:108:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):959:963 -> b
-    109:109:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):957:957 -> b
-    110:114:void updateStateForDupTwoBelowOne(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot):1625:1629 -> b
-    115:119:void processLocalVariablesAtExit(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1919:1923 -> b
-    120:132:void dupTwoBelowOne(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.IRBuilder):2427:2439 -> b
-    1:1:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):621:621 -> c
+    8:8:int getMoveExceptionRegister():646:646 -> b
+    8:8:int getMoveExceptionRegister(int):641 -> b
+    9:59:boolean canThrow(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):686:736 -> b
+    60:83:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):952:975 -> b
+    84:100:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):955:971 -> b
+    101:101:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):969:969 -> b
+    102:102:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):967:967 -> b
+    103:103:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):965:965 -> b
+    104:104:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):961:961 -> b
+    105:109:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):959:963 -> b
+    110:110:com.android.tools.r8.ir.code.MemberType memberType(com.android.tools.r8.org.objectweb.asm.Type):957:957 -> b
+    111:115:void updateStateForDupTwoBelowOne(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot):1625:1629 -> b
+    116:120:void processLocalVariablesAtExit(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.ir.conversion.IRBuilder):1919:1923 -> b
+    121:133:void dupTwoBelowOne(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.ir.conversion.IRBuilder):2427:2439 -> b
+    int instructionOffset(int) -> c
+    1:1:int instructionCount():252:252 -> c
     2:10:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):626:634 -> c
     11:16:java.util.List getTryHandlerGuards(java.util.List):845:850 -> c
     11:16:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):635 -> c
@@ -23151,29 +22665,29 @@
     18:20:java.util.List getTryHandlerOffsets(java.util.List):837:839 -> c
     18:20:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):636 -> c
     21:21:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):636:636 -> c
-    22:22:boolean verifyCurrentInstructionCanThrow():651:651 -> c
-    23:39:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):860:876 -> c
-    40:41:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):866:867 -> c
-    42:50:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):862:870 -> c
-    51:75:int[] getJumpTargets(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode):890:914 -> c
-    51:75:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):870 -> c
-    76:76:int[] getJumpTargets(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode):911:911 -> c
+    22:38:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):860:876 -> c
+    39:40:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):866:867 -> c
+    41:49:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):862:870 -> c
+    50:74:int[] getJumpTargets(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode):890:914 -> c
+    50:74:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):870 -> c
+    75:75:int[] getJumpTargets(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode):911:911 -> c
+    75:75:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):870 -> c
+    76:76:int[] getJumpTargets(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode):909:909 -> c
     76:76:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):870 -> c
-    77:77:int[] getJumpTargets(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode):909:909 -> c
+    77:77:int[] getJumpTargets(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode):907:907 -> c
     77:77:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):870 -> c
-    78:78:int[] getJumpTargets(com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode):907:907 -> c
-    78:78:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):870 -> c
-    79:79:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):873:873 -> c
-    80:83:int[] getVarTargets(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode):919:922 -> c
-    80:83:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):873 -> c
-    84:84:int[] getVarTargets(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode):920:920 -> c
-    84:84:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):873 -> c
-    85:101:com.android.tools.r8.ir.code.NumericType numericType(com.android.tools.r8.org.objectweb.asm.Type):984:1000 -> c
-    102:102:com.android.tools.r8.ir.code.NumericType numericType(com.android.tools.r8.org.objectweb.asm.Type):998:998 -> c
-    103:105:com.android.tools.r8.ir.code.NumericType numericType(com.android.tools.r8.org.objectweb.asm.Type):994:996 -> c
-    106:106:com.android.tools.r8.ir.code.NumericType numericType(com.android.tools.r8.org.objectweb.asm.Type):992:992 -> c
-    107:107:com.android.tools.r8.ir.code.NumericType numericType(com.android.tools.r8.org.objectweb.asm.Type):990:990 -> c
-    108:110:com.android.tools.r8.ir.code.NumericType numericType(com.android.tools.r8.org.objectweb.asm.Type):986:988 -> c
+    78:78:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):873:873 -> c
+    79:82:int[] getVarTargets(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode):919:922 -> c
+    79:82:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):873 -> c
+    83:83:int[] getVarTargets(com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode):920:920 -> c
+    83:83:int[] getTargets(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):873 -> c
+    84:100:com.android.tools.r8.ir.code.NumericType numericType(com.android.tools.r8.org.objectweb.asm.Type):984:1000 -> c
+    101:101:com.android.tools.r8.ir.code.NumericType numericType(com.android.tools.r8.org.objectweb.asm.Type):998:998 -> c
+    102:104:com.android.tools.r8.ir.code.NumericType numericType(com.android.tools.r8.org.objectweb.asm.Type):994:996 -> c
+    105:105:com.android.tools.r8.ir.code.NumericType numericType(com.android.tools.r8.org.objectweb.asm.Type):992:992 -> c
+    106:106:com.android.tools.r8.ir.code.NumericType numericType(com.android.tools.r8.org.objectweb.asm.Type):990:990 -> c
+    107:109:com.android.tools.r8.ir.code.NumericType numericType(com.android.tools.r8.org.objectweb.asm.Type):986:988 -> c
+    int instructionIndex(int) -> d
     1:2:void buildMonitorExit(com.android.tools.r8.ir.conversion.IRBuilder):486:487 -> d
     3:4:java.util.List getTryHandlers(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):815:816 -> d
     5:5:int getOffset(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):856:856 -> d
@@ -23191,10 +22705,8 @@
     11:11:java.util.List getTryHandlers(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):818 -> d
     12:25:java.util.List getTryHandlers(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):818:831 -> d
     26:27:void updateStateForConversion(com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.org.objectweb.asm.Type):1860:1861 -> d
-    28:46:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):2898:2916 -> d
-    47:48:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):2902:2903 -> d
-    49:49:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):2902:2902 -> d
-    50:50:com.android.tools.r8.ir.code.Position getCurrentPosition():2921:2921 -> d
+    28:28:com.android.tools.r8.ir.code.Position getCurrentPosition():2921:2921 -> d
+    boolean verifyRegister(int) -> e
     1:1:boolean generateMethodSynchronization():238:238 -> e
     2:24:void computeBlockEntryJarStates(com.android.tools.r8.ir.conversion.IRBuilder):417:439 -> e
     25:72:void updateState(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):1199:1246 -> e
@@ -23451,18 +22963,17 @@
     1395:1396:void computeBlockEntryJarStates(com.android.tools.r8.ir.conversion.IRBuilder):440 -> e
     1397:1412:void computeBlockEntryJarStates(com.android.tools.r8.ir.conversion.IRBuilder):441:456 -> e
     1413:1451:void computeBlockEntryJarStates(com.android.tools.r8.ir.conversion.IRBuilder):426:464 -> e
-    1452:1452:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):616:616 -> e
-    1453:1453:boolean isReturn(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):669:669 -> e
-    1454:1473:com.android.tools.r8.ir.code.ValueType valueType(com.android.tools.r8.org.objectweb.asm.Type):928:947 -> e
-    1474:1486:com.android.tools.r8.ir.code.ValueType valueType(com.android.tools.r8.org.objectweb.asm.Type):931:943 -> e
-    1487:1487:com.android.tools.r8.ir.code.ValueType valueType(com.android.tools.r8.org.objectweb.asm.Type):941:941 -> e
-    1488:1488:com.android.tools.r8.ir.code.ValueType valueType(com.android.tools.r8.org.objectweb.asm.Type):939:939 -> e
-    1489:1489:com.android.tools.r8.ir.code.ValueType valueType(com.android.tools.r8.org.objectweb.asm.Type):937:937 -> e
-    boolean verifyRegister(int) -> f
-    1:1:boolean isThrow(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):677:677 -> f
-    2:26:com.android.tools.r8.ir.code.Position getExceptionalExitPosition():2942:2966 -> f
-    int instructionIndex(int) -> g
-    1:1:int getMoveExceptionRegister():646:646 -> g
+    1452:1452:boolean isReturn(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):669:669 -> e
+    1453:1472:com.android.tools.r8.ir.code.ValueType valueType(com.android.tools.r8.org.objectweb.asm.Type):928:947 -> e
+    1473:1485:com.android.tools.r8.ir.code.ValueType valueType(com.android.tools.r8.org.objectweb.asm.Type):931:943 -> e
+    1486:1486:com.android.tools.r8.ir.code.ValueType valueType(com.android.tools.r8.org.objectweb.asm.Type):941:941 -> e
+    1487:1487:com.android.tools.r8.ir.code.ValueType valueType(com.android.tools.r8.org.objectweb.asm.Type):939:939 -> e
+    1488:1488:com.android.tools.r8.ir.code.ValueType valueType(com.android.tools.r8.org.objectweb.asm.Type):937:937 -> e
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):621:621 -> f
+    2:2:boolean isThrow(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):677:677 -> f
+    3:27:com.android.tools.r8.ir.code.Position getExceptionalExitPosition():2942:2966 -> f
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):616:616 -> g
+    2:2:int getMoveExceptionRegister():646:646 -> g
     1:1:java.lang.String arrayTypeDesc(int):1061:1061 -> h
     2:5:com.android.tools.r8.ir.code.Position getPreamblePosition():2930:2933 -> h
     1:1:boolean isStatic():227:227 -> i
@@ -23566,7 +23077,7 @@
     129:136:boolean recordStateForTarget(int,com.android.tools.r8.ir.conversion.JarState$Local[],com.android.tools.r8.com.google.common.collect.ImmutableList):812:819 -> a
     137:137:boolean isRefinement(com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.org.objectweb.asm.Type):824:824 -> a
     138:151:java.lang.String localsToString(java.util.Collection):910:923 -> a
-    152:152:java.lang.String com.android.tools.r8.org.objectweb.asm.Type.toString():889:889 -> a
+    152:152:java.lang.String com.android.tools.r8.org.objectweb.asm.Type.toString():904:904 -> a
     152:152:java.lang.String localsToString(java.util.Collection):925 -> a
     153:157:java.lang.String localsToString(java.util.Collection):925:929 -> a
     1:10:void closeLocals():549:558 -> b
@@ -23624,7 +23135,7 @@
     59:59:boolean verifySlots(com.android.tools.r8.ir.conversion.JarState$Slot[],com.android.tools.r8.org.objectweb.asm.Type):877:877 -> b
     59:59:com.android.tools.r8.ir.conversion.JarState$Slot[] popReverse(int,com.android.tools.r8.org.objectweb.asm.Type):763 -> b
     60:63:java.lang.String stackToString(java.util.Collection):890:893 -> b
-    64:64:java.lang.String com.android.tools.r8.org.objectweb.asm.Type.toString():889:889 -> b
+    64:64:java.lang.String com.android.tools.r8.org.objectweb.asm.Type.toString():904:904 -> b
     64:64:java.lang.String stackToString(java.util.Collection):895 -> b
     65:76:java.lang.String stackToString(java.util.Collection):895:906 -> b
     1:7:com.android.tools.r8.com.google.common.collect.ImmutableList getLocals():592:598 -> c
@@ -23727,127 +23238,124 @@
     java.util.Map protoFixupCache -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():69:69 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):75:75 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView):73:76 -> <init>
-    1:5:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,java.util.Set):80:84 -> a
-    6:14:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):93:101 -> a
-    15:35:boolean unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):432:452 -> a
-    15:35:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
-    36:56:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):106:126 -> a
-    57:61:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):459:463 -> a
-    57:61:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):127 -> a
-    62:64:com.android.tools.r8.graph.DexValue$DexValueMethodHandle rewriteDexValueMethodHandle(com.android.tools.r8.graph.DexValue$DexValueMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):488:490 -> a
-    62:64:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):463 -> a
-    62:64:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):127 -> a
-    65:81:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):464:480 -> a
-    65:81:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):127 -> a
-    82:125:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):128:171 -> a
-    126:141:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):166:181 -> a
-    142:175:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):387:420 -> a
-    142:175:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):181 -> a
-    176:176:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):411:411 -> a
-    176:176:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):181 -> a
-    177:177:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):410:410 -> a
-    177:177:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):181 -> a
-    178:185:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):183:190 -> a
-    186:214:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):569:597 -> a
-    186:214:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):189 -> a
-    215:251:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):192:228 -> a
-    252:373:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):227:348 -> a
-    374:405:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):344:375 -> a
-    406:453:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):495:542 -> a
-    454:459:com.android.tools.r8.graph.DexValue$DexValueMethodType rewriteDexMethodType(com.android.tools.r8.graph.DexValue$DexValueMethodType):549:554 -> a
-    460:460:boolean canInvokeTargetWithInvokeVirtual(com.android.tools.r8.graph.DexEncodedMethod):601:601 -> a
-    461:467:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):605:611 -> a
-    468:468:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):78:78 -> a
-    468:468:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):616 -> a
-    469:472:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):619:622 -> a
+    1:1:void <clinit>():70:70 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):76:76 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.AppView):74:77 -> <init>
+    1:5:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,java.util.Set):81:85 -> a
+    6:14:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):94:102 -> a
+    15:35:boolean unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):433:453 -> a
+    15:35:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):104 -> a
+    36:56:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):107:127 -> a
+    57:61:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):460:464 -> a
+    57:61:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):128 -> a
+    62:64:com.android.tools.r8.graph.DexValue$DexValueMethodHandle rewriteDexValueMethodHandle(com.android.tools.r8.graph.DexValue$DexValueMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):489:491 -> a
+    62:64:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):464 -> a
+    62:64:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):128 -> a
+    65:81:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):465:481 -> a
+    65:81:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):128 -> a
+    82:125:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):129:172 -> a
+    126:141:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):167:182 -> a
+    142:175:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):388:421 -> a
+    142:175:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):182 -> a
+    176:176:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):412:412 -> a
+    176:176:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):182 -> a
+    177:177:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):411:411 -> a
+    177:177:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):182 -> a
+    178:185:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):184:191 -> a
+    186:214:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):567:595 -> a
+    186:214:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):190 -> a
+    215:251:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):193:229 -> a
+    252:373:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):228:349 -> a
+    374:405:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):345:376 -> a
+    406:450:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):496:540 -> a
+    451:456:com.android.tools.r8.graph.DexValue$DexValueMethodType rewriteDexMethodType(com.android.tools.r8.graph.DexValue$DexValueMethodType):547:552 -> a
+    457:457:boolean canInvokeTargetWithInvokeVirtual(com.android.tools.r8.graph.DexEncodedMethod):599:599 -> a
+    458:464:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):603:609 -> a
+    465:465:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):328:328 -> a
+    465:465:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):614 -> a
+    466:469:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):617:620 -> a
 com.android.tools.r8.ir.conversion.OptimizationFeedback -> a.a.a.a.h.c.la:
+    void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
     void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget) -> a
-    void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
-    void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set) -> a
-    void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int) -> a
     void methodReturnsConstantNumber(com.android.tools.r8.graph.DexEncodedMethod,long) -> a
     void methodReturnsConstantString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString) -> a
     void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility) -> a
+    void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet) -> a
     void setParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ParameterUsagesInfo) -> a
     void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer) -> a
-    void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> b
-    void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod) -> b
+    void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> b
+    void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod) -> b
     void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet) -> b
-    void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod) -> c
-    void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod) -> d
-    void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> e
+    void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod) -> c
+    void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> d
+    void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod) -> e
 com.android.tools.r8.ir.conversion.OptimizationFeedbackDelayed -> a.a.a.a.h.c.ma:
     java.util.Map optimizationInfos -> a
     java.util.Map processed -> b
-    1:6:void <init>():21:26 -> <init>
-    1:1:void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):42:42 -> a
-    2:2:void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int):47:47 -> a
-    3:3:void methodReturnsConstantNumber(com.android.tools.r8.graph.DexEncodedMethod,long):52:52 -> a
-    4:4:void methodReturnsConstantString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):57:57 -> a
-    5:5:void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod):67:67 -> a
-    6:6:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):77:77 -> a
-    7:7:void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):94:94 -> a
-    8:8:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):100:100 -> a
-    9:9:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):105:105 -> a
-    10:10:void setParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ParameterUsagesInfo):116:116 -> a
-    11:11:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):121:121 -> a
-    12:13:void updateVisibleOptimizationInfo():133:134 -> a
-    14:20:void updateVisibleOptimizationInfo():133:139 -> a
-    21:21:boolean lambda$updateVisibleOptimizationInfo$0(java.util.Map$Entry):134:134 -> a
-    1:1:void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):88:88 -> b
-    2:2:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):110:110 -> b
-    3:3:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):126:126 -> b
-    4:4:boolean lambda$updateVisibleOptimizationInfo$1(java.util.Map$Entry):135:135 -> b
-    1:1:void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod):72:72 -> c
-    1:1:void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod):82:82 -> d
-    1:1:void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod):62:62 -> e
-    1:6:com.android.tools.r8.graph.UpdatableOptimizationInfo getOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedMethod):30:35 -> f
+    1:6:void <init>():19:24 -> <init>
+    1:1:void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int):39:39 -> a
+    2:2:void methodReturnsConstantNumber(com.android.tools.r8.graph.DexEncodedMethod,long):44:44 -> a
+    3:3:void methodReturnsConstantString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):49:49 -> a
+    4:4:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):69:69 -> a
+    5:5:void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):80:80 -> a
+    6:6:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):92:92 -> a
+    7:7:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):97:97 -> a
+    8:8:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):102:102 -> a
+    9:9:void setParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ParameterUsagesInfo):108:108 -> a
+    10:10:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):113:113 -> a
+    11:12:void updateVisibleOptimizationInfo():125:126 -> a
+    13:19:void updateVisibleOptimizationInfo():125:131 -> a
+    20:20:boolean lambda$updateVisibleOptimizationInfo$0(java.util.Map$Entry):126:126 -> a
+    1:1:void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod):64:64 -> b
+    2:2:void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):86:86 -> b
+    3:3:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):118:118 -> b
+    4:4:boolean lambda$updateVisibleOptimizationInfo$1(java.util.Map$Entry):127:127 -> b
+    1:1:void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod):59:59 -> c
+    1:1:void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod):54:54 -> d
+    1:1:void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod):74:74 -> e
+    1:6:com.android.tools.r8.graph.UpdatableOptimizationInfo getOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedMethod):28:33 -> f
 com.android.tools.r8.ir.conversion.OptimizationFeedbackIgnore -> a.a.a.a.h.c.na:
-    1:1:void <init>():17:17 -> <init>
+    1:1:void <init>():15:15 -> <init>
+    void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
     void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget) -> a
-    void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
-    void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set) -> a
-    void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int) -> a
     void methodReturnsConstantNumber(com.android.tools.r8.graph.DexEncodedMethod,long) -> a
     void methodReturnsConstantString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString) -> a
     void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility) -> a
+    void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet) -> a
     void setParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ParameterUsagesInfo) -> a
     void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer) -> a
-    void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> b
-    void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod) -> b
+    void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> b
+    void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod) -> b
     void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet) -> b
-    void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod) -> c
-    void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod) -> d
-    void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> e
+    void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod) -> c
+    void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> d
+    void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod) -> e
 com.android.tools.r8.ir.conversion.SourceCode -> a.a.a.a.h.c.oa:
     void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean) -> a
     void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean) -> a
     void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder) -> a
+    com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int) -> a
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int) -> a
-    int getMoveExceptionRegister(int) -> a
-    int instructionCount() -> a
     void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder) -> a
     void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder) -> a
     int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder) -> a
+    boolean verifyCurrentInstructionCanThrow() -> a
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> a
     void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder) -> b
-    int instructionOffset(int) -> b
+    int getMoveExceptionRegister(int) -> b
     void setUp() -> b
     com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder) -> c
-    com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int) -> c
-    boolean verifyCurrentInstructionCanThrow() -> c
-    com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int) -> d
+    int instructionCount() -> c
+    int instructionOffset(int) -> c
     com.android.tools.r8.ir.code.Position getCurrentPosition() -> d
-    com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> e
-    boolean verifyRegister(int) -> f
-    int instructionIndex(int) -> g
+    int instructionIndex(int) -> d
+    boolean verifyRegister(int) -> e
+    com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int) -> f
+    com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> g
 com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> a.a.a.a.h.c.qa:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
@@ -23956,13 +23464,11 @@
     35:122:void process(com.android.tools.r8.graph.DexClass):88 -> a
     123:135:void process(com.android.tools.r8.graph.DexClass):89:101 -> a
     136:147:com.android.tools.r8.graph.DexEncodedMethod addForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):105:116 -> a
-    148:148:com.android.tools.r8.ir.conversion.SourceCode lambda$addForwardingMethod$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Position):123:123 -> a
-    149:149:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):387:387 -> a
-    149:149:com.android.tools.r8.ir.conversion.SourceCode lambda$addForwardingMethod$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Position):128 -> a
-    150:153:com.android.tools.r8.ir.conversion.SourceCode lambda$addForwardingMethod$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Position):128:131 -> a
-    154:173:void hideCandidates(java.util.List,java.util.List,java.util.List):235:254 -> a
+    148:156:com.android.tools.r8.ir.conversion.SourceCode lambda$addForwardingMethod$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Position):123:131 -> a
+    157:176:void hideCandidates(java.util.List,java.util.List,java.util.List):235:254 -> a
 com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> a.a.a.a.h.d.c:
     1:1:void <clinit>():50:50 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexItemFactory):54:54 -> <init>
 com.android.tools.r8.ir.desugar.DefaultMethodsHelper -> a.a.a.a.h.d.f:
     java.util.Set candidates -> a
     java.util.Set hidden -> b
@@ -23999,99 +23505,92 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):116:116 -> <init>
     2:35:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):88:121 -> <init>
     1:56:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):127:182 -> a
-    57:57:com.android.tools.r8.graph.DexMethod staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):348:348 -> a
+    57:57:com.android.tools.r8.graph.DexMethod staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):336:336 -> a
     57:57:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):183 -> a
     58:58:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):184:184 -> a
-    59:69:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):182:192 -> a
+    59:67:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):182:190 -> a
+    68:68:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):331:331 -> a
+    68:68:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):191 -> a
+    69:69:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):192:192 -> a
     70:98:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):190:218 -> a
-    99:100:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):375:376 -> a
+    99:100:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):361:362 -> a
     99:100:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):218 -> a
     101:101:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):219:219 -> a
-    102:102:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):387:387 -> a
+    102:102:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):368:368 -> a
     102:102:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):220 -> a
     103:103:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):221:221 -> a
     104:143:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):219:258 -> a
-    144:144:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):387:387 -> a
+    144:144:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):368:368 -> a
     144:144:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):259 -> a
     145:145:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):260:260 -> a
     146:155:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):258:267 -> a
-    156:156:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):397:397 -> a
+    156:156:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):374:374 -> a
     156:156:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):268 -> a
-    157:157:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):393:393 -> a
-    157:157:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):397 -> a
-    157:157:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):268 -> a
-    158:158:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):269:269 -> a
-    159:159:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):267:267 -> a
-    160:162:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):240:242 -> a
-    163:163:java.util.Set lambda$rewriteMethodReferences$0(com.android.tools.r8.graph.DexLibraryClass):186:186 -> a
-    164:173:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):278:287 -> a
-    174:175:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):298:299 -> a
-    176:176:java.lang.String getCompanionClassDescriptor(java.lang.String):293:293 -> a
-    176:176:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):300 -> a
-    177:177:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):301:301 -> a
-    178:182:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):310:314 -> a
-    183:192:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):359:368 -> a
-    193:193:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):365:365 -> a
-    194:194:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):383:383 -> a
-    195:195:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):387:387 -> a
-    196:196:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):411:411 -> a
-    197:203:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):462:468 -> a
-    197:203:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):411 -> a
-    204:210:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):411:417 -> a
-    211:224:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):445:458 -> a
-    211:224:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):418 -> a
-    225:229:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):418:422 -> a
-    230:230:boolean isInMainDexList(com.android.tools.r8.graph.DexType):337:337 -> a
-    230:230:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):422 -> a
-    231:235:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):422:426 -> a
-    236:238:void clear():433:435 -> a
-    236:238:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):429 -> a
-    239:240:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):440:441 -> a
-    241:255:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):472:486 -> a
-    256:256:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):479:479 -> a
-    257:271:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):516:530 -> a
-    272:272:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):529:529 -> a
-    273:273:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):546:546 -> a
-    274:275:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):559:560 -> a
-    274:275:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):550 -> a
-    276:293:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):494:511 -> a
-    276:293:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):562 -> a
-    276:293:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):550 -> a
-    294:294:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():628:628 -> a
-    294:294:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):511 -> a
-    294:294:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):562 -> a
-    294:294:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):550 -> a
-    295:295:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):511:511 -> a
-    295:295:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):562 -> a
-    295:295:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):550 -> a
-    296:296:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):510:510 -> a
-    296:296:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):562 -> a
-    296:296:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):550 -> a
-    297:331:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):563:597 -> a
-    297:331:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):550 -> a
-    332:332:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):551:551 -> a
-    333:335:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):567:569 -> a
-    333:335:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):550 -> a
-    1:1:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):329:329 -> b
-    2:2:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):319:319 -> b
-    2:2:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):329 -> b
-    3:6:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):329:332 -> b
-    7:9:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):331:333 -> b
-    10:10:boolean hasDispatchClassSuffix(com.android.tools.r8.graph.DexType):353:353 -> b
-    11:11:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):397:397 -> b
-    12:12:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):393:393 -> b
-    12:12:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):397 -> b
-    1:1:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):319:319 -> c
-    2:2:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):343:343 -> c
-    3:3:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):305:305 -> c
-    3:3:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):343 -> c
-    4:4:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):343:343 -> c
-    1:2:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):534:535 -> d
-    3:3:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):324:324 -> d
-    3:3:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):536 -> d
-    4:5:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):538:539 -> d
-    6:6:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():628:628 -> d
-    6:6:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):539 -> d
+    157:157:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):269:269 -> a
+    158:158:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):267:267 -> a
+    159:161:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):240:242 -> a
+    162:162:java.util.Set lambda$rewriteMethodReferences$0(com.android.tools.r8.graph.DexLibraryClass):186:186 -> a
+    163:172:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):278:287 -> a
+    173:177:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):294:298 -> a
+    178:186:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String):346:354 -> a
+    187:187:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String):352:352 -> a
+    188:188:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):368:368 -> a
+    189:189:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):388:388 -> a
+    190:196:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):439:445 -> a
+    190:196:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):388 -> a
+    197:203:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):388:394 -> a
+    204:217:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):422:435 -> a
+    204:217:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):395 -> a
+    218:222:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):395:399 -> a
+    223:223:boolean isInMainDexList(com.android.tools.r8.graph.DexType):325:325 -> a
+    223:223:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):399 -> a
+    224:228:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):399:403 -> a
+    229:231:void clear():410:412 -> a
+    229:231:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):406 -> a
+    232:233:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):417:418 -> a
+    234:248:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):449:463 -> a
+    249:249:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):456:456 -> a
+    250:264:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):493:507 -> a
+    265:265:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):506:506 -> a
+    266:266:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):523:523 -> a
+    267:268:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):536:537 -> a
+    267:268:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):527 -> a
+    269:286:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):471:488 -> a
+    269:286:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):539 -> a
+    269:286:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):527 -> a
+    287:287:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():624:624 -> a
+    287:287:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):488 -> a
+    287:287:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):539 -> a
+    287:287:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):527 -> a
+    288:288:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):488:488 -> a
+    288:288:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):539 -> a
+    288:288:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):527 -> a
+    289:289:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):487:487 -> a
+    289:289:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):539 -> a
+    289:289:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):527 -> a
+    290:324:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):540:574 -> a
+    290:324:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):527 -> a
+    325:325:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):528:528 -> a
+    326:328:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):544:546 -> a
+    326:328:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):527 -> a
+    1:5:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):303:307 -> b
+    6:6:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):374:374 -> b
+    1:1:boolean hasDispatchClassSuffix(com.android.tools.r8.graph.DexType):341:341 -> c
+    2:2:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):511:511 -> c
+    3:3:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):312:312 -> c
+    3:3:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):512 -> c
+    4:4:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):317:317 -> c
+    4:4:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):513 -> c
+    5:5:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):312:312 -> c
+    5:5:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):317 -> c
+    5:5:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):513 -> c
+    6:9:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):317:320 -> c
+    6:9:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):513 -> c
+    10:12:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):319:321 -> c
+    10:12:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):513 -> c
+    13:14:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):515:516 -> c
+    15:15:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():624:624 -> c
+    15:15:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):516 -> c
 com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor -> a.a.a.a.h.d.g:
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor ExcludeDexResources -> b
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor IncludeAllResources -> a
@@ -24107,34 +23606,34 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):59:59 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):57:61 -> <init>
     1:9:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):65:73 -> a
-    10:21:boolean canMoveToCompanionClass(com.android.tools.r8.graph.DexEncodedMethod):280:291 -> a
+    10:21:boolean canMoveToCompanionClass(com.android.tools.r8.graph.DexEncodedMethod):283:294 -> a
     10:21:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):74 -> a
     22:36:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):80:94 -> a
-    37:44:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):93:100 -> a
-    45:46:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):84:85 -> a
-    47:48:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):75:76 -> a
-    49:74:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):304:329 -> a
-    49:74:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):104 -> a
-    75:94:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):105:124 -> a
-    95:98:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):337:340 -> a
-    95:98:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):125 -> a
-    99:104:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):126:131 -> a
-    105:125:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):130:150 -> a
-    126:131:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):149:154 -> a
-    132:147:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):144:159 -> a
-    148:148:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):338:338 -> a
-    148:148:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):125 -> a
-    149:167:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):163:181 -> a
-    168:168:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):305:305 -> a
-    168:168:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):181 -> a
-    169:187:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):182:200 -> a
-    188:212:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):204:228 -> a
-    213:213:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):348:348 -> a
-    213:213:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):228 -> a
-    214:233:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):229:248 -> a
-    234:288:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):221:275 -> a
-    289:289:com.android.tools.r8.ir.conversion.SourceCode lambda$process$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):238:238 -> a
-com.android.tools.r8.ir.desugar.Java8MethodRewriter -> a.a.a.a.h.d.t:
+    37:47:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):93:103 -> a
+    48:49:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):84:85 -> a
+    50:51:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):75:76 -> a
+    52:77:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):307:332 -> a
+    52:77:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):107 -> a
+    78:97:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):108:127 -> a
+    98:101:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):340:343 -> a
+    98:101:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):128 -> a
+    102:105:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):129:132 -> a
+    106:106:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):331:331 -> a
+    106:106:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):132 -> a
+    107:108:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):133:134 -> a
+    109:129:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):133:153 -> a
+    130:135:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):152:157 -> a
+    136:151:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):147:162 -> a
+    152:152:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):341:341 -> a
+    152:152:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):128 -> a
+    153:190:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):166:203 -> a
+    191:215:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):207:231 -> a
+    216:216:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):336:336 -> a
+    216:216:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):231 -> a
+    217:236:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):232:251 -> a
+    237:291:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):224:278 -> a
+    292:292:com.android.tools.r8.ir.conversion.SourceCode lambda$process$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):241:241 -> a
+com.android.tools.r8.ir.desugar.Java8MethodRewriter -> a.a.a.a.h.d.r:
     com.android.tools.r8.graph.DexItemFactory factory -> d
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> g
@@ -24154,7 +23653,7 @@
     22:28:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):102:108 -> a
     29:29:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):87:87 -> a
     29:29:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):110 -> a
-    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():632:632 -> a
+    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():628:628 -> a
     30:30:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):88 -> a
     30:30:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):110 -> a
     31:31:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):89:89 -> a
@@ -24170,56 +23669,47 @@
 com.android.tools.r8.ir.desugar.Java8MethodRewriter$ByteMethods -> a.a.a.a.h.d.k:
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,java.lang.String):163:163 -> <init>
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$ByteMethods hashCodeCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):167:167 -> a
-com.android.tools.r8.ir.desugar.Java8MethodRewriter$CharacterMethods -> a.a.a.a.h.d.l:
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,java.lang.String):400:400 -> <init>
-    1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$CharacterMethods hashCodeCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):404:404 -> a
-com.android.tools.r8.ir.desugar.Java8MethodRewriter$DoubleMethods -> a.a.a.a.h.d.m:
+com.android.tools.r8.ir.desugar.Java8MethodRewriter$DoubleMethods -> a.a.a.a.h.d.l:
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,java.lang.String):230:230 -> <init>
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$DoubleMethods hashCodeCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):234:234 -> a
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$DoubleMethods isFiniteCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):250:250 -> b
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$DoubleMethods maxCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):238:238 -> c
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$DoubleMethods minCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):242:242 -> d
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$DoubleMethods sumCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):246:246 -> e
-com.android.tools.r8.ir.desugar.Java8MethodRewriter$FloatMethods -> a.a.a.a.h.d.n:
+com.android.tools.r8.ir.desugar.Java8MethodRewriter$FloatMethods -> a.a.a.a.h.d.m:
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,java.lang.String):277:277 -> <init>
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$FloatMethods hashCodeCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):281:281 -> a
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$FloatMethods isFiniteCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):297:297 -> b
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$FloatMethods maxCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):285:285 -> c
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$FloatMethods minCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):289:289 -> d
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$FloatMethods sumCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):293:293 -> e
-com.android.tools.r8.ir.desugar.Java8MethodRewriter$IntegerMethods -> a.a.a.a.h.d.o:
+com.android.tools.r8.ir.desugar.Java8MethodRewriter$IntegerMethods -> a.a.a.a.h.d.n:
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,java.lang.String):192:192 -> <init>
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$IntegerMethods hashCodeCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):196:196 -> a
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$IntegerMethods maxCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):200:200 -> b
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$IntegerMethods minCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):204:204 -> c
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$IntegerMethods sumCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):208:208 -> d
-com.android.tools.r8.ir.desugar.Java8MethodRewriter$LongMethods -> a.a.a.a.h.d.p:
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,java.lang.String):362:362 -> <init>
-    1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$LongMethods hashCodeCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):366:366 -> a
-    1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$LongMethods maxCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):370:370 -> b
-    1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$LongMethods minCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):374:374 -> c
-    1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$LongMethods sumCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):378:378 -> d
-com.android.tools.r8.ir.desugar.Java8MethodRewriter$RewritableMethods -> a.a.a.a.h.d.r:
+com.android.tools.r8.ir.desugar.Java8MethodRewriter$RewritableMethods -> a.a.a.a.h.d.p:
     java.util.Map rewritable -> a
-    1:173:void <init>(com.android.tools.r8.graph.DexItemFactory):417:589 -> <init>
-    1:1:java.util.Map addOrGetClass(com.android.tools.r8.graph.DexString):593:593 -> a
-    2:2:java.util.Map addOrGetMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):598:598 -> a
-    3:7:com.android.tools.r8.ir.desugar.Java8MethodRewriter$RewritableMethods$MethodGenerator getGenerator(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):602:606 -> a
-    1:1:java.util.Map lambda$addOrGetClass$0(com.android.tools.r8.graph.DexString):593:593 -> b
-    1:1:java.util.Map lambda$addOrGetMethod$1(com.android.tools.r8.graph.DexString):598:598 -> c
-com.android.tools.r8.ir.desugar.Java8MethodRewriter$RewritableMethods$MethodGenerator -> a.a.a.a.h.d.q:
+    1:137:void <init>(com.android.tools.r8.graph.DexItemFactory):365:501 -> <init>
+    1:1:java.util.Map addOrGetClass(com.android.tools.r8.graph.DexString):505:505 -> a
+    2:2:java.util.Map addOrGetMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):510:510 -> a
+    3:7:com.android.tools.r8.ir.desugar.Java8MethodRewriter$RewritableMethods$MethodGenerator getGenerator(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):514:518 -> a
+    1:1:java.util.Map lambda$addOrGetClass$0(com.android.tools.r8.graph.DexString):505:505 -> b
+    1:1:java.util.Map lambda$addOrGetMethod$1(com.android.tools.r8.graph.DexString):510:510 -> c
+com.android.tools.r8.ir.desugar.Java8MethodRewriter$RewritableMethods$MethodGenerator -> a.a.a.a.h.d.o:
     com.android.tools.r8.graph.DexString clazz -> b
     com.android.tools.r8.graph.DexString method -> c
     com.android.tools.r8.graph.DexProto proto -> d
     java.util.function.BiFunction generator -> a
     com.android.tools.r8.graph.DexMethod dexMethod -> e
-    1:5:void <init>(java.util.function.BiFunction,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):621:625 -> <init>
-    1:9:com.android.tools.r8.graph.DexMethod generateMethod(com.android.tools.r8.graph.DexItemFactory):629:637 -> a
-    10:10:com.android.tools.r8.ir.synthetic.TemplateMethodCode generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):641:641 -> a
-com.android.tools.r8.ir.desugar.Java8MethodRewriter$ShortMethods -> a.a.a.a.h.d.s:
+    1:5:void <init>(java.util.function.BiFunction,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):533:537 -> <init>
+    1:8:com.android.tools.r8.graph.DexMethod generateMethod(com.android.tools.r8.graph.DexItemFactory):541:548 -> a
+    9:9:com.android.tools.r8.ir.synthetic.TemplateMethodCode generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):552:552 -> a
+com.android.tools.r8.ir.desugar.Java8MethodRewriter$ShortMethods -> a.a.a.a.h.d.q:
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,java.lang.String):178:178 -> <init>
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$ShortMethods hashCodeCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):182:182 -> a
-com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode -> a.a.a.a.h.d.u:
+com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode -> a.a.a.a.h.d.s:
     com.android.tools.r8.graph.DexMethod mainMethod -> q
     1:1:void com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode.<init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):29:29 -> <init>
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):23 -> <init>
@@ -24229,129 +23719,126 @@
     1:1:void lambda$prepareInstructions$2(int,com.android.tools.r8.ir.conversion.IRBuilder):66:66 -> c
     1:17:void prepareInstructions():29:45 -> j
     18:40:void prepareInstructions():44:66 -> j
-com.android.tools.r8.ir.desugar.LambdaClass -> a.a.a.a.h.d.B:
-    java.util.concurrent.atomic.AtomicBoolean addToMainDexList -> i
-    boolean $assertionsDisabled -> l
-    com.android.tools.r8.graph.DexField instanceField -> g
-    com.android.tools.r8.ir.desugar.LambdaClass$Target target -> h
+com.android.tools.r8.ir.desugar.LambdaClass -> a.a.a.a.h.d.z:
+    java.util.concurrent.atomic.AtomicBoolean addToMainDexList -> h
+    com.android.tools.r8.graph.DexField instanceField -> f
+    com.android.tools.r8.ir.desugar.LambdaClass$Target target -> g
+    boolean $assertionsDisabled -> k
+    java.util.function.Supplier lazyDexClass -> j
     com.android.tools.r8.ir.desugar.LambdaRewriter rewriter -> a
-    java.util.function.Supplier lazyDexClass -> k
-    com.android.tools.r8.graph.DexMethod createInstanceMethod -> f
     com.android.tools.r8.graph.DexType type -> b
     com.android.tools.r8.ir.desugar.LambdaDescriptor descriptor -> c
     com.android.tools.r8.graph.DexMethod classConstructor -> e
     com.android.tools.r8.graph.DexMethod constructor -> d
-    java.util.Collection synthesizedFrom -> j
+    java.util.Collection synthesizedFrom -> i
     1:1:void <clinit>():59:59 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):78:78 -> <init>
-    2:23:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):69:90 -> <init>
-    24:24:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):336:336 -> <init>
-    24:24:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    25:64:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):359:398 -> <init>
-    25:64:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):337 -> <init>
-    25:64:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    65:65:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):397:397 -> <init>
-    65:65:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):337 -> <init>
-    65:65:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    66:66:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):396:396 -> <init>
-    66:66:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):337 -> <init>
-    66:66:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    67:80:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):341:354 -> <init>
-    67:80:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    81:81:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):343:343 -> <init>
-    81:81:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    82:84:com.android.tools.r8.ir.desugar.LambdaClass$Target createInterfaceMethodTarget(com.android.tools.r8.graph.DexType):474:476 -> <init>
-    82:84:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):345 -> <init>
-    82:84:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    85:102:com.android.tools.r8.ir.desugar.LambdaClass$Target createConstructorTarget(com.android.tools.r8.graph.DexType):451:468 -> <init>
-    85:102:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):347 -> <init>
-    85:102:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    103:105:com.android.tools.r8.ir.desugar.LambdaClass$Target createConstructorTarget(com.android.tools.r8.graph.DexType):467:469 -> <init>
-    103:105:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):347 -> <init>
-    103:105:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    106:107:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):405:406 -> <init>
-    106:107:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):352 -> <init>
-    106:107:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    108:129:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):405:426 -> <init>
-    108:129:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):352 -> <init>
-    108:129:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    130:133:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):425:428 -> <init>
-    130:133:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):352 -> <init>
-    130:133:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    134:144:com.android.tools.r8.ir.desugar.LambdaClass$Target createStaticMethodTarget(com.android.tools.r8.graph.DexType):434:444 -> <init>
-    134:144:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):349 -> <init>
-    134:144:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    145:147:com.android.tools.r8.ir.desugar.LambdaClass$Target createStaticMethodTarget(com.android.tools.r8.graph.DexType):443:445 -> <init>
-    145:147:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):349 -> <init>
-    145:147:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    148:160:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93:105 -> <init>
-    161:167:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):103:109 -> <init>
-    1:21:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):115:135 -> a
-    22:22:com.android.tools.r8.graph.DexProgramClass getOrCreateLambdaClass():139:139 -> a
-    23:24:com.android.tools.r8.graph.DexField getCaptureField(int):184:185 -> a
-    25:25:com.android.tools.r8.graph.DexField getCaptureField(int):184:184 -> a
-    26:33:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):193:200 -> a
-    34:62:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):205:233 -> a
-    63:63:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeVirtualMethods$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):218:218 -> a
-    64:64:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeVirtualMethods$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):236:236 -> a
-    65:65:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeDirectMethods$2(com.android.tools.r8.ir.code.Position):261:261 -> a
-    1:1:boolean isStateless():189:189 -> b
+    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):74:74 -> <init>
+    2:20:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):68:86 -> <init>
+    21:21:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):307:307 -> <init>
+    21:21:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    22:61:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):330:369 -> <init>
+    22:61:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):308 -> <init>
+    22:61:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    62:62:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):368:368 -> <init>
+    62:62:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):308 -> <init>
+    62:62:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    63:63:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):367:367 -> <init>
+    63:63:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):308 -> <init>
+    63:63:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    64:77:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):312:325 -> <init>
+    64:77:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    78:78:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):314:314 -> <init>
+    78:78:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    79:81:com.android.tools.r8.ir.desugar.LambdaClass$Target createInterfaceMethodTarget(com.android.tools.r8.graph.DexType):445:447 -> <init>
+    79:81:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):316 -> <init>
+    79:81:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    82:99:com.android.tools.r8.ir.desugar.LambdaClass$Target createConstructorTarget(com.android.tools.r8.graph.DexType):422:439 -> <init>
+    82:99:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):318 -> <init>
+    82:99:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    100:102:com.android.tools.r8.ir.desugar.LambdaClass$Target createConstructorTarget(com.android.tools.r8.graph.DexType):438:440 -> <init>
+    100:102:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):318 -> <init>
+    100:102:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    103:104:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):376:377 -> <init>
+    103:104:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):323 -> <init>
+    103:104:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    105:126:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):376:397 -> <init>
+    105:126:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):323 -> <init>
+    105:126:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    127:130:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):396:399 -> <init>
+    127:130:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):323 -> <init>
+    127:130:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    131:141:com.android.tools.r8.ir.desugar.LambdaClass$Target createStaticMethodTarget(com.android.tools.r8.graph.DexType):405:415 -> <init>
+    131:141:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):320 -> <init>
+    131:141:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    142:144:com.android.tools.r8.ir.desugar.LambdaClass$Target createStaticMethodTarget(com.android.tools.r8.graph.DexType):414:416 -> <init>
+    142:144:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):320 -> <init>
+    142:144:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    145:154:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89:98 -> <init>
+    1:21:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):104:124 -> a
+    22:22:com.android.tools.r8.graph.DexProgramClass getLambdaClass():128:128 -> a
+    23:24:com.android.tools.r8.graph.DexField getCaptureField(int):168:169 -> a
+    25:25:com.android.tools.r8.graph.DexField getCaptureField(int):168:168 -> a
+    26:33:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):177:184 -> a
+    34:62:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):189:217 -> a
+    63:63:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeVirtualMethods$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):202:202 -> a
+    64:64:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeVirtualMethods$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):220:220 -> a
+    65:65:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeDirectMethods$2(com.android.tools.r8.ir.code.Position):242:242 -> a
+    1:1:boolean isStateless():173:173 -> b
     2:2:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isStateless():162:162 -> b
-    2:2:boolean isStateless():189 -> b
-    3:3:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeDirectMethods$3(com.android.tools.r8.ir.code.Position):273:273 -> b
-    1:1:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeDirectMethods$4(com.android.tools.r8.ir.code.Position):283:283 -> c
-    2:2:com.android.tools.r8.graph.DexString generateUniqueLambdaMethodName():480:480 -> c
-    1:38:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeDirectMethods():244:281 -> d
-    1:11:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():148:158 -> e
-    12:15:com.android.tools.r8.graph.DexTypeList buildInterfaces():327:330 -> e
-    12:15:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():161 -> e
-    16:20:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():161:165 -> e
-    21:36:com.android.tools.r8.graph.DexEncodedField[] synthesizeStaticFields():305:320 -> e
-    21:36:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():166 -> e
-    37:45:com.android.tools.r8.graph.DexEncodedField[] synthesizeInstanceFields():290:298 -> e
-    37:45:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():167 -> e
-    46:57:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():168:179 -> e
-com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> a.a.a.a.h.d.v:
+    2:2:boolean isStateless():173 -> b
+    3:3:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeDirectMethods$3(com.android.tools.r8.ir.code.Position):254:254 -> b
+    1:1:com.android.tools.r8.graph.DexString generateUniqueLambdaMethodName():451:451 -> c
+    1:25:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeDirectMethods():228:252 -> d
+    1:11:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():132:142 -> e
+    12:15:com.android.tools.r8.graph.DexTypeList buildInterfaces():298:301 -> e
+    12:15:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():145 -> e
+    16:20:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():145:149 -> e
+    21:36:com.android.tools.r8.graph.DexEncodedField[] synthesizeStaticFields():276:291 -> e
+    21:36:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():150 -> e
+    37:45:com.android.tools.r8.graph.DexEncodedField[] synthesizeInstanceFields():261:269 -> e
+    37:45:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():151 -> e
+    46:57:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():152:163 -> e
+com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> a.a.a.a.h.d.t:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
-    1:1:void <clinit>():638:638 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):640:641 -> <init>
-    1:1:boolean ensureAccessibility():647:647 -> a
-    2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.LambdaClass$Target.programDefinitionFor(com.android.tools.r8.graph.DexType):507:507 -> a
-    2:2:boolean ensureAccessibility():647 -> a
-    3:26:boolean ensureAccessibility():648:671 -> a
-    27:27:boolean ensureAccessibility():669:669 -> a
-    28:28:com.android.tools.r8.ir.conversion.SourceCode lambda$ensureAccessibility$0(com.android.tools.r8.ir.code.Position):664:664 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> a.a.a.a.h.d.w:
+    1:1:void <clinit>():609:609 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):611:612 -> <init>
+    1:1:boolean ensureAccessibility():618:618 -> a
+    2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.LambdaClass$Target.programDefinitionFor(com.android.tools.r8.graph.DexType):478:478 -> a
+    2:2:boolean ensureAccessibility():618 -> a
+    3:26:boolean ensureAccessibility():619:642 -> a
+    27:27:boolean ensureAccessibility():640:640 -> a
+    28:28:com.android.tools.r8.ir.conversion.SourceCode lambda$ensureAccessibility$0(com.android.tools.r8.ir.code.Position):635:635 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> a.a.a.a.h.d.u:
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):597:598 -> <init>
-    1:24:boolean ensureAccessibility():605:628 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> a.a.a.a.h.d.x:
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):568:569 -> <init>
+    1:24:boolean ensureAccessibility():576:599 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> a.a.a.a.h.d.v:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
-    1:1:void <clinit>():546:546 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):548:549 -> <init>
-    1:28:boolean ensureAccessibility():556:583 -> a
-    29:36:boolean ensureAccessibility():582:589 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> a.a.a.a.h.d.y:
-    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Invoke$Type):515:515 -> <init>
+    1:1:void <clinit>():517:517 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):519:520 -> <init>
+    1:28:boolean ensureAccessibility():527:554 -> a
+    29:36:boolean ensureAccessibility():553:560 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> a.a.a.a.h.d.w:
+    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Invoke$Type):486:486 -> <init>
     boolean ensureAccessibility() -> a
-com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> a.a.a.a.h.d.z:
+com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> a.a.a.a.h.d.x:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
-    1:1:void <clinit>():525:525 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass):527:528 -> <init>
-    1:5:boolean ensureAccessibility():534:538 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$Target -> a.a.a.a.h.d.A:
+    1:1:void <clinit>():496:496 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass):498:499 -> <init>
+    1:5:boolean ensureAccessibility():505:509 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$Target -> a.a.a.a.h.d.y:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> b
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> c
     com.android.tools.r8.graph.DexMethod callTarget -> a
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():487:487 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):492:496 -> <init>
+    1:1:void <clinit>():458:458 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):463:467 -> <init>
     boolean ensureAccessibility() -> a
-    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):503:503 -> a
-com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode -> a.a.a.a.h.d.C:
+    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):474:474 -> a
+com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode -> a.a.a.a.h.d.A:
     boolean $assertionsDisabled -> q
     1:1:void <clinit>():15:15 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):18:19 -> <init>
@@ -24360,7 +23847,7 @@
     7:7:void lambda$prepareInstructions$1(int,com.android.tools.r8.ir.conversion.IRBuilder):29:29 -> c
     1:1:void lambda$prepareInstructions$2(int,com.android.tools.r8.ir.conversion.IRBuilder):38:38 -> d
     1:17:void prepareInstructions():25:41 -> j
-com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> a.a.a.a.h.d.D:
+com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> a.a.a.a.h.d.B:
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):19:19 -> <init>
     1:5:void lambda$prepareInstructions$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder):28:32 -> a
     6:6:void lambda$prepareInstructions$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder):28:28 -> a
@@ -24368,13 +23855,7 @@
     1:8:boolean equals(java.lang.Object):61:68 -> equals
     1:2:int hashCode():55:56 -> hashCode
     1:23:void prepareInstructions():25:47 -> j
-com.android.tools.r8.ir.desugar.LambdaCreateInstanceSourceCode -> a.a.a.a.h.d.E:
-    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):18:18 -> <init>
-    1:1:void lambda$prepareInstructions$1(java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):36:36 -> a
-    1:1:void lambda$prepareInstructions$0(int,com.android.tools.r8.ir.conversion.IRBuilder):25:25 -> b
-    1:1:void lambda$prepareInstructions$2(int,com.android.tools.r8.ir.conversion.IRBuilder):43:43 -> c
-    1:20:void prepareInstructions():24:43 -> j
-com.android.tools.r8.ir.desugar.LambdaDescriptor -> a.a.a.a.h.d.F:
+com.android.tools.r8.ir.desugar.LambdaDescriptor -> a.a.a.a.h.d.C:
     java.util.Set bridges -> g
     com.android.tools.r8.graph.DexString name -> b
     com.android.tools.r8.ir.desugar.LambdaDescriptor MATCH_FAILED -> j
@@ -24428,7 +23909,7 @@
     95:96:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfo):267:268 -> b
     1:4:com.android.tools.r8.graph.DexType getImplReceiverType():85:88 -> c
     5:6:com.android.tools.r8.ir.desugar.LambdaDescriptor tryInfer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfo):225:226 -> c
-com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> a.a.a.a.h.d.G:
+com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> a.a.a.a.h.d.D:
     boolean $assertionsDisabled -> q
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode.<init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):29:29 -> <init>
@@ -24438,7 +23919,7 @@
     14:46:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):82:114 -> a
     47:47:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57:57 -> a
     47:47:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):121 -> a
-    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):431:431 -> a
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):403:403 -> a
     48:48:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57 -> a
     48:48:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):121 -> a
     49:58:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):122:131 -> a
@@ -24450,7 +23931,7 @@
     69:86:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):289:306 -> a
     87:87:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57:57 -> a
     87:87:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
-    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):431:431 -> a
+    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):403:403 -> a
     88:88:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57 -> a
     88:88:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
     89:130:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):310:351 -> a
@@ -24493,62 +23974,56 @@
     79:80:int prepareParameterValue(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):279:280 -> j
     79:80:void prepareInstructions():222 -> j
     81:111:void prepareInstructions():222:252 -> j
-com.android.tools.r8.ir.desugar.LambdaRewriter -> a.a.a.a.h.d.H:
+com.android.tools.r8.ir.desugar.LambdaRewriter -> a.a.a.a.h.d.E:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString constructorName -> e
+    boolean $assertionsDisabled -> k
     com.android.tools.r8.graph.DexString classConstructorName -> f
-    boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexString instanceFieldName -> g
-    com.android.tools.r8.graph.DexString createInstanceMethodName -> h
-    java.util.Map knownCallSites -> j
-    java.util.Map knownLambdaClasses -> k
+    java.util.Map knownCallSites -> i
+    java.util.Map knownLambdaClasses -> j
+    com.android.tools.r8.com.google.common.collect.BiMap methodMapping -> h
     com.android.tools.r8.graph.DexMethod objectInitMethod -> d
-    com.android.tools.r8.com.google.common.collect.BiMap methodMapping -> i
     com.android.tools.r8.ir.conversion.IRConverter converter -> b
-    1:1:void <clinit>():50:50 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):88:88 -> <init>
-    2:31:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):70:99 -> <init>
-    1:10:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):108:117 -> a
-    11:15:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):217:221 -> a
-    11:15:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):116 -> a
-    16:16:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):220:220 -> a
-    16:16:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):116 -> a
-    17:17:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118:118 -> a
-    18:28:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):231:241 -> a
-    18:28:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):123 -> a
-    29:29:boolean isInMainDexList(com.android.tools.r8.graph.DexType):225:225 -> a
-    29:29:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):242 -> a
-    29:29:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):123 -> a
-    30:30:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):243:243 -> a
-    30:30:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):123 -> a
-    31:31:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):124:124 -> a
-    32:47:void patchInstruction(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):269:284 -> a
-    32:47:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):129 -> a
-    48:109:void patchInstruction(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):283:344 -> a
-    48:109:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):129 -> a
-    110:111:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():143:144 -> a
-    110:111:void patchInstruction(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):346 -> a
-    110:111:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):129 -> a
-    112:113:void patchInstruction(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):346:347 -> a
-    112:113:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):129 -> a
-    114:125:boolean removeLambdaDeserializationMethods(java.lang.Iterable):137:148 -> a
-    126:132:void adjustAccessibility():167:173 -> a
-    133:133:void adjustAccessibility():172:172 -> a
-    134:135:com.android.tools.r8.graph.DexProgramClass getLambdaClass(com.android.tools.r8.graph.DexType):182:183 -> a
-    136:145:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):189:198 -> a
-    146:146:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):195:195 -> a
-    147:149:java.lang.Object getKnown(java.util.Map,java.lang.Object):249:251 -> a
-    150:157:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):255:262 -> a
-    1:1:boolean hasLambdaClassPrefix(com.android.tools.r8.graph.DexType):85:85 -> b
-    2:4:java.util.Set getDesugaredCallSites():203:205 -> b
-com.android.tools.r8.ir.desugar.LambdaRewriterGraphLense -> a.a.a.a.h.d.I:
+    1:1:void <clinit>():49:49 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):85:85 -> <init>
+    2:30:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):67:95 -> <init>
+    1:10:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):104:113 -> a
+    11:15:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):212:216 -> a
+    11:15:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):112 -> a
+    16:16:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):215:215 -> a
+    16:16:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):112 -> a
+    17:17:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):114:114 -> a
+    18:25:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):226:233 -> a
+    18:25:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):119 -> a
+    26:26:boolean isInMainDexList(com.android.tools.r8.graph.DexType):220:220 -> a
+    26:26:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):234 -> a
+    26:26:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):119 -> a
+    27:27:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):235:235 -> a
+    27:27:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):119 -> a
+    28:28:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):120:120 -> a
+    29:44:void patchInstruction(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):261:276 -> a
+    29:44:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):125 -> a
+    45:95:void patchInstruction(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):275:325 -> a
+    45:95:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):125 -> a
+    96:107:boolean removeLambdaDeserializationMethods(java.lang.Iterable):133:144 -> a
+    108:114:void adjustAccessibility():163:169 -> a
+    115:115:void adjustAccessibility():168:168 -> a
+    116:117:com.android.tools.r8.graph.DexProgramClass getLambdaClass(com.android.tools.r8.graph.DexType):178:179 -> a
+    118:126:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):185:193 -> a
+    127:127:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):191:191 -> a
+    128:130:java.lang.Object getKnown(java.util.Map,java.lang.Object):241:243 -> a
+    131:138:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):247:254 -> a
+    1:1:boolean hasLambdaClassPrefix(com.android.tools.r8.graph.DexType):82:82 -> b
+    2:4:java.util.Set getDesugaredCallSites():198:200 -> b
+com.android.tools.r8.ir.desugar.LambdaRewriterGraphLense -> a.a.a.a.h.d.F:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():15:15 -> <clinit>
     1:5:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory):20:24 -> <init>
     6:6:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory):19:19 -> <init>
     1:3:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):31:33 -> b
-com.android.tools.r8.ir.desugar.StringConcatRewriter -> a.a.a.a.h.d.O:
+com.android.tools.r8.ir.desugar.StringConcatRewriter -> a.a.a.a.h.d.L:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexMethod defaultAppendMethod -> h
@@ -24559,50 +24034,50 @@
     java.util.Map paramTypeToAppendMethod -> g
     1:1:void <init>(com.android.tools.r8.graph.AppView):63:63 -> <init>
     2:9:void <init>(com.android.tools.r8.graph.AppView):60:67 -> <init>
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> <init>
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> <init>
     10:10:void <init>(com.android.tools.r8.graph.AppView):67 -> <init>
     11:11:void <init>(com.android.tools.r8.graph.AppView):68:68 -> <init>
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> <init>
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> <init>
     12:12:void <init>(com.android.tools.r8.graph.AppView):68 -> <init>
     13:13:void <init>(com.android.tools.r8.graph.AppView):69:69 -> <init>
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> <init>
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> <init>
     14:14:void <init>(com.android.tools.r8.graph.AppView):69 -> <init>
     15:15:void <init>(com.android.tools.r8.graph.AppView):70:70 -> <init>
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> <init>
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> <init>
     16:16:void <init>(com.android.tools.r8.graph.AppView):70 -> <init>
     17:19:void <init>(com.android.tools.r8.graph.AppView):72:74 -> <init>
     20:27:void <init>(com.android.tools.r8.graph.AppView):72:79 -> <init>
     28:35:void <init>(com.android.tools.r8.graph.AppView):76:83 -> <init>
     36:42:void <init>(com.android.tools.r8.graph.AppView):81:87 -> <init>
     43:50:void <init>(com.android.tools.r8.graph.AppView):85:92 -> <init>
-    51:51:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1081:1081 -> <init>
+    51:51:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):980:980 -> <init>
     51:51:void <init>(com.android.tools.r8.graph.AppView):91 -> <init>
     52:55:void <init>(com.android.tools.r8.graph.AppView):91:94 -> <init>
-    56:56:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1081:1081 -> <init>
+    56:56:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):980:980 -> <init>
     56:56:void <init>(com.android.tools.r8.graph.AppView):93 -> <init>
     57:60:void <init>(com.android.tools.r8.graph.AppView):93:96 -> <init>
-    61:61:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1081:1081 -> <init>
+    61:61:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):980:980 -> <init>
     61:61:void <init>(com.android.tools.r8.graph.AppView):95 -> <init>
     62:65:void <init>(com.android.tools.r8.graph.AppView):95:98 -> <init>
-    66:66:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1081:1081 -> <init>
+    66:66:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):980:980 -> <init>
     66:66:void <init>(com.android.tools.r8.graph.AppView):97 -> <init>
     67:70:void <init>(com.android.tools.r8.graph.AppView):97:100 -> <init>
-    71:71:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1081:1081 -> <init>
+    71:71:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):980:980 -> <init>
     71:71:void <init>(com.android.tools.r8.graph.AppView):99 -> <init>
     72:75:void <init>(com.android.tools.r8.graph.AppView):99:102 -> <init>
-    76:76:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1081:1081 -> <init>
+    76:76:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):980:980 -> <init>
     76:76:void <init>(com.android.tools.r8.graph.AppView):101 -> <init>
     77:80:void <init>(com.android.tools.r8.graph.AppView):101:104 -> <init>
-    81:81:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1081:1081 -> <init>
+    81:81:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):980:980 -> <init>
     81:81:void <init>(com.android.tools.r8.graph.AppView):103 -> <init>
     82:85:void <init>(com.android.tools.r8.graph.AppView):103:106 -> <init>
-    86:86:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1081:1081 -> <init>
+    86:86:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):980:980 -> <init>
     86:86:void <init>(com.android.tools.r8.graph.AppView):105 -> <init>
     87:90:void <init>(com.android.tools.r8.graph.AppView):105:108 -> <init>
-    91:91:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1081:1081 -> <init>
+    91:91:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):980:980 -> <init>
     91:91:void <init>(com.android.tools.r8.graph.AppView):107 -> <init>
     92:95:void <init>(com.android.tools.r8.graph.AppView):107:110 -> <init>
-    96:96:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1081:1081 -> <init>
+    96:96:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):980:980 -> <init>
     96:96:void <init>(com.android.tools.r8.graph.AppView):109 -> <init>
     97:97:void <init>(com.android.tools.r8.graph.AppView):109:109 -> <init>
     1:1:com.android.tools.r8.graph.DexItemFactory access$100(com.android.tools.r8.ir.desugar.StringConcatRewriter):40:40 -> a
@@ -24652,8 +24127,8 @@
     162:164:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.DexMethod,java.lang.String):457:459 -> a
     1:1:com.android.tools.r8.graph.DexMethod access$200(com.android.tools.r8.ir.desugar.StringConcatRewriter):40:40 -> b
     1:1:com.android.tools.r8.graph.DexMethod access$300(com.android.tools.r8.ir.desugar.StringConcatRewriter):40:40 -> c
-com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> a.a.a.a.h.d.J:
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> a.a.a.a.h.d.N:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> a.a.a.a.h.d.G:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> a.a.a.a.h.d.K:
     java.util.ListIterator blocks -> c
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> f
     com.android.tools.r8.graph.AppView appView -> a
@@ -24682,22 +24157,22 @@
     27:41:void desugar():357:371 -> a
     42:72:void desugar():370:400 -> a
     1:1:com.android.tools.r8.ir.code.IRCode access$600(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder):284:284 -> b
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ArgumentChunk -> a.a.a.a.h.d.K:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ArgumentChunk -> a.a.a.a.h.d.H:
     com.android.tools.r8.ir.code.Value value -> c
     1:2:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod):424:425 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getOrCreateValue():430:430 -> a
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk -> a.a.a.a.h.d.L:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk -> a.a.a.a.h.d.I:
     com.android.tools.r8.graph.DexMethod method -> a
     com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder this$1 -> b
     1:2:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,com.android.tools.r8.graph.DexMethod):407:408 -> <init>
     com.android.tools.r8.ir.code.Value getOrCreateValue() -> a
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ConstantChunk -> a.a.a.a.h.d.M:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ConstantChunk -> a.a.a.a.h.d.J:
     com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder this$1 -> d
     java.lang.String str -> c
     1:3:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,java.lang.String,com.android.tools.r8.graph.DexMethod):437:439 -> <init>
     1:7:com.android.tools.r8.ir.code.Value getOrCreateValue():444:450 -> a
     8:8:com.android.tools.r8.ir.code.Value getOrCreateValue():446:446 -> a
-com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode -> a.a.a.a.h.d.P:
+com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode -> a.a.a.a.h.d.M:
     com.android.tools.r8.graph.DexMethod currentMethod -> n
     boolean $assertionsDisabled -> p
     com.android.tools.r8.ir.desugar.LambdaClass lambda -> o
@@ -24710,7 +24185,7 @@
     1:1:com.android.tools.r8.ir.desugar.LambdaDescriptor descriptor():33:33 -> l
     1:1:com.android.tools.r8.graph.DexItemFactory factory():43:43 -> m
     1:1:java.lang.String toString():59:59 -> toString
-com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter -> a.a.a.a.h.d.S:
+com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter -> a.a.a.a.h.d.O:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set referencingClasses -> d
     boolean $assertionsDisabled -> e
@@ -24719,7 +24194,7 @@
     1:1:void <clinit>():51:51 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):63:63 -> <init>
     2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):61:67 -> <init>
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> <init>
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> <init>
     9:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):68 -> <init>
     10:14:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):69:73 -> <init>
     1:18:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):79:96 -> a
@@ -24727,7 +24202,7 @@
     24:36:boolean isSynthesizedCloseResourceMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):105:117 -> a
     37:76:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):124:163 -> a
     77:77:boolean lambda$synthesizeUtilityClass$0(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexProgramClass):160:160 -> a
-com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter$CloseResourceMethodCode -> a.a.a.a.h.d.Q:
+com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter$CloseResourceMethodCode -> a.a.a.a.h.d.N:
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):171:171 -> <init>
 com.android.tools.r8.ir.optimize.BasicBlockInstructionsEquivalence -> a.a.a.a.h.e.a:
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> a
@@ -24762,334 +24237,331 @@
     2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):98:104 -> <init>
     1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization):61:61 -> a
     2:14:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):108:120 -> a
-    15:41:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):321:347 -> a
+    15:41:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):320:346 -> a
     15:41:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
-    42:43:boolean com.android.tools.r8.graph.DexClass.definesStaticField(com.android.tools.r8.graph.DexField):404:405 -> a
-    42:43:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):348 -> a
+    42:43:boolean com.android.tools.r8.graph.DexClass.definesStaticField(com.android.tools.r8.graph.DexField):402:403 -> a
+    42:43:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):347 -> a
     42:43:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
-    44:49:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):349:354 -> a
+    44:49:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):348:353 -> a
     44:49:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
-    50:52:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():760:762 -> a
-    50:52:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):354 -> a
+    50:52:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():741:743 -> a
+    50:52:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):353 -> a
     50:52:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
-    53:61:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):357:365 -> a
+    53:61:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):356:364 -> a
     53:61:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
-    62:66:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):406:410 -> a
-    62:66:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):367 -> a
+    62:66:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):405:409 -> a
+    62:66:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):366 -> a
     62:66:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
-    67:96:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):369:398 -> a
+    67:96:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):368:397 -> a
     67:96:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
-    97:104:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):393:400 -> a
+    97:104:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):392:399 -> a
     97:104:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
     105:117:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):125:137 -> a
-    118:139:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):253:274 -> a
+    118:139:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):252:273 -> a
     118:139:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
-    140:177:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):278:315 -> a
-    140:177:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):274 -> a
+    140:177:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):277:314 -> a
+    140:177:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):273 -> a
     140:177:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
     178:178:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137:137 -> a
-    179:179:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):315:315 -> a
-    179:179:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):274 -> a
+    179:179:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):314:314 -> a
+    179:179:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):273 -> a
     179:179:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
     180:188:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138:146 -> a
-    189:189:boolean com.android.tools.r8.ir.code.ConstNumber.getBooleanValue():67:67 -> a
+    189:189:boolean com.android.tools.r8.ir.code.ConstNumber.getBooleanValue():62:62 -> a
     189:189:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):147 -> a
     190:206:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):147:163 -> a
-    207:316:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):139:248 -> a
-    317:317:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):398:398 -> a
-    317:317:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
-    318:318:com.android.tools.r8.graph.DexField lambda$optimize$0(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexField):215:215 -> a
-    319:320:void lambda$optimize$1():237:238 -> a
-    321:329:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):416:424 -> a
+    207:315:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):139:247 -> a
+    316:316:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):397:397 -> a
+    316:316:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
+    317:317:com.android.tools.r8.graph.DexField lambda$optimize$0(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexField):214:214 -> a
+    318:319:void lambda$optimize$1():236:237 -> a
+    320:328:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):415:423 -> a
 com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> a.a.a.a.h.e.b:
     java.util.Map fieldsWithStaticValues -> a
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization this$0 -> c
     java.util.Set noLongerWrittenFields -> b
     1:3:void <init>(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization,java.util.Map,java.util.Set):70:72 -> <init>
     1:2:void join(java.util.Map,java.util.Set):78:79 -> a
-    3:5:void execute():85:87 -> a
-    6:10:void execute():86:90 -> a
+    1:3:void execute():85:87 -> execute
+    4:8:void execute():86:90 -> execute
 com.android.tools.r8.ir.optimize.CodeRewriter -> a.a.a.a.h.e.m:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
-    boolean $assertionsDisabled -> e
-    com.android.tools.r8.utils.InternalOptions options -> d
+    java.util.Set libraryMethodsReturningReceiver -> d
+    boolean $assertionsDisabled -> f
+    com.android.tools.r8.utils.InternalOptions options -> e
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
     1:1:void <clinit>():141:141 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):160:164 -> <init>
+    1:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,java.util.Set):164:169 -> <init>
     boolean lambda$computeConstantArrayValues$11(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction) -> a
-    1:2:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):190:191 -> a
-    3:26:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):202:225 -> a
-    27:36:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):230:239 -> a
-    37:37:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):292:292 -> a
-    38:38:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():870:870 -> a
-    38:38:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):292 -> a
+    1:2:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):195:196 -> a
+    3:26:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):207:230 -> a
+    27:36:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):235:244 -> a
+    37:37:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):297:297 -> a
+    38:38:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():841:841 -> a
+    38:38:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):297 -> a
     39:40:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():519:520 -> a
-    39:40:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):292 -> a
-    41:64:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):297:320 -> a
-    65:101:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):468:504 -> a
-    102:103:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):336:337 -> a
-    102:103:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):505 -> a
-    104:118:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):506:520 -> a
-    119:120:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):336:337 -> a
-    119:120:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):521 -> a
-    121:130:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):522:531 -> a
-    131:144:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):579:592 -> a
-    145:145:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):589:589 -> a
-    146:157:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):602:613 -> a
-    158:165:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):618:625 -> a
-    166:166:int codeUnitMargin():632:632 -> a
-    167:167:int lambda$rewriteSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):769:769 -> a
-    168:182:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):921:935 -> a
-    183:201:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):245:263 -> a
-    183:201:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):936 -> a
-    202:202:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):938:938 -> a
-    203:216:void collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):269:282 -> a
-    203:216:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):939 -> a
+    39:40:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):297 -> a
+    41:64:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):302:325 -> a
+    65:101:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):473:509 -> a
+    102:103:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):341:342 -> a
+    102:103:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):510 -> a
+    104:118:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):511:525 -> a
+    119:120:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):341:342 -> a
+    119:120:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):526 -> a
+    121:130:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):527:536 -> a
+    131:144:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):584:597 -> a
+    145:145:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):594:594 -> a
+    146:157:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):607:618 -> a
+    158:165:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):623:630 -> a
+    166:166:int codeUnitMargin():637:637 -> a
+    167:167:int lambda$rewriteSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):774:774 -> a
+    168:182:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):926:940 -> a
+    183:201:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):250:268 -> a
+    183:201:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):941 -> a
+    202:202:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):943:943 -> a
+    203:216:void collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):274:287 -> a
+    203:216:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):944 -> a
     217:217:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):401:401 -> a
-    217:217:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):943 -> a
-    218:225:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):945:952 -> a
+    217:217:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):948 -> a
+    218:225:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):950:957 -> a
     226:226:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):401:401 -> a
-    226:226:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):956 -> a
-    227:228:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):958:959 -> a
-    229:232:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.OptimizationFeedback):1012:1015 -> a
-    233:239:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.OptimizationFeedback):1014:1020 -> a
-    240:240:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.OptimizationFeedback):1019:1019 -> a
-    241:294:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1036:1089 -> a
-    295:339:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1064:1108 -> a
-    340:413:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):1264:1337 -> a
-    414:414:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):1369:1369 -> a
-    415:419:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1372:1376 -> a
-    420:435:boolean isKotlinNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):1434:1449 -> a
-    420:435:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1378 -> a
-    436:457:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1379:1400 -> a
-    458:463:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1399:1404 -> a
-    464:471:boolean isInstantiationOfNullPointerException(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):1468:1475 -> a
-    464:471:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1404 -> a
-    472:492:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1405:1425 -> a
-    493:495:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1457:1459 -> a
-    496:496:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1489:1489 -> a
-    497:513:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$4(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1492:1508 -> a
-    514:573:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1520:1579 -> a
-    574:614:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1539:1579 -> a
-    615:628:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1566:1579 -> a
-    629:629:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1587:1587 -> a
-    630:630:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1586:1586 -> a
-    631:637:com.android.tools.r8.graph.DexType getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1597:1603 -> a
-    631:637:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1590 -> a
-    638:638:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1590:1590 -> a
-    639:643:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1589:1593 -> a
-    644:681:void disableAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1751:1788 -> a
-    682:693:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1872:1883 -> a
-    694:724:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1989:2019 -> a
-    694:724:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1883 -> a
-    725:741:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):2018:2034 -> a
-    725:741:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1883 -> a
-    742:742:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):2028:2028 -> a
-    742:742:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1883 -> a
-    743:745:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1895:1897 -> a
-    746:759:boolean removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1903:1916 -> a
-    760:760:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtCheckCastVerifierBug():998:998 -> a
-    760:760:boolean removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1916 -> a
-    761:787:boolean removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1917:1943 -> a
-    788:788:boolean com.android.tools.r8.ir.analysis.type.Nullability.lessThanOrEqual(com.android.tools.r8.ir.analysis.type.Nullability):62:62 -> a
-    788:788:boolean removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1943 -> a
-    789:810:boolean removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1943:1964 -> a
-    811:812:boolean lambda$removeCheckCastInstructionIfTrivial$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):1928:1929 -> a
-    813:825:boolean isTypeInaccessibleInCurrentContext(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1969:1981 -> a
-    826:831:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):2041:2046 -> a
-    832:842:void removeOrReplaceByDebugLocalWrite(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2051:2061 -> a
-    843:844:boolean lambda$shortenLiveRanges$7(com.android.tools.r8.ir.code.ConstInstruction):2231:2232 -> a
-    845:899:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):2296:2350 -> a
-    900:911:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):2355:2366 -> a
-    912:914:boolean lambda$insertConstantInBlock$10(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):2360:2362 -> a
-    915:915:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():831:831 -> a
-    915:915:boolean lambda$insertConstantInBlock$10(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):2363 -> a
-    916:916:boolean lambda$insertConstantInBlock$10(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):2363:2363 -> a
-    917:964:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):2401:2448 -> a
-    965:970:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2778:2783 -> a
-    971:972:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2967:2968 -> a
-    973:973:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2972:2972 -> a
-    974:978: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):3381:3385 -> a
-    979:994:void rewriteLongCompareAndRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3436:3451 -> a
-    995:1011:void rewriteLongCompareAndRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3449:3465 -> a
-    1012:1035:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3476:3499 -> a
-    1036:1070:java.util.Set computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3536:3570 -> a
-    1036:1070:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3503 -> a
-    1071:1093:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3504:3526 -> a
-    1094:1103:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3581:3590 -> a
-    1104:1104:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3643:3643 -> a
-    1105:1114:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3649:3658 -> a
-    1105:1114:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3645 -> a
-    1115:1115:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3655:3655 -> a
-    1115:1115:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3645 -> a
-    1116:1121: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):3664:3669 -> a
-    1122:1138:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3679:3695 -> a
-    1139:1139:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> a
-    1139:1139:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3695 -> a
-    1140:1140:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3696:3696 -> a
-    1141:1141:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> a
-    1141:1141:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3696 -> a
-    1142:1142:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3699:3699 -> a
-    1143:1152:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3698:3707 -> a
-    1153:1214:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3705:3766 -> a
-    1215:1230:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3765:3780 -> a
-    1231:1240:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3784:3793 -> a
-    1241:1251:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3807:3817 -> a
-    1241:1251:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3793 -> a
-    1252:1252:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3794:3794 -> a
-    1253:1278:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):3840:3865 -> a
-    1253:1278:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3794 -> a
-    1279:1283:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3795:3799 -> a
-    1284:1284:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3796:3796 -> a
-    1285:1285:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3815:3815 -> a
-    1285:1285:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3793 -> a
-    1286:1286:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3811:3811 -> a
-    1286:1286:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3793 -> a
-    1287:1293:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3821:3827 -> a
-    1:1:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):180:180 -> b
-    2:2:void lambda$removeSwitchMaps$2(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):901:901 -> b
-    3:7:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1135:1139 -> b
-    8:14:com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage collectParameterUsages(int,com.android.tools.r8.ir.code.Value):1151:1157 -> b
-    8:14:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1142 -> b
-    15:18:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1144:1147 -> b
-    19:20:boolean isClassDesiredAssertionStatusInvoke(com.android.tools.r8.ir.code.Instruction):1795:1796 -> b
-    21:22:com.android.tools.r8.ir.code.Value blockWithAssertionsDisabledFieldPut(com.android.tools.r8.ir.code.BasicBlock):1820:1821 -> b
-    23:24:boolean isAssertionsDisabledFieldPut(com.android.tools.r8.ir.code.Instruction):1801:1802 -> b
-    23:24:com.android.tools.r8.ir.code.Value blockWithAssertionsDisabledFieldPut(com.android.tools.r8.ir.code.BasicBlock):1823 -> b
-    25:25:com.android.tools.r8.ir.code.Value blockWithAssertionsDisabledFieldPut(com.android.tools.r8.ir.code.BasicBlock):1823:1823 -> b
-    26:26:boolean lambda$shortenLiveRanges$8(com.android.tools.r8.ir.code.ConstInstruction):2240:2240 -> b
-    27:27:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2800:2800 -> b
-    28:35:boolean hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2787:2794 -> b
-    28:35:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2801 -> b
-    36:52:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2803:2819 -> b
-    53:62:boolean shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2765:2774 -> b
-    53:62:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2820 -> b
-    63:78:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2821:2836 -> b
-    79:81:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$15():3928:3930 -> b
-    82:82:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$15():3928:3928 -> b
-    1:40:void identifyReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):964:1003 -> c
-    41:41:boolean isNotDebugInstruction(com.android.tools.r8.ir.code.Instruction):1806:1806 -> c
-    42:48:com.android.tools.r8.ir.code.Value blockWithSingleConstNumberAndGoto(com.android.tools.r8.ir.code.BasicBlock):1810:1816 -> c
-    49:95:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3184:3230 -> c
-    96:97:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):827:828 -> c
-    96:97:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3230 -> c
-    98:109:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3231:3242 -> c
-    1:9:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):869:877 -> d
-    10:48:com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo com.android.tools.r8.ir.optimize.SwitchUtils.analyzeSwitchOverEnum(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):62:100 -> d
-    10:48:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):877 -> d
-    49:77:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):879:907 -> d
-    78:93:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1114:1129 -> d
-    94:173:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeInstanceInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.function.Function):1175:1254 -> d
-    94:173:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1129 -> d
-    174:174:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1130:1130 -> d
-    175:175:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1127:1127 -> d
-    176:199:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3347:3370 -> d
-    200:200:boolean lambda$logArgumentTypes$14(com.android.tools.r8.ir.code.Instruction):3688:3688 -> d
-    1:36:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1608:1643 -> e
-    37:79:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1642:1684 -> e
-    80:80:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):401:401 -> e
-    80:80:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1685 -> e
-    81:95:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1686:1700 -> e
-    96:96:java.util.List lambda$shortenLiveRangesInsideBlock$9(com.android.tools.r8.ir.code.BasicBlock):2344:2344 -> e
-    1:100:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):727:826 -> f
-    101:187:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.Switch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):636:722 -> f
-    101:187:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):827 -> f
-    188:207:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):830:849 -> f
-    1:40:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3600:3639 -> g
-    1:59:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2217:2275 -> h
-    60:86:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2260:2286 -> h
-    1:12:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2478:2489 -> i
-    13:29:boolean allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2454:2470 -> i
-    13:29:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2490 -> i
-    30:46:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2493:2509 -> i
-    47:64:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2508:2525 -> i
-    65:81:short[] computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):2374:2390 -> i
-    65:81:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2526 -> i
-    82:124:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2530:2572 -> i
-    1:6:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2614:2619 -> j
-    7:24:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2658:2675 -> j
-    7:24:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2619 -> j
-    25:35:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2624:2634 -> j
-    36:60:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2581:2605 -> j
-    36:60:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2636 -> j
-    61:74:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2637:2650 -> j
-    75:75:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2610:2610 -> j
-    75:75:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2636 -> j
-    1:6:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2840:2845 -> k
-    7:23:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.BasicBlock):3415:3431 -> k
-    7:23:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2846 -> k
-    24:35:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3389:3400 -> k
-    24:35:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2847 -> k
-    36:49:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():27:40 -> k
-    36:49:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3400 -> k
-    36:49:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2847 -> k
-    50:50:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():38:38 -> k
-    50:50:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3400 -> k
-    50:50:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2847 -> k
-    51:51:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():36:36 -> k
-    51:51:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3400 -> k
-    51:51:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2847 -> k
-    52:52:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():34:34 -> k
-    52:52:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3400 -> k
-    52:52:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2847 -> k
-    53:53:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():32:32 -> k
-    53:53:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3400 -> k
-    53:53:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2847 -> k
-    54:62:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3400:3408 -> k
-    54:62:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2847 -> k
-    63:124:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3276:3337 -> k
-    63:124:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2849 -> k
-    125:175:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2854:2904 -> k
-    176:177:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2896:2897 -> k
-    178:224:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2888:2934 -> k
-    225:262:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2924:2961 -> k
-    1:26:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2074:2099 -> l
-    1:4:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2113:2116 -> m
-    5:8:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2153:2156 -> m
-    5:8:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2117 -> m
-    9:17:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2171:2179 -> m
-    9:17:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2157 -> m
-    9:17:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2117 -> m
-    18:18:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> m
-    18:18:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2179 -> m
-    18:18:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2157 -> m
-    18:18:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2117 -> m
-    19:21:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2179:2181 -> m
-    19:21:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2157 -> m
-    19:21:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2117 -> m
-    22:29:boolean hasPath(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2202:2209 -> m
-    22:29:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2182 -> m
-    22:29:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2157 -> m
-    22:29:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2117 -> m
-    30:31:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2187:2188 -> m
-    30:31:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2157 -> m
-    30:31:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2117 -> m
-    32:52:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2118:2138 -> m
-    53:71:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2126:2144 -> m
-    1:15:void workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3984:3998 -> n
-    1:46:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3927:3972 -> o
-    1:37:boolean hasJavacClinitAssertionCode(com.android.tools.r8.ir.code.IRCode):1827:1863 -> p
-    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$6(com.android.tools.r8.ir.code.IRCode):2218:2218 -> q
-    1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):168:180 -> r
-    14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):177:183 -> r
+    226:226:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):961 -> a
+    227:228:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):963:964 -> a
+    229:232:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.OptimizationFeedback):1017:1020 -> a
+    233:239:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.OptimizationFeedback):1019:1025 -> a
+    240:240:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.OptimizationFeedback):1024:1024 -> a
+    241:294:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1041:1094 -> a
+    295:339:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1069:1113 -> a
+    340:402:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):1269:1331 -> a
+    403:403:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):1363:1363 -> a
+    404:408:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1366:1370 -> a
+    409:424:boolean isKotlinNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):1428:1443 -> a
+    409:424:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1372 -> a
+    425:446:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1373:1394 -> a
+    447:452:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1393:1398 -> a
+    453:460:boolean isInstantiationOfNullPointerException(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):1462:1469 -> a
+    453:460:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1398 -> a
+    461:481:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1399:1419 -> a
+    482:484:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1451:1453 -> a
+    485:485:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1483:1483 -> a
+    486:501:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$4(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1486:1501 -> a
+    502:561:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1513:1572 -> a
+    562:602:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1532:1572 -> a
+    603:616:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1559:1572 -> a
+    617:617:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1580:1580 -> a
+    618:618:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1579:1579 -> a
+    619:625:com.android.tools.r8.graph.DexType getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1590:1596 -> a
+    619:625:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1583 -> a
+    626:626:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1583:1583 -> a
+    627:631:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1582:1586 -> a
+    632:669:void disableAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1729:1766 -> a
+    670:681:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1850:1861 -> a
+    682:712:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1965:1995 -> a
+    682:712:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1861 -> a
+    713:729:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1994:2010 -> a
+    713:729:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1861 -> a
+    730:730:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):2004:2004 -> a
+    730:730:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1861 -> a
+    731:733:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1873:1875 -> a
+    734:747:boolean removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1881:1894 -> a
+    748:748:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtCheckCastVerifierBug():968:968 -> a
+    748:748:boolean removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1894 -> a
+    749:773:boolean removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1895:1919 -> a
+    774:774:boolean com.android.tools.r8.ir.analysis.type.Nullability.lessThanOrEqual(com.android.tools.r8.ir.analysis.type.Nullability):47:47 -> a
+    774:774:boolean removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1919 -> a
+    775:796:boolean removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1919:1940 -> a
+    797:797:boolean lambda$removeCheckCastInstructionIfTrivial$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):1905:1905 -> a
+    798:810:boolean isTypeInaccessibleInCurrentContext(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1945:1957 -> a
+    811:816:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):2017:2022 -> a
+    817:827:void removeOrReplaceByDebugLocalWrite(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2027:2037 -> a
+    828:829:boolean lambda$shortenLiveRanges$7(com.android.tools.r8.ir.code.ConstInstruction):2207:2208 -> a
+    830:884:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):2272:2326 -> a
+    885:896:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):2331:2342 -> a
+    897:899:boolean lambda$insertConstantInBlock$10(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):2336:2338 -> a
+    900:900:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():802:802 -> a
+    900:900:boolean lambda$insertConstantInBlock$10(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):2339 -> a
+    901:901:boolean lambda$insertConstantInBlock$10(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):2339:2339 -> a
+    902:949:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):2377:2424 -> a
+    950:955:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2752:2757 -> a
+    956:957:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2941:2942 -> a
+    958:958:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2946:2946 -> a
+    959:963: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):3355:3359 -> a
+    964:979:void rewriteLongCompareAndRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3410:3425 -> a
+    980:996:void rewriteLongCompareAndRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3423:3439 -> a
+    997:1020:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3450:3473 -> a
+    1021:1055:java.util.Set computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3510:3544 -> a
+    1021:1055:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3477 -> a
+    1056:1078:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3478:3500 -> a
+    1079:1088:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3555:3564 -> a
+    1089:1089:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3617:3617 -> a
+    1090:1099:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3623:3632 -> a
+    1090:1099:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3619 -> a
+    1100:1100:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3629:3629 -> a
+    1100:1100:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3619 -> a
+    1101:1106: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):3638:3643 -> a
+    1107:1123:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3653:3669 -> a
+    1124:1124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> a
+    1124:1124:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3669 -> a
+    1125:1125:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3670:3670 -> a
+    1126:1126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> a
+    1126:1126:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3670 -> a
+    1127:1127:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3673:3673 -> a
+    1128:1137:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3672:3681 -> a
+    1138:1199:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3679:3740 -> a
+    1200:1215:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3739:3754 -> a
+    1216:1222:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3796:3802 -> a
+    1:1:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):185:185 -> b
+    2:2:void lambda$removeSwitchMaps$2(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):906:906 -> b
+    3:7:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1140:1144 -> b
+    8:14:com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage collectParameterUsages(int,com.android.tools.r8.ir.code.Value):1156:1162 -> b
+    8:14:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1147 -> b
+    15:18:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1149:1152 -> b
+    19:20:boolean isClassDesiredAssertionStatusInvoke(com.android.tools.r8.ir.code.Instruction):1773:1774 -> b
+    21:22:com.android.tools.r8.ir.code.Value blockWithAssertionsDisabledFieldPut(com.android.tools.r8.ir.code.BasicBlock):1798:1799 -> b
+    23:24:boolean isAssertionsDisabledFieldPut(com.android.tools.r8.ir.code.Instruction):1779:1780 -> b
+    23:24:com.android.tools.r8.ir.code.Value blockWithAssertionsDisabledFieldPut(com.android.tools.r8.ir.code.BasicBlock):1801 -> b
+    25:25:com.android.tools.r8.ir.code.Value blockWithAssertionsDisabledFieldPut(com.android.tools.r8.ir.code.BasicBlock):1801:1801 -> b
+    26:26:boolean lambda$shortenLiveRanges$8(com.android.tools.r8.ir.code.ConstInstruction):2216:2216 -> b
+    27:27:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2774:2774 -> b
+    28:35:boolean hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2761:2768 -> b
+    28:35:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2775 -> b
+    36:52:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2777:2793 -> b
+    53:62:boolean shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2739:2748 -> b
+    53:62:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2794 -> b
+    63:78:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2795:2810 -> b
+    79:81:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$15():3903:3905 -> b
+    82:82:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$15():3903:3903 -> b
+    1:40:void identifyReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):969:1008 -> c
+    41:41:boolean isNotDebugInstruction(com.android.tools.r8.ir.code.Instruction):1784:1784 -> c
+    42:48:com.android.tools.r8.ir.code.Value blockWithSingleConstNumberAndGoto(com.android.tools.r8.ir.code.BasicBlock):1788:1794 -> c
+    49:59:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode):3758:3768 -> c
+    60:70:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3782:3792 -> c
+    60:70:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode):3768 -> c
+    71:71:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode):3769:3769 -> c
+    72:97:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):3815:3840 -> c
+    72:97:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode):3769 -> c
+    98:102:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode):3770:3774 -> c
+    103:103:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode):3771:3771 -> c
+    104:104:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3790:3790 -> c
+    104:104:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode):3768 -> c
+    105:105:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3786:3786 -> c
+    105:105:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode):3768 -> c
+    1:16:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1119:1134 -> d
+    17:96:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeInstanceInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.function.Function):1180:1259 -> d
+    17:96:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1134 -> d
+    97:97:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1135:1135 -> d
+    98:98:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1132:1132 -> d
+    99:145:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3158:3204 -> d
+    146:147:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):827:828 -> d
+    146:147:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3204 -> d
+    148:159:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3205:3216 -> d
+    160:183:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3321:3344 -> d
+    184:184:boolean lambda$logArgumentTypes$14(com.android.tools.r8.ir.code.Instruction):3662:3662 -> d
+    1:9:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):874:882 -> e
+    10:48:com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo com.android.tools.r8.ir.optimize.SwitchUtils.analyzeSwitchOverEnum(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):62:100 -> e
+    10:48:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):882 -> e
+    49:77:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):884:912 -> e
+    78:78:java.util.List lambda$shortenLiveRangesInsideBlock$9(com.android.tools.r8.ir.code.BasicBlock):2320:2320 -> e
+    1:78:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1601:1678 -> f
+    1:100:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):732:831 -> g
+    101:187:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.Switch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):641:727 -> g
+    101:187:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):832 -> g
+    188:207:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):835:854 -> g
+    1:40:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3574:3613 -> h
+    1:59:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2193:2251 -> i
+    60:86:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2236:2262 -> i
+    1:12:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2454:2465 -> j
+    13:29:boolean allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2430:2446 -> j
+    13:29:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2466 -> j
+    30:46:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2469:2485 -> j
+    47:64:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2484:2501 -> j
+    65:81:short[] computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):2350:2366 -> j
+    65:81:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2502 -> j
+    82:124:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2506:2548 -> j
+    1:6:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2590:2595 -> k
+    7:24:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2634:2651 -> k
+    7:24:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2595 -> k
+    25:35:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2600:2610 -> k
+    36:60:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2557:2581 -> k
+    36:60:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2612 -> k
+    61:74:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2613:2626 -> k
+    75:75:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2586:2586 -> k
+    75:75:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2612 -> k
+    1:6:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2814:2819 -> l
+    7:23:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.BasicBlock):3389:3405 -> l
+    7:23:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2820 -> l
+    24:35:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3363:3374 -> l
+    24:35:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2821 -> l
+    36:49:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():27:40 -> l
+    36:49:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3374 -> l
+    36:49:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2821 -> l
+    50:50:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():38:38 -> l
+    50:50:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3374 -> l
+    50:50:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2821 -> l
+    51:51:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():36:36 -> l
+    51:51:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3374 -> l
+    51:51:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2821 -> l
+    52:52:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():34:34 -> l
+    52:52:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3374 -> l
+    52:52:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2821 -> l
+    53:53:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():32:32 -> l
+    53:53:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3374 -> l
+    53:53:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2821 -> l
+    54:62:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3374:3382 -> l
+    54:62:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2821 -> l
+    63:124:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3250:3311 -> l
+    63:124:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2823 -> l
+    125:175:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2828:2878 -> l
+    176:177:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2870:2871 -> l
+    178:224:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2862:2908 -> l
+    225:262:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2898:2935 -> l
+    1:26:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2050:2075 -> m
+    1:4:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2089:2092 -> n
+    5:8:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2129:2132 -> n
+    5:8:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2093 -> n
+    9:17:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2147:2155 -> n
+    9:17:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2133 -> n
+    9:17:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2093 -> n
+    18:18:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> n
+    18:18:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2155 -> n
+    18:18:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2133 -> n
+    18:18:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2093 -> n
+    19:21:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2155:2157 -> n
+    19:21:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2133 -> n
+    19:21:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2093 -> n
+    22:29:boolean hasPath(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2178:2185 -> n
+    22:29:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2158 -> n
+    22:29:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2133 -> n
+    22:29:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2093 -> n
+    30:31:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2163:2164 -> n
+    30:31:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2133 -> n
+    30:31:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2093 -> n
+    32:52:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2094:2114 -> n
+    53:71:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2102:2120 -> n
+    1:14:void workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3959:3972 -> o
+    1:46:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3902:3947 -> p
+    1:37:boolean hasJavacClinitAssertionCode(com.android.tools.r8.ir.code.IRCode):1805:1841 -> q
+    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$6(com.android.tools.r8.ir.code.IRCode):2194:2194 -> r
+    1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):173:185 -> s
+    14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):182:188 -> s
 com.android.tools.r8.ir.optimize.CodeRewriter$1 -> a.a.a.a.h.e.d:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
-    1:1:void <clinit>():2882:2882 -> <clinit>
+    1:1:void <clinit>():2856:2856 -> <clinit>
 com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> a.a.a.a.h.e.e:
-    com.android.tools.r8.utils.InternalOptions options -> a
+    com.android.tools.r8.ir.code.IRCode code -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():2679:2679 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):2684:2686 -> <init>
-    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.CodeRewriter$1):2679 -> <init>
-    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2679:2679 -> a
-    2:21:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2694:2713 -> a
-    2:21:boolean doEquivalent(java.lang.Object,java.lang.Object):2679 -> a
-    22:22:int doHash(java.lang.Object):2679:2679 -> a
-    23:37:int doHash(com.android.tools.r8.ir.code.Instruction):2724:2738 -> a
-    23:37:int doHash(java.lang.Object):2679 -> a
-    38:43:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2745:2750 -> a
-    44:48:int getHashCode(com.android.tools.r8.ir.code.Value):2756:2760 -> a
+    1:1:void <clinit>():2655:2655 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.code.IRCode):2659:2660 -> <init>
+    1:2:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.CodeRewriter$1):2655 -> <init>
+    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2655:2655 -> a
+    2:21:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2668:2687 -> a
+    2:21:boolean doEquivalent(java.lang.Object,java.lang.Object):2655 -> a
+    22:22:int doHash(java.lang.Object):2655:2655 -> a
+    23:37:int doHash(com.android.tools.r8.ir.code.Instruction):2698:2712 -> a
+    23:37:int doHash(java.lang.Object):2655 -> a
+    38:43:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2719:2724 -> a
+    44:48:int getHashCode(com.android.tools.r8.ir.code.Value):2730:2734 -> a
 com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> a.a.a.a.h.e.f:
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> g
     com.android.tools.r8.ir.code.BasicBlock target -> f
@@ -25097,17 +24569,17 @@
     com.android.tools.r8.ir.code.IRCode code -> c
     boolean $assertionsDisabled -> h
     int right -> e
-    1:1:void <clinit>():401:401 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRCode):409:410 -> <init>
+    1:1:void <clinit>():406:406 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRCode):414:415 -> <init>
     java.lang.Object self() -> a
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setLeft(com.android.tools.r8.ir.code.Value):419:419 -> a
-    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):424:424 -> a
-    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):434:434 -> a
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):429:429 -> b
-    2:10:com.android.tools.r8.ir.code.BasicBlock build():439:447 -> b
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setLeft(com.android.tools.r8.ir.code.Value):424:424 -> a
+    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):429:429 -> a
+    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):439:439 -> a
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):434:434 -> b
+    2:10:com.android.tools.r8.ir.code.BasicBlock build():444:452 -> b
     11:15: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.Instruction):1291:1295 -> b
-    11:15:com.android.tools.r8.ir.code.BasicBlock build():447 -> b
-    16:21:com.android.tools.r8.ir.code.BasicBlock build():449:454 -> b
+    11:15:com.android.tools.r8.ir.code.BasicBlock build():452 -> b
+    16:21:com.android.tools.r8.ir.code.BasicBlock build():454:459 -> b
 com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult -> a.a.a.a.h.e.g:
     com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult FALSE -> c
     com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult TRUE -> b
@@ -25118,41 +24590,41 @@
 com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> a.a.a.a.h.e.h:
     com.android.tools.r8.ir.code.Position position -> b
     int blockNumber -> a
-    1:2:void <init>(com.android.tools.r8.ir.code.Position):329:330 -> <init>
+    1:2:void <init>(com.android.tools.r8.ir.code.Position):334:335 -> <init>
     java.lang.Object self() -> a
 com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect -> a.a.a.a.h.e.i:
     com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect NO_EFFECT -> d
     com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect DESIRED_EFFECT -> a
     com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect OTHER_EFFECT -> c
     com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect CONDITIONAL_EFFECT -> b
-    1:4:void <clinit>():1355:1358 -> <clinit>
-    5:5:void <clinit>():1354:1354 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1354:1354 -> <init>
+    1:4:void <clinit>():1349:1352 -> <clinit>
+    5:5:void <clinit>():1348:1348 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1348:1348 -> <init>
 com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> a.a.a.a.h.e.j:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList keys -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():534:534 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):538:538 -> <init>
-    2:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):536:542 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList access$000(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):534:534 -> a
-    2:2:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):570:570 -> a
-    1:1:int getMax():551:551 -> b
-    1:1:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):560 -> b
-    2:2:int getMin():547:547 -> b
-    2:2:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):560 -> b
-    3:3:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):561:561 -> b
-    4:4:int com.android.tools.r8.ir.code.Switch.baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):113:113 -> b
-    4:4:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):564 -> b
-    5:5:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):564:564 -> b
-    6:6:int com.android.tools.r8.ir.code.Switch.basePackedSize(com.android.tools.r8.utils.InternalOutputMode):102:102 -> b
-    6:6:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):565 -> b
-    7:7:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):565:565 -> b
-    8:8:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):555:555 -> b
-    9:9:int getMax():551:551 -> b
-    9:9:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):555 -> b
-    10:10:int getMin():547:547 -> b
-    10:10:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):555 -> b
-    11:12:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):555:556 -> b
+    1:1:void <clinit>():539:539 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):543:543 -> <init>
+    2:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):541:547 -> <init>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList access$000(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):539:539 -> a
+    2:2:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):575:575 -> a
+    1:1:int getMax():556:556 -> b
+    1:1:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):565 -> b
+    2:2:int getMin():552:552 -> b
+    2:2:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):565 -> b
+    3:3:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):566:566 -> b
+    4:4:int com.android.tools.r8.ir.code.Switch.baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):108:108 -> b
+    4:4:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):569 -> b
+    5:5:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):569:569 -> b
+    6:6:int com.android.tools.r8.ir.code.Switch.basePackedSize(com.android.tools.r8.utils.InternalOutputMode):97:97 -> b
+    6:6:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):570 -> b
+    7:7:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):570:570 -> b
+    8:8:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):560:560 -> b
+    9:9:int getMax():556:556 -> b
+    9:9:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):560 -> b
+    10:10:int getMin():552:552 -> b
+    10:10:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):560 -> b
+    11:12:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):560:561 -> b
 com.android.tools.r8.ir.optimize.CodeRewriter$SCC -> a.a.a.a.h.e.k:
     java.util.Deque unassignedStack -> d
     java.util.Set unassignedSet -> c
@@ -25161,59 +24633,56 @@
     java.util.Deque preorderStack -> e
     boolean $assertionsDisabled -> g
     int currentTime -> a
-    1:1:void <clinit>():3872:3872 -> <clinit>
-    1:8:void <init>():3872:3879 -> <init>
-    1:8:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):3872 -> <init>
-    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):3882:3884 -> a
-    1:33:void dfs(com.android.tools.r8.ir.code.Value):3888:3920 -> b
+    1:1:void <clinit>():3847:3847 -> <clinit>
+    1:8:void <init>():3847:3854 -> <init>
+    1:8:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):3847 -> <init>
+    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):3857:3859 -> a
+    1:33:void dfs(com.android.tools.r8.ir.code.Value):3863:3895 -> b
 com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> a.a.a.a.h.e.l:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap keyToTarget -> d
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> e
     com.android.tools.r8.ir.code.Value value -> c
-    1:1:void <init>(com.android.tools.r8.ir.code.Position):347:347 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Position):343:343 -> <init>
+    1:1:void <init>(com.android.tools.r8.ir.code.Position):352:352 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Position):348:348 -> <init>
     java.lang.Object self() -> a
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):356:356 -> a
-    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):361:361 -> a
-    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):366:366 -> a
-    4:4:java.lang.Integer lambda$build$0(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):384:384 -> a
-    1:22:com.android.tools.r8.ir.code.BasicBlock build():372:393 -> b
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):361:361 -> a
+    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):366:366 -> a
+    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):371:371 -> a
+    4:4:java.lang.Integer lambda$build$0(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):389:389 -> a
+    1:22:com.android.tools.r8.ir.code.BasicBlock build():377:398 -> b
     23:26:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createSwitchBlock(int,com.android.tools.r8.ir.code.Switch):1300:1303 -> b
-    23:26:com.android.tools.r8.ir.code.BasicBlock build():393 -> b
+    23:26:com.android.tools.r8.ir.code.BasicBlock build():398 -> b
     27:27:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.keySet():87:87 -> b
-    27:27:com.android.tools.r8.ir.code.BasicBlock build():394 -> b
-    28:29:com.android.tools.r8.ir.code.BasicBlock build():394:395 -> b
-    30:30:java.lang.Integer lambda$build$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):390:390 -> b
+    27:27:com.android.tools.r8.ir.code.BasicBlock build():399 -> b
+    28:29:com.android.tools.r8.ir.code.BasicBlock build():399:400 -> b
+    30:30:java.lang.Integer lambda$build$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):395:395 -> b
 com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> a.a.a.a.h.e.o:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():29:29 -> <clinit>
-    1:59:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):34:92 -> a
-    60:61:boolean constantUsedByInvokeRange(com.android.tools.r8.ir.code.ConstInstruction):185:186 -> a
-    60:61:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):92 -> a
-    62:62:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):96:96 -> a
-    63:109:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):95:141 -> a
-    110:110:java.util.List lambda$canonicalize$0(com.android.tools.r8.ir.code.ConstInstruction):96:96 -> a
-    111:111:boolean lambda$canonicalize$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):114:114 -> a
-    112:112:int lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):115:115 -> a
-    113:116:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):118:121 -> a
-    117:131:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):119:133 -> a
-    132:143:void insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstInstruction):146:157 -> a
-    132:143:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):134 -> a
-    144:145:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):135:136 -> a
-    146:161:com.android.tools.r8.ir.code.Position findFirstNonNonePosition(com.android.tools.r8.ir.code.IRCode):161:176 -> a
-    162:162:boolean lambda$findFirstNonNonePosition$4(com.android.tools.r8.ir.code.Instruction):163:163 -> a
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:48:void canonicalize(com.android.tools.r8.ir.code.IRCode):31:78 -> a
+    49:50:boolean constantUsedByInvokeRange(com.android.tools.r8.ir.code.ConstInstruction):166:167 -> a
+    49:50:void canonicalize(com.android.tools.r8.ir.code.IRCode):78 -> a
+    51:51:void canonicalize(com.android.tools.r8.ir.code.IRCode):82:82 -> a
+    52:93:void canonicalize(com.android.tools.r8.ir.code.IRCode):81:122 -> a
+    94:94:java.util.List lambda$canonicalize$0(com.android.tools.r8.ir.code.ConstInstruction):82:82 -> a
+    95:95:boolean lambda$canonicalize$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):100:100 -> a
+    96:96:int lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):101:101 -> a
+    97:107:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):104:114 -> a
+    108:119:void insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstInstruction):127:138 -> a
+    108:119:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):115 -> a
+    120:121:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):116:117 -> a
+    122:122:boolean lambda$findFirstNonNonePosition$4(com.android.tools.r8.ir.code.Instruction):144:144 -> a
+    1:16:com.android.tools.r8.ir.code.Position findFirstNonNonePosition(com.android.tools.r8.ir.code.IRCode):142:157 -> b
 com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> a.a.a.a.h.e.n:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():36:36 -> <clinit>
-    1:1:void <init>():36:36 -> <init>
-    1:1:boolean equals(java.lang.Object,java.lang.Object):36:36 -> a
-    2:5:boolean equals(com.android.tools.r8.ir.code.ConstInstruction,com.android.tools.r8.ir.code.ConstInstruction):55:58 -> a
-    2:5:boolean equals(java.lang.Object,java.lang.Object):36 -> a
-    6:6:int hashCode(java.lang.Object):36:36 -> a
-    7:9:int hashCode(com.android.tools.r8.ir.code.ConstInstruction):39:41 -> a
-    7:9:int hashCode(java.lang.Object):36 -> a
-    10:20:int hashCode(com.android.tools.r8.ir.code.ConstInstruction):39:49 -> a
-    10:20:int hashCode(java.lang.Object):36 -> a
+    1:1:void <clinit>():33:33 -> <clinit>
+    1:1:void <init>():33:33 -> <init>
+    1:1:boolean equals(java.lang.Object,java.lang.Object):33:33 -> a
+    2:5:boolean equals(com.android.tools.r8.ir.code.ConstInstruction,com.android.tools.r8.ir.code.ConstInstruction):47:50 -> a
+    2:5:boolean equals(java.lang.Object,java.lang.Object):33 -> a
+    6:6:int hashCode(java.lang.Object):33:33 -> a
+    7:12:int hashCode(com.android.tools.r8.ir.code.ConstInstruction):36:41 -> a
+    7:12:int hashCode(java.lang.Object):33 -> a
 com.android.tools.r8.ir.optimize.DeadCodeRemover -> a.a.a.a.h.e.p:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> b
@@ -25253,22 +24722,22 @@
     1:14:com.android.tools.r8.graph.DexEncodedMethod validateCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):74:87 -> a
     15:31:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):97:113 -> a
     32:33:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):100:101 -> a
-    34:107:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):159:232 -> a
-    108:119:int computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):265:276 -> a
-    108:119:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):233 -> a
-    120:138:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):234:252 -> a
-    139:139:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):251:251 -> a
-    140:175:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType):288:323 -> a
-    176:192:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):331:347 -> a
-    193:213:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):128:148 -> a
-    193:213:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):347 -> a
-    214:221:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):354:361 -> a
-    222:226:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):376:380 -> a
-    227:228:boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):388:389 -> a
-    229:229:boolean stillHasBudget():394:394 -> a
-    230:269:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock):399:438 -> a
-    270:270:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):444:444 -> a
-    271:287:void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):450:466 -> a
+    34:108:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):159:233 -> a
+    109:120:int computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):266:277 -> a
+    109:120:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):234 -> a
+    121:139:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):235:253 -> a
+    140:140:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):252:252 -> a
+    141:177:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType):289:325 -> a
+    178:194:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):333:349 -> a
+    195:215:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):128:148 -> a
+    195:215:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):349 -> a
+    216:223:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):356:363 -> a
+    224:228:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):378:382 -> a
+    229:230:boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):389:390 -> a
+    231:231:boolean stillHasBudget():395:395 -> a
+    232:271:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock):400:439 -> a
+    272:272:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):445:445 -> a
+    273:291:void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):451:469 -> a
     void finish() -> b
     1:2:boolean isDoubleInliningTarget(com.android.tools.r8.graph.DexEncodedMethod):153:154 -> b
 com.android.tools.r8.ir.optimize.Devirtualizer -> a.a.a.a.h.e.r:
@@ -25277,7 +24746,7 @@
     1:1:void <clinit>():36:36 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):40:41 -> <init>
     1:30:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):45:74 -> a
-    31:31:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.NonNull.getAliasForOutValue():67:67 -> a
+    31:31:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.NonNull.getAliasForOutValue():62:62 -> a
     31:31:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):74 -> a
     32:58:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):75:101 -> a
     59:107:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):100:148 -> a
@@ -25288,28 +24757,28 @@
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):36:36 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.AppView):34:37 -> <init>
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness run():41:41 -> a
+    1:1:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness run():41:41 -> a
     2:43:void processClasses(com.android.tools.r8.graph.DexProgramClass):52:93 -> a
-    2:43:com.android.tools.r8.shaking.AppInfoWithLiveness run():42 -> a
-    44:47:com.android.tools.r8.shaking.AppInfoWithLiveness run() -> a
+    2:43:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness run():42 -> a
+    44:47:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness run() -> a
 com.android.tools.r8.ir.optimize.ForcedInliningOracle -> a.a.a.a.h.e.t:
     java.util.Map invokesToInline -> b
     com.android.tools.r8.graph.DexEncodedMethod method -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():23:23 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):28:30 -> <init>
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):27:29 -> <init>
     com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexType) -> a
     void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode) -> a
-    boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy) -> a
+    boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode) -> a
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
     boolean stillHasBudget() -> a
     void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock) -> a
     boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock) -> a
-    1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType):40:40 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):48:48 -> a
-    3:6:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):102:105 -> a
+    1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType):39:39 -> a
+    2:2:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):47:47 -> a
+    3:6:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):100:103 -> a
     void finish() -> b
-    1:11:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod):52:62 -> b
+    1:11:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod):51:61 -> b
 com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> a.a.a.a.h.e.v:
     java.util.Set idempotentMethods -> a
     boolean $assertionsDisabled -> b
@@ -25359,9 +24828,9 @@
     11:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):98 -> a
     14:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):99:104 -> a
     20:27:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):119:126 -> a
-    28:28:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):78:78 -> a
+    28:28:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):328:328 -> a
     28:28:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):126 -> a
-    29:29:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):78:78 -> a
+    29:29:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):328:328 -> a
     29:29:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):129 -> a
     30:31:boolean isDoubleInliningTarget(com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.graph.DexEncodedMethod):134:135 -> a
     32:46:com.android.tools.r8.graph.DexEncodedMethod doubleInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):140:154 -> a
@@ -25369,23 +24838,23 @@
     55:68:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.OptimizationFeedback):170:183 -> a
     69:73:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback):173:177 -> a
     74:80:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback):173:179 -> a
-    81:82:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):444:445 -> a
-    83:141:boolean legalConstructorInline(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):462:520 -> a
-    142:143:void performForcedInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map):543:544 -> a
-    144:152:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):552:560 -> a
-    153:160:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):554:561 -> a
-    161:161:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):571:571 -> a
-    162:190:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):584:612 -> a
-    191:195:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):610:614 -> a
-    196:201:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason com.android.tools.r8.ir.optimize.Inliner$InlineAction.buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position):422:427 -> a
-    196:201:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):615 -> a
-    202:212:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):617:627 -> a
-    213:222:com.android.tools.r8.graph.DexType getDowncastTypeIfNeeded(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):663:672 -> a
-    213:222:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):630 -> a
-    223:245:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):633:655 -> a
+    81:82:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):448:449 -> a
+    83:141:boolean legalConstructorInline(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):466:524 -> a
+    142:143:void performForcedInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map):547:548 -> a
+    144:152:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):556:564 -> a
+    153:160:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):558:565 -> a
+    161:161:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):575:575 -> a
+    162:190:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):588:616 -> a
+    191:195:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):614:618 -> a
+    196:201:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason com.android.tools.r8.ir.optimize.Inliner$InlineAction.buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position):426:431 -> a
+    196:201:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):619 -> a
+    202:212:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):621:631 -> a
+    213:222:com.android.tools.r8.graph.DexType getDowncastTypeIfNeeded(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):667:676 -> a
+    213:222:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):634 -> a
+    223:245:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):637:659 -> a
     246:246:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):401:401 -> a
-    246:246:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):656 -> a
-    247:248:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):657:658 -> a
+    246:246:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):660 -> a
+    247:248:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):661:662 -> a
     1:6:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):110:115 -> b
 com.android.tools.r8.ir.optimize.Inliner$Constraint -> a.a.a.a.h.e.w:
     com.android.tools.r8.ir.optimize.Inliner$Constraint SUBCLASS -> e
@@ -25400,7 +24869,7 @@
     8:26:void <clinit>():193:211 -> <clinit>
     1:2:void <init>(java.lang.String,int,int):203:204 -> <init>
     1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():193:193 -> a
-    1:1:boolean isSet(int):215:215 -> c
+    1:1:boolean isSet(int):215:215 -> b
 com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget -> a.a.a.a.h.e.x:
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget ALWAYS -> d
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget NEVER -> c
@@ -25410,41 +24879,42 @@
     1:9:void <clinit>():233:241 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):243:246 -> <init>
     5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):249:253 -> <init>
-    1:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):276:281 -> a
-    7:7:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):78:78 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):282 -> a
-    8:12:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):284:288 -> a
-    13:13:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):78:78 -> a
-    13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):291 -> a
-    14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):292:292 -> a
-    15:26:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):298:309 -> a
-    27:94:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):314:381 -> a
+    1:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexDefinitionSupplier):279:284 -> a
+    7:7:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):328:328 -> a
+    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexDefinitionSupplier):285 -> a
+    8:12:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexDefinitionSupplier):287:291 -> a
+    13:13:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):328:328 -> a
+    13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexDefinitionSupplier):294 -> a
+    14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexDefinitionSupplier):295:295 -> a
+    15:17:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):301:303 -> a
+    18:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):302:313 -> a
+    30:97:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.DexDefinitionSupplier):318:385 -> a
     1:5:boolean equals(java.lang.Object):266:270 -> equals
     1:4:int hashCode():258:261 -> hashCode
-    5:5:int com.android.tools.r8.graph.DexType.computeHashCode():36:36 -> hashCode
+    5:5:int com.android.tools.r8.graph.DexType.computeHashCode():61:61 -> hashCode
     5:5:int hashCode():261 -> hashCode
 com.android.tools.r8.ir.optimize.Inliner$InlineAction -> a.a.a.a.h.e.y:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> b
-    1:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):410:413 -> <init>
+    1:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):414:417 -> <init>
 com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> a.a.a.a.h.e.z:
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> a
     com.android.tools.r8.ir.code.IRCode code -> b
-    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner$Reason):436:438 -> <init>
+    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner$Reason):440:442 -> <init>
 com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> a.a.a.a.h.e.A:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.graph.DexType receiverType -> b
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):532:534 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):536:538 -> <init>
 com.android.tools.r8.ir.optimize.Inliner$Reason -> a.a.a.a.h.e.B:
     com.android.tools.r8.ir.optimize.Inliner$Reason SIMPLE -> e
     com.android.tools.r8.ir.optimize.Inliner$Reason SINGLE_CALLER -> c
     com.android.tools.r8.ir.optimize.Inliner$Reason DUAL_CALLER -> d
     com.android.tools.r8.ir.optimize.Inliner$Reason FORCE -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason ALWAYS -> b
-    1:5:void <clinit>():392:396 -> <clinit>
-    6:6:void <clinit>():391:391 -> <clinit>
-    1:1:void <init>(java.lang.String,int):391:391 -> <init>
-    1:1:boolean mustBeInlined():400:400 -> a
+    1:5:void <clinit>():396:400 -> <clinit>
+    6:6:void <clinit>():395:395 -> <clinit>
+    1:1:void <init>(java.lang.String,int):395:395 -> <init>
+    1:1:boolean mustBeInlined():404:404 -> a
 com.android.tools.r8.ir.optimize.InliningConstraints -> a.a.a.a.h.e.D:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.GraphLense graphLense -> c
@@ -25453,9 +24923,8 @@
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense):42:42 -> <init>
     2:20:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense):28:46 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forSwap():253:253 -> A
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forThrow():257:257 -> B
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forUnop():261:261 -> C
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forThrow():257:257 -> A
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forUnop():261:261 -> B
     1:1:void disallowStaticInterfaceMethodCalls():50:50 -> a
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):78:78 -> a
     3:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstanceGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):110:112 -> a
@@ -25470,11 +24939,10 @@
     30:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexType):128:128 -> a
     31:33:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):151:153 -> a
     34:34:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):152:152 -> a
-    35:35:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):182:182 -> a
-    36:52:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):271:287 -> a
-    53:66:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):285:298 -> a
-    67:90:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):303:326 -> a
-    91:136:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,java.util.Collection,com.android.tools.r8.graph.DexType):331:376 -> a
+    35:51:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):271:287 -> a
+    52:65:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):285:298 -> a
+    66:89:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):303:326 -> a
+    90:135:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,java.util.Collection,com.android.tools.r8.graph.DexType):331:376 -> a
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forAlwaysMaterializingUser():54:54 -> b
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):82:82 -> b
     3:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstancePut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):120:122 -> b
@@ -25483,20 +24951,22 @@
     10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):158:158 -> b
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forArgument():58:58 -> c
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):116:116 -> c
-    3:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):175:177 -> c
-    6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):176:176 -> c
-    7:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):237:239 -> c
-    10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):238:238 -> c
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokePolymorphic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):171:171 -> c
+    4:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):237:239 -> c
+    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):238:238 -> c
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forArrayGet():62:62 -> d
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeMultiNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):163:163 -> d
-    3:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):186:188 -> d
-    6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):187:187 -> d
+    3:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):175:177 -> d
+    6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):176:176 -> d
     7:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticPut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):243:245 -> d
     10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticPut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):244:244 -> d
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forArrayLength():66:66 -> e
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):167:167 -> e
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):182:182 -> e
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forArrayPut():70:70 -> f
-    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):213:213 -> f
+    2:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):186:188 -> f
+    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):187:187 -> f
+    6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):213:213 -> f
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forBinop():74:74 -> g
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):221:221 -> g
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forConstInstruction():86:86 -> h
@@ -25507,17 +24977,17 @@
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forDup():102:102 -> m
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forDup2():106:106 -> n
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeCustom():147:147 -> o
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokePolymorphic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):171:171 -> p
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forJumpInstruction():192:192 -> q
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forLoad():196:196 -> r
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forMonitor():201:201 -> s
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forMove():205:205 -> t
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forMoveException():209:209 -> u
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayFilledData():217:217 -> v
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNonNull():225:225 -> w
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forPop():229:229 -> x
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forReturn():233:233 -> y
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStore():249:249 -> z
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forJumpInstruction():192:192 -> p
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forLoad():196:196 -> q
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forMonitor():201:201 -> r
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forMove():205:205 -> s
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forMoveException():209:209 -> t
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayFilledData():217:217 -> u
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNonNull():225:225 -> v
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forPop():229:229 -> w
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forReturn():233:233 -> x
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStore():249:249 -> y
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forSwap():253:253 -> z
 com.android.tools.r8.ir.optimize.InliningOracle -> a.a.a.a.h.e.E:
     com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis) -> a
@@ -25526,7 +24996,7 @@
 com.android.tools.r8.ir.optimize.InliningStrategy -> a.a.a.a.h.e.F:
     void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode) -> a
     com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod) -> a
-    boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy) -> a
+    boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode) -> a
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
     boolean stillHasBudget() -> a
     void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock) -> a
@@ -25546,81 +25016,59 @@
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> a
     com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool superType -> b
     boolean $assertionsDisabled -> f
-    1:1:void <clinit>():164:164 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.com.google.common.base.Equivalence):172:172 -> <init>
-    2:7:void <init>(com.android.tools.r8.com.google.common.base.Equivalence):168:173 -> <init>
-    1:2:void linkInterface(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):187:188 -> a
-    3:3:void seen(java.lang.Object):192:192 -> a
-    4:4:boolean hasSeen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):201:201 -> a
-    5:5:boolean hasSeenStrictlyBelow(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):221:221 -> a
-    5:5:boolean hasSeen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):201 -> a
-    6:6:boolean hasSeenDirectly(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):205:205 -> a
-    6:6:boolean hasSeenAbove(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,boolean):213 -> a
-    7:8:boolean hasSeenAbove(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,boolean):216:217 -> a
-    9:9:boolean lambda$hasSeenAbove$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):217:217 -> a
-    1:2:void linkSubtype(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):182:183 -> b
-    3:3:boolean hasSeenDirectly(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):205:205 -> b
-    3:3:boolean hasSeenBelow(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,boolean):225 -> b
-    4:4:boolean hasSeenBelow(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,boolean):228:228 -> b
-    5:5:boolean hasSeenDirectly(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):205:205 -> b
-    6:6:boolean lambda$hasSeenBelow$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):228:228 -> b
-    1:2:void linkSupertype(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):177:178 -> c
-    3:3:boolean hasSeenStrictlyAbove(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):209:209 -> c
-    1:1:boolean hasSeenStrictlyBelow(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):221:221 -> d
-    1:2:void seen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):196:197 -> e
+    1:1:void <clinit>():144:144 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.com.google.common.base.Equivalence):151:151 -> <init>
+    2:7:void <init>(com.android.tools.r8.com.google.common.base.Equivalence):147:152 -> <init>
+    1:2:void linkInterface(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):166:167 -> a
+    3:3:void seen(java.lang.Object):171:171 -> a
+    4:4:boolean hasSeen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):184:184 -> a
+    5:5:boolean lambda$hasSeenDownwardRecursive$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):203:203 -> a
+    1:2:void linkSubtype(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):161:162 -> b
+    3:3:boolean hasSeenDirectly(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):192:192 -> b
+    4:4:boolean lambda$hasSeenUpwardRecursive$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):198:198 -> b
+    1:2:void linkSupertype(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):156:157 -> c
+    3:4:void seen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):175:176 -> c
+    1:2:boolean hasSeenDownwardRecursive(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):202:203 -> d
+    1:3:boolean hasSeenUpwardRecursive(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):196:198 -> e
 com.android.tools.r8.ir.optimize.MemberValuePropagation -> a.a.a.a.h.e.K:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():43:43 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):64:65 -> <init>
-    1:8:com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup lookupMemberRule(com.android.tools.r8.graph.DexDefinition):84:91 -> a
-    9:12:com.android.tools.r8.ir.code.ConstNumber createConstNumberReplacement(com.android.tools.r8.ir.code.IRCode,long,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):128:131 -> a
-    13:15:com.android.tools.r8.ir.code.ConstNumber createConstNumberReplacement(com.android.tools.r8.ir.code.IRCode,long,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):130:132 -> a
-    16:16:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):168:168 -> a
-    17:20:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):100:103 -> a
-    17:20:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):168 -> a
-    21:28:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):102:109 -> a
-    21:28:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):168 -> a
-    29:40:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):108:119 -> a
-    29:40:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):168 -> a
-    41:41:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):171:171 -> a
-    42:44:void setValueRangeFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.Value):155:157 -> a
-    42:44:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):171 -> a
-    45:58:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):174:187 -> a
-    59:77:void rewritePutWithConstantValues(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType):337:355 -> a
-    78:78:boolean lambda$rewritePutWithConstantValues$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):348:348 -> a
-    79:88:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):366:375 -> a
-    89:116:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):200:227 -> a
-    89:116:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):374 -> a
-    117:119:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedMethod):75:77 -> a
-    117:119:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):228 -> a
-    117:119:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):374 -> a
-    120:126:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):231:237 -> a
-    120:126:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):374 -> a
-    127:137:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):236:246 -> a
-    127:137:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):374 -> a
-    138:145:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):245:252 -> a
-    138:145:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):374 -> a
-    146:150:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):140:144 -> a
-    146:150:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):251 -> a
-    146:150:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):374 -> a
-    151:154:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):142:145 -> a
-    151:154:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):251 -> a
-    151:154:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):374 -> a
-    155:164:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):141:150 -> a
-    155:164:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):251 -> a
-    155:164:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):374 -> a
-    165:173:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):255:263 -> a
-    165:173:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):374 -> a
-    174:183:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):376:385 -> a
-    184:187:void rewriteStaticGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):275:278 -> a
-    184:187:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):379 -> a
-    188:190:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedField):69:71 -> a
-    188:190:void rewriteStaticGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):279 -> a
-    188:190:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):379 -> a
-    191:236:void rewriteStaticGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):283:328 -> a
-    191:236:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):379 -> a
-    237:252:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):377:392 -> a
+    1:8:com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup lookupMemberRule(com.android.tools.r8.graph.DexDefinition):72:79 -> a
+    9:12:com.android.tools.r8.ir.code.ConstNumber createConstNumberReplacement(com.android.tools.r8.ir.code.IRCode,long,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):116:119 -> a
+    13:15:com.android.tools.r8.ir.code.ConstNumber createConstNumberReplacement(com.android.tools.r8.ir.code.IRCode,long,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):118:120 -> a
+    16:16:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):155:155 -> a
+    17:20:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):88:91 -> a
+    17:20:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):155 -> a
+    21:28:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):90:97 -> a
+    21:28:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):155 -> a
+    29:40:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):96:107 -> a
+    29:40:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):155 -> a
+    41:41:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):158:158 -> a
+    42:44:void setValueRangeFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.Value):142:144 -> a
+    42:44:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):158 -> a
+    45:58:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):161:174 -> a
+    59:68:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):346:355 -> a
+    69:114:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):187:232 -> a
+    69:114:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):354 -> a
+    115:122:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):231:238 -> a
+    115:122:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):354 -> a
+    123:127:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):128:132 -> a
+    123:127:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):237 -> a
+    123:127:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):354 -> a
+    128:136:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):129:137 -> a
+    128:136:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):237 -> a
+    128:136:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):354 -> a
+    137:145:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):241:249 -> a
+    137:145:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):354 -> a
+    146:155:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):356:365 -> a
+    156:209:void rewriteStaticGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):261:314 -> a
+    156:209:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):359 -> a
+    210:210:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):357:357 -> a
+    211:223:void rewritePutWithConstantValues(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.FieldInstruction):323:335 -> a
+    211:223:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):357 -> a
+    224:227:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):369:372 -> a
 com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> a.a.a.a.h.e.I:
     com.android.tools.r8.shaking.ProguardMemberRule rule -> b
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType type -> a
@@ -25634,49 +25082,45 @@
     1:1:void <init>(java.lang.String,int):47:47 -> <init>
 com.android.tools.r8.ir.optimize.MethodPoolCollection -> a.a.a.a.h.e.L:
     java.util.Map com.android.tools.r8.ir.optimize.MemberPoolCollection.memberPools -> c
-    com.android.tools.r8.graph.AppView com.android.tools.r8.ir.optimize.MemberPoolCollection.appView -> b
+    com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.optimize.MemberPoolCollection.application -> b
     com.android.tools.r8.com.google.common.base.Equivalence com.android.tools.r8.ir.optimize.MemberPoolCollection.equivalence -> a
     boolean com.android.tools.r8.ir.optimize.MemberPoolCollection.$assertionsDisabled -> d
-    1:1:void com.android.tools.r8.ir.optimize.MemberPoolCollection.<clinit>():31:31 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):32:32 -> <init>
-    2:2:void com.android.tools.r8.ir.optimize.MemberPoolCollection.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.base.Equivalence):38:38 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView):32 -> <init>
-    3:8:void com.android.tools.r8.ir.optimize.MemberPoolCollection.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.base.Equivalence):35:40 -> <init>
-    3:8:void <init>(com.android.tools.r8.graph.AppView):32 -> <init>
-    void com.android.tools.r8.ir.optimize.MemberPoolCollection.buildAll(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing) -> a
+    1:1:void com.android.tools.r8.ir.optimize.MemberPoolCollection.<clinit>():29:29 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication):27:27 -> <init>
+    2:2:void com.android.tools.r8.ir.optimize.MemberPoolCollection.<init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.com.google.common.base.Equivalence):35:35 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexApplication):27 -> <init>
+    3:7:void com.android.tools.r8.ir.optimize.MemberPoolCollection.<init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.com.google.common.base.Equivalence):33:37 -> <init>
+    3:7:void <init>(com.android.tools.r8.graph.DexApplication):27 -> <init>
     com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing) -> a
-    1:1:java.lang.Runnable computeMemberPoolForClass(com.android.tools.r8.graph.DexClass):37:37 -> a
-    2:3:void lambda$computeMemberPoolForClass$1(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexEncodedMethod):43:44 -> a
-    4:9:boolean com.android.tools.r8.ir.optimize.MemberPoolCollection.markIfNotSeen(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Descriptor):85:90 -> a
-    4:9:boolean com.android.tools.r8.ir.optimize.MemberPoolCollection.markIfNotSeen(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Descriptor):0 -> a
-    10:10:void com.android.tools.r8.ir.optimize.MemberPoolCollection.submitAll(java.lang.Iterable,java.util.List,java.util.concurrent.ExecutorService):98:98 -> a
-    11:11:void com.android.tools.r8.ir.optimize.MemberPoolCollection.submit(com.android.tools.r8.graph.DexClass,java.util.List,java.util.concurrent.ExecutorService):104:104 -> a
-    11:11:void com.android.tools.r8.ir.optimize.MemberPoolCollection.submitAll(java.lang.Iterable,java.util.List,java.util.concurrent.ExecutorService):99 -> a
-    12:12:void com.android.tools.r8.ir.optimize.MemberPoolCollection.submit(com.android.tools.r8.graph.DexClass,java.util.List,java.util.concurrent.ExecutorService):104:104 -> a
-    12:12:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$buildAll$0(java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):53 -> a
-    13:35:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):135:157 -> a
-    36:36:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$1(java.util.Deque,com.android.tools.r8.graph.DexType):140:140 -> a
-    37:37:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):234:234 -> a
-    1:13:void com.android.tools.r8.ir.optimize.MemberPoolCollection.buildAll(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):44:56 -> b
-    14:18:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):62:66 -> b
-    19:26:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):65:72 -> b
-    27:27:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):70:70 -> b
-    28:28:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):80:80 -> b
-    28:28:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):0 -> b
-    29:29:boolean com.android.tools.r8.ir.optimize.MemberPoolCollection.hasPool(com.android.tools.r8.graph.DexClass):76:76 -> b
-    29:29:boolean com.android.tools.r8.ir.optimize.MemberPoolCollection.hasPool(com.android.tools.r8.graph.DexClass):0 -> b
-    29:29:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):80 -> b
-    29:29:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):0 -> b
-    30:31:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):80:81 -> b
-    30:31:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):0 -> b
-    32:45:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSuperTypesInclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):112:125 -> b
-    46:46:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$2(java.util.Deque,com.android.tools.r8.graph.DexType):144:144 -> b
-    1:1:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool lambda$computeMemberPoolForClass$0(com.android.tools.r8.graph.DexClass):39:39 -> c
-    2:2:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$3(java.util.Deque,com.android.tools.r8.graph.DexType):154:154 -> c
-    1:1:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool lambda$computeMemberPoolForClass$2(com.android.tools.r8.graph.DexClass):51:51 -> d
-    2:2:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):158:158 -> d
-    1:1:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool lambda$computeMemberPoolForClass$3(com.android.tools.r8.graph.DexClass):61:61 -> e
-    1:26:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):38:63 -> f
+    1:1:java.lang.Runnable computeMemberPoolForClass(com.android.tools.r8.graph.DexClass):32:32 -> a
+    2:3:void lambda$computeMemberPoolForClass$1(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexEncodedMethod):38:39 -> a
+    4:11:void com.android.tools.r8.ir.optimize.MemberPoolCollection.buildAll(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):41:48 -> a
+    4:11:void com.android.tools.r8.ir.optimize.MemberPoolCollection.buildAll(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):0 -> a
+    12:17:boolean com.android.tools.r8.ir.optimize.MemberPoolCollection.markIfNotSeen(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Descriptor):77:82 -> a
+    12:17:boolean com.android.tools.r8.ir.optimize.MemberPoolCollection.markIfNotSeen(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Descriptor):0 -> a
+    18:19:void com.android.tools.r8.ir.optimize.MemberPoolCollection.submitAll(java.lang.Iterable,java.util.List,java.util.concurrent.ExecutorService):90:91 -> a
+    20:34:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):123:137 -> a
+    35:35:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$0(java.util.Deque,com.android.tools.r8.graph.DexType):126:126 -> a
+    36:36:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):209:209 -> a
+    1:5:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):54:58 -> b
+    6:13:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):57:64 -> b
+    14:14:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):62:62 -> b
+    15:15:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):72:72 -> b
+    15:15:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):0 -> b
+    16:16:boolean com.android.tools.r8.ir.optimize.MemberPoolCollection.hasPool(com.android.tools.r8.graph.DexClass):68:68 -> b
+    16:16:boolean com.android.tools.r8.ir.optimize.MemberPoolCollection.hasPool(com.android.tools.r8.graph.DexClass):0 -> b
+    16:16:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):72 -> b
+    16:16:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):0 -> b
+    17:18:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):72:73 -> b
+    17:18:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):0 -> b
+    19:32:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSuperTypesInclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):100:113 -> b
+    33:33:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$1(java.util.Deque,com.android.tools.r8.graph.DexType):128:128 -> b
+    1:1:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool lambda$computeMemberPoolForClass$0(com.android.tools.r8.graph.DexClass):34:34 -> c
+    2:2:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$2(java.util.Deque,com.android.tools.r8.graph.DexType):136:136 -> c
+    1:1:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool lambda$computeMemberPoolForClass$2(com.android.tools.r8.graph.DexClass):46:46 -> d
+    2:2:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$3(java.util.Deque,com.android.tools.r8.graph.DexType):138:138 -> d
+    1:1:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool lambda$computeMemberPoolForClass$3(com.android.tools.r8.graph.DexClass):56:56 -> e
+    1:25:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):33:57 -> f
 com.android.tools.r8.ir.optimize.MoveEliminator -> a.a.a.a.h.e.M:
     java.util.HashSet activeMoves -> a
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> b
@@ -25687,31 +25131,33 @@
     52:56:boolean lambda$shouldBeEliminated$0(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Move):54:58 -> a
 com.android.tools.r8.ir.optimize.NonNullTracker -> a.a.a.a.h.e.N:
     com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> b
-    1:1:void <clinit>():43:43 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.AppView):47:48 -> <init>
-    boolean lambda$addNonNullForValues$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    1:1:void addNonNull(com.android.tools.r8.ir.code.IRCode):82:82 -> a
-    2:28:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):87:113 -> a
-    29:35:boolean throwsOnNullInput(com.android.tools.r8.ir.code.Instruction):53:59 -> a
-    29:35:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):116 -> a
-    36:49:com.android.tools.r8.ir.code.Value getNonNullInput(com.android.tools.r8.ir.code.Instruction):63:76 -> a
-    36:49:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):117 -> a
-    50:51:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):118:119 -> a
-    52:52:com.android.tools.r8.ir.code.Value getNonNullInput(com.android.tools.r8.ir.code.Instruction):78:78 -> a
-    52:52:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):117 -> a
-    53:61:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):122:130 -> a
-    62:159:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):129:226 -> a
-    160:178:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):224:242 -> a
-    179:231:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):267:319 -> a
-    232:248:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):317:333 -> a
-    249:264:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):341:356 -> a
-    265:266:boolean isNonNullCandidate(com.android.tools.r8.ir.code.Value):365:366 -> a
-    267:298:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):370:401 -> a
-    299:344:boolean isNormalExitDominated(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):423:468 -> a
-    299:344:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):402 -> a
-    345:350:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):408:413 -> a
-    1:47:void cleanupNonNull(com.android.tools.r8.ir.code.IRCode):473:519 -> b
+    java.util.Set libraryMethodsReturningNonNull -> b
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():42:42 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):49:51 -> <init>
+    boolean lambda$addNonNull$0(com.android.tools.r8.ir.code.BasicBlock) -> a
+    boolean lambda$addNonNullForValues$1(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
+    1:1:void addNonNull(com.android.tools.r8.ir.code.IRCode):85:85 -> a
+    2:18:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):90:106 -> a
+    19:28:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):105:114 -> a
+    29:35:boolean throwsOnNullInput(com.android.tools.r8.ir.code.Instruction):56:62 -> a
+    29:35:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):117 -> a
+    36:49:com.android.tools.r8.ir.code.Value getNonNullInput(com.android.tools.r8.ir.code.Instruction):66:79 -> a
+    36:49:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):118 -> a
+    50:51:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):119:120 -> a
+    52:52:com.android.tools.r8.ir.code.Value getNonNullInput(com.android.tools.r8.ir.code.Instruction):81:81 -> a
+    52:52:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):118 -> a
+    53:61:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):123:131 -> a
+    62:157:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):130:225 -> a
+    158:175:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):224:241 -> a
+    176:239:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):266:329 -> a
+    240:255:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):337:352 -> a
+    256:265:boolean isNonNullCandidate(com.android.tools.r8.ir.code.Value):361:370 -> a
+    266:297:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):374:405 -> a
+    298:343:boolean isNormalExitDominated(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):427:472 -> a
+    298:343:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):406 -> a
+    344:349:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):412:417 -> a
+    1:47:void cleanupNonNull(com.android.tools.r8.ir.code.IRCode):477:523 -> b
 com.android.tools.r8.ir.optimize.Outliner -> a.a.a.a.h.e.ba:
     java.util.List candidateMethodLists -> a
     java.util.Map outlineSites -> c
@@ -25731,7 +25177,7 @@
     20:20:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.Outliner$Outline.buildMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):577:577 -> a
     20:20:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1262 -> a
     21:39:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1263:1281 -> a
-    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> a
+    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> a
     40:40:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1281 -> a
     41:61:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1282:1302 -> a
     62:68:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1319:1325 -> a
@@ -25910,26 +25356,26 @@
     1:1:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline,com.android.tools.r8.graph.DexMethod):1346:1346 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline,com.android.tools.r8.graph.DexMethod):1344:1348 -> <init>
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int) -> a
+    boolean verifyCurrentInstructionCanThrow() -> a
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> a
-    1:1:int instructionCount():1353:1353 -> a
-    2:2:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):1384:1384 -> a
-    3:8:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1398:1403 -> a
-    9:9:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):1409:1409 -> a
-    10:23:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1420:1433 -> a
-    24:24:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):1439:1439 -> a
-    25:25:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):1445:1445 -> a
-    26:26:int getMoveExceptionRegister(int):1455:1455 -> a
+    1:1:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):1384:1384 -> a
+    2:7:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1398:1403 -> a
+    8:8:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):1409:1409 -> a
+    9:22:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1420:1433 -> a
+    23:23:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):1439:1439 -> a
+    24:24:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):1445:1445 -> a
+    25:25:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):1460:1460 -> a
     void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder) -> b
-    int instructionOffset(int) -> b
     void setUp() -> b
+    1:1:int getMoveExceptionRegister(int):1455:1455 -> b
     com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder) -> c
-    com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int) -> c
-    boolean verifyCurrentInstructionCanThrow() -> c
-    1:1:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):1460:1460 -> d
-    2:2:com.android.tools.r8.ir.code.Position getCurrentPosition():1465:1465 -> d
-    com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> e
-    boolean verifyRegister(int) -> f
-    int instructionIndex(int) -> g
+    int instructionOffset(int) -> c
+    1:1:int instructionCount():1353:1353 -> c
+    int instructionIndex(int) -> d
+    1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():1465:1465 -> d
+    boolean verifyRegister(int) -> e
+    com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int) -> f
+    com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> g
 com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> a.a.a.a.h.e.aa:
     int pendingNewInstanceIndex -> n
     com.android.tools.r8.graph.DexType returnType -> k
@@ -26093,7 +25539,7 @@
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():30:30 -> <clinit>
     1:54:void rewriteGetClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):80:133 -> a
-    55:56:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):314:315 -> a
+    55:56:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.classClassType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.analysis.type.Nullability):302:303 -> a
     55:56:void rewriteGetClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):133 -> a
     57:62:void rewriteGetClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):134:139 -> a
     63:63:com.android.tools.r8.graph.DexString computeClassName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo,com.android.tools.r8.graph.DexItemFactory):148:148 -> a
@@ -26101,14 +25547,14 @@
     65:65:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory):160:160 -> a
     66:101:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory,int):170:205 -> a
     102:111:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory,int):192:201 -> a
-    112:113:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getClassNameFromDescriptor(java.lang.String):227:228 -> a
-    112:113:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getCanonicalNameFromDescriptor(java.lang.String):238 -> a
+    112:113:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getClassNameFromDescriptor(java.lang.String):226:227 -> a
+    112:113:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getCanonicalNameFromDescriptor(java.lang.String):237 -> a
     112:113:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory,int):186 -> a
-    114:114:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getCanonicalNameFromDescriptor(java.lang.String):239:239 -> a
+    114:114:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getCanonicalNameFromDescriptor(java.lang.String):238:238 -> a
     114:114:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory,int):186 -> a
     115:115:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory,int):188:188 -> a
     116:116:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory,int):179:179 -> a
-    117:118:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getClassNameFromDescriptor(java.lang.String):227:228 -> a
+    117:118:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getClassNameFromDescriptor(java.lang.String):226:227 -> a
     117:118:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory,int):172 -> a
     119:153:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory,int):174:208 -> a
 com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo -> a.a.a.a.h.e.ia:
@@ -26134,42 +25580,17 @@
     1:1:void <init>(java.lang.String,int):33:33 -> <init>
     1:1:boolean needsToComputeClassName():41:41 -> a
     1:1:boolean needsToRegisterTypeReference():45:45 -> b
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> a.a.a.a.h.e.la:
-    1:1:void <init>():58:58 -> <init>
-    1:90:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):61:150 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> a.a.a.a.h.e.ka:
-    com.android.tools.r8.graph.DexItemFactory factory -> b
-    com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> i
-    com.android.tools.r8.ir.code.InvokeStatic serviceLoaderLoad -> d
-    com.android.tools.r8.ir.code.MemberType memberType -> f
-    com.android.tools.r8.ir.code.Value valueArray -> g
-    int index -> h
-    com.android.tools.r8.ir.code.IRCode code -> c
-    com.android.tools.r8.ir.code.InstructionIterator iterator -> e
-    1:1:void <clinit>():186:186 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InvokeStatic):202:202 -> <init>
-    2:13:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InvokeStatic):196:207 -> <init>
-    boolean lambda$perform$1(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.code.Instruction) -> a
-    1:2:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):211:212 -> a
-    3:6:void clearGetClassLoader(com.android.tools.r8.ir.code.InvokeVirtual):291:294 -> a
-    3:6:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):216 -> a
-    7:37:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):217:247 -> a
-    38:51:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):246:259 -> a
-    52:57:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):258:263 -> a
-    58:58:boolean lambda$perform$0(com.android.tools.r8.ir.code.Instruction):217:217 -> a
-    59:79:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):267:287 -> a
-com.android.tools.r8.ir.optimize.SwitchMapCollector -> a.a.a.a.h.e.ma:
+com.android.tools.r8.ir.optimize.SwitchMapCollector -> a.a.a.a.h.e.ka:
     com.android.tools.r8.graph.DexString switchMapPrefix -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map switchMaps -> d
     com.android.tools.r8.graph.DexType intArrayType -> c
     1:1:void <init>(com.android.tools.r8.graph.AppView):68:68 -> <init>
     2:7:void <init>(com.android.tools.r8.graph.AppView):66:71 -> <init>
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> <init>
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> <init>
     8:8:void <init>(com.android.tools.r8.graph.AppView):71 -> <init>
     9:9:void <init>(com.android.tools.r8.graph.AppView):71:71 -> <init>
-    1:7:com.android.tools.r8.shaking.AppInfoWithLiveness run():75:81 -> a
+    1:7:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness run():75:81 -> a
     8:15:void processClasses(com.android.tools.r8.graph.DexProgramClass):86:93 -> a
     16:16:void lambda$processClasses$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedField):93:93 -> a
     17:57:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):98:138 -> a
@@ -26178,8 +25599,8 @@
     61:65:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):306:310 -> a
     61:65:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):145 -> a
     66:66:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):145:145 -> a
-com.android.tools.r8.ir.optimize.SwitchUtils$1 -> a.a.a.a.h.e.na:
-com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo -> a.a.a.a.h.e.oa:
+com.android.tools.r8.ir.optimize.SwitchUtils$1 -> a.a.a.a.h.e.la:
+com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo -> a.a.a.a.h.e.ma:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap ordinalsMap -> e
     com.android.tools.r8.ir.code.Instruction arrayGet -> b
     com.android.tools.r8.ir.code.Instruction staticGet -> c
@@ -26187,130 +25608,119 @@
     com.android.tools.r8.ir.code.Instruction ordinalInvoke -> a
     1: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,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):34:40 -> <init>
     1: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,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.ir.optimize.SwitchUtils$1):22 -> <init>
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> a.a.a.a.h.e.ra:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> a.a.a.a.h.e.pa:
+    com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> e
-    boolean $assertionsDisabled -> f
-    int numberOfInvokesWithNullReceiver -> d
-    int numberOfInstanceGetOrInstancePutWithNullReceiver -> b
-    int numberOfInvokesWithNullArgument -> c
-    1:46:void <clinit>():57:102 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):110:110 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.AppView):106:111 -> <init>
-    1:12:com.android.tools.r8.graph.GraphLense run(com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):118:129 -> a
-    13:27:com.android.tools.r8.graph.GraphLense run(com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128:142 -> a
-    28:28:com.android.tools.r8.graph.GraphLense run(com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):120:120 -> a
-    29:29:void lambda$run$0(java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map,com.android.tools.r8.graph.DexProgramClass):131:131 -> a
-    30:76:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):151:197 -> a
-    77:148:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):196:267 -> a
-    149:149:boolean lambda$processClass$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):233:233 -> a
-    150:150:java.util.Set lambda$processClass$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):265:265 -> a
-    151:157:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):275:281 -> a
-    158:158:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):277:277 -> a
-    159:194:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription):314:349 -> a
-    195:195:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription):348:348 -> a
-    196:216:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):353:373 -> a
-    217:218:void rewriteStaticFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):441:442 -> a
-    217:218:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):372 -> a
-    219:219:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):366:366 -> a
-    220:237:void rewriteInstanceFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):413:430 -> a
-    220:237:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):365 -> a
-    238:240:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):379:381 -> a
-    241:264:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):506:529 -> a
-    241:264:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):380 -> a
-    265:268:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):389:392 -> a
-    269:288:void rewriteFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):452:471 -> a
-    289:289:boolean com.android.tools.r8.ir.code.Instruction.isFieldPut():768:768 -> a
-    289:289:void rewriteFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):472 -> a
-    290:311:void rewriteFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):474:495 -> a
-    1:12:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):286:297 -> b
+    com.android.tools.r8.utils.InternalOptions options -> c
+    int numberOfInvokesWithNullReceiver -> f
+    boolean $assertionsDisabled -> g
+    int numberOfInstanceGetOrInstancePutWithNullReceiver -> d
+    int numberOfInvokesWithNullArgument -> e
+    1:1:void <clinit>():63:63 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions):117:117 -> <init>
+    2:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions):112:120 -> <init>
+    1:16:com.android.tools.r8.graph.GraphLense run(com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):125:140 -> a
+    17:150:com.android.tools.r8.graph.GraphLense run(com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):138:271 -> a
+    151:151:com.android.tools.r8.graph.GraphLense run(com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):135:135 -> a
+    152:198:void lambda$run$2(com.android.tools.r8.ir.optimize.MethodPoolCollection,com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexProgramClass):142:188 -> a
+    199:271:void lambda$run$2(com.android.tools.r8.ir.optimize.MethodPoolCollection,com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexProgramClass):187:259 -> a
+    272:272:boolean lambda$run$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):225:225 -> a
+    273:273:java.util.Set lambda$run$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):257:257 -> a
+    274:280:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):276:282 -> a
+    281:281:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):278:278 -> a
+    282:315:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription):315:348 -> a
+    316:316:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription):347:347 -> a
+    317:337:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):352:372 -> a
+    338:339:void rewriteStaticFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):440:441 -> a
+    338:339:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):371 -> a
+    340:340:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):365:365 -> a
+    341:358:void rewriteInstanceFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):412:429 -> a
+    341:358:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):364 -> a
+    359:361:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):378:380 -> a
+    362:385:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):506:529 -> a
+    362:385:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):379 -> a
+    386:389:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):388:391 -> a
+    390:409:void rewriteFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):451:470 -> a
+    410:410:boolean com.android.tools.r8.ir.code.Instruction.isFieldPut():766:766 -> a
+    410:410:void rewriteFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):471 -> a
+    411:417:void rewriteFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):473:479 -> a
+    418:435:void rewriteFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):478:495 -> a
+    436:471:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.ir.code.Instruction,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):542:577 -> a
+    472:481:void lambda$replaceCurrentInstructionWithThrowNull$3(java.util.Set,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.BasicBlock):579:588 -> a
+    482:491:boolean isAlwaysNull(com.android.tools.r8.ir.code.Value):595:604 -> a
+    492:496:boolean isAlwaysNull(com.android.tools.r8.graph.DexType):610:614 -> a
+    1:12:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):287:298 -> b
     13:13:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo.builder():117:117 -> b
-    13:13:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):300 -> b
-    14:17:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):301:304 -> b
-    18:28:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):299:309 -> b
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy -> a.a.a.a.h.e.pa:
+    13:13:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):301 -> b
+    14:17:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):302:305 -> b
+    18:28:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):300:310 -> b
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy -> a.a.a.a.h.e.na:
     com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy ALLOW_ARGUMENT_REMOVAL -> a
     com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy DISALLOW_ARGUMENT_REMOVAL -> b
-    1:2:void <clinit>():60:61 -> <clinit>
-    3:3:void <clinit>():59:59 -> <clinit>
-    1:1:void <init>(java.lang.String,int):59:59 -> <init>
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLense -> a.a.a.a.h.e.qa:
+    1:2:void <clinit>():66:67 -> <clinit>
+    3:3:void <clinit>():65:65 -> <clinit>
+    1:1:void <init>(java.lang.String,int):65:65 -> <init>
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLense -> a.a.a.a.h.e.oa:
     boolean $assertionsDisabled -> l
     java.util.Map removedArgumentsInfoPerMethod -> k
-    1:1:void <clinit>():64:64 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.AppView):73:79 -> <init>
-    8:16:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.AppView):72:80 -> <init>
-    1:12:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):85:96 -> f
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> a.a.a.a.h.e.xa:
-    com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> b
+    1:1:void <clinit>():70:70 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.AppView):79:85 -> <init>
+    8:16:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.AppView):78:86 -> <init>
+    1:12:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):91:102 -> f
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> a.a.a.a.h.e.ua:
+    java.util.Map removedArguments -> c
     com.android.tools.r8.graph.AppView appView -> a
-    java.util.Map removedArguments -> d
-    com.android.tools.r8.com.google.common.collect.BiMap methodMapping -> c
-    com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> e
-    boolean $assertionsDisabled -> f
-    1:3:void <clinit>():44:46 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.MethodPoolCollection):91:91 -> <init>
-    2:44:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.MethodPoolCollection):51:93 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector):44:44 -> a
-    2:2:com.android.tools.r8.utils.MethodSignatureEquivalence access$100():44:44 -> a
-    3:9:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):97:103 -> a
-    10:36:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):97:123 -> a
-    37:37:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):209:209 -> a
-    38:70:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):271:303 -> a
-    71:71:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo.builder():117:117 -> a
-    71:71:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):305 -> a
-    72:74:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):306:308 -> a
-    75:82:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):304:311 -> a
-    83:101:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):318:336 -> a
-    1:8:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):213:220 -> b
-    9:9:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod):266:266 -> b
-    9:9:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):221 -> b
-    10:22:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222:234 -> b
-    1:21:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):240:260 -> c
-    1:1:java.lang.Runnable runnableForClass(com.android.tools.r8.graph.DexProgramClass):209:209 -> d
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> a.a.a.a.h.e.sa:
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> a.a.a.a.h.e.ta:
+    com.android.tools.r8.com.google.common.collect.BiMap methodMapping -> b
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():41:41 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):84:84 -> <init>
+    2:42:void <init>(com.android.tools.r8.graph.AppView):45:85 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector):41:41 -> a
+    2:8:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService):89:95 -> a
+    9:29:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService):89:109 -> a
+    30:30:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):182:182 -> a
+    1:7:void processClass(com.android.tools.r8.graph.DexProgramClass):186:192 -> b
+    8:39:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod):206:237 -> b
+    8:39:void processClass(com.android.tools.r8.graph.DexProgramClass):193 -> b
+    40:47:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod):233:240 -> b
+    40:47:void processClass(com.android.tools.r8.graph.DexProgramClass):193 -> b
+    48:54:void processClass(com.android.tools.r8.graph.DexProgramClass):194:200 -> b
+    1:1:java.lang.Runnable runnableForClass(com.android.tools.r8.graph.DexProgramClass):182:182 -> c
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> a.a.a.a.h.e.qa:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> a.a.a.a.h.e.ra:
     java.util.BitSet used -> a
-    1:3:void <init>():339:341 -> <init>
-    1:3:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):339 -> <init>
-    1:1:java.util.BitSet getUsedArguments():344:344 -> a
-    2:2:boolean register(int):349:349 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> a.a.a.a.h.e.ua:
-    com.android.tools.r8.ir.optimize.UnusedArgumentsCollector this$0 -> b
-    com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool methodPool -> a
-    1:2:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):177:178 -> <init>
-    1:4:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):187:190 -> a
-    5:5:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    5:5:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):190 -> a
-    6:14:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):190:198 -> a
-    15:16:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):203:204 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UnusedArgumentsGraphLense -> a.a.a.a.h.e.va:
+    1:3:void <init>():246:248 -> <init>
+    1:3:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):246 -> <init>
+    1:1:java.util.BitSet getUsedArguments():251:251 -> a
+    2:2:boolean register(int):256:256 -> a
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UnusedArgumentsGraphLense -> a.a.a.a.h.e.sa:
     java.util.Map removedArguments -> k
-    1:9:void <init>(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory,java.util.Map):67:75 -> <init>
-    1:6:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):81:86 -> f
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures -> a.a.a.a.h.e.wa:
+    1:9:void <init>(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory,java.util.Map):61:69 -> <init>
+    1:6:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):75:80 -> f
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures -> a.a.a.a.h.e.ta:
     com.android.tools.r8.ir.optimize.UnusedArgumentsCollector this$0 -> c
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> a
     java.util.Set usedSignatures -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():126:126 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector):126:129 -> <init>
-    1:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector,com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):126 -> <init>
-    1:1:void markSignatureAsUsed(com.android.tools.r8.graph.DexMethod):136:136 -> a
-    1:1:void access$300(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures,com.android.tools.r8.graph.DexMethod):126 -> a
-    2:6:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):145:149 -> a
-    7:7:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    7:7:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):152 -> a
-    8:8:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):152:152 -> a
-    9:9:java.lang.String com.android.tools.r8.utils.StringUtils.numberToIdentifier(char[],int):260:260 -> a
-    9:9:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):151 -> a
-    10:18:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):150:158 -> a
-    19:19:boolean isMethodSignatureAvailable(com.android.tools.r8.graph.DexMethod):132:132 -> a
-    19:19:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):160 -> a
-    20:21:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):165:166 -> a
-    22:22:void markSignatureAsUsed(com.android.tools.r8.graph.DexMethod):136:136 -> a
-    22:22:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):168 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):169:169 -> a
+    1:1:void <clinit>():112:112 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector):112:115 -> <init>
+    1:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector,com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):112 -> <init>
+    1:19:com.android.tools.r8.graph.DexProto protoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):119:137 -> a
+    1:19:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):157 -> a
+    20:23:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):163:166 -> a
+    24:24:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
+    24:24:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):166 -> a
+    25:31:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):166:172 -> a
+    32:32:boolean isMethodSignatureAvailable(com.android.tools.r8.graph.DexMethod):141:141 -> a
+    32:32:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):174 -> a
+    33:33:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):175:175 -> a
+    34:35:void markSignatureAsNoLongerUsed(com.android.tools.r8.graph.DexMethod):149:150 -> a
+    34:35:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):175 -> a
+    36:36:void markSignatureAsUsed(com.android.tools.r8.graph.DexMethod):145:145 -> a
+    36:36:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):176 -> a
+    37:37:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):177:177 -> a
+    38:38:void markSignatureAsUsed(com.android.tools.r8.graph.DexMethod):145:145 -> a
+    38:38:void access$200(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures,com.android.tools.r8.graph.DexMethod):112 -> a
 com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> a.a.a.a.h.e.a.a:
     java.util.concurrent.ConcurrentHashMap knownClasses -> b
     com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> a
@@ -26319,19 +25729,19 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter):34:34 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter):32:36 -> <init>
     1:54:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):128:181 -> a
-    55:96:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):158:199 -> a
-    97:97:boolean lambda$processMethodCode$0(com.android.tools.r8.ir.code.Instruction):129:129 -> a
-    98:98:boolean isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):205:205 -> a
-    98:98:boolean lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):149 -> a
-    99:116:boolean computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):221:238 -> a
-    99:116:boolean isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):207 -> a
-    99:116:boolean lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):149 -> a
-    117:117:boolean com.android.tools.r8.graph.DexClass.initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier):727:727 -> a
-    117:117:boolean computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):238 -> a
-    117:117:boolean isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):207 -> a
-    117:117:boolean lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):149 -> a
-    118:123:boolean isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):207:212 -> a
-    118:123:boolean lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):149 -> a
+    55:95:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):158:198 -> a
+    96:96:boolean lambda$processMethodCode$0(com.android.tools.r8.ir.code.Instruction):129:129 -> a
+    97:97:boolean isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):204:204 -> a
+    97:97:boolean lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):149 -> a
+    98:115:boolean computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):220:237 -> a
+    98:115:boolean isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):206 -> a
+    98:115:boolean lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):149 -> a
+    116:116:boolean com.android.tools.r8.graph.DexClass.initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier):709:709 -> a
+    116:116:boolean computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):237 -> a
+    116:116:boolean isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):206 -> a
+    116:116:boolean lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):149 -> a
+    117:122:boolean isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):206:211 -> a
+    117:122:boolean lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):149 -> a
 com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> a.a.a.a.h.e.a.b:
     com.android.tools.r8.ir.code.Instruction root -> c
     com.android.tools.r8.graph.AppView appView -> d
@@ -26529,31 +25939,31 @@
     106:115:void processCode():188 -> b
 com.android.tools.r8.ir.optimize.lambda.CodeProcessor$1 -> a.a.a.a.h.e.b.b:
     1:1:void <init>():77:77 -> <init>
+    boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> a
     boolean isValidNewInstance(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance) -> a
     boolean isValidStaticFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> a
-    1:1:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):120:120 -> a
-    2:2:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstancePut):125:125 -> a
-    3:3:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstanceGet):130:130 -> a
-    4:4:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticPut):135:135 -> a
-    5:5:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):140:140 -> a
-    boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> b
-    boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> b
+    1:1:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstancePut):125:125 -> a
+    2:2:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstanceGet):130:130 -> a
+    3:3:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticPut):135:135 -> a
+    4:4:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):140:140 -> a
+    boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> b
     1:1:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance):115:115 -> b
-    boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> c
-    boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> d
+    2:2:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):120:120 -> b
+    boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> c
+    boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> d
 com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy -> a.a.a.a.h.e.b.c:
+    boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> a
     boolean isValidNewInstance(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance) -> a
     boolean isValidStaticFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> a
     void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstanceGet) -> a
     void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstancePut) -> a
-    void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> a
     void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet) -> a
     void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticPut) -> a
-    boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> b
-    boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> b
+    boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> b
+    void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> b
     void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance) -> b
-    boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> c
-    boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> d
+    boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> c
+    boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> d
 com.android.tools.r8.ir.optimize.lambda.LambdaGroup -> a.a.a.a.h.e.b.g:
     java.util.Map lambdas -> c
     com.android.tools.r8.ir.optimize.lambda.LambdaGroupId id -> a
@@ -26598,9 +26008,9 @@
     1:2:void <init>(java.lang.String):211 -> <init>
     3:4:void <init>(java.lang.String,boolean):215:216 -> <init>
 com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder -> a.a.a.a.h.e.b.h:
-    java.lang.String origin -> n
-    com.android.tools.r8.graph.DexItemFactory factory -> m
-    com.android.tools.r8.ir.optimize.lambda.LambdaGroup group -> l
+    com.android.tools.r8.graph.DexItemFactory factory -> b
+    com.android.tools.r8.ir.optimize.lambda.LambdaGroup group -> a
+    java.lang.String origin -> c
     1:4:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):27:30 -> <init>
     com.android.tools.r8.graph.ClassAccessFlags buildAccessFlags() -> a
     com.android.tools.r8.graph.DexAnnotationSet buildAnnotations() -> b
@@ -26762,8 +26172,8 @@
     7:7:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):221:221 -> c
     1:1:void prepareSuperConstructorCall(int):219:219 -> j
 com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> a.a.a.a.h.e.b.a.h:
-    boolean $assertionsDisabled -> n
-    com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory INSTANCE -> m
+    com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory INSTANCE -> b
+    boolean $assertionsDisabled -> c
     1:2:void <clinit>():16:17 -> <clinit>
     1:1:void <init>():16:16 -> <init>
     1:6:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):22:27 -> b
@@ -26810,8 +26220,8 @@
     8:8:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):239:239 -> c
     1:3:void prepareSuperConstructorCall(int):235:237 -> j
 com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> a.a.a.a.h.e.b.a.o:
-    boolean $assertionsDisabled -> n
-    com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory INSTANCE -> m
+    com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory INSTANCE -> b
+    boolean $assertionsDisabled -> c
     1:2:void <clinit>():16:17 -> <clinit>
     1:1:void <init>():16:16 -> <init>
     1:6:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):22:27 -> b
@@ -26953,8 +26363,8 @@
     1:1:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id():27:27 -> i
     1:1:boolean isStateless():31:31 -> j
 com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupClassBuilder -> a.a.a.a.h.e.b.a.t:
-    boolean $assertionsDisabled -> p
-    com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id -> o
+    com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id -> d
+    boolean $assertionsDisabled -> e
     1:1:void <clinit>():36:36 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):42:43 -> <init>
     com.android.tools.r8.ir.synthetic.SyntheticSourceCode createInstanceInitializerSourceCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position) -> a
@@ -26989,51 +26399,51 @@
     1:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup):40:41 -> <init>
     1:7:boolean isValidStaticFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):51:57 -> a
     8:8:boolean isValidNewInstance(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance):89:89 -> a
-    9:11:boolean isValidVirtualCall(com.android.tools.r8.ir.code.InvokeMethod):111:113 -> a
-    12:14:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):129:131 -> a
-    15:29:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):210:224 -> a
-    15:29:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):131 -> a
-    30:33:com.android.tools.r8.graph.DexMethod mapInitializerMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):255:258 -> a
-    30:33:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):224 -> a
-    30:33:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):131 -> a
-    34:34:com.android.tools.r8.graph.DexMethod mapInitializerMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):257:257 -> a
-    34:34:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):224 -> a
-    34:34:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):131 -> a
-    35:35:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):225:225 -> a
-    35:35:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):131 -> a
-    36:44:java.util.List mapInitializerArgs(com.android.tools.r8.ir.code.Value,java.util.List,com.android.tools.r8.graph.DexProto):240:248 -> a
-    36:44:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):225 -> a
-    36:44:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):131 -> a
-    45:45:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):226:226 -> a
-    45:45:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):131 -> a
-    46:48:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):134:136 -> a
-    49:49:com.android.tools.r8.graph.DexMethod mapVirtualMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):263:263 -> a
-    49:49:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):137 -> a
-    50:51:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):137:138 -> a
-    52:52:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):136:136 -> a
-    53:53:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstancePut):146:146 -> a
-    54:62:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstanceGet):151:159 -> a
-    63:63:com.android.tools.r8.graph.DexField mapCaptureField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):268:268 -> a
-    63:63:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstanceGet):160 -> a
-    64:84:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstanceGet):160:180 -> a
-    85:85:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticPut):188:188 -> a
-    86:91:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):194:199 -> a
-    92:92:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):198:198 -> a
-    93:96:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):197:200 -> a
-    97:97:com.android.tools.r8.graph.DexField mapSingletonInstanceField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexField):273:273 -> a
-    97:97:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):200 -> a
-    98:98:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):200:200 -> a
-    99:99:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):195:195 -> a
-    100:103:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):232:235 -> a
-    104:104:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):234:234 -> a
-    1:5:boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):72:76 -> b
-    6:6:boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):94:94 -> b
-    7:12:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance):118:123 -> b
-    13:13:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance):122:122 -> b
-    14:17:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance):121:124 -> b
-    1:4:boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):63:66 -> c
-    5:14:boolean isValidInitializerCall(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):98:107 -> c
-    1:1:boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):81:81 -> d
+    9:9:boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):94:94 -> a
+    10:12:boolean isValidVirtualCall(com.android.tools.r8.ir.code.InvokeMethod):111:113 -> a
+    13:13:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstancePut):146:146 -> a
+    14:22:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstanceGet):151:159 -> a
+    23:23:com.android.tools.r8.graph.DexField mapCaptureField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):268:268 -> a
+    23:23:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstanceGet):160 -> a
+    24:44:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstanceGet):160:180 -> a
+    45:45:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticPut):188:188 -> a
+    46:51:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):194:199 -> a
+    52:52:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):198:198 -> a
+    53:56:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):197:200 -> a
+    57:57:com.android.tools.r8.graph.DexField mapSingletonInstanceField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexField):273:273 -> a
+    57:57:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):200 -> a
+    58:58:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):200:200 -> a
+    59:59:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):195:195 -> a
+    60:63:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):232:235 -> a
+    64:64:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):234:234 -> a
+    1:4:boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):63:66 -> b
+    5:10:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance):118:123 -> b
+    11:11:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance):122:122 -> b
+    12:15:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance):121:124 -> b
+    16:18:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):129:131 -> b
+    19:33:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):210:224 -> b
+    19:33:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):131 -> b
+    34:37:com.android.tools.r8.graph.DexMethod mapInitializerMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):255:258 -> b
+    34:37:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):224 -> b
+    34:37:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):131 -> b
+    38:38:com.android.tools.r8.graph.DexMethod mapInitializerMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):257:257 -> b
+    38:38:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):224 -> b
+    38:38:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):131 -> b
+    39:39:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):225:225 -> b
+    39:39:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):131 -> b
+    40:48:java.util.List mapInitializerArgs(com.android.tools.r8.ir.code.Value,java.util.List,com.android.tools.r8.graph.DexProto):240:248 -> b
+    40:48:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):225 -> b
+    40:48:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):131 -> b
+    49:49:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):226:226 -> b
+    49:49:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):131 -> b
+    50:52:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):134:136 -> b
+    53:53:com.android.tools.r8.graph.DexMethod mapVirtualMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):263:263 -> b
+    53:53:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):137 -> b
+    54:55:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):137:138 -> b
+    56:56:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):136:136 -> b
+    1:1:boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):81:81 -> c
+    2:11:boolean isValidInitializerCall(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):98:107 -> c
+    1:5:boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):72:76 -> d
 com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId -> a.a.a.a.h.e.b.a.v:
     com.android.tools.r8.graph.DexProto mainMethodProto -> g
     com.android.tools.r8.graph.ParameterAnnotationsList mainMethodParamAnnotations -> i
@@ -27060,7 +26470,7 @@
     8:8:java.lang.String toString():119 -> toString
     9:23:java.lang.String toString():119:133 -> toString
 com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory -> a.a.a.a.h.e.b.a.w:
-    boolean $assertionsDisabled -> l
+    boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():23:23 -> <init>
     1:7:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId create(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):36:42 -> a
@@ -27165,9 +26575,8 @@
     33:52:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):76:95 -> a
     1:10:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):51:60 -> b
 com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> a.a.a.a.h.e.c.g:
-    int getMin() -> a
-    void setIndex(int) -> a
-    java.util.function.Predicate getPredicate() -> b
+    java.util.function.Predicate getPredicate() -> a
+    int getMin() -> b
     int getMax() -> c
 com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> a.a.a.a.h.e.c.h:
     boolean $assertionsDisabled -> a
@@ -27203,11 +26612,11 @@
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>(java.util.function.Predicate):15:15 -> <init>
     2:5:void <init>(java.util.function.Predicate):13:16 -> <init>
-    int getMin() -> a
-    1:2:void setIndex(int):36:37 -> a
-    3:3:com.android.tools.r8.ir.code.Instruction get(com.android.tools.r8.ir.optimize.peepholes.Match):41:41 -> a
-    1:1:java.util.function.Predicate getPredicate():21:21 -> b
+    1:1:java.util.function.Predicate getPredicate():21:21 -> a
+    2:2:com.android.tools.r8.ir.code.Instruction get(com.android.tools.r8.ir.optimize.peepholes.Match):41:41 -> a
+    int getMin() -> b
     int getMax() -> c
+    1:2:void setIndex(int):36:37 -> setIndex
 com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> a.a.a.a.h.e.c.k:
     com.android.tools.r8.ir.optimize.peepholes.Point loadExp -> b
     com.android.tools.r8.ir.optimize.peepholes.Point storeExp -> a
@@ -27248,11 +26657,11 @@
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(java.util.function.Predicate):16:16 -> <init>
     2:5:void <init>(java.util.function.Predicate):14:17 -> <init>
-    int getMin() -> a
-    1:2:void setIndex(int):37:38 -> a
-    3:3:java.util.List get(com.android.tools.r8.ir.optimize.peepholes.Match):42:42 -> a
-    1:1:java.util.function.Predicate getPredicate():22:22 -> b
+    1:1:java.util.function.Predicate getPredicate():22:22 -> a
+    2:2:java.util.List get(com.android.tools.r8.ir.optimize.peepholes.Match):42:42 -> a
+    int getMin() -> b
     int getMax() -> c
+    1:2:void setIndex(int):37:38 -> setIndex
 com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer -> a.a.a.a.h.e.d.e:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$Phase phase -> d
@@ -27264,66 +26673,66 @@
     1:1:void <clinit>():47:47 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):106:106 -> <init>
     2:54:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):57:109 -> <init>
-    1:67:void collectCandidates(com.android.tools.r8.graph.DexApplication):116:182 -> a
-    68:102:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):127:161 -> a
-    103:107:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):167:171 -> a
-    108:113:boolean isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):186:191 -> a
-    108:113:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):172 -> a
-    114:117:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):173:176 -> a
-    118:131:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):221:234 -> a
-    132:152:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):233:253 -> a
-    153:161:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):339:347 -> a
-    153:161:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    162:162:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.DexEncodedMethod):84:84 -> a
-    162:162:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):350 -> a
-    162:162:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    163:203:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):353:393 -> a
-    163:203:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    204:204:boolean isNonThrowingConstInstruction(com.android.tools.r8.ir.code.Instruction):421:421 -> a
-    204:204:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):393 -> a
-    204:204:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    205:210:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):396:401 -> a
-    205:210:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    211:234:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):426:449 -> a
-    211:234:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):401 -> a
-    211:234:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    235:242:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):402:409 -> a
-    235:242:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    243:250:boolean isValidStaticPut(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):454:461 -> a
-    243:250:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):409 -> a
-    243:250:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    251:255:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):410:414 -> a
-    251:255:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    256:257:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):260:261 -> a
-    258:262:boolean isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):329:333 -> a
-    258:262:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):261 -> a
-    263:287:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):262:286 -> a
-    288:300:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):468:480 -> a
-    288:300:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):286 -> a
-    301:333:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):288:320 -> a
-    334:367:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):487:520 -> a
-    368:369:void staticizeCandidates(com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.concurrent.ExecutorService):541:542 -> a
-    370:373:void setFixupStrategy(java.util.function.BiConsumer):553:556 -> a
-    374:377:void cleanFixupStrategy():560:563 -> a
-    1:3:void fixupMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):546:548 -> b
+    1:65:void collectCandidates(com.android.tools.r8.graph.DexApplication):116:180 -> a
+    66:100:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):125:159 -> a
+    101:105:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):165:169 -> a
+    106:111:boolean isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):184:189 -> a
+    106:111:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):170 -> a
+    112:115:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):171:174 -> a
+    116:129:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):219:232 -> a
+    130:150:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):231:251 -> a
+    151:159:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):337:345 -> a
+    151:159:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):252 -> a
+    160:160:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.DexEncodedMethod):84:84 -> a
+    160:160:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):348 -> a
+    160:160:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):252 -> a
+    161:201:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):351:391 -> a
+    161:201:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):252 -> a
+    202:202:boolean isNonThrowingConstInstruction(com.android.tools.r8.ir.code.Instruction):419:419 -> a
+    202:202:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):391 -> a
+    202:202:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):252 -> a
+    203:208:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):394:399 -> a
+    203:208:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):252 -> a
+    209:232:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):424:447 -> a
+    209:232:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):399 -> a
+    209:232:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):252 -> a
+    233:240:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):400:407 -> a
+    233:240:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):252 -> a
+    241:248:boolean isValidStaticPut(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):452:459 -> a
+    241:248:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):407 -> a
+    241:248:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):252 -> a
+    249:253:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):408:412 -> a
+    249:253:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):252 -> a
+    254:255:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):258:259 -> a
+    256:260:boolean isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):327:331 -> a
+    256:260:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):259 -> a
+    261:285:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):260:284 -> a
+    286:298:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):466:478 -> a
+    286:298:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):284 -> a
+    299:331:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):286:318 -> a
+    332:365:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):485:518 -> a
+    366:367:void staticizeCandidates(com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.concurrent.ExecutorService):539:540 -> a
+    368:371:void setFixupStrategy(java.util.function.BiConsumer):551:554 -> a
+    372:375:void cleanFixupStrategy():558:561 -> a
+    1:3:void fixupMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):544:546 -> b
 com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> a.a.a.a.h.e.d.a:
 com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> a.a.a.a.h.e.d.b:
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer this$0 -> c
-    1:2:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory):568:569 -> <init>
-    1:2:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1):566 -> <init>
-    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):591:591 -> a
-    2:2:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):616:616 -> a
-    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):601:601 -> b
-    2:2:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):611:611 -> b
-    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):596:596 -> c
-    2:2:boolean registerNewInstance(com.android.tools.r8.graph.DexType):621:621 -> c
-    3:3:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):626:626 -> c
-    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):606:606 -> d
-    2:2:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):631:631 -> d
-    3:5:boolean registerTypeReference(com.android.tools.r8.graph.DexType):636:638 -> d
-    1:2:boolean registerField(com.android.tools.r8.graph.DexField):579:580 -> e
-    3:3:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):586:586 -> e
-    1:2:boolean registerMethod(com.android.tools.r8.graph.DexMethod):573:574 -> f
+    1:2:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory):566:567 -> <init>
+    1:2:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1):564 -> <init>
+    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):589:589 -> a
+    2:2:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):614:614 -> a
+    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):599:599 -> b
+    2:2:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):609:609 -> b
+    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):594:594 -> c
+    2:2:boolean registerNewInstance(com.android.tools.r8.graph.DexType):619:619 -> c
+    3:3:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):624:624 -> c
+    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):604:604 -> d
+    2:2:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):629:629 -> d
+    3:5:boolean registerTypeReference(com.android.tools.r8.graph.DexType):634:636 -> d
+    1:2:boolean registerField(com.android.tools.r8.graph.DexField):577:578 -> e
+    3:3:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):584:584 -> e
+    1:2:boolean registerMethod(com.android.tools.r8.graph.DexMethod):571:572 -> f
 com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> a.a.a.a.h.e.d.c:
     java.util.concurrent.atomic.AtomicInteger instancesCreated -> e
     com.android.tools.r8.graph.DexEncodedField singletonField -> b
@@ -27399,7 +26808,7 @@
     213:214:void lambda$rewriteReferences$3(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):267:268 -> a
     215:234:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):323:342 -> a
     235:249:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):386:400 -> a
-    250:250:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction):270:270 -> a
+    250:250:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction):268:268 -> a
     250:250:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):399 -> a
     251:257:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):457:463 -> a
     258:261:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):511:514 -> a
@@ -27430,31 +26839,28 @@
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> d
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> c
-    1:1:void <clinit>():41:41 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView):47:50 -> <init>
-    1:54:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):70:123 -> a
-    55:59:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):121:125 -> a
-    60:122:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):124:186 -> a
-    123:138:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):184:199 -> a
-    139:145:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):197:203 -> a
-    146:146:java.lang.Integer lambda$computeTrivialOperationsOnConstString$0(java.lang.String):135:135 -> a
-    147:147:java.lang.Integer lambda$computeTrivialOperationsOnConstString$1(java.lang.String,java.lang.String):137:137 -> a
-    148:174:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):210:236 -> a
-    175:196:boolean hasPotentialReadOutside(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):357:378 -> a
-    175:196:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):235 -> a
-    197:268:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):240:311 -> a
-    269:315:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):294:340 -> a
-    316:317:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):320:321 -> a
-    316:317:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):340 -> a
-    318:318:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):341:341 -> a
-    319:330:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):339:350 -> a
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$2(java.lang.String,java.lang.String):139:139 -> b
-    2:21:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):388:407 -> b
-    22:54:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):405:437 -> b
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$3(java.lang.String,java.lang.String):141:141 -> c
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$4(java.lang.String,java.lang.String):143:143 -> d
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$5(java.lang.String,java.lang.String):145:145 -> e
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$6(java.lang.String,java.lang.String):147:147 -> f
+    1:1:void <clinit>():42:42 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView):48:51 -> <init>
+    1:54:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):71:124 -> a
+    55:59:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):122:126 -> a
+    60:122:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):125:187 -> a
+    123:138:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):185:200 -> a
+    139:145:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):198:204 -> a
+    146:146:java.lang.Integer lambda$computeTrivialOperationsOnConstString$0(java.lang.String):136:136 -> a
+    147:147:java.lang.Integer lambda$computeTrivialOperationsOnConstString$1(java.lang.String,java.lang.String):138:138 -> a
+    148:174:void rewriteClassGetName(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.RootSetBuilder$RootSet):211:237 -> a
+    175:196:boolean hasPotentialReadOutside(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):355:376 -> a
+    175:196:void rewriteClassGetName(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.RootSetBuilder$RootSet):236 -> a
+    197:266:void rewriteClassGetName(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.RootSetBuilder$RootSet):241:310 -> a
+    267:312:void rewriteClassGetName(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.RootSetBuilder$RootSet):294:339 -> a
+    313:324:void rewriteClassGetName(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.RootSetBuilder$RootSet):337:348 -> a
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$2(java.lang.String,java.lang.String):140:140 -> b
+    2:21:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):386:405 -> b
+    22:54:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):403:435 -> b
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$3(java.lang.String,java.lang.String):142:142 -> c
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$4(java.lang.String,java.lang.String):144:144 -> d
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$5(java.lang.String,java.lang.String):146:146 -> e
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$6(java.lang.String,java.lang.String):148:148 -> f
 com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator -> a.a.a.a.h.f.c:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List moveExceptionIntervals -> o
@@ -27498,181 +26904,181 @@
     220:243:com.android.tools.r8.ir.code.DebugLocalsChange createLocalsChange(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.code.Position):520:543 -> a
     244:263:com.android.tools.r8.ir.code.DebugLocalsChange createLocalsChange(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.code.Position):526:545 -> a
     264:268:void addRegisterIfUsed(java.util.Set,com.android.tools.r8.ir.regalloc.LiveIntervals):592:596 -> a
-    269:281:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):616:628 -> a
-    282:283:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):813:814 -> a
-    282:283:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):630 -> a
-    284:286:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):621:623 -> a
-    287:287:com.android.tools.r8.utils.InternalOptions options():643:643 -> a
-    288:288:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661:661 -> a
-    289:300:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):794:805 -> a
-    289:300:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):664 -> a
-    301:301:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):665:665 -> a
-    302:310:void pinArgumentRegisters():2963:2971 -> a
-    302:310:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):668 -> a
-    311:311:void pinArgumentRegisters():2968:2968 -> a
-    311:311:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):668 -> a
-    312:400:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):842:930 -> a
-    312:400:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    401:409:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1070:1078 -> a
-    401:409:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):932 -> a
-    401:409:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    410:423:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1089:1102 -> a
-    410:423:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):933 -> a
-    410:423:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    424:489:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1117:1182 -> a
-    424:489:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):938 -> a
-    424:489:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    490:539:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939:988 -> a
-    490:539:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    540:620:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1624:1704 -> a
-    540:620:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
-    540:620:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    621:621:int toInstructionPosition(int):1406:1406 -> a
-    621:621:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1704 -> a
-    621:621:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
-    621:621:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    622:633:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1709:1720 -> a
-    622:633:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
-    622:633:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    634:642:boolean freePositionsAreConsistentWithFreeRegisters(com.android.tools.r8.ir.regalloc.RegisterPositions,int):1043:1051 -> a
-    634:642:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1720 -> a
-    634:642:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
-    634:642:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    643:673:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1799:1829 -> a
-    643:673:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1723 -> a
-    643:673:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
-    643:673:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    674:704:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1729:1759 -> a
-    674:704:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
-    674:704:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    705:723:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1998:2016 -> a
-    705:723:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1761 -> a
-    705:723:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
-    705:723:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    724:807:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2015:2098 -> a
-    724:807:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1761 -> a
-    724:807:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
-    724:807:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    808:815:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1271:1278 -> a
-    808:815:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2100 -> a
-    808:815:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1761 -> a
-    808:815:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
-    808:815:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    816:834:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2101:2119 -> a
-    816:834:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1761 -> a
-    816:834:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
-    816:834:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    835:854:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1766:1785 -> a
-    835:854:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
-    835:854:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
-    855:900:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):672:717 -> a
-    901:915:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):690:704 -> a
-    916:923:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):678:685 -> a
-    924:964:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):682:722 -> a
-    965:968:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):721:724 -> a
-    969:969:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):723:723 -> a
-    970:977:boolean isSpillInstruction(com.android.tools.r8.ir.code.Instruction):780:787 -> a
-    978:982:int realRegisterNumberFromAllocated(int):832:836 -> a
-    983:1021:boolean invariantsHold(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):999:1037 -> a
-    1022:1023:void lambda$invariantsHold$3(java.util.TreeSet,int):1007:1008 -> a
-    1024:1032:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1191:1199 -> a
-    1033:1043:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1196:1206 -> a
-    1044:1051:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1254:1261 -> a
-    1044:1051:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1209 -> a
-    1052:1052:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1260:1260 -> a
-    1052:1052:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1209 -> a
-    1053:1053:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1210:1210 -> a
-    1054:1067:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1208:1221 -> a
-    1068:1068:int getFreeConsecutiveRegisters(int):2990:2990 -> a
-    1068:1068:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1222 -> a
-    1069:1070:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1224:1225 -> a
-    1071:1076:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1059:1064 -> a
-    1071:1076:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1225 -> a
-    1077:1077:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1063:1063 -> a
-    1077:1077:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1225 -> a
-    1078:1078:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1062:1062 -> a
-    1078:1078:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1225 -> a
-    1079:1092:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1227:1240 -> a
-    1093:1117:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1223:1247 -> a
-    1118:1137:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1283:1302 -> a
-    1138:1145:boolean registersAreFreeAndConsecutive(int,boolean):3046:3053 -> a
-    1138:1145:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1302 -> a
-    1146:1171:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1303:1328 -> a
-    1172:1226:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1344:1398 -> a
-    1227:1242:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1849:1864 -> a
-    1243:1245:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1914:1916 -> a
-    1246:1258:int getLargestCandidate(int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1928:1940 -> a
-    1259:1264:int handleWorkaround(java.util.function.Predicate,java.util.function.BiPredicate,int,com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1958:1963 -> a
-    1265:1277:int getLargestValidCandidate(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1978:1990 -> a
-    1278:1280:int getLargestPosition(com.android.tools.r8.ir.regalloc.RegisterPositions,int,boolean):2126:2128 -> a
-    1281:1285:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2136:2140 -> a
-    1286:1318:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2148:2180 -> a
-    1286:1318:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2143 -> a
-    1319:1330: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):2344:2355 -> a
-    1331:1342: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):2463:2474 -> a
-    1343:1344:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getStartOfConsecutive():374:375 -> a
-    1343:1344: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):2475 -> a
-    1345:1367: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):2476:2498 -> a
-    1368:1368:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2671:2671 -> a
-    1368:1368: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):2498 -> a
-    1369:1375: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):2498:2504 -> a
-    1376:1428:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2537:2589 -> a
-    1429:1442:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2586:2599 -> a
-    1443:1443:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2671:2671 -> a
-    1443:1443:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2599 -> a
-    1444:1481:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2599:2636 -> a
-    1482:1483:int getLiveRangeEndOnExceptionalFlow(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):2663:2664 -> a
-    1482:1483:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2640 -> a
-    1484:1501:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2637:2654 -> a
-    1502:1524:boolean implementationIsBridge(com.android.tools.r8.ir.code.IRCode):2740:2762 -> a
-    1525:1525:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2784:2784 -> a
-    1526:1530:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2889:2893 -> a
-    1526:1530:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2784 -> a
-    1531:1564:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2785:2818 -> a
-    1565:1566:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():691:692 -> a
-    1565:1566:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2820 -> a
-    1567:1567:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2821:2821 -> a
-    1568:1569:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):2769:2770 -> a
-    1568:1569:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2821 -> a
-    1570:1571:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2822:2823 -> a
-    1572:1575:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2775:2778 -> a
-    1572:1575:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2824 -> a
-    1576:1600:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2826:2850 -> a
-    1601:1627:void generateArgumentMovesAtDefinitions(com.android.tools.r8.ir.code.Invoke,java.util.PriorityQueue,com.android.tools.r8.ir.code.InstructionListIterator):2858:2884 -> a
-    1601:1627:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2851 -> a
-    1628:1628:int lambda$generateArgumentMoves$5(com.android.tools.r8.ir.code.Move,com.android.tools.r8.ir.code.Move):2792:2792 -> a
-    1629:1673:int getFreeConsecutiveRegisters(int,boolean):2994:3038 -> a
-    1674:1685:int lambda$getFreeConsecutiveRegisters$6(java.lang.Integer,java.lang.Integer):3000:3011 -> a
-    1686:1689:int getNextFreeRegister(java.util.Iterator):3062:3065 -> a
-    1690:1702:void excludeRegistersForInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):3069:3081 -> a
-    1703:1714:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3087:3098 -> a
-    1715:1715:boolean hasEqualTypesAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3193:3193 -> a
+    269:271:int registersUsed():607:609 -> a
+    272:273:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):635:636 -> a
+    274:275:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):813:814 -> a
+    274:275:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):636 -> a
+    276:276:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):638:638 -> a
+    277:277:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):661:661 -> a
+    278:289:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):794:805 -> a
+    278:289:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):664 -> a
+    290:290:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):665:665 -> a
+    291:299:void pinArgumentRegisters():2963:2971 -> a
+    291:299:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):668 -> a
+    300:300:void pinArgumentRegisters():2968:2968 -> a
+    300:300:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):668 -> a
+    301:389:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):842:930 -> a
+    301:389:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    390:398:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1070:1078 -> a
+    390:398:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):932 -> a
+    390:398:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    399:412:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1089:1102 -> a
+    399:412:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):933 -> a
+    399:412:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    413:478:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1117:1182 -> a
+    413:478:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):938 -> a
+    413:478:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    479:528:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939:988 -> a
+    479:528:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    529:609:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1624:1704 -> a
+    529:609:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
+    529:609:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    610:610:int toInstructionPosition(int):1406:1406 -> a
+    610:610:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1704 -> a
+    610:610:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
+    610:610:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    611:622:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1709:1720 -> a
+    611:622:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
+    611:622:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    623:631:boolean freePositionsAreConsistentWithFreeRegisters(com.android.tools.r8.ir.regalloc.RegisterPositions,int):1043:1051 -> a
+    623:631:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1720 -> a
+    623:631:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
+    623:631:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    632:662:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1799:1829 -> a
+    632:662:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1723 -> a
+    632:662:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
+    632:662:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    663:693:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1729:1759 -> a
+    663:693:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
+    663:693:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    694:712:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1998:2016 -> a
+    694:712:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1761 -> a
+    694:712:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
+    694:712:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    713:796:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2015:2098 -> a
+    713:796:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1761 -> a
+    713:796:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
+    713:796:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    797:804:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1271:1278 -> a
+    797:804:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2100 -> a
+    797:804:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1761 -> a
+    797:804:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
+    797:804:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    805:823:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2101:2119 -> a
+    805:823:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1761 -> a
+    805:823:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
+    805:823:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    824:843:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1766:1785 -> a
+    824:843:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):990 -> a
+    824:843:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> a
+    844:889:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):672:717 -> a
+    890:904:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):690:704 -> a
+    905:912:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):678:685 -> a
+    913:953:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):682:722 -> a
+    954:957:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):721:724 -> a
+    958:958:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):723:723 -> a
+    959:966:boolean isSpillInstruction(com.android.tools.r8.ir.code.Instruction):780:787 -> a
+    967:971:int realRegisterNumberFromAllocated(int):832:836 -> a
+    972:1010:boolean invariantsHold(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):999:1037 -> a
+    1011:1012:void lambda$invariantsHold$3(java.util.TreeSet,int):1007:1008 -> a
+    1013:1021:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1191:1199 -> a
+    1022:1032:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1196:1206 -> a
+    1033:1040:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1254:1261 -> a
+    1033:1040:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1209 -> a
+    1041:1041:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1260:1260 -> a
+    1041:1041:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1209 -> a
+    1042:1042:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1210:1210 -> a
+    1043:1056:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1208:1221 -> a
+    1057:1057:int getFreeConsecutiveRegisters(int):2990:2990 -> a
+    1057:1057:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1222 -> a
+    1058:1059:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1224:1225 -> a
+    1060:1065:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1059:1064 -> a
+    1060:1065:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1225 -> a
+    1066:1066:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1063:1063 -> a
+    1066:1066:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1225 -> a
+    1067:1067:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1062:1062 -> a
+    1067:1067:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1225 -> a
+    1068:1081:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1227:1240 -> a
+    1082:1106:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1223:1247 -> a
+    1107:1126:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1283:1302 -> a
+    1127:1134:boolean registersAreFreeAndConsecutive(int,boolean):3046:3053 -> a
+    1127:1134:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1302 -> a
+    1135:1160:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1303:1328 -> a
+    1161:1215:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1344:1398 -> a
+    1216:1231:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1849:1864 -> a
+    1232:1234:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1914:1916 -> a
+    1235:1247:int getLargestCandidate(int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1928:1940 -> a
+    1248:1253:int handleWorkaround(java.util.function.Predicate,java.util.function.BiPredicate,int,com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1958:1963 -> a
+    1254:1266:int getLargestValidCandidate(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1978:1990 -> a
+    1267:1269:int getLargestPosition(com.android.tools.r8.ir.regalloc.RegisterPositions,int,boolean):2126:2128 -> a
+    1270:1274:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2136:2140 -> a
+    1275:1307:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2148:2180 -> a
+    1275:1307:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2143 -> a
+    1308:1319: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):2344:2355 -> a
+    1320:1331: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):2463:2474 -> a
+    1332:1333:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getStartOfConsecutive():372:373 -> a
+    1332:1333: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):2475 -> a
+    1334:1356: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):2476:2498 -> a
+    1357:1357:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2671:2671 -> a
+    1357:1357: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):2498 -> a
+    1358:1364: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):2498:2504 -> a
+    1365:1417:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2537:2589 -> a
+    1418:1431:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2586:2599 -> a
+    1432:1432:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2671:2671 -> a
+    1432:1432:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2599 -> a
+    1433:1470:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2599:2636 -> a
+    1471:1472:int getLiveRangeEndOnExceptionalFlow(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):2663:2664 -> a
+    1471:1472:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2640 -> a
+    1473:1490:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2637:2654 -> a
+    1491:1513:boolean implementationIsBridge(com.android.tools.r8.ir.code.IRCode):2740:2762 -> a
+    1514:1514:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2784:2784 -> a
+    1515:1519:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2889:2893 -> a
+    1515:1519:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2784 -> a
+    1520:1553:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2785:2818 -> a
+    1554:1555:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():672:673 -> a
+    1554:1555:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2820 -> a
+    1556:1556:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2821:2821 -> a
+    1557:1558:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):2769:2770 -> a
+    1557:1558:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2821 -> a
+    1559:1560:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2822:2823 -> a
+    1561:1564:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2775:2778 -> a
+    1561:1564:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2824 -> a
+    1565:1589:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2826:2850 -> a
+    1590:1616:void generateArgumentMovesAtDefinitions(com.android.tools.r8.ir.code.Invoke,java.util.PriorityQueue,com.android.tools.r8.ir.code.InstructionListIterator):2858:2884 -> a
+    1590:1616:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2851 -> a
+    1617:1617:int lambda$generateArgumentMoves$5(com.android.tools.r8.ir.code.Move,com.android.tools.r8.ir.code.Move):2792:2792 -> a
+    1618:1662:int getFreeConsecutiveRegisters(int,boolean):2994:3038 -> a
+    1663:1674:int lambda$getFreeConsecutiveRegisters$6(java.lang.Integer,java.lang.Integer):3000:3011 -> a
+    1675:1678:int getNextFreeRegister(java.util.Iterator):3062:3065 -> a
+    1679:1691:void excludeRegistersForInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):3069:3081 -> a
+    1692:1703:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3087:3098 -> a
+    1704:1704:boolean hasEqualTypesAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3193:3193 -> a
     void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> b
     1:1:boolean lambda$computeDebugInfo$1(com.android.tools.r8.ir.code.Instruction):325:325 -> b
-    2:4:int registersUsed():607:609 -> b
-    5:6:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):635:636 -> b
-    7:8:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):813:814 -> b
-    7:8:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):636 -> b
-    9:9:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):638:638 -> b
-    10:15:int unadjustedRealRegisterFromAllocated(int):818:823 -> b
-    16:17:void lambda$invariantsHold$4(java.util.TreeSet,int):1024:1025 -> b
-    18:35:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1425:1442 -> b
-    36:37:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1872:1873 -> b
-    38:67:void updateRegisterHints(com.android.tools.r8.ir.regalloc.LiveIntervals):1878:1907 -> b
-    38:67:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1874 -> b
-    68:69:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2185:2186 -> b
-    70:70:boolean atLeastOneOfRegistersAreTaken(int,boolean):3143:3143 -> b
-    70:70:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2186 -> b
-    71:117:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2186:2232 -> b
-    118:153:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2300:2335 -> b
-    118:153:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2235 -> b
-    154:154:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2236:2236 -> b
-    155:162:void splitRangesForSpilledArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):2249:2256 -> b
-    155:162:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2237 -> b
-    163:190:void splitRangesForSpilledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2263:2290 -> b
-    163:190:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2239 -> b
-    191:192:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2244:2245 -> b
-    193:197:void increaseCapacity(int,boolean):2982:2986 -> b
+    2:14:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):616:628 -> b
+    15:16:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):813:814 -> b
+    15:16:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):630 -> b
+    17:19:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):621:623 -> b
+    20:20:com.android.tools.r8.utils.InternalOptions options():643:643 -> b
+    21:26:int unadjustedRealRegisterFromAllocated(int):818:823 -> b
+    27:28:void lambda$invariantsHold$4(java.util.TreeSet,int):1024:1025 -> b
+    29:46:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1425:1442 -> b
+    47:48:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1872:1873 -> b
+    49:78:void updateRegisterHints(com.android.tools.r8.ir.regalloc.LiveIntervals):1878:1907 -> b
+    49:78:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1874 -> b
+    79:80:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2185:2186 -> b
+    81:81:boolean atLeastOneOfRegistersAreTaken(int,boolean):3143:3143 -> b
+    81:81:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2186 -> b
+    82:128:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2186:2232 -> b
+    129:164:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2300:2335 -> b
+    129:164:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2235 -> b
+    165:165:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2236:2236 -> b
+    166:173:void splitRangesForSpilledArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):2249:2256 -> b
+    166:173:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2237 -> b
+    174:201:void splitRangesForSpilledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2263:2290 -> b
+    174:201:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2239 -> b
+    202:203:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2244:2245 -> b
+    204:208:void increaseCapacity(int,boolean):2982:2986 -> b
     1:1:void allocateRegisters():205:205 -> c
     2:11:boolean noLinkedValues():3147:3156 -> c
     2:11:void allocateRegisters():205 -> c
@@ -27698,14 +27104,14 @@
     98:103:void computeLiveRanges():2509:2514 -> c
     98:103:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():649 -> c
     98:103:void allocateRegisters():213 -> c
-    104:104:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():755:755 -> c
+    104:104:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():726:726 -> c
     104:104:void computeLiveRanges():2514 -> c
     104:104:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():649 -> c
     104:104:void allocateRegisters():213 -> c
     105:105:void computeLiveRanges():2514:2514 -> c
     105:105:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():649 -> c
     105:105:void allocateRegisters():213 -> c
-    106:106:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():764:764 -> c
+    106:106:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():735:735 -> c
     106:106:void computeLiveRanges():2514 -> c
     106:106:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():649 -> c
     106:106:void allocateRegisters():213 -> c
@@ -27722,17 +27128,17 @@
     140:145:void allocateRegisters():237 -> c
     146:150:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1448:1452 -> c
     151:151:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1518:1518 -> c
-    152:152:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():770:770 -> c
+    152:152:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():741:741 -> c
     152:152:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1518 -> c
     153:173:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1521:1541 -> c
     174:174:void increaseCapacity(int):2977:2977 -> c
     175:175:boolean registersAreFree(int,boolean):3130:3130 -> c
     1:1:int highestUsedRegister():602:602 -> d
     2:2:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1457:1457 -> d
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():977:977 -> d
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():947:947 -> d
     3:3:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1457 -> d
     4:22:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1460:1478 -> d
-    23:23:boolean com.android.tools.r8.ir.code.NumberConversion.isLongToIntConversion():47:47 -> d
+    23:23:boolean com.android.tools.r8.ir.code.NumberConversion.isLongToIntConversion():42:42 -> d
     23:23:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1478 -> d
     24:36:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1554:1566 -> d
     37:38:boolean registerIsFree(int):3123:3124 -> d
@@ -27805,7 +27211,7 @@
     1:1:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):52:52 -> <init>
     2:23:void <init>(com.android.tools.r8.ir.code.Value):32:53 -> <init>
-    24:25:boolean com.android.tools.r8.ir.code.Value.usedInMonitorOperation():466:467 -> <init>
+    24:25:boolean com.android.tools.r8.ir.code.Value.usedInMonitorOperation():447:448 -> <init>
     24:25:void <init>(com.android.tools.r8.ir.code.Value):54 -> <init>
     26:28:void <init>(com.android.tools.r8.ir.code.Value):54:56 -> <init>
     29:29:void <init>(com.android.tools.r8.ir.regalloc.LiveIntervals):59:59 -> <init>
@@ -27884,34 +27290,34 @@
     84:84:void computeRematerializable(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):638 -> a
     85:89:void computeRematerializable(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):639:643 -> a
     1:1:boolean hasConflictingRegisters(com.android.tools.r8.ir.regalloc.LiveIntervals):318:318 -> b
-    2:3:com.android.tools.r8.ir.regalloc.LiveIntervalsUse firstUseWithConstraint():387:388 -> b
+    2:4:int firstUseAfter(int):374:376 -> b
+    5:6:com.android.tools.r8.ir.regalloc.LiveIntervalsUse firstUseWithConstraint():387:388 -> b
     1:3:void link(com.android.tools.r8.ir.regalloc.LiveIntervals):122:124 -> c
     4:5:int getEnd():261:262 -> c
-    6:8:int firstUseAfter(int):374:376 -> c
+    6:6:com.android.tools.r8.ir.regalloc.LiveIntervals getSplitCovering(int):476:476 -> c
+    7:7:com.android.tools.r8.ir.regalloc.LiveIntervals getSplitParent():202:202 -> c
+    7:7:com.android.tools.r8.ir.regalloc.LiveIntervals getSplitCovering(int):476 -> c
+    8:41:com.android.tools.r8.ir.regalloc.LiveIntervals getSplitCovering(int):476:509 -> c
     1:1:int compareTo(java.lang.Object):23:23 -> compareTo
     2:3:int compareTo(com.android.tools.r8.ir.regalloc.LiveIntervals):540:541 -> compareTo
     2:3:int compareTo(java.lang.Object):23 -> compareTo
-    1:10:int nextOverlap(com.android.tools.r8.ir.regalloc.LiveIntervals):357:366 -> d
-    11:11:int getFirstUse():383:383 -> d
-    12:12:com.android.tools.r8.ir.regalloc.LiveIntervals getSplitCovering(int):476:476 -> d
-    13:13:com.android.tools.r8.ir.regalloc.LiveIntervals getSplitParent():202:202 -> d
-    13:13:com.android.tools.r8.ir.regalloc.LiveIntervals getSplitCovering(int):476 -> d
-    14:47:com.android.tools.r8.ir.regalloc.LiveIntervals getSplitCovering(int):476:509 -> d
+    1:6:boolean overlapsPosition(int):327:332 -> d
+    7:16:int nextOverlap(com.android.tools.r8.ir.regalloc.LiveIntervals):357:366 -> d
+    17:17:int getFirstUse():383:383 -> d
     1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getHint():90:90 -> e
-    2:7:boolean overlapsPosition(int):327:332 -> e
-    8:8:boolean overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> e
+    2:3:void setMaxNonSpilledRegister(int):293:294 -> e
+    4:4:boolean overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> e
     1:1:void setHint(com.android.tools.r8.ir.regalloc.LiveIntervals):86:86 -> f
-    2:3:void setMaxNonSpilledRegister(int):293:294 -> f
+    2:3:void setRegister(int):274:275 -> f
     4:7:int getMaxNonSpilledRegister():298:301 -> f
     1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getNextConsecutive():145:145 -> g
-    2:3:void setRegister(int):274:275 -> g
-    1:1:java.util.List getRanges():252:252 -> h
-    2:4:com.android.tools.r8.ir.regalloc.LiveIntervals splitBefore(int):404:406 -> h
-    5:5:int toGapPosition(int):70:70 -> h
-    5:5:com.android.tools.r8.ir.regalloc.LiveIntervals splitBefore(int):409 -> h
-    6:43:com.android.tools.r8.ir.regalloc.LiveIntervals splitBefore(int):410:447 -> h
-    1:1:int toInstructionPosition(int):66:66 -> i
-    2:2:int getRegister():266:266 -> i
+    2:4:com.android.tools.r8.ir.regalloc.LiveIntervals splitBefore(int):404:406 -> g
+    5:5:int toGapPosition(int):70:70 -> g
+    5:5:com.android.tools.r8.ir.regalloc.LiveIntervals splitBefore(int):409 -> g
+    6:43:com.android.tools.r8.ir.regalloc.LiveIntervals splitBefore(int):410:447 -> g
+    1:1:int toInstructionPosition(int):66:66 -> h
+    2:2:java.util.List getRanges():252:252 -> h
+    1:1:int getRegister():266:266 -> i
     1:1:int getRegisterLimit():270:270 -> j
     1:1:java.util.List getSplitChildren():198:198 -> k
     1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getSplitParent():202:202 -> l
@@ -27962,12 +27368,12 @@
     1:1:java.lang.String toString():28:28 -> toString
 com.android.tools.r8.ir.regalloc.RegisterAllocator -> a.a.a.a.h.f.g:
     void addNewBlockToShareIdenticalSuffix(com.android.tools.r8.ir.code.BasicBlock,int,java.util.List) -> a
-    int getRegisterForValue(com.android.tools.r8.ir.code.Value,int) -> a
+    int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int) -> a
     boolean hasEqualTypesAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
-    com.android.tools.r8.utils.InternalOptions options() -> a
-    int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int) -> b
+    int registersUsed() -> a
+    int getRegisterForValue(com.android.tools.r8.ir.code.Value,int) -> b
     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() -> b
 com.android.tools.r8.ir.regalloc.RegisterMove -> a.a.a.a.h.f.h:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement type -> a
     com.android.tools.r8.ir.code.Instruction definition -> d
@@ -27978,7 +27384,7 @@
     1:5:void <init>(int,int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):20:24 -> <init>
     6:11:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.Instruction):27:32 -> <init>
     1:10:boolean isBlocked(java.util.Set,java.util.Map):43:52 -> a
-    1:4:boolean writes(int):36:39 -> c
+    1:4:boolean writes(int):36:39 -> b
     1:1:int compareTo(java.lang.Object):13:13 -> compareTo
     2:28:int compareTo(com.android.tools.r8.ir.regalloc.RegisterMove):77:103 -> compareTo
     2:28:int compareTo(java.lang.Object):13 -> compareTo
@@ -28090,7 +27496,7 @@
     93:97:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):318:322 -> a
     98:106:void removeArgumentRestores(java.util.Set):334:342 -> a
     107:131:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):349:373 -> a
-    132:132:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():739:739 -> a
+    132:132:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():710:710 -> a
     132:132:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):373 -> a
     133:138:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):373:378 -> a
     139:143:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):377:381 -> a
@@ -28173,37 +27579,37 @@
     3:41:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexMethod):38:76 -> <init>
     void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean) -> a
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int) -> a
+    boolean verifyCurrentInstructionCanThrow() -> a
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> a
     1:1:void add(java.util.function.Consumer):80:80 -> a
     2:3:void add(java.util.function.Consumer,java.util.function.Predicate):84:85 -> a
     2:3:void add(java.util.function.Consumer):80 -> a
     4:5:void add(java.util.function.Consumer,java.util.function.Predicate):84:85 -> a
     6:7:int nextRegister(com.android.tools.r8.ir.code.ValueType):89:90 -> a
-    8:8:int instructionCount():126:126 -> a
-    9:10:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):164:165 -> a
-    11:17:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):186:192 -> a
-    18:18:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):191:191 -> a
-    19:36:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):189:206 -> a
-    37:37:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):218:218 -> a
-    38:38:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):230:230 -> a
-    39:39:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):236:236 -> a
-    40:40:int getMoveExceptionRegister(int):246:246 -> a
+    8:9:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):164:165 -> a
+    10:16:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):186:192 -> a
+    17:17:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):191:191 -> a
+    18:35:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):189:206 -> a
+    36:36:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):218:218 -> a
+    37:37:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):230:230 -> a
+    38:38:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):236:236 -> a
+    39:39:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):251:251 -> a
     void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder) -> b
-    int instructionOffset(int) -> b
     1:3:void setUp():170:172 -> b
+    4:4:int getMoveExceptionRegister(int):246:246 -> b
     com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder) -> c
-    com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int) -> c
-    boolean verifyCurrentInstructionCanThrow() -> c
+    int instructionOffset(int) -> c
+    1:1:int instructionCount():126:126 -> c
     1:5:void clear():177:181 -> clear
+    int instructionIndex(int) -> d
     boolean lambda$static$0(com.android.tools.r8.ir.conversion.IRBuilder) -> d
-    1:1:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):251:251 -> d
-    2:2:com.android.tools.r8.ir.code.Position getCurrentPosition():256:256 -> d
-    com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> e
+    1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():256:256 -> d
     boolean lambda$static$1(com.android.tools.r8.ir.conversion.IRBuilder) -> e
+    boolean verifyRegister(int) -> e
     1:1:int getParamCount():113:113 -> e
-    boolean verifyRegister(int) -> f
+    com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int) -> f
     1:3:int getReceiverRegister():101:103 -> f
-    int instructionIndex(int) -> g
+    com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> g
     1:3:com.android.tools.r8.ir.code.Value getReceiverValue():95:97 -> g
     1:3:int getParamRegister(int):117:119 -> h
     4:4:int lastInstructionIndex():130:130 -> h
@@ -28231,6 +27637,7 @@
     boolean equals(java.lang.Object,java.lang.Object) -> a
     int hashCode(java.lang.Object) -> a
 com.android.tools.r8.it.unimi.dsi.fastutil.HashCommon -> a.a.a.a.i.a.a.a.d:
+    1:1:void <clinit>():31:31 -> <clinit>
     int mix(int) -> a
     long nextPowerOfTwo(long) -> a
     1:2:int arraySize(int,float):228:229 -> a
@@ -28362,7 +27769,6 @@
     1:1:void defaultReturnValue(int):55:55 -> a
     2:5:java.lang.Integer put(java.lang.Integer,java.lang.Integer):135:138 -> a
     int put(int,int) -> b
-    int remove(int) -> b
     1:1:boolean containsKey(java.lang.Object):105:105 -> containsKey
     1:2:java.lang.Integer get(java.lang.Object):120:121 -> get
     1:2:java.lang.Object get(java.lang.Object):41 -> get
@@ -28371,8 +27777,8 @@
     1:4:java.lang.Object remove(java.lang.Object):41 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap -> a.a.a.a.i.a.a.a.b.c:
     1:1:void <init>():46:46 -> <init>
+    boolean containsValue(int) -> b
     1:1:boolean containsValue(java.lang.Object):63:63 -> containsValue
-    boolean containsValue(int) -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():311:311 -> entrySet
     1:1:java.util.Set entrySet():43 -> entrySet
     1:3:boolean equals(java.lang.Object):334:336 -> equals
@@ -28413,12 +27819,12 @@
     1:1:java.lang.Object put(int,java.lang.Object):71:71 -> a
     2:4:java.lang.Object put(java.lang.Integer,java.lang.Object):135:137 -> a
     1:1:boolean containsKey(java.lang.Object):105:105 -> containsKey
-    1:1:java.lang.Object remove(int):82:82 -> d
     1:2:java.lang.Object get(java.lang.Object):120:121 -> get
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):41:41 -> put
     2:4:java.lang.Object put(java.lang.Integer,java.lang.Object):135:137 -> put
     2:4:java.lang.Object put(java.lang.Object,java.lang.Object):41 -> put
-    1:3:java.lang.Object remove(java.lang.Object):153:155 -> remove
+    1:1:java.lang.Object remove(int):82:82 -> remove
+    2:4:java.lang.Object remove(java.lang.Object):153:155 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectMap -> a.a.a.a.i.a.a.a.b.f:
     1:1:void <init>():45:45 -> <init>
     boolean containsKey(int) -> c
@@ -28466,13 +27872,13 @@
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectSortedMap):122:122 -> <init>
     1:1:int lastInt():150:150 -> a
     1:1:int firstInt():145:145 -> b
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet subSet(int,int):165:165 -> b
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int):160:160 -> c
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int):160:160 -> b
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet subSet(int,int):165:165 -> b
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int):155:155 -> c
     1:1:void clear():135:135 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():140:140 -> comparator
     1:1:java.util.Comparator comparator():122 -> comparator
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int):155:155 -> d
-    1:1:boolean contains(int):125:125 -> e
+    1:1:boolean contains(int):125:125 -> d
     1:1:int size():130:130 -> size
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceFunction -> a.a.a.a.i.a.a.a.b.i:
     java.lang.Object defRetValue -> a
@@ -28533,30 +27939,30 @@
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap):122:122 -> <init>
     1:1:int lastInt():150:150 -> a
     1:1:int firstInt():145:145 -> b
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet subSet(int,int):165:165 -> b
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int):160:160 -> c
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int):160:160 -> b
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet subSet(int,int):165:165 -> b
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int):155:155 -> c
     1:1:void clear():135:135 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():140:140 -> comparator
     1:1:java.util.Comparator comparator():122 -> comparator
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int):155:155 -> d
-    1:1:boolean contains(int):125:125 -> e
+    1:1:boolean contains(int):125:125 -> d
     1:1:int size():130:130 -> size
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntBidirectionalIterator -> a.a.a.a.i.a.a.a.b.n:
     1:1:void <init>():34:34 -> <init>
-    int previousInt() -> d
+    int previousInt() -> c
     1:1:java.lang.Integer previous():56:56 -> previous
     1:1:java.lang.Object previous():33 -> previous
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection -> a.a.a.a.i.a.a.a.b.o:
     1:1:void <init>():37:37 -> <init>
-    1:1:boolean add(int):68:68 -> a
-    2:2:boolean add(java.lang.Integer):114:114 -> a
-    3:4:int[] toArray(int[]):148:149 -> a
+    1:1:boolean add(java.lang.Integer):114:114 -> a
+    2:3:int[] toArray(int[]):148:149 -> 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
+    boolean contains(int) -> d
     1:1:int[] toIntArray(int[]):167:167 -> d
     1:1:int[] toIntArray():155 -> d
-    boolean contains(int) -> e
-    1:4:boolean rem(int):94:97 -> f
+    1:4:boolean rem(int):94:97 -> e
     1:1:boolean remove(java.lang.Object):143:143 -> remove
     1:14:java.lang.String toString():206:219 -> toString
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator -> a.a.a.a.i.a.a.a.b.p:
@@ -28568,42 +27974,42 @@
     1:1:void <init>():33:33 -> <init>
     boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection) -> a
     boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList) -> a
-    1:1:boolean add(int):86:86 -> a
-    2:8:void removeElements(int,int):341:347 -> a
-    9:9:void removeElements(int,int):344:344 -> a
-    10:15:void getElements(int,int[],int,int):388:393 -> a
-    16:16:void getElements(int,int[],int,int):391:391 -> a
-    17:17:void getElements(int,int[],int,int):390:390 -> a
-    18:18:void getElements(int,int[],int,int):389:389 -> a
-    19:37:int compareTo(java.util.List):464:482 -> a
-    38:38:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> a
-    39:39:void add(int,java.lang.Integer):578:578 -> a
+    int removeInt(int) -> a
+    1:7:void removeElements(int,int):341:347 -> a
+    8:8:void removeElements(int,int):344:344 -> a
+    9:14:void getElements(int,int[],int,int):388:393 -> a
+    15:15:void getElements(int,int[],int,int):391:391 -> a
+    16:16:void getElements(int,int[],int,int):390:390 -> a
+    17:17:void getElements(int,int[],int,int):389:389 -> a
+    18:36:int compareTo(java.util.List):464:482 -> a
+    37:37:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> a
+    38:38:void add(int,java.lang.Integer):578:578 -> a
     1:1:void add(int,java.lang.Object):32:32 -> add
     2:2:void add(int,int):74:74 -> add
+    3:3:boolean add(int):86:86 -> add
     1:5:boolean addAll(int,java.util.Collection):120:124 -> addAll
     6:6:boolean addAll(java.util.Collection):137:137 -> addAll
-    int removeInt(int) -> b
     1:2:int popInt():492:493 -> c
     3:3:int popInt():492:492 -> c
     1:1:void clear():403:403 -> clear
     1:1:int compareTo(java.lang.Object):32:32 -> compareTo
-    1:1:boolean contains(int):274:274 -> e
+    1:1:boolean contains(int):274:274 -> d
     1:14:boolean equals(java.lang.Object):430:443 -> equals
     15:15:boolean valEquals(java.lang.Object,java.lang.Object):407:407 -> equals
     15:15:boolean equals(java.lang.Object):443 -> equals
-    1:1:void ensureIndex(int):47:47 -> g
-    2:2:void ensureIndex(int):46:46 -> g
+    1:1:void ensureIndex(int):47:47 -> f
+    2:2:void ensureIndex(int):46:46 -> f
+    1:1:void ensureRestrictedIndex(int):62:62 -> g
+    2:2:void ensureRestrictedIndex(int):61:61 -> g
     1:1:java.lang.Integer get(int):606:606 -> get
     1:1:java.lang.Object get(int):32 -> get
-    1:1:void ensureRestrictedIndex(int):62:62 -> h
-    2:2:void ensureRestrictedIndex(int):61:61 -> h
+    1:5:int indexOf(int):279:283 -> h
     1:4:int hashCode():418:421 -> hashCode
-    1:5:int indexOf(int):279:283 -> i
+    1:5:int lastIndexOf(int):290:294 -> i
     1:1:int indexOf(java.lang.Object):620:620 -> indexOf
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():32:32 -> iterator
     2:2:java.util.Iterator iterator():32:32 -> iterator
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():180:180 -> iterator
-    1:5:int lastIndexOf(int):290:294 -> j
     1:1:int lastIndexOf(java.lang.Object):634:634 -> lastIndexOf
     1:1:java.util.ListIterator listIterator():32:32 -> listIterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():192:192 -> listIterator
@@ -28625,7 +28031,7 @@
     1:1:void <clinit>():726:726 -> <clinit>
     1:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int,int):735:738 -> <init>
     1:1:boolean access$000(com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList):726:726 -> a
-    2:4:boolean add(int):750:752 -> a
+    2:4:int removeInt(int):779:781 -> a
     5:7:void getElements(int,int[],int,int):797:799 -> a
     8:8:void getElements(int,int[],int,int):798:798 -> a
     9:13:void removeElements(int,int):804:808 -> a
@@ -28636,12 +28042,12 @@
     21:21:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):542:542 -> a
     21:21:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):905 -> a
     1:1:void add(int,java.lang.Object):726:726 -> add
-    2:5:void add(int,int):758:761 -> add
+    2:4:boolean add(int):750:752 -> add
+    5:8:void add(int,int):758:761 -> add
     1:3:boolean addAll(int,java.util.Collection):766:768 -> addAll
-    1:3:int removeInt(int):779:781 -> b
     1:1:int compareTo(java.lang.Object):726:726 -> compareTo
     1:3:boolean assertRange():742:744 -> e
-    1:5:boolean rem(int):888:892 -> f
+    4:8:boolean rem(int):888:892 -> e
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.get(int):606:606 -> get
     1:1:java.lang.Object get(int):726 -> get
     1:2:int getInt(int):773:774 -> getInt
@@ -28681,10 +28087,10 @@
     3:4:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList.set(int,int):786:787 -> b
     3:4:void set(int):860 -> b
     5:5:void set(int):859:859 -> b
-    1:1:boolean hasPrevious():830:830 -> d
-    1:1:int previousInt():839 -> d
-    2:2:int previousInt():840:840 -> d
-    3:3:int previousInt():839:839 -> d
+    1:1:boolean hasPrevious():830:830 -> c
+    1:1:int previousInt():839 -> c
+    2:2:int previousInt():840:840 -> c
+    3:3:int previousInt():839:839 -> c
     1:1:boolean hasNext():826:826 -> hasNext
     1:1:boolean hasPrevious():830:830 -> hasPrevious
     1:1:int nextIndex():844:844 -> nextIndex
@@ -28710,8 +28116,8 @@
     2:2:void set(java.lang.Object):34 -> set
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSet -> a.a.a.a.i.a.a.a.b.u:
     1:1:void <init>():32:32 -> <init>
+    1:1:boolean rem(int):87:87 -> e
     1:4:boolean equals(java.lang.Object):41:44 -> equals
-    1:1:boolean rem(int):87:87 -> f
     1:5:int hashCode():57:61 -> hashCode
     1:1:boolean remove(int):75:75 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSortedSet -> a.a.a.a.i.a.a.a.b.v:
@@ -28737,8 +28143,8 @@
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):37:37 -> a
     2:2:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap,int):37:37 -> a
     1:1:int access$010(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):37:37 -> b
-    2:21:int put(int,int):279:298 -> b
-    22:28:int remove(int):304:310 -> b
+    2:3:boolean containsValue(int):266:267 -> b
+    4:23:int put(int,int):279:298 -> b
     1:1:int[] access$100(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):37:37 -> c
     2:2:boolean containsKey(int):261:261 -> c
     1:1:void clear():256:256 -> clear
@@ -28747,14 +28153,14 @@
     7:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap clone():341:341 -> clone
     7:7:java.lang.Object clone():37 -> clone
     1:1:int[] access$200(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):37:37 -> d
-    2:3:boolean containsValue(int):266:267 -> d
-    1:3:int findKey(int):234:236 -> e
+    2:4:int findKey(int):234:236 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet int2IntEntrySet():230:230 -> f
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():37 -> f
     1:4:int get(int):243:246 -> get
     1:1:boolean isEmpty():273:273 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():316:316 -> keySet
     1:1:java.util.Set keySet():37 -> keySet
+    1:7:int remove(int):304:310 -> remove
     1:1:int size():251:251 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():321:321 -> values
     1:1:java.util.Collection values():37 -> values
@@ -28839,28 +28245,27 @@
     1:16:int insert(int,int):248:263 -> b
     1:16:int put(int,int):270 -> b
     17:19:int put(int,int):271:273 -> b
-    20:31:int remove(int):352:363 -> b
+    20:24:boolean containsValue(int):403:407 -> b
     1:10:boolean containsKey(int):387:396 -> c
     1:4:void clear():420:423 -> clear
     1:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap clone():1017:1026 -> clone
     1:10:java.lang.Object clone():50 -> clone
     11:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap clone():1019:1019 -> clone
     11:11:java.lang.Object clone():50 -> clone
-    1:5:boolean containsValue(int):403:407 -> d
-    1:7:void rehash(int):979:985 -> e
-    8:8:int realSize():206:206 -> e
-    8:8:void rehash(int):986 -> e
-    9:21:void rehash(int):987:999 -> e
-    1:2:int removeEntry(int):220:221 -> f
-    3:8:void shiftKeys(int):333:338 -> f
-    3:8:int removeEntry(int):222 -> f
-    9:9:int removeEntry(int):223:223 -> f
-    10:15:void shiftKeys(int):341:346 -> f
-    10:15:int removeEntry(int):222 -> f
-    16:16:void shiftKeys(int):343:343 -> f
-    16:16:int removeEntry(int):222 -> f
-    17:18:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet int2IntEntrySet():773:774 -> f
-    17:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():50 -> f
+    1:7:void rehash(int):979:985 -> d
+    8:8:int realSize():206:206 -> d
+    8:8:void rehash(int):986 -> d
+    9:21:void rehash(int):987:999 -> d
+    1:2:int removeEntry(int):220:221 -> e
+    3:8:void shiftKeys(int):333:338 -> e
+    3:8:int removeEntry(int):222 -> e
+    9:9:int removeEntry(int):223:223 -> e
+    10:15:void shiftKeys(int):341:346 -> e
+    10:15:int removeEntry(int):222 -> e
+    16:16:void shiftKeys(int):343:343 -> e
+    16:16:int removeEntry(int):222 -> e
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet int2IntEntrySet():773:774 -> f
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():50 -> f
     1:11:int get(int):370:380 -> get
     1:1:int realSize():206:206 -> hashCode
     1:1:int hashCode():1043 -> hashCode
@@ -28878,6 +28283,7 @@
     6:7:void putAll(java.util.Map):239 -> putAll
     8:20:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap.putAll(java.util.Map):83:95 -> putAll
     8:20:void putAll(java.util.Map):242 -> putAll
+    1:12:int remove(int):352:363 -> remove
     1:1:int size():428:428 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():866:887 -> values
     1:22:java.util.Collection values():50 -> values
@@ -28885,9 +28291,9 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):866:866 -> <init>
     1:1:void clear():884:884 -> clear
-    1:1:boolean contains(int):879:879 -> e
-    2:6:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.containsValue(int):403:407 -> e
-    2:6:boolean contains(int):879 -> e
+    1:1:boolean contains(int):879:879 -> d
+    2:6:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.containsValue(int):403:407 -> d
+    2:6:boolean contains(int):879 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():869:869 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():869:869 -> iterator
     2:2:java.util.Iterator iterator():866 -> iterator
@@ -28928,9 +28334,9 @@
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):803:803 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1):803 -> <init>
     1:1:void clear():828:828 -> clear
-    1:1:boolean contains(int):816:816 -> e
-    2:11:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.containsKey(int):387:396 -> e
-    2:11:boolean contains(int):816 -> e
+    1:1:boolean contains(int):816:816 -> d
+    2:11:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.containsKey(int):387:396 -> d
+    2:11:boolean contains(int):816 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():806:806 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():806:806 -> iterator
     2:2:java.util.Iterator iterator():803 -> iterator
@@ -29024,12 +28430,12 @@
     136:136:java.lang.Object put(int,java.lang.Object):283 -> a
     137:138:int firstIntKey():1001:1002 -> a
     139:139:int firstIntKey():1001:1001 -> a
-    140:140:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int):1416:1416 -> a
+    140:140:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int):1411:1411 -> a
     141:141:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap subMap(int,int):1421:1421 -> a
     1:1:int compare(int,int):232:232 -> b
     2:3:int lastIntKey():1007:1008 -> b
     4:4:int lastIntKey():1007:1007 -> b
-    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int):1411:1411 -> b
+    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int):1416:1416 -> b
     1:1:boolean containsKey(int):980:980 -> c
     2:80:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ObjectEntrySet():1161:1239 -> c
     2:80:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ObjectEntrySet():41 -> c
@@ -29043,31 +28449,31 @@
     4:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$ValueIterator.next():1351:1351 -> containsValue
     4:4:boolean containsValue(java.lang.Object):693 -> containsValue
     5:5:boolean containsValue(java.lang.Object):694:694 -> containsValue
-    1:1:void allocatePaths():278:278 -> d
-    2:9:java.lang.Object remove(int):484:491 -> d
-    10:10:int compare(int,int):232:232 -> d
-    10:10:java.lang.Object remove(int):491 -> d
-    11:59:java.lang.Object remove(int):500:548 -> d
-    60:77:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry parent(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry):453:470 -> d
-    60:77:java.lang.Object remove(int):556 -> d
-    78:196:java.lang.Object remove(int):558:676 -> d
-    197:198:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry parent(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry):474:475 -> d
-    197:198:java.lang.Object remove(int):556 -> d
-    199:202:java.lang.Object remove(int):681:684 -> d
-    203:206:java.lang.Object remove(int):494:497 -> d
-    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry findKey(int):245:247 -> e
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry findKey(int):245:247 -> d
+    4:4:int compare(int,int):232:232 -> d
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry findKey(int):247 -> d
+    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry findKey(int):248:248 -> d
+    6:6:void allocatePaths():278:278 -> d
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry locateKey(int):262:264 -> e
     4:4:int compare(int,int):232:232 -> e
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry findKey(int):247 -> e
-    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry findKey(int):248:248 -> e
-    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry locateKey(int):262:264 -> f
-    4:4:int compare(int,int):232:232 -> f
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry locateKey(int):264 -> f
-    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry locateKey(int):266:266 -> f
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry locateKey(int):264 -> e
+    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry locateKey(int):266:266 -> e
     1:2:java.lang.Object get(int):995:996 -> get
     1:1:boolean isEmpty():990:990 -> isEmpty
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1334:1335 -> keySet
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1334:1335 -> keySet
     3:4:java.util.Set keySet():41 -> keySet
+    1:8:java.lang.Object remove(int):484:491 -> remove
+    9:9:int compare(int,int):232:232 -> remove
+    9:9:java.lang.Object remove(int):491 -> remove
+    10:58:java.lang.Object remove(int):500:548 -> remove
+    59:76:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry parent(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry):453:470 -> remove
+    59:76:java.lang.Object remove(int):556 -> remove
+    77:195:java.lang.Object remove(int):558:676 -> remove
+    196:197:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry parent(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry):474:475 -> remove
+    196:197:java.lang.Object remove(int):556 -> remove
+    198:201:java.lang.Object remove(int):681:684 -> remove
+    202:205:java.lang.Object remove(int):494:497 -> remove
     1:1:int size():985:985 -> size
     1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():1384:1401 -> values
     1:18:java.util.Collection values():41 -> values
@@ -29135,12 +28541,12 @@
     3:3:void incBalance():888:888 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry left():767:767 -> e
     1:3:boolean equals(java.lang.Object):946:948 -> equals
-    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry next():902:904 -> f
-    1:1:boolean pred():786:786 -> g
-    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry prev():915:917 -> h
+    1:1:boolean pred():786:786 -> f
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry prev():915:917 -> g
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry right():777:777 -> h
     1:1:int hashCode():953:953 -> hashCode
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry right():777:777 -> i
-    1:1:boolean succ():795:795 -> j
+    1:1:boolean succ():795:795 -> i
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry next():902:904 -> next
     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.Int2ObjectAVLTreeMap$EntryIterator -> a.a.a.a.i.a.a.a.b.T:
@@ -29160,7 +28566,7 @@
     1:1:void add(java.lang.Object):1252:1252 -> add
     2:2:void add(java.lang.Integer):1301:1301 -> add
     2:2:void add(java.lang.Object):1252 -> add
-    1:1:int previousInt():1267:1267 -> d
+    1:1:int previousInt():1267:1267 -> c
     1:1:java.lang.Integer next():1283:1283 -> next
     1:1:java.lang.Object next():1252 -> next
     1:1:int nextInt():1262:1262 -> nextInt
@@ -29189,11 +28595,11 @@
     boolean bottom -> d
     1:7:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap,int,boolean,int,boolean):1466:1472 -> <init>
     1:4:java.lang.Object put(int,java.lang.Object):1648:1651 -> a
-    5:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int):1692:1693 -> a
+    5:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int):1686:1687 -> a
     7:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap subMap(int,int):1698:1702 -> a
     12:14:int firstIntKey():1753:1755 -> a
     15:15:int firstIntKey():1754:1754 -> a
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int):1686:1687 -> b
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int):1692:1693 -> b
     3:5:int lastIntKey():1760:1762 -> b
     6:6:int lastIntKey():1761:1761 -> b
     1:81:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ObjectEntrySet():1497:1577 -> c
@@ -29211,15 +28617,15 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():1681:1681 -> comparator
     2:2:java.util.Comparator comparator():1435 -> comparator
     1:5:boolean containsValue(java.lang.Object):1629:1633 -> containsValue
-    1:4:java.lang.Object remove(int):1657:1660 -> d
-    5:17:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry firstEntry():1712:1724 -> d
-    1:1:boolean in(int):1492:1492 -> e
-    2:14:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry lastEntry():1735:1747 -> e
+    1:1:boolean in(int):1492:1492 -> d
+    2:14:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry firstEntry():1712:1724 -> d
+    1:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry lastEntry():1735:1747 -> e
     1:1:java.lang.Object get(int):1643:1643 -> get
     1:1:boolean isEmpty():1676:1676 -> isEmpty
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1592:1593 -> keySet
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1592:1593 -> keySet
     3:4:java.util.Set keySet():1435 -> keySet
+    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.ObjectCollection values():1598:1618 -> values
     1:21:java.util.Collection values():1435 -> values
@@ -29304,14 +28710,14 @@
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$SubmapIterator -> a.a.a.a.i.a.a.a.b.aa:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap this$1 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap):1777:1778 -> <init>
-    1:2:void updateNext():1802:1803 -> c
+    1:2:void updateNext():1802:1803 -> d
     1:2:void updatePrevious():1797:1798 -> e
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$SubmapKeyIterator -> a.a.a.a.i.a.a.a.b.ba:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap):1848:1848 -> <init>
     1:1:void add(java.lang.Object):1846:1846 -> add
     2:2:void add(java.lang.Integer):1896:1896 -> add
     2:2:void add(java.lang.Object):1846 -> add
-    1:1:int previousInt():1862:1862 -> d
+    1:1:int previousInt():1862:1862 -> c
     1:1:java.lang.Integer next():1878:1878 -> next
     1:1:java.lang.Object next():1846 -> next
     1:1:int nextInt():1857:1857 -> nextInt
@@ -29341,7 +28747,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry previousEntry():1080 -> b
     2:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry previousEntry():1081:1084 -> b
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry previousEntry():1080:1080 -> b
-    1:1:void updateNext():1064:1064 -> c
+    1:1:void updateNext():1064:1064 -> d
     1:1:void updatePrevious():1076:1076 -> e
     1:1:boolean hasNext():1056:1056 -> hasNext
     1:1:boolean hasPrevious():1060:1060 -> hasPrevious
@@ -29376,12 +28782,12 @@
     7:7:java.lang.Object clone():37 -> clone
     1:2:boolean containsValue(java.lang.Object):270:271 -> containsValue
     1:1:java.lang.Object[] access$200(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap):37:37 -> d
-    2:9:java.lang.Object remove(int):308:315 -> d
-    1:3:int findKey(int):235:237 -> e
+    2:4:int findKey(int):235:237 -> d
     1:4:java.lang.Object get(int):244:247 -> get
     1:1:boolean isEmpty():277:277 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():321:321 -> keySet
     1:1:java.util.Set keySet():37 -> keySet
+    1:8:java.lang.Object remove(int):308:315 -> remove
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
@@ -29466,19 +28872,18 @@
     11:11:java.lang.Object clone():49 -> clone
     1:5:boolean containsValue(java.lang.Object):360:364 -> containsValue
     1:5:java.lang.Object removeNullEntry():228:232 -> d
-    6:17:java.lang.Object remove(int):309:320 -> d
-    1:7:void rehash(int):907:913 -> e
-    8:8:int realSize():205:205 -> e
-    8:8:void rehash(int):914 -> e
-    9:21:void rehash(int):915:927 -> e
-    1:3:java.lang.Object removeEntry(int):219:221 -> f
-    4:10:void shiftKeys(int):289:295 -> f
-    4:10:java.lang.Object removeEntry(int):222 -> f
-    11:11:java.lang.Object removeEntry(int):223:223 -> f
-    12:17:void shiftKeys(int):298:303 -> f
-    12:17:java.lang.Object removeEntry(int):222 -> f
-    18:18:void shiftKeys(int):300:300 -> f
-    18:18:java.lang.Object removeEntry(int):222 -> f
+    6:12:void rehash(int):907:913 -> d
+    13:13:int realSize():205:205 -> d
+    13:13:void rehash(int):914 -> d
+    14:26:void rehash(int):915:927 -> d
+    1:3:java.lang.Object removeEntry(int):219:221 -> e
+    4:10:void shiftKeys(int):289:295 -> e
+    4:10:java.lang.Object removeEntry(int):222 -> e
+    11:11:java.lang.Object removeEntry(int):223:223 -> e
+    12:17:void shiftKeys(int):298:303 -> e
+    12:17:java.lang.Object removeEntry(int):222 -> e
+    18:18:void shiftKeys(int):300:300 -> e
+    18:18:java.lang.Object removeEntry(int):222 -> e
     1:11:java.lang.Object get(int):327:337 -> get
     1:1:int realSize():205:205 -> hashCode
     1:1:int hashCode():971 -> hashCode
@@ -29496,6 +28901,7 @@
     6:7:void putAll(java.util.Map):240 -> putAll
     8:20:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectMap.putAll(java.util.Map):70:82 -> putAll
     8:20:void putAll(java.util.Map):243 -> putAll
+    1:12:java.lang.Object remove(int):309:320 -> remove
     1:1:int size():386:386 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():794:815 -> values
     1:22:java.util.Collection values():49 -> values
@@ -29546,9 +28952,9 @@
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):737:737 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1):737 -> <init>
     1:1:void clear():762:762 -> clear
-    1:1:boolean contains(int):750:750 -> e
-    2:11:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap.containsKey(int):344:353 -> e
-    2:11:boolean contains(int):750 -> e
+    1:1:boolean contains(int):750:750 -> d
+    2:11:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap.containsKey(int):344:353 -> d
+    2:11:boolean contains(int):750 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     2:2:java.util.Iterator iterator():737 -> iterator
@@ -29606,10 +29012,10 @@
     1:1:java.lang.Object next():788:788 -> next
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap -> a.a.a.a.i.a.a.a.b.Ba:
     int firstIntKey() -> a
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int) -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap subMap(int,int) -> a
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int) -> a
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int) -> b
     int lastIntKey() -> b
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int) -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ObjectEntrySet() -> c
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps -> a.a.a.a.i.a.a.a.b.Da:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps$EmptySortedMap EMPTY_MAP -> a
@@ -29617,9 +29023,9 @@
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps$EmptySortedMap -> a.a.a.a.i.a.a.a.b.Ca:
     1:1:void <init>():60:60 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap subMap(int,int):95:95 -> a
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int):107:107 -> a
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int):101:101 -> a
     3:3:int firstIntKey():112:112 -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int):101:101 -> b
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int):107:107 -> b
     2:2:int lastIntKey():117:117 -> b
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ObjectEntrySet():71:71 -> c
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ObjectEntrySet():57 -> c
@@ -29684,12 +29090,12 @@
     136:136:java.lang.Object put(int,java.lang.Object):283 -> a
     137:138:int firstIntKey():1001:1002 -> a
     139:139:int firstIntKey():1001:1001 -> a
-    140:140:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1416:1416 -> a
+    140:140:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1411:1411 -> a
     141:141:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1421:1421 -> a
     1:1:int compare(int,int):232:232 -> b
     2:3:int lastIntKey():1007:1008 -> b
     4:4:int lastIntKey():1007:1007 -> b
-    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1411:1411 -> b
+    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1416:1416 -> b
     1:1:void allocatePaths():278:278 -> c
     2:2:boolean containsKey(int):980:980 -> c
     1:6:void clear():701:706 -> clear
@@ -29797,12 +29203,12 @@
     3:3:void incBalance():888:888 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry left():767:767 -> e
     1:3:boolean equals(java.lang.Object):946:948 -> equals
-    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry next():902:904 -> f
-    1:1:boolean pred():786:786 -> g
-    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry prev():915:917 -> h
+    1:1:boolean pred():786:786 -> f
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry prev():915:917 -> g
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry right():777:777 -> h
     1:1:int hashCode():953:953 -> hashCode
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry right():777:777 -> i
-    1:1:boolean succ():795:795 -> j
+    1:1:boolean succ():795:795 -> i
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry next():902:904 -> next
     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 -> a.a.a.a.i.a.a.a.b.Ja:
@@ -29822,7 +29228,7 @@
     1:1:void add(java.lang.Object):1252:1252 -> add
     2:2:void add(java.lang.Integer):1301:1301 -> add
     2:2:void add(java.lang.Object):1252 -> add
-    1:1:int previousInt():1267:1267 -> d
+    1:1:int previousInt():1267:1267 -> c
     1:1:java.lang.Integer next():1283:1283 -> next
     1:1:java.lang.Object next():1252 -> next
     1:1:int nextInt():1262:1262 -> nextInt
@@ -29851,11 +29257,11 @@
     boolean bottom -> d
     1:7:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap,int,boolean,int,boolean):1466:1472 -> <init>
     1:4:java.lang.Object put(int,java.lang.Object):1648:1651 -> a
-    5:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1692:1693 -> a
+    5:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1686:1687 -> a
     7:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1698:1702 -> a
     12:14:int firstIntKey():1753:1755 -> a
     15:15:int firstIntKey():1754:1754 -> a
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1686:1687 -> b
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1692:1693 -> b
     3:5:int lastIntKey():1760:1762 -> b
     6:6:int lastIntKey():1761:1761 -> b
     1:1:boolean containsKey(int):1624:1624 -> c
@@ -29969,14 +29375,14 @@
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator -> a.a.a.a.i.a.a.a.b.Qa:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1777:1778 -> <init>
-    1:2:void updateNext():1802:1803 -> c
+    1:2:void updateNext():1802:1803 -> d
     1:2:void updatePrevious():1797:1798 -> e
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> a.a.a.a.i.a.a.a.b.Ra:
     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 add(java.lang.Integer):1896:1896 -> add
     2:2:void add(java.lang.Object):1846 -> add
-    1:1:int previousInt():1862:1862 -> d
+    1:1:int previousInt():1862:1862 -> c
     1:1:java.lang.Integer next():1878:1878 -> next
     1:1:java.lang.Object next():1846 -> next
     1:1:int nextInt():1857:1857 -> nextInt
@@ -30006,7 +29412,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry previousEntry():1080 -> b
     2:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry previousEntry():1081:1084 -> b
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry previousEntry():1080:1080 -> b
-    1:1:void updateNext():1064:1064 -> c
+    1:1:void updateNext():1064:1064 -> d
     1:1:void updatePrevious():1076:1076 -> e
     1:1:boolean hasNext():1056:1056 -> hasNext
     1:1:boolean hasPrevious():1060:1060 -> hasPrevious
@@ -30245,9 +29651,9 @@
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):737:737 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1):737 -> <init>
     1:1:void clear():762:762 -> clear
-    1:1:boolean contains(int):750:750 -> e
-    2:11:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.containsKey(int):344:353 -> e
-    2:11:boolean contains(int):750 -> e
+    1:1:boolean contains(int):750:750 -> d
+    2:11:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.containsKey(int):344:353 -> d
+    2:11:boolean contains(int):750 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     2:2:java.util.Iterator iterator():737 -> iterator
@@ -30305,10 +29711,10 @@
     1:1:java.lang.Object next():788:788 -> next
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap -> a.a.a.a.i.a.a.a.b.qb:
     int firstIntKey() -> a
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int) -> 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 tailMap(int) -> a
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int) -> b
     int lastIntKey() -> b
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int) -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet() -> d
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> a.a.a.a.i.a.a.a.b.sb:
     int size -> b
@@ -30318,27 +29724,27 @@
     6:6:void <init>(int[]):135:135 -> <init>
     7:9:void <init>(int[],int,int):149:151 -> <init>
     7:9:void <init>(int[]):135 -> <init>
-    1:2:boolean add(int):266:267 -> a
-    3:4:void getElements(int,int[],int,int):393:394 -> a
-    5:7:void removeElements(int,int):407:409 -> a
-    8:9:int[] toArray(int[]):436:437 -> a
-    10:18:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):443:451 -> a
-    19:25:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):458:464 -> a
+    1:4:int removeInt(int):294:297 -> a
+    5:5:int removeInt(int):294:294 -> a
+    6:7:void getElements(int,int[],int,int):393:394 -> a
+    8:10:void removeElements(int,int):407:409 -> a
+    11:12:int[] toArray(int[]):436:437 -> a
+    13:21:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):443:451 -> a
+    22:28:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):458:464 -> a
     1:5:void add(int,int):256:260 -> add
-    1:4:int removeInt(int):294:297 -> b
-    5:5:int removeInt(int):294:294 -> b
+    6:7:boolean add(int):266:267 -> add
     1:1:void clear():321:321 -> clear
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList clone():549:551 -> clone
     1:3:java.lang.Object clone():48 -> clone
-    1:2:int indexOf(int):280:281 -> f
-    1:2:boolean rem(int):304 -> f
-    3:3:boolean rem(int):306:306 -> f
+    1:2:int indexOf(int):280:281 -> e
+    1:2:boolean rem(int):304 -> e
+    3:3:boolean rem(int):306:306 -> e
     1:2:int getInt(int):274:275 -> getInt
     3:3:int getInt(int):274:274 -> getInt
-    1:2:int indexOf(int):280:281 -> i
+    1:2:int indexOf(int):280:281 -> h
+    1:2:int lastIndexOf(int):287:288 -> i
     1:1:boolean isEmpty():339:339 -> isEmpty
-    1:2:int lastIndexOf(int):287:288 -> j
-    1:1:void grow(int):250:250 -> k
+    1:1:void grow(int):250:250 -> j
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):493:494 -> listIterator
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):493:494 -> listIterator
     3:4:java.util.ListIterator listIterator(int):48 -> listIterator
@@ -30359,10 +29765,10 @@
     6:6:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.set(int,int):313:313 -> b
     6:6:void set(int):530 -> b
     7:7:void set(int):529:529 -> b
-    1:1:boolean hasPrevious():502:502 -> d
-    1:1:int previousInt():511 -> d
-    2:2:int previousInt():512:512 -> d
-    3:3:int previousInt():511:511 -> d
+    1:1:boolean hasPrevious():502:502 -> c
+    1:1:int previousInt():511 -> c
+    2:2:int previousInt():512:512 -> c
+    3:3:int previousInt():511:511 -> c
     1:1:boolean hasNext():498:498 -> hasNext
     1:1:boolean hasPrevious():502:502 -> hasPrevious
     1:1:int nextIndex():516:516 -> nextIndex
@@ -30379,7 +29785,7 @@
     3:4:void <init>(int):65:66 -> <init>
     5:8:void <init>(int[],int):104:107 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet):29:29 -> a
-    2:10:boolean add(int):164:172 -> a
+    1:9:boolean add(int):164:172 -> add
     1:1:int access$010(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet):29:29 -> b
     1:1:int[] access$100(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet):29:29 -> c
     1:1:void clear():178:178 -> clear
@@ -30387,8 +29793,8 @@
     1:5:java.lang.Object clone():29 -> clone
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet clone():203:203 -> clone
     6:6:java.lang.Object clone():29 -> clone
-    1:1:boolean contains(int):143:143 -> e
-    1:2:int findKey(int):111:112 -> g
+    1:1:boolean contains(int):143:143 -> d
+    1:2:int findKey(int):111:112 -> f
     1:1:boolean isEmpty():183:183 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():119:119 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():119:119 -> iterator
@@ -30417,16 +29823,15 @@
     4:4:void ensureOffsetLength(int[],int,int):389 -> a
     1:4:int[] grow(int[],int,int):204:207 -> b
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator -> a.a.a.a.i.a.a.a.b.wb:
-    int previousInt() -> d
+    int previousInt() -> c
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> a.a.a.a.i.a.a.a.b.xb:
-    boolean add(int) -> a
     int[] toIntArray() -> d
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> a.a.a.a.i.a.a.a.b.Ab:
     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 -> a.a.a.a.i.a.a.a.b.yb:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
-    boolean contains(int) -> e
+    boolean contains(int) -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():38:38 -> iterator
     2:2:java.util.Iterator iterator():38:38 -> iterator
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():55:55 -> iterator
@@ -30437,10 +29842,10 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):369:371 -> <init>
     4:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):370:370 -> <init>
-    1:1:boolean add(int):376:376 -> a
     1:1:boolean add(java.lang.Object):365:365 -> add
     2:2:boolean add(java.lang.Integer):453:453 -> add
     2:2:boolean add(java.lang.Object):365 -> add
+    3:3:boolean add(int):376:376 -> add
     1:1:boolean addAll(java.util.Collection):437:437 -> addAll
     1:1:void clear():417:417 -> clear
     1:1:boolean contains(java.lang.Object):459:459 -> contains
@@ -30477,17 +29882,17 @@
     9:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator):830:830 -> a
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> a.a.a.a.i.a.a.a.b.Eb:
     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 previousInt():62:62 -> d
     1:1:int nextInt():57:57 -> nextInt
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$SingletonIterator -> a.a.a.a.i.a.a.a.b.Fb:
     int curr -> b
     int element -> a
     1:2:void <init>(int):110:111 -> <init>
-    1:1:boolean hasPrevious():121:121 -> d
-    1:1:int previousInt():133 -> d
-    2:3:int previousInt():134:135 -> d
-    4:4:int previousInt():133:133 -> d
+    1:1:boolean hasPrevious():121:121 -> c
+    1:1:int previousInt():133 -> c
+    2:3:int previousInt():134:135 -> c
+    4:4:int previousInt():133:133 -> c
     1:1:boolean hasNext():116:116 -> hasNext
     1:1:boolean hasPrevious():121:121 -> hasPrevious
     1:1:int nextIndex():140:140 -> nextIndex
@@ -30502,11 +29907,10 @@
     1:1:boolean hasNext():813:813 -> hasNext
     1:1:int nextInt():818:818 -> nextInt
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> a.a.a.a.i.a.a.a.b.Ib:
-    boolean add(int) -> a
     boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList) -> a
     void getElements(int,int[],int,int) -> a
     void removeElements(int,int) -> a
-    int removeInt(int) -> b
+    int removeInt(int) -> a
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> a.a.a.a.i.a.a.a.b.Jb:
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists -> a.a.a.a.i.a.a.a.b.Nb:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList EMPTY_LIST -> a
@@ -30515,10 +29919,11 @@
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$1 -> a.a.a.a.i.a.a.a.b.Kb:
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList -> a.a.a.a.i.a.a.a.b.Lb:
     1:1:void <init>():65:65 -> <init>
-    1:1:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):110:110 -> a
-    2:2:boolean add(java.lang.Integer):156:156 -> a
-    3:4:void getElements(int,int[],int,int):263:264 -> a
-    5:5:void removeElements(int,int):269:269 -> a
+    1:1:int removeInt(int):80:80 -> a
+    2:2:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):110:110 -> a
+    3:3:boolean add(java.lang.Integer):156:156 -> a
+    4:5:void getElements(int,int[],int,int):263:264 -> a
+    6:6:void removeElements(int,int):269:269 -> a
     1:1:void add(int,java.lang.Object):62:62 -> add
     2:2:void add(int,java.lang.Integer):132:132 -> add
     2:2:void add(int,java.lang.Object):62 -> add
@@ -30527,13 +29932,12 @@
     4:4:boolean add(java.lang.Object):62 -> add
     5:5:void add(int,int):85:85 -> add
     1:1:boolean addAll(int,java.util.Collection):105:105 -> addAll
-    1:1:int removeInt(int):80:80 -> b
     1:1:java.lang.Object clone():295:295 -> clone
     1:1:int compareTo(java.lang.Object):62:62 -> compareTo
     2:2:int compareTo(java.util.List):290:290 -> compareTo
     2:2:int compareTo(java.lang.Object):62 -> compareTo
+    1:1:boolean rem(int):75:75 -> e
     1:1:boolean equals(java.lang.Object):306:306 -> equals
-    1:1:boolean rem(int):75:75 -> f
     1:1:java.lang.Integer get(int):144:144 -> get
     1:1:java.lang.Object get(int):62 -> get
     1:1:int getInt(int):70:70 -> getInt
@@ -30561,16 +29965,16 @@
     int element -> a
     1:2:void <init>(int):336:337 -> <init>
     1:2:void <init>(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$1):332 -> <init>
-    1:1:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):419:419 -> a
-    2:2:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):424:424 -> a
-    3:3:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):429:429 -> a
+    1:1:int removeInt(int):353:353 -> a
+    2:2:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):419:419 -> a
+    3:3:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):424:424 -> a
+    4:4:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):429:429 -> a
     1:1:boolean addAll(int,java.util.Collection):399:399 -> addAll
     2:2:boolean addAll(java.util.Collection):404:404 -> addAll
-    1:1:int removeInt(int):353:353 -> b
     1:1:void clear():459:459 -> clear
-    1:2:int[] toIntArray():364:365 -> d
-    1:1:boolean contains(int):358:358 -> e
-    1:1:boolean rem(int):348:348 -> f
+    1:1:boolean contains(int):358:358 -> d
+    2:3:int[] toIntArray():364:365 -> d
+    1:1:boolean rem(int):348:348 -> e
     1:2:int getInt(int):342:343 -> getInt
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():376:376 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():332 -> iterator
@@ -30614,7 +30018,7 @@
     7:7:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):280:280 -> a
     8:9:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):173:174 -> a
     8:9:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):283 -> a
-    10:23:boolean add(int):302:315 -> a
+    1:14:boolean add(int):302:315 -> add
     1:1:boolean addAll(java.util.Collection):289:289 -> addAll
     2:3:void ensureCapacity(int):266:267 -> addAll
     2:3:boolean addAll(java.util.Collection):289 -> addAll
@@ -30626,19 +30030,19 @@
     1:6:java.lang.Object clone():40 -> clone
     7:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet clone():674:674 -> clone
     7:7:java.lang.Object clone():40 -> clone
-    1:9:boolean contains(int):382:390 -> e
-    1:5:void rehash(int):639:643 -> g
-    6:6:int realSize():262:262 -> g
-    6:6:void rehash(int):644 -> g
-    7:16:void rehash(int):645:654 -> g
-    1:1:boolean removeEntry(int):348:348 -> h
-    2:7:void shiftKeys(int):331:336 -> h
-    2:7:boolean removeEntry(int):349 -> h
-    8:8:boolean removeEntry(int):350:350 -> h
-    9:13:void shiftKeys(int):339:343 -> h
-    9:13:boolean removeEntry(int):349 -> h
-    14:14:void shiftKeys(int):341:341 -> h
-    14:14:boolean removeEntry(int):349 -> h
+    1:9:boolean contains(int):382:390 -> d
+    1:5:void rehash(int):639:643 -> f
+    6:6:int realSize():262:262 -> f
+    6:6:void rehash(int):644 -> f
+    7:16:void rehash(int):645:654 -> f
+    1:1:boolean removeEntry(int):348:348 -> g
+    2:7:void shiftKeys(int):331:336 -> g
+    2:7:boolean removeEntry(int):349 -> g
+    8:8:boolean removeEntry(int):350:350 -> g
+    9:13:void shiftKeys(int):339:343 -> g
+    9:13:boolean removeEntry(int):349 -> g
+    14:14:void shiftKeys(int):341:341 -> g
+    14:14:boolean removeEntry(int):349 -> g
     1:1:int realSize():262:262 -> hashCode
     1:1:int hashCode():694 -> hashCode
     2:4:int hashCode():695:697 -> hashCode
@@ -30682,15 +30086,15 @@
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet -> a.a.a.a.i.a.a.a.b.Sb:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():52:52 -> clone
+    1:1:boolean rem(int):64:64 -> e
     1:1:boolean equals(java.lang.Object):58:58 -> equals
-    1:1:boolean rem(int):64:64 -> f
     1:1:boolean remove(int):47:47 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> a.a.a.a.i.a.a.a.b.Ub:
     int lastInt() -> a
     int firstInt() -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet subSet(int,int) -> b
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int) -> c
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int) -> d
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int) -> b
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int) -> c
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> a.a.a.a.i.a.a.a.b.Wb:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():168:168 -> <clinit>
@@ -30886,9 +30290,9 @@
     int defRetValue -> a
     1:1:void <init>():44:44 -> <init>
     int put(java.lang.Object,int) -> a
+    int removeInt(java.lang.Object) -> a
     1:1:void defaultReturnValue(int):55:55 -> a
     2:4:java.lang.Integer put(java.lang.Object,java.lang.Integer):123:125 -> a
-    int removeInt(java.lang.Object) -> b
     1:1:java.lang.Integer get(java.lang.Object):108:108 -> get
     1:1:java.lang.Object get(java.lang.Object):41 -> get
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):41:41 -> put
@@ -30943,11 +30347,11 @@
     6:6:boolean addAll(java.util.Collection):138:138 -> addAll
     1:1:void clear():404:404 -> clear
     1:1:boolean contains(java.lang.Object):275:275 -> contains
-    1:1:void ensureIndex(int):48:48 -> e
-    2:2:void ensureIndex(int):47:47 -> e
+    1:1:void ensureIndex(int):48:48 -> d
+    2:2:void ensureIndex(int):47:47 -> d
+    1:1:void ensureRestrictedIndex(int):63:63 -> e
+    2:2:void ensureRestrictedIndex(int):62:62 -> e
     1:7:boolean equals(java.lang.Object):427:433 -> equals
-    1:1:void ensureRestrictedIndex(int):63:63 -> f
-    2:2:void ensureRestrictedIndex(int):62:62 -> f
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():181:181 -> hashCode
     1:1:int hashCode():415 -> hashCode
     2:5:int hashCode():416:419 -> hashCode
@@ -31177,7 +30581,7 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1596:1596 -> <init>
     1:1:void clear():1614:1614 -> clear
-    1:1:boolean contains(int):1609:1609 -> e
+    1:1:boolean contains(int):1609:1609 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     2:2:java.util.Iterator iterator():1596 -> iterator
@@ -31295,7 +30699,7 @@
     1:1:int previousEntry():1136 -> b
     2:6:int previousEntry():1137:1141 -> b
     7:7:int previousEntry():1136:1136 -> b
-    1:14:void ensureIndexKnown():1099:1112 -> c
+    1:14:void ensureIndexKnown():1099:1112 -> d
     1:1:boolean hasNext():1091:1091 -> hasNext
     1:1:boolean hasPrevious():1095:1095 -> hasPrevious
     1:2:int nextIndex():1117:1118 -> nextIndex
@@ -31309,7 +30713,7 @@
     1:1:void add(java.lang.Object):1544:1544 -> add
     2:2:void add(java.lang.Integer):1565:1565 -> add
     2:2:void add(java.lang.Object):1544 -> add
-    1:1:int previousInt():1547:1547 -> d
+    1:1:int previousInt():1547:1547 -> c
     1:1:java.lang.Integer next():1590:1590 -> next
     1:1:java.lang.Object next():1544 -> next
     1:1:int nextInt():1584:1584 -> nextInt
@@ -31830,13 +31234,12 @@
     1:3:void <init>():70:72 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):37:37 -> a
     2:2:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap,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
+    3:22:int put(java.lang.Object,int):283:302 -> a
+    23:30:int removeInt(java.lang.Object):308:315 -> a
     1:1:int access$010(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):37:37 -> b
-    2:3:boolean containsValue(int):270:271 -> b
-    4:11:int removeInt(java.lang.Object):308:315 -> b
+    2:4:int findKey(java.lang.Object):235:237 -> b
+    5:6:boolean containsValue(int):270:271 -> b
     1:1:java.lang.Object[] access$100(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):37:37 -> c
-    2:4:int findKey(java.lang.Object):235:237 -> c
     1:4:void clear():257:260 -> clear
     1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap clone():344:349 -> clone
     1:6:java.lang.Object clone():37 -> clone
@@ -31846,6 +31249,7 @@
     1:1:int[] access$200(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):37:37 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet reference2IntEntrySet():231:231 -> e
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():37 -> e
+    1:4:int getInt(java.lang.Object):244:247 -> getInt
     1:1:boolean isEmpty():277:277 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():321:321 -> keySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():321:321 -> keySet
@@ -31880,7 +31284,6 @@
     1:6:void remove():153:158 -> remove
     7:7:void remove():153:153 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> a.a.a.a.i.a.a.a.c.Ya:
-    int getInt(java.lang.Object) -> a
     int put(java.lang.Object,int) -> a
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> a.a.a.a.i.a.a.a.c.gb:
     float f -> l
@@ -31907,10 +31310,9 @@
     9:33:int insert(java.lang.Object,int):307:331 -> a
     9:33:int put(java.lang.Object,int):338 -> a
     34:36:int put(java.lang.Object,int):339:341 -> a
-    37:47:int getInt(java.lang.Object):721:731 -> a
-    48:71:void fixPointers(int,int):937:960 -> a
-    1:12:int removeInt(java.lang.Object):431:442 -> b
-    13:17:boolean containsValue(int):754:758 -> b
+    37:48:int removeInt(java.lang.Object):431:442 -> a
+    49:72:void fixPointers(int,int):937:960 -> a
+    1:5:boolean containsValue(int):754:758 -> b
     1:25:void fixPointers(int):899:923 -> c
     1:5:void clear():771:775 -> clear
     1:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap clone():1768:1778 -> clone
@@ -31932,6 +31334,7 @@
     21:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet reference2IntEntrySet():1422:1423 -> e
     1:2:java.lang.Object firstKey():970:971 -> firstKey
     3:3:java.lang.Object firstKey():970:970 -> firstKey
+    1:11:int getInt(java.lang.Object):721:731 -> getInt
     1:1:int realSize():262:262 -> hashCode
     1:1:int hashCode():1795 -> hashCode
     2:10:int hashCode():1796:1804 -> hashCode
@@ -31964,9 +31367,9 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1596:1596 -> <init>
     1:1:void clear():1614:1614 -> clear
-    1:1:boolean contains(int):1609:1609 -> e
-    2:6:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.containsValue(int):754:758 -> e
-    2:6:boolean contains(int):1609 -> e
+    1:1:boolean contains(int):1609:1609 -> d
+    2:6:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.containsValue(int):754:758 -> d
+    2:6:boolean contains(int):1609 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     2:2:java.util.Iterator iterator():1596 -> iterator
@@ -32084,7 +31487,7 @@
     1:1:int previousEntry():1136 -> b
     2:6:int previousEntry():1137:1141 -> b
     7:7:int previousEntry():1136:1136 -> b
-    1:14:void ensureIndexKnown():1099:1112 -> c
+    1:14:void ensureIndexKnown():1099:1112 -> d
     1:1:boolean hasNext():1091:1091 -> hasNext
     1:1:boolean hasPrevious():1095:1095 -> hasPrevious
     1:2:int nextIndex():1117:1118 -> nextIndex
@@ -32098,7 +31501,7 @@
     1:1:void add(java.lang.Object):1544:1544 -> add
     2:2:void add(java.lang.Integer):1565:1565 -> add
     2:2:void add(java.lang.Object):1544 -> add
-    1:1:int previousInt():1547:1547 -> d
+    1:1:int previousInt():1547:1547 -> c
     1:1:java.lang.Integer next():1590:1590 -> next
     1:1:java.lang.Object next():1544 -> next
     1:1:int nextInt():1584:1584 -> nextInt
@@ -32135,9 +31538,8 @@
     8:23:int insert(java.lang.Object,int):248:263 -> a
     8:23:int put(java.lang.Object,int):270 -> a
     24:26:int put(java.lang.Object,int):271:273 -> a
-    27:37:int getInt(java.lang.Object):371:381 -> a
-    1:12:int removeInt(java.lang.Object):353:364 -> b
-    13:17:boolean containsValue(int):404:408 -> b
+    27:38:int removeInt(java.lang.Object):353:364 -> a
+    1:5:boolean containsValue(int):404:408 -> b
     1:7:void rehash(int):961:967 -> c
     8:8:int realSize():205:205 -> c
     8:8:void rehash(int):968 -> c
@@ -32158,6 +31560,7 @@
     16:16:int removeEntry(int):221 -> d
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet reference2IntEntrySet():761:762 -> e
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():49 -> e
+    1:11:int getInt(java.lang.Object):371:381 -> getInt
     1:1:int realSize():205:205 -> hashCode
     1:1:int hashCode():1025 -> hashCode
     2:10:int hashCode():1026:1034 -> hashCode
@@ -32181,9 +31584,9 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):848:848 -> <init>
     1:1:void clear():866:866 -> clear
-    1:1:boolean contains(int):861:861 -> e
-    2:6:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.containsValue(int):404:408 -> e
-    2:6:boolean contains(int):861 -> e
+    1:1:boolean contains(int):861:861 -> d
+    2:6:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.containsValue(int):404:408 -> d
+    2:6:boolean contains(int):861 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():851:851 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():851:851 -> iterator
     2:2:java.util.Iterator iterator():848 -> iterator
@@ -32303,7 +31706,7 @@
     1:2:void clear():365:366 -> clear
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList clone():553:555 -> clone
     1:3:java.lang.Object clone():57 -> clone
-    1:7:void grow(int):285:291 -> g
+    1:7:void grow(int):285:291 -> f
     1:2:java.lang.Object get(int):317:318 -> get
     3:3:java.lang.Object get(int):317:317 -> get
     1:2:int indexOf(java.lang.Object):323:324 -> indexOf
@@ -32435,18 +31838,18 @@
     7:7:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet clone():642:642 -> clone
     7:7:java.lang.Object clone():40 -> clone
     1:9:boolean contains(java.lang.Object):350:358 -> contains
-    1:5:void rehash(int):607:611 -> e
-    6:6:int realSize():239:239 -> e
-    6:6:void rehash(int):612 -> e
-    7:16:void rehash(int):613:622 -> e
-    1:1:boolean removeEntry(int):314:314 -> f
-    2:7:void shiftKeys(int):297:302 -> f
-    2:7:boolean removeEntry(int):315 -> f
-    8:8:boolean removeEntry(int):316:316 -> f
-    9:13:void shiftKeys(int):305:309 -> f
-    9:13:boolean removeEntry(int):315 -> f
-    14:14:void shiftKeys(int):307:307 -> f
-    14:14:boolean removeEntry(int):315 -> f
+    1:5:void rehash(int):607:611 -> d
+    6:6:int realSize():239:239 -> d
+    6:6:void rehash(int):612 -> d
+    7:16:void rehash(int):613:622 -> d
+    1:1:boolean removeEntry(int):314:314 -> e
+    2:7:void shiftKeys(int):297:302 -> e
+    2:7:boolean removeEntry(int):315 -> e
+    8:8:boolean removeEntry(int):316:316 -> e
+    9:13:void shiftKeys(int):305:309 -> e
+    9:13:boolean removeEntry(int):315 -> e
+    14:14:void shiftKeys(int):307:307 -> e
+    14:14:boolean removeEntry(int):315 -> e
     1:1:int realSize():239:239 -> hashCode
     1:1:int hashCode():662 -> hashCode
     2:4:int hashCode():663:665 -> hashCode
@@ -32506,99 +31909,97 @@
     com.android.tools.r8.dex.Marker marker -> f
     1:1:void <clinit>():62:62 -> <clinit>
     1:11:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.Marker,java.lang.String,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,java.lang.String,com.android.tools.r8.naming.ProguardMapSupplier):90:100 -> <init>
-    1:1:com.android.tools.r8.ByteDataView com.android.tools.r8.ByteDataView.of(byte[]):17:17 -> a
-    1:1:void lambda$writeClass$0(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):194 -> a
-    2:2:void lambda$writeClass$0(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):194:194 -> a
+    1:1:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():64:64 -> a
+    1:1:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):315 -> a
+    2:2:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):314:314 -> a
     3:3:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():64:64 -> a
-    3:3:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):315 -> a
-    4:4:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):314:314 -> a
-    5:5:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():64:64 -> a
-    5:5:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):317 -> a
-    6:13:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):316:323 -> a
-    14:14:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):321:321 -> a
-    15:19:void write(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):104:108 -> a
-    20:41:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):114:135 -> a
-    42:42:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):128:128 -> a
-    43:46:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):140:143 -> a
-    47:52:int getClassFileVersion(com.android.tools.r8.graph.DexProgramClass):198:203 -> a
-    47:52:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):144 -> a
-    53:67:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):145:159 -> a
-    68:79:com.android.tools.r8.com.google.common.collect.ImmutableMap getAnnotationDefaults(com.android.tools.r8.graph.DexAnnotationSet):236:247 -> a
-    68:79:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):159 -> a
-    80:112:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):161:193 -> a
-    113:117:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):30:34 -> a
-    113:117:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):193 -> a
-    118:125:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):209:216 -> a
-    126:138:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotationSet):220:232 -> a
-    139:142:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):273:276 -> a
-    143:146:java.lang.Object getStaticValue(com.android.tools.r8.graph.DexEncodedField):266:269 -> a
-    143:146:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):277 -> a
-    147:149:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):278:280 -> a
-    150:154:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):288:292 -> a
-    155:164:java.lang.String[] getExceptions(com.android.tools.r8.graph.DexAnnotationSet):251:260 -> a
-    155:164:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):292 -> a
-    165:176:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):293:304 -> a
-    177:182:void writeCode(com.android.tools.r8.graph.Code,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.utils.InternalOptions,int):402:407 -> a
-    177:182:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):304 -> a
-    183:183:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):306:306 -> a
-    184:184:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor lambda$writeParameterAnnotations$1(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,boolean):322:322 -> a
-    185:194:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):332:341 -> a
-    195:200:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):340:345 -> a
-    201:202:void writeAnnotation(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,com.android.tools.r8.graph.DexEncodedAnnotation):351:352 -> a
-    203:207:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):357:361 -> a
-    208:226:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):360:378 -> a
-    227:246:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):377:396 -> a
-    247:247:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):394:394 -> a
-    248:248:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):386:386 -> a
-    249:249:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):384:384 -> a
-    250:250:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):382:382 -> a
-    251:251:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):380:380 -> a
+    3:3:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):317 -> a
+    4:11:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):316:323 -> a
+    12:12:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):321:321 -> a
+    13:17:void write(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):104:108 -> a
+    18:39:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):114:135 -> a
+    40:40:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):128:128 -> a
+    41:44:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):140:143 -> a
+    45:50:int getClassFileVersion(com.android.tools.r8.graph.DexProgramClass):198:203 -> a
+    45:50:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):144 -> a
+    51:65:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):145:159 -> a
+    66:77:com.android.tools.r8.com.google.common.collect.ImmutableMap getAnnotationDefaults(com.android.tools.r8.graph.DexAnnotationSet):236:247 -> a
+    66:77:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):159 -> a
+    78:110:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):161:193 -> a
+    111:115:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):30:34 -> a
+    111:115:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):193 -> a
+    116:116:void lambda$writeClass$0(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):194:194 -> a
+    117:124:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):209:216 -> a
+    125:137:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotationSet):220:232 -> a
+    138:141:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):273:276 -> a
+    142:145:java.lang.Object getStaticValue(com.android.tools.r8.graph.DexEncodedField):266:269 -> a
+    142:145:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):277 -> a
+    146:148:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):278:280 -> a
+    149:153:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):288:292 -> a
+    154:163:java.lang.String[] getExceptions(com.android.tools.r8.graph.DexAnnotationSet):251:260 -> a
+    154:163:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):292 -> a
+    164:175:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):293:304 -> a
+    176:181:void writeCode(com.android.tools.r8.graph.Code,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.utils.InternalOptions,int):402:407 -> a
+    176:181:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):304 -> a
+    182:182:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):306:306 -> a
+    183:183:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor lambda$writeParameterAnnotations$1(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,boolean):322:322 -> a
+    184:193:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):332:341 -> a
+    194:199:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):340:345 -> a
+    200:201:void writeAnnotation(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,com.android.tools.r8.graph.DexEncodedAnnotation):351:352 -> a
+    202:206:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):357:361 -> a
+    207:225:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):360:378 -> a
+    226:245:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):377:396 -> a
+    246:246:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):394:394 -> a
+    247:247:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):386:386 -> a
+    248:248:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):384:384 -> a
+    249:249:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):382:382 -> a
+    250:250:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):380:380 -> a
 com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer -> a.a.a.a.j.a:
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visit(java.lang.String,boolean) -> a
 com.android.tools.r8.jar.InliningConstraintVisitor -> a.a.a.a.j.c:
-    com.android.tools.r8.ir.optimize.InliningConstraints inliningConstraints -> m
-    com.android.tools.r8.graph.DexType invocationContext -> o
-    com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget constraint -> p
-    com.android.tools.r8.graph.DexEncodedMethod method -> n
-    boolean $assertionsDisabled -> q
-    com.android.tools.r8.graph.AppView appView -> k
-    com.android.tools.r8.graph.GraphLense graphLense -> l
-    com.android.tools.r8.graph.JarApplicationReader application -> j
+    boolean $assertionsDisabled -> j
+    com.android.tools.r8.graph.GraphLense graphLense -> e
+    com.android.tools.r8.graph.JarApplicationReader application -> c
+    com.android.tools.r8.graph.AppView appView -> d
+    com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget constraint -> i
+    com.android.tools.r8.graph.DexType invocationContext -> h
+    com.android.tools.r8.ir.optimize.InliningConstraints inliningConstraints -> f
+    com.android.tools.r8.graph.DexEncodedMethod method -> g
     1:1:void <clinit>():37:37 -> <clinit>
     1:12:void <init>(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):54:65 -> <init>
     1:1:void updateConstraint(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):77:77 -> a
-    2:2:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):93:93 -> a
-    3:3:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.JarApplicationReader.getField(java.lang.String,java.lang.String,java.lang.String):84:84 -> a
-    3:3:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):93 -> a
-    4:4:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):112:112 -> a
-    5:5:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):100:100 -> a
-    6:18:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):96:108 -> a
-    19:19:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):104:104 -> a
-    20:26:void visitLdcInsn(java.lang.Object):118:124 -> a
-    27:95:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):130:198 -> a
-    96:134:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):138:176 -> a
-    135:184:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):152:201 -> a
-    185:185:boolean noNeedToUseGraphLense(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):205:205 -> a
-    186:186:void visitInsn(int):214:214 -> a
-    187:188:void visitMultiANewArrayInsn(java.lang.String,int):224:225 -> a
-    189:208:void visitTypeInsn(int,java.lang.String):230:249 -> a
-    209:209:void visitTypeInsn(int,java.lang.String):237:237 -> a
-    210:222:void visitTypeInsn(int,java.lang.String):233:245 -> a
-    1:1:void accept(com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode):88:88 -> d
-    1:1:void disallowStaticInterfaceMethodCalls():69:69 -> e
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget getConstraint():73:73 -> f
-    1:1:boolean isFinished():83:83 -> g
+    2:2:void accept(com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode):88:88 -> a
+    3:3:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):93:93 -> a
+    4:4:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.JarApplicationReader.getField(java.lang.String,java.lang.String,java.lang.String):84:84 -> a
+    4:4:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):93 -> a
+    5:5:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):112:112 -> a
+    6:6:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):100:100 -> a
+    7:19:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):96:108 -> a
+    20:20:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):104:104 -> a
+    21:27:void visitLdcInsn(java.lang.Object):118:124 -> a
+    28:96:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):130:198 -> a
+    97:135:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):138:176 -> a
+    136:185:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):152:201 -> a
+    186:186:boolean noNeedToUseGraphLense(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):205:205 -> a
+    187:187:void visitInsn(int):214:214 -> a
+    188:189:void visitMultiANewArrayInsn(java.lang.String,int):224:225 -> a
+    190:209:void visitTypeInsn(int,java.lang.String):230:249 -> a
+    210:210:void visitTypeInsn(int,java.lang.String):237:237 -> a
+    211:223:void visitTypeInsn(int,java.lang.String):233:245 -> a
+    1:1:void disallowStaticInterfaceMethodCalls():69:69 -> d
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget getConstraint():73:73 -> e
+    1:1:boolean isFinished():83:83 -> f
 com.android.tools.r8.jar.JarArgumentUseVisitor -> a.a.a.a.j.d:
-    int arguments -> l
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap slotToArgument -> k
-    com.android.tools.r8.graph.ArgumentUse registry -> j
+    com.android.tools.r8.graph.ArgumentUse registry -> c
+    int arguments -> e
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap slotToArgument -> d
     1:30:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ArgumentUse):28:57 -> <init>
     1:2:void visitVarInsn(int,int):69:70 -> d
 com.android.tools.r8.jar.JarRegisterEffectsVisitor -> a.a.a.a.j.e:
-    boolean $assertionsDisabled -> m
-    com.android.tools.r8.graph.UseRegistry registry -> k
-    com.android.tools.r8.graph.DexType clazz -> j
-    com.android.tools.r8.graph.JarApplicationReader application -> l
+    com.android.tools.r8.graph.JarApplicationReader application -> e
+    com.android.tools.r8.graph.UseRegistry registry -> d
+    boolean $assertionsDisabled -> f
+    com.android.tools.r8.graph.DexType clazz -> c
     1:1:void <clinit>():23:23 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.JarApplicationReader):30:33 -> <init>
     1:7:void visitTypeInsn(int,java.lang.String):38:44 -> a
@@ -32706,7 +32107,8 @@
     10:10:java.lang.String toString():90:90 -> toString
 com.android.tools.r8.jetbrains.kotlin._Assertions -> a.a.a.a.k.a.q:
     boolean ENABLED -> a
-    1:1:void <clinit>():14:14 -> <clinit>
+    1:4:void <clinit>():11:14 -> <clinit>
+    1:1:void <init>():11:11 -> <init>
 com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection -> a.a.a.a.k.a.a.b:
     1:1:void <init>():13:13 -> <init>
     int getSize() -> c
@@ -32722,8 +32124,8 @@
     1:1:java.lang.String toString():24:24 -> toString
 com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection$toString$1 -> a.a.a.a.k.a.a.a:
     com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection this$0 -> a
-    1:1:java.lang.CharSequence invoke(java.lang.Object):25:25 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):13 -> a
+    1:1:java.lang.CharSequence invoke(java.lang.Object):25:25 -> invoke
+    1:1:java.lang.Object invoke(java.lang.Object):13 -> invoke
 com.android.tools.r8.jetbrains.kotlin.collections.AbstractList -> a.a.a.a.k.a.a.g:
     com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion Companion -> a
     1:1:void <init>():22:22 -> <init>
@@ -32751,7 +32153,7 @@
     int index -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.collections.AbstractList):72:72 -> <init>
     1:1:void setIndex(int):74:74 -> a
-    1:1:int getIndex():74:74 -> e
+    1:1:int getIndex():74:74 -> d
     1:1:boolean hasNext():76:76 -> hasNext
     2:2:int com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection.size():13:13 -> hasNext
     2:2:boolean hasNext():76 -> hasNext
@@ -32960,7 +32362,6 @@
 com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> a.a.a.a.k.a.c.a.a:
     java.lang.Object invoke() -> a
 com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> a.a.a.a.k.a.c.a.b:
-    java.lang.Object invoke(java.lang.Object) -> a
 com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 -> a.a.a.a.k.a.c.a.c:
     java.lang.Object invoke(java.lang.Object,java.lang.Object) -> a
 com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference$NoReceiver -> a.a.a.a.k.a.c.b.a:
@@ -33020,14 +32421,13 @@
     4:4:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.compute():0 -> a
     5:5:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.compute():68:68 -> a
     5:5:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.compute():0 -> a
-    java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getName() -> b
-    com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getOwner() -> c
-    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getReflected():75:75 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty getReflected():25 -> d
-    2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty getReflected():25:25 -> d
-    3:3:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getReflected():77:77 -> d
-    3:3:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty getReflected():25 -> d
-    java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getSignature() -> e
+    com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getOwner() -> b
+    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getReflected():75:75 -> c
+    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty getReflected():25 -> c
+    2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty getReflected():25:25 -> c
+    3:3:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getReflected():77:77 -> c
+    3:3:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty getReflected():25 -> c
+    java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getSignature() -> d
     1:3:boolean equals(java.lang.Object):43:45 -> equals
     4:4:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getBoundReceiver():60:60 -> equals
     4:4:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getBoundReceiver():0 -> equals
@@ -33045,14 +32445,14 @@
     1:1:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.<init>():13:13 -> <init>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer,java.lang.String,java.lang.String):15 -> <init>
     2:4:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer,java.lang.String,java.lang.String):16:18 -> <init>
-    1:1:java.lang.Object get(java.lang.Object):38:38 -> a
-    1:1:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.invoke(java.lang.Object):28 -> a
-    1:1:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.invoke(java.lang.Object):0 -> a
-    1:1:java.lang.String getName():28:28 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer getOwner():23:23 -> c
-    1:1:java.lang.String getSignature():33:33 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():33:33 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():0 -> f
+    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer getOwner():23:23 -> b
+    1:1:java.lang.String getSignature():33:33 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():33:33 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():0 -> e
+    1:1:java.lang.String getName():28:28 -> getName
+    1:1:java.lang.Object get(java.lang.Object):38:38 -> invoke
+    1:1:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.invoke(java.lang.Object):28 -> invoke
+    1:1:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.invoke(java.lang.Object):0 -> invoke
 com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection -> a.a.a.a.k.a.c.b.i:
     com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory factory -> a
     1:9:void <clinit>():22:30 -> <clinit>
@@ -33073,10 +32473,10 @@
     int first -> a
     1:24:void <init>(int,int,int):70:93 -> <init>
     25:25:void <init>(int,int,int):77:77 -> <init>
-    1:1:int getFirst():83:83 -> c
-    1:1:int getLast():88:88 -> e
+    1:1:int getStep():93:93 -> c
     1:1:boolean equals(java.lang.Object):101:101 -> equals
-    1:1:int getStep():93:93 -> g
+    1:1:int getFirst():83:83 -> getFirst
+    1:1:int getLast():88:88 -> getLast
     1:1:int hashCode():105:105 -> hashCode
     1:1:boolean isEmpty():98:98 -> isEmpty
     1:1:com.android.tools.r8.jetbrains.kotlin.collections.IntIterator iterator():95:95 -> iterator
@@ -33116,8 +32516,8 @@
     com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion Companion -> f
     1:1:void <clinit>():58:58 -> <clinit>
     1:1:void <init>(int,int):39:39 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange access$getEMPTY$cp():39:39 -> e
     1:1:boolean equals(java.lang.Object):48:48 -> equals
-    1:1:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange access$getEMPTY$cp():39:39 -> h
     1:1:int hashCode():52:52 -> hashCode
     1:1:boolean isEmpty():45:45 -> isEmpty
     1:1:java.lang.String toString():54:54 -> toString
@@ -33172,11 +32572,11 @@
     5:5:int com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.coerceIn(int,int,int):918:918 -> <init>
     5:5:int com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.coerceIn(int,int,int):0 -> <init>
     5:5:void <init>(com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence):1047 -> <init>
-    1:15:void calcNext():1053:1067 -> e
-    16:17:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.until(int,int):587:588 -> e
-    16:17:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.until(int,int):0 -> e
-    16:17:void calcNext():1067 -> e
-    18:23:void calcNext():1067:1072 -> e
+    1:15:void calcNext():1053:1067 -> d
+    16:17:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.until(int,int):587:588 -> d
+    16:17:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.until(int,int):0 -> d
+    16:17:void calcNext():1067 -> d
+    18:23:void calcNext():1067:1072 -> d
     1:3:boolean hasNext():1089:1091 -> hasNext
     1:8:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange next():1077:1084 -> next
     1:8:java.lang.Object next():1045 -> next
@@ -33278,25 +32678,25 @@
     4644:4644:java.lang.Object invoke(java.lang.Object,java.lang.Object):0 -> a
 com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2 -> a.a.a.a.k.a.g.i:
     java.lang.CharSequence receiver$0 -> a
-    1:1185:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):0:1184 -> a
-    1:1185:java.lang.Object invoke(java.lang.Object):0 -> a
-    1186:1186:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):0:0 -> a
-    1186:1186:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1184 -> a
-    1186:1186:java.lang.Object invoke(java.lang.Object):0 -> a
-    1187:1187:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.ranges.IntRange.getStart():40:40 -> a
-    1187:1187:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):329 -> a
-    1187:1187:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1184 -> a
-    1187:1187:java.lang.Object invoke(java.lang.Object):0 -> a
-    1188:1188:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):329:329 -> a
-    1188:1188:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1184 -> a
-    1188:1188:java.lang.Object invoke(java.lang.Object):0 -> a
-    1189:1189:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.ranges.IntRange.getEndInclusive():41:41 -> a
-    1189:1189:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):329 -> a
-    1189:1189:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1184 -> a
-    1189:1189:java.lang.Object invoke(java.lang.Object):0 -> a
-    1190:1190:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):329:329 -> a
-    1190:1190:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1184 -> a
-    1190:1190:java.lang.Object invoke(java.lang.Object):0 -> a
+    1:1185:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):0:1184 -> invoke
+    1:1185:java.lang.Object invoke(java.lang.Object):0 -> invoke
+    1186:1186:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):0:0 -> invoke
+    1186:1186:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1184 -> invoke
+    1186:1186:java.lang.Object invoke(java.lang.Object):0 -> invoke
+    1187:1187:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.ranges.IntRange.getStart():40:40 -> invoke
+    1187:1187:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):329 -> invoke
+    1187:1187:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1184 -> invoke
+    1187:1187:java.lang.Object invoke(java.lang.Object):0 -> invoke
+    1188:1188:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):329:329 -> invoke
+    1188:1188:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1184 -> invoke
+    1188:1188:java.lang.Object invoke(java.lang.Object):0 -> invoke
+    1189:1189:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.ranges.IntRange.getEndInclusive():41:41 -> invoke
+    1189:1189:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):329 -> invoke
+    1189:1189:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1184 -> invoke
+    1189:1189:java.lang.Object invoke(java.lang.Object):0 -> invoke
+    1190:1190:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):329:329 -> invoke
+    1190:1190:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1184 -> invoke
+    1190:1190:java.lang.Object invoke(java.lang.Object):0 -> invoke
 com.android.tools.r8.jetbrains.kotlin.text.StringsKt___StringsJvmKt -> a.a.a.a.k.a.g.j:
 com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> a.a.a.a.k.b.a.c:
     int bitWidth -> b
@@ -33309,10 +32709,12 @@
     1:1:boolean invoke(int):56:56 -> a
 com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Property -> a.a.a.a.k.b.a.a:
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_VAR -> a
-    1:79:void <clinit>():316:394 -> <clinit>
+    1:84:void <clinit>():311:394 -> <clinit>
+    1:1:void <init>():311:311 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Type -> a.a.a.a.k.b.a.b:
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_NULLABLE -> a
-    1:7:void <clinit>():428:434 -> <clinit>
+    1:12:void <clinit>():423:434 -> <clinit>
+    1:1:void <init>():423:423 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException -> a.a.a.a.k.b.a.d:
     1:1:void <init>(java.lang.String,java.lang.Throwable):8:8 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor -> a.a.a.a.k.b.a.e:
@@ -33556,14 +32958,14 @@
     1:1:int access$4302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,int):1875:1875 -> a
     2:2:java.util.List access$4400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation):1875:1875 -> a
     3:3:java.util.List access$4402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,java.util.List):1875:1875 -> a
-    4:9:boolean isInitialized():4041:4046 -> a
-    10:10:int getArgumentCount():4019:4019 -> a
-    10:10:boolean isInitialized():4049 -> a
-    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument getArgument(int):4025:4025 -> a
-    11:11:boolean isInitialized():4050 -> a
-    12:17:boolean isInitialized():4050:4055 -> a
     1:1:int access$4502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,int):1875:1875 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$4600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation):1875:1875 -> b
+    3:8:boolean isInitialized():4041:4046 -> b
+    9:9:int getArgumentCount():4019:4019 -> b
+    9:9:boolean isInitialized():4049 -> b
+    10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument getArgument(int):4025:4025 -> b
+    10:10:boolean isInitialized():4050 -> b
+    11:16:boolean isInitialized():4050:4055 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder newBuilder():4150:4150 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation):4153 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation):4153:4153 -> c
@@ -33620,11 +33022,11 @@
     1:1:int access$3702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument,int):1996:1996 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value access$3802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value):1996:1996 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$4000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument):1996:1996 -> a
-    4:13:boolean isInitialized():3654:3663 -> a
-    14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value getValue():3645:3645 -> a
-    14:14:boolean isInitialized():3666 -> a
-    15:19:boolean isInitialized():3666:3670 -> a
     1:1:int access$3902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument,int):1996:1996 -> b
+    2:11:boolean isInitialized():3654:3663 -> b
+    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value getValue():3645:3645 -> b
+    12:12:boolean isInitialized():3666 -> b
+    13:17:boolean isInitialized():3666:3670 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder newBuilderForType():3766:3766 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():1996 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument):3768:3768 -> e
@@ -33632,11 +33034,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():1996 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument getDefaultInstance():2009:2009 -> f
     1:1:int getNameId():3630:3630 -> g
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value getValue():3645:3645 -> h
-    1:1:boolean hasNameId():3624:3624 -> i
-    1:1:boolean hasValue():3639:3639 -> j
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder newBuilder():3765:3765 -> k
-    1:2:void initFields():3649:3650 -> l
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value getValue():3645:3645 -> getValue
+    1:1:boolean hasNameId():3624:3624 -> h
+    1:1:boolean hasValue():3639:3639 -> i
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder newBuilder():3765:3765 -> j
+    1:2:void initFields():3649:3650 -> k
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1 -> a.a.a.a.k.b.a.b.a.c:
     1:1:void <init>():2080:2080 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2085:2085 -> a
@@ -33751,17 +33153,17 @@
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation access$3002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation):2224:2224 -> a
     7:7:java.util.List access$3100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value):2224:2224 -> a
     8:8:java.util.List access$3102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,java.util.List):2224:2224 -> a
-    9:13:boolean isInitialized():2743:2747 -> a
-    14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation getAnnotation():2668:2668 -> a
-    14:14:boolean isInitialized():2748 -> a
-    15:16:boolean isInitialized():2748:2749 -> a
-    17:17:int getArrayElementCount():2690:2690 -> a
-    17:17:boolean isInitialized():2753 -> a
-    18:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value getArrayElement(int):2696:2696 -> a
-    18:18:boolean isInitialized():2754 -> a
-    19:24:boolean isInitialized():2754:2759 -> a
     1:1:int access$2802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,int):2224:2224 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$3400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value):2224:2224 -> b
+    3:7:boolean isInitialized():2743:2747 -> b
+    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation getAnnotation():2668:2668 -> b
+    8:8:boolean isInitialized():2748 -> b
+    9:10:boolean isInitialized():2748:2749 -> b
+    11:11:int getArrayElementCount():2690:2690 -> b
+    11:11:boolean isInitialized():2753 -> b
+    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value getArrayElement(int):2696:2696 -> b
+    12:12:boolean isInitialized():2754 -> b
+    13:18:boolean isInitialized():2754:2759 -> b
     1:1:int access$2902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,int):2224:2224 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder newBuilder():2910:2910 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value):2913 -> c
@@ -33774,25 +33176,25 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder toBuilder():2915:2915 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation getAnnotation():2668:2668 -> f
     1:1:int getClassId():2638:2638 -> g
+    1:1:int getFlags():2726:2726 -> getFlags
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value getDefaultInstance():2237:2237 -> h
     1:1:double getDoubleValue():2600:2600 -> i
     1:1:int getEnumValueId():2653:2653 -> j
-    1:1:int getFlags():2726:2726 -> k
-    1:1:float getFloatValue():2585:2585 -> l
-    1:1:long getIntValue():2570:2570 -> m
-    1:1:int getStringValue():2615:2615 -> n
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type getType():2555:2555 -> o
-    1:1:boolean hasAnnotation():2662:2662 -> p
-    1:1:boolean hasClassId():2628:2628 -> q
-    1:1:boolean hasDoubleValue():2594:2594 -> r
-    1:1:boolean hasEnumValueId():2647:2647 -> s
-    1:1:boolean hasFlags():2716:2716 -> t
-    1:1:boolean hasFloatValue():2579:2579 -> u
-    1:1:boolean hasIntValue():2564:2564 -> v
-    1:1:boolean hasStringValue():2609:2609 -> w
-    1:1:boolean hasType():2543:2543 -> x
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder newBuilder():2910:2910 -> y
-    1:10:void initFields():2730:2739 -> z
+    1:1:float getFloatValue():2585:2585 -> k
+    1:1:long getIntValue():2570:2570 -> l
+    1:1:int getStringValue():2615:2615 -> m
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type getType():2555:2555 -> n
+    1:1:boolean hasAnnotation():2662:2662 -> o
+    1:1:boolean hasClassId():2628:2628 -> p
+    1:1:boolean hasDoubleValue():2594:2594 -> q
+    1:1:boolean hasEnumValueId():2647:2647 -> r
+    1:1:boolean hasFlags():2716:2716 -> s
+    1:1:boolean hasFloatValue():2579:2579 -> t
+    1:1:boolean hasIntValue():2564:2564 -> u
+    1:1:boolean hasStringValue():2609:2609 -> v
+    1:1:boolean hasType():2543:2543 -> w
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder newBuilder():2910:2910 -> x
+    1:10:void initFields():2730:2739 -> y
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1 -> a.a.a.a.k.b.a.b.a.e:
     1:1:void <init>():2361:2361 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2366:2366 -> a
@@ -33876,19 +33278,19 @@
     50:50:void <clinit>():2378:2378 -> <clinit>
     1:2:void <init>(java.lang.String,int,int,int):2523:2524 -> <init>
     1:1:int getNumber():2488:2488 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2504:2504 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2503:2503 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2502:2502 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2501:2501 -> c
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2500:2500 -> c
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2499:2499 -> c
-    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2498:2498 -> c
-    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2497:2497 -> c
-    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2496:2496 -> c
-    10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2495:2495 -> c
-    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2494:2494 -> c
-    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2493:2493 -> c
-    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2492:2492 -> c
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2504:2504 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2503:2503 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2502:2502 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2501:2501 -> b
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2500:2500 -> b
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2499:2499 -> b
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2498:2498 -> b
+    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2497:2497 -> b
+    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2496:2496 -> b
+    10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2495:2495 -> b
+    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2494:2494 -> b
+    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2493:2493 -> b
+    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2492:2492 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$ValueOrBuilder -> a.a.a.a.k.b.a.b.a.i:
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$ArgumentOrBuilder -> a.a.a.a.k.b.a.b.a.k:
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> a.a.a.a.k.b.a.b.a.l:
@@ -33970,60 +33372,59 @@
     2873:3058:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8372:8557 -> <init>
     3059:3104:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8555:8600 -> <init>
     3105:3144:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8561:8600 -> <init>
-    1:1:boolean hasFqName():8773:8773 -> A
-    1:1:boolean hasTypeTable():9117:9117 -> B
-    1:1:boolean hasVersionRequirementTable():9166:9166 -> C
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder newBuilder():9500:9500 -> D
-    1:16:void initFields():9176:9191 -> E
+    1:1:boolean hasTypeTable():9117:9117 -> A
+    1:1:boolean hasVersionRequirementTable():9166:9166 -> B
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder newBuilder():9500:9500 -> C
+    1:16:void initFields():9176:9191 -> D
     1:1:java.util.List access$10000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8323:8323 -> a
     2:2:java.util.List access$10002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8323:8323 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable access$10102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):8323:8323 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable access$10302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):8323:8323 -> a
     5:5:int access$10402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,int):8323:8323 -> a
-    6:11:boolean isInitialized():9195:9200 -> a
-    12:12:int getTypeParameterCount():8816:8816 -> a
-    12:12:boolean isInitialized():9203 -> a
-    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getTypeParameter(int):8822:8822 -> a
-    13:13:boolean isInitialized():9204 -> a
-    14:15:boolean isInitialized():9204:9205 -> a
-    16:16:int getSupertypeCount():8851:8851 -> a
-    16:16:boolean isInitialized():9209 -> a
-    17:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getSupertype(int):8857:8857 -> a
-    17:17:boolean isInitialized():9210 -> a
-    18:19:boolean isInitialized():9210:9211 -> a
-    20:20:int getConstructorCount():8932:8932 -> a
-    20:20:boolean isInitialized():9215 -> a
-    21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor getConstructor(int):8938:8938 -> a
-    21:21:boolean isInitialized():9216 -> a
-    22:23:boolean isInitialized():9216:9217 -> a
-    24:24:int getFunctionCount():8967:8967 -> a
-    24:24:boolean isInitialized():9221 -> a
-    25:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function getFunction(int):8973:8973 -> a
-    25:25:boolean isInitialized():9222 -> a
-    26:27:boolean isInitialized():9222:9223 -> a
-    28:28:int getPropertyCount():9002:9002 -> a
-    28:28:boolean isInitialized():9227 -> a
-    29:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property getProperty(int):9008:9008 -> a
-    29:29:boolean isInitialized():9228 -> a
-    30:31:boolean isInitialized():9228:9229 -> a
-    32:32:int getTypeAliasCount():9037:9037 -> a
-    32:32:boolean isInitialized():9233 -> a
-    33:33:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias getTypeAlias(int):9043:9043 -> a
-    33:33:boolean isInitialized():9234 -> a
-    34:35:boolean isInitialized():9234:9235 -> a
-    36:36:int getEnumEntryCount():9072:9072 -> a
-    36:36:boolean isInitialized():9239 -> a
-    37:37:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry getEnumEntry(int):9078:9078 -> a
-    37:37:boolean isInitialized():9240 -> a
-    38:43:boolean isInitialized():9240:9245 -> a
-    44:44:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():9123:9123 -> a
-    44:44:boolean isInitialized():9246 -> a
-    45:54:boolean isInitialized():9246:9255 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class getDefaultInstanceForType():8341:8341 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():8323 -> a
     1:1:java.util.List access$10200(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8323:8323 -> b
     2:2:java.util.List access$10202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8323:8323 -> b
     3:3:int access$8802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,int):8323:8323 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class getDefaultInstanceForType():8341:8341 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():8323 -> b
+    4:9:boolean isInitialized():9195:9200 -> b
+    10:10:int getTypeParameterCount():8816:8816 -> b
+    10:10:boolean isInitialized():9203 -> b
+    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getTypeParameter(int):8822:8822 -> b
+    11:11:boolean isInitialized():9204 -> b
+    12:13:boolean isInitialized():9204:9205 -> b
+    14:14:int getSupertypeCount():8851:8851 -> b
+    14:14:boolean isInitialized():9209 -> b
+    15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getSupertype(int):8857:8857 -> b
+    15:15:boolean isInitialized():9210 -> b
+    16:17:boolean isInitialized():9210:9211 -> b
+    18:18:int getConstructorCount():8932:8932 -> b
+    18:18:boolean isInitialized():9215 -> b
+    19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor getConstructor(int):8938:8938 -> b
+    19:19:boolean isInitialized():9216 -> b
+    20:21:boolean isInitialized():9216:9217 -> b
+    22:22:int getFunctionCount():8967:8967 -> b
+    22:22:boolean isInitialized():9221 -> b
+    23:23:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function getFunction(int):8973:8973 -> b
+    23:23:boolean isInitialized():9222 -> b
+    24:25:boolean isInitialized():9222:9223 -> b
+    26:26:int getPropertyCount():9002:9002 -> b
+    26:26:boolean isInitialized():9227 -> b
+    27:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property getProperty(int):9008:9008 -> b
+    27:27:boolean isInitialized():9228 -> b
+    28:29:boolean isInitialized():9228:9229 -> b
+    30:30:int getTypeAliasCount():9037:9037 -> b
+    30:30:boolean isInitialized():9233 -> b
+    31:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias getTypeAlias(int):9043:9043 -> b
+    31:31:boolean isInitialized():9234 -> b
+    32:33:boolean isInitialized():9234:9235 -> b
+    34:34:int getEnumEntryCount():9072:9072 -> b
+    34:34:boolean isInitialized():9239 -> b
+    35:35:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry getEnumEntry(int):9078:9078 -> b
+    35:35:boolean isInitialized():9240 -> b
+    36:41:boolean isInitialized():9240:9245 -> b
+    42:42:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():9123:9123 -> b
+    42:42:boolean isInitialized():9246 -> b
+    43:52:boolean isInitialized():9246:9255 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$10500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8323:8323 -> c
     2:2:int access$8902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,int):8323:8323 -> c
     3:3:java.util.List access$9102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8323:8323 -> c
@@ -34041,6 +33442,7 @@
     2:2:java.util.List access$9402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8323:8323 -> f
     1:1:java.util.List access$9400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8323:8323 -> g
     2:2:java.util.List access$9502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8323:8323 -> g
+    1:1:int getFlags():8764:8764 -> getFlags
     1:1:java.util.List access$9500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8323:8323 -> h
     2:2:java.util.List access$9602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8323:8323 -> h
     3:3:int getCompanionObjectName():8794:8794 -> h
@@ -34054,21 +33456,21 @@
     2:2:java.util.List access$9902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8323:8323 -> k
     3:3:java.util.List getEnumEntryList():9059:9059 -> k
     1:1:java.util.List access$9900(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8323:8323 -> l
-    2:2:int getFlags():8764:8764 -> l
-    1:1:int getFqName():8779:8779 -> m
-    1:1:java.util.List getFunctionList():8954:8954 -> n
-    1:1:java.util.List getNestedClassNameList():8897:8897 -> o
-    1:1:java.util.List getPropertyList():8989:8989 -> p
-    1:1:java.util.List getSealedSubclassFqNameList():9095:9095 -> q
-    1:1:java.util.List getSupertypeIdList():8874:8874 -> r
-    1:1:java.util.List getSupertypeList():8838:8838 -> s
-    1:1:java.util.List getTypeAliasList():9024:9024 -> t
-    1:1:java.util.List getTypeParameterList():8803:8803 -> u
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():9123:9123 -> v
-    1:1:java.util.List getVersionRequirementList():9137:9137 -> w
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable getVersionRequirementTable():9172:9172 -> x
-    1:1:boolean hasCompanionObjectName():8788:8788 -> y
-    1:1:boolean hasFlags():8746:8746 -> z
+    2:2:int getFqName():8779:8779 -> l
+    1:1:java.util.List getFunctionList():8954:8954 -> m
+    1:1:java.util.List getNestedClassNameList():8897:8897 -> n
+    1:1:java.util.List getPropertyList():8989:8989 -> o
+    1:1:java.util.List getSealedSubclassFqNameList():9095:9095 -> p
+    1:1:java.util.List getSupertypeIdList():8874:8874 -> q
+    1:1:java.util.List getSupertypeList():8838:8838 -> r
+    1:1:java.util.List getTypeAliasList():9024:9024 -> s
+    1:1:java.util.List getTypeParameterList():8803:8803 -> t
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():9123:9123 -> u
+    1:1:java.util.List getVersionRequirementList():9137:9137 -> v
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable getVersionRequirementTable():9172:9172 -> w
+    1:1:boolean hasCompanionObjectName():8788:8788 -> x
+    1:1:boolean hasFlags():8746:8746 -> y
+    1:1:boolean hasFqName():8773:8773 -> z
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> a.a.a.a.k.b.a.b.a.o:
     1:1:void <init>():8604:8604 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8609:8609 -> a
@@ -34220,30 +33622,30 @@
     1:1:int access$12602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,int):13193:13193 -> a
     2:2:java.util.List access$12700(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor):13193:13193 -> a
     3:3:java.util.List access$12702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,java.util.List):13193:13193 -> a
-    4:4:boolean isInitialized():13418:13418 -> a
-    5:5:int getValueParameterCount():13361:13361 -> a
-    5:5:boolean isInitialized():13422 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getValueParameter(int):13367:13367 -> a
-    6:6:boolean isInitialized():13423 -> a
-    7:16:boolean isInitialized():13423:13432 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor getDefaultInstanceForType():13211:13211 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():13193 -> a
     1:1:java.util.List access$12800(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor):13193:13193 -> b
     2:2:java.util.List access$12802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,java.util.List):13193:13193 -> b
     3:3:int access$12902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,int):13193:13193 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor getDefaultInstanceForType():13211:13211 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():13193 -> b
+    4:4:boolean isInitialized():13418:13418 -> b
+    5:5:int getValueParameterCount():13361:13361 -> b
+    5:5:boolean isInitialized():13422 -> b
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getValueParameter(int):13367:13367 -> b
+    6:6:boolean isInitialized():13423 -> b
+    7:16:boolean isInitialized():13423:13432 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$13000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor):13193:13193 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder newBuilderForType():13545:13545 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():13193 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor):13547:13547 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder toBuilder():13549 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():13193 -> e
+    1:1:int getFlags():13339:13339 -> getFlags
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor getDefaultInstance():13207:13207 -> h
-    1:1:int getFlags():13339:13339 -> i
-    1:1:java.util.List getValueParameterList():13348:13348 -> j
-    1:1:java.util.List getVersionRequirementList():13388:13388 -> k
-    1:1:boolean hasFlags():13327:13327 -> l
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder newBuilder():13544:13544 -> m
-    1:3:void initFields():13412:13414 -> n
+    1:1:java.util.List getValueParameterList():13348:13348 -> i
+    1:1:java.util.List getVersionRequirementList():13388:13388 -> j
+    1:1:boolean hasFlags():13327:13327 -> k
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder newBuilder():13544:13544 -> l
+    1:3:void initFields():13412:13414 -> m
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> a.a.a.a.k.b.a.b.a.t:
     1:1:void <init>():13300:13300 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13305:13305 -> a
@@ -34306,13 +33708,13 @@
     394:401:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):23138 -> <init>
     1:1:java.util.List access$22400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23138:23138 -> a
     2:2:java.util.List access$22402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,java.util.List):23138:23138 -> a
-    3:3:boolean isInitialized():23269:23269 -> a
-    4:4:int getEffectCount():23248:23248 -> a
-    4:4:boolean isInitialized():23273 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect getEffect(int):23254:23254 -> a
-    5:5:boolean isInitialized():23274 -> a
-    6:11:boolean isInitialized():23274:23279 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$22500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23138:23138 -> b
+    2:2:boolean isInitialized():23269:23269 -> b
+    3:3:int getEffectCount():23248:23248 -> b
+    3:3:boolean isInitialized():23273 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect getEffect(int):23254:23254 -> b
+    4:4:boolean isInitialized():23274 -> b
+    5:10:boolean isInitialized():23274:23279 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder newBuilder():23367:23367 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23370 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23370:23370 -> c
@@ -34397,16 +33799,16 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression access$23102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):23668:23668 -> a
     5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind access$23202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind):23668:23668 -> a
     6:6:int access$23302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect,int):23668:23668 -> a
-    7:7:boolean isInitialized():24059:24059 -> a
-    8:8:int getEffectConstructorArgumentCount():23995:23995 -> a
-    8:8:boolean isInitialized():24063 -> a
-    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getEffectConstructorArgument(int):24001:24001 -> a
-    9:9:boolean isInitialized():24064 -> a
-    10:15:boolean isInitialized():24064:24069 -> a
-    16:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getConclusionOfConditionalEffect():24033:24033 -> a
-    16:16:boolean isInitialized():24070 -> a
-    17:22:boolean isInitialized():24070:24075 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$23400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect):23668:23668 -> b
+    2:2:boolean isInitialized():24059:24059 -> b
+    3:3:int getEffectConstructorArgumentCount():23995:23995 -> b
+    3:3:boolean isInitialized():24063 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getEffectConstructorArgument(int):24001:24001 -> b
+    4:4:boolean isInitialized():24064 -> b
+    5:10:boolean isInitialized():24064:24069 -> b
+    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getConclusionOfConditionalEffect():24033:24033 -> b
+    11:11:boolean isInitialized():24070 -> b
+    12:17:boolean isInitialized():24070:24075 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder newBuilderForType():24185:24185 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():23668 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect):24187:24187 -> e
@@ -34473,9 +33875,9 @@
     1:2:void <init>(java.lang.String,int,int,int):23888:23889 -> <init>
     1:1:int getNumber():23863:23863 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType[] values():23807:23807 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):23869:23869 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):23868:23868 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):23867:23867 -> c
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):23869:23869 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):23868:23868 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):23867:23867 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> a.a.a.a.k.b.a.b.a.E:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind AT_MOST_ONCE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind EXACTLY_ONCE -> c
@@ -34487,9 +33889,9 @@
     1:2:void <init>(java.lang.String,int,int,int):23953:23954 -> <init>
     1:1:int getNumber():23928:23928 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind[] values():23898:23898 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):23934:23934 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):23933:23933 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):23932:23932 -> c
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):23934:23934 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):23933:23933 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):23932:23932 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EffectOrBuilder -> a.a.a.a.k.b.a.b.a.G:
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> a.a.a.a.k.b.a.b.a.J:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
@@ -34522,20 +33924,20 @@
     326:332:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):20283 -> <init>
     1:1:int access$19302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry,int):20283:20283 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$19500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry):20283:20283 -> a
-    3:11:boolean isInitialized():20390:20398 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry getDefaultInstanceForType():20301:20301 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():20283 -> a
     1:1:int access$19402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry,int):20283:20283 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry getDefaultInstanceForType():20301:20301 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():20283 -> b
+    2:10:boolean isInitialized():20390:20398 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder newBuilderForType():20492:20492 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():20283 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry):20494:20494 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder toBuilder():20496 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():20283 -> e
+    1:1:int getName():20382:20382 -> getName
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry getDefaultInstance():20297:20297 -> h
-    1:1:int getName():20382:20382 -> i
-    1:1:boolean hasName():20376:20376 -> j
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder newBuilder():20491:20491 -> k
-    1:1:void initFields():20386:20386 -> l
+    1:1:boolean hasName():20376:20376 -> i
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder newBuilder():20491:20491 -> j
+    1:1:void initFields():20386:20386 -> k
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> a.a.a.a.k.b.a.b.a.H:
     1:1:void <init>():20355:20355 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20360:20360 -> a
@@ -34630,23 +34032,23 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$24102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):24773:24773 -> a
     4:4:java.util.List access$24300(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):24773:24773 -> a
     5:5:java.util.List access$24302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,java.util.List):24773:24773 -> a
-    6:10:boolean isInitialized():25227:25231 -> a
-    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getIsInstanceType():25068:25068 -> a
-    11:11:boolean isInitialized():25232 -> a
-    12:13:boolean isInitialized():25232:25233 -> a
-    14:14:int getAndArgumentCount():25123:25123 -> a
-    14:14:boolean isInitialized():25237 -> a
-    15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getAndArgument(int):25135:25135 -> a
-    15:15:boolean isInitialized():25238 -> a
-    16:17:boolean isInitialized():25238:25239 -> a
-    18:18:int getOrArgumentCount():25188:25188 -> a
-    18:18:boolean isInitialized():25243 -> a
-    19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getOrArgument(int):25200:25200 -> a
-    19:19:boolean isInitialized():25244 -> a
-    20:25:boolean isInitialized():25244:25249 -> a
     1:1:int access$23902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,int):24773:24773 -> b
     2:2:java.util.List access$24400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):24773:24773 -> b
     3:3:java.util.List access$24402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,java.util.List):24773:24773 -> b
+    4:8:boolean isInitialized():25227:25231 -> b
+    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getIsInstanceType():25068:25068 -> b
+    9:9:boolean isInitialized():25232 -> b
+    10:11:boolean isInitialized():25232:25233 -> b
+    12:12:int getAndArgumentCount():25123:25123 -> b
+    12:12:boolean isInitialized():25237 -> b
+    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getAndArgument(int):25135:25135 -> b
+    13:13:boolean isInitialized():25238 -> b
+    14:15:boolean isInitialized():25238:25239 -> b
+    16:16:int getOrArgumentCount():25188:25188 -> b
+    16:16:boolean isInitialized():25243 -> b
+    17:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getOrArgument(int):25200:25200 -> b
+    17:17:boolean isInitialized():25244 -> b
+    18:23:boolean isInitialized():25244:25249 -> b
     1:1:int access$24202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,int):24773:24773 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$24600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):24773:24773 -> c
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder newBuilderForType():25380:25380 -> c
@@ -34659,17 +34061,17 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder toBuilder():25384:25384 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue getConstantValue():25043:25043 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getDefaultInstance():24786:24786 -> g
-    1:1:int getFlags():25003:25003 -> h
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getIsInstanceType():25068:25068 -> i
-    1:1:int getIsInstanceTypeId():25083:25083 -> j
-    1:1:int getValueParameterReference():25028:25028 -> k
-    1:1:boolean hasConstantValue():25037:25037 -> l
-    1:1:boolean hasFlags():24992:24992 -> m
-    1:1:boolean hasIsInstanceType():25057:25057 -> n
-    1:1:boolean hasIsInstanceTypeId():25077:25077 -> o
-    1:1:boolean hasValueParameterReference():25017:25017 -> p
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder newBuilder():25379:25379 -> q
-    1:7:void initFields():25217:25223 -> r
+    1:1:int getFlags():25003:25003 -> getFlags
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getIsInstanceType():25068:25068 -> h
+    1:1:int getIsInstanceTypeId():25083:25083 -> i
+    1:1:int getValueParameterReference():25028:25028 -> j
+    1:1:boolean hasConstantValue():25037:25037 -> k
+    1:1:boolean hasFlags():24992:24992 -> l
+    1:1:boolean hasIsInstanceType():25057:25057 -> m
+    1:1:boolean hasIsInstanceTypeId():25077:25077 -> n
+    1:1:boolean hasValueParameterReference():25017:25017 -> o
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder newBuilder():25379:25379 -> p
+    1:7:void initFields():25217:25223 -> q
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> a.a.a.a.k.b.a.b.a.L:
     1:1:void <init>():24901:24901 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):24906:24906 -> a
@@ -34732,9 +34134,9 @@
     1:2:void <init>(java.lang.String,int,int,int):24973:24974 -> <init>
     1:1:int getNumber():24948:24948 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue[] values():24918:24918 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):24954:24954 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):24953:24953 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):24952:24952 -> c
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):24954:24954 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):24953:24953 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):24952:24952 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ExpressionOrBuilder -> a.a.a.a.k.b.a.b.a.P:
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> a.a.a.a.k.b.a.b.a.T:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function defaultInstance -> q
@@ -34828,46 +34230,44 @@
     1741:1762:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):14139 -> <init>
     1763:1778:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14310:14325 -> <init>
     1763:1778:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):14139 -> <init>
-    1:1:boolean hasReturnType():14423:14423 -> A
-    1:1:boolean hasReturnTypeId():14438:14438 -> B
-    1:1:boolean hasTypeTable():14553:14553 -> C
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder newBuilder():14850:14850 -> D
-    1:12:void initFields():14612:14623 -> E
+    1:1:boolean hasTypeTable():14553:14553 -> A
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder newBuilder():14850:14850 -> B
+    1:12:void initFields():14612:14623 -> C
     1:1:int access$13402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,int):14139:14139 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$13702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):14139:14139 -> a
     3:3:java.util.List access$13900(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):14139:14139 -> a
     4:4:java.util.List access$13902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,java.util.List):14139:14139 -> a
     5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable access$14302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):14139:14139 -> a
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract access$14502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):14139:14139 -> a
-    7:15:boolean isInitialized():14627:14635 -> a
-    16:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReturnType():14429:14429 -> a
-    16:16:boolean isInitialized():14636 -> a
-    17:18:boolean isInitialized():14636:14637 -> a
-    19:19:int getTypeParameterCount():14466:14466 -> a
-    19:19:boolean isInitialized():14641 -> a
-    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getTypeParameter(int):14472:14472 -> a
-    20:20:boolean isInitialized():14642 -> a
-    21:26:boolean isInitialized():14642:14647 -> a
-    27:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReceiverType():14494:14494 -> a
-    27:27:boolean isInitialized():14648 -> a
-    28:29:boolean isInitialized():14648:14649 -> a
-    30:30:int getValueParameterCount():14531:14531 -> a
-    30:30:boolean isInitialized():14653 -> a
-    31:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getValueParameter(int):14537:14537 -> a
-    31:31:boolean isInitialized():14654 -> a
-    32:37:boolean isInitialized():14654:14659 -> a
-    38:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():14559:14559 -> a
-    38:38:boolean isInitialized():14660 -> a
-    39:44:boolean isInitialized():14660:14665 -> a
-    45:45:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract getContract():14608:14608 -> a
-    45:45:boolean isInitialized():14666 -> a
-    46:55:boolean isInitialized():14666:14675 -> a
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function getDefaultInstanceForType():14157:14157 -> a
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():14139 -> a
     1:1:int access$13502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,int):14139:14139 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$14002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):14139:14139 -> b
     3:3:java.util.List access$14200(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):14139:14139 -> b
     4:4:java.util.List access$14202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,java.util.List):14139:14139 -> b
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function getDefaultInstanceForType():14157:14157 -> b
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():14139 -> b
+    5:13:boolean isInitialized():14627:14635 -> b
+    14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReturnType():14429:14429 -> b
+    14:14:boolean isInitialized():14636 -> b
+    15:16:boolean isInitialized():14636:14637 -> b
+    17:17:int getTypeParameterCount():14466:14466 -> b
+    17:17:boolean isInitialized():14641 -> b
+    18:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getTypeParameter(int):14472:14472 -> b
+    18:18:boolean isInitialized():14642 -> b
+    19:24:boolean isInitialized():14642:14647 -> b
+    25:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReceiverType():14494:14494 -> b
+    25:25:boolean isInitialized():14648 -> b
+    26:27:boolean isInitialized():14648:14649 -> b
+    28:28:int getValueParameterCount():14531:14531 -> b
+    28:28:boolean isInitialized():14653 -> b
+    29:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getValueParameter(int):14537:14537 -> b
+    29:29:boolean isInitialized():14654 -> b
+    30:35:boolean isInitialized():14654:14659 -> b
+    36:36:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():14559:14559 -> b
+    36:36:boolean isInitialized():14660 -> b
+    37:42:boolean isInitialized():14660:14665 -> b
+    43:43:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract getContract():14608:14608 -> b
+    43:43:boolean isInitialized():14666 -> b
+    44:53:boolean isInitialized():14666:14675 -> b
     1:1:int access$13602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,int):14139:14139 -> c
     2:2:java.util.List access$14400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):14139:14139 -> c
     3:3:java.util.List access$14402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,java.util.List):14139:14139 -> c
@@ -34880,25 +34280,27 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder toBuilder():14855 -> e
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():14139 -> e
     1:1:int access$14602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,int):14139:14139 -> f
+    1:1:int getFlags():14384:14384 -> getFlags
+    1:1:int getName():14414:14414 -> getName
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract getContract():14608:14608 -> h
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function getDefaultInstance():14153:14153 -> i
-    1:1:int getFlags():14384:14384 -> j
-    1:1:int getName():14414:14414 -> k
-    1:1:int getOldFlags():14399:14399 -> l
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReceiverType():14494:14494 -> m
-    1:1:int getReceiverTypeId():14509:14509 -> n
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReturnType():14429:14429 -> o
-    1:1:int getReturnTypeId():14444:14444 -> p
-    1:1:java.util.List getTypeParameterList():14453:14453 -> q
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():14559:14559 -> r
-    1:1:java.util.List getValueParameterList():14518:14518 -> s
-    1:1:java.util.List getVersionRequirementList():14573:14573 -> t
-    1:1:boolean hasContract():14602:14602 -> u
-    1:1:boolean hasFlags():14364:14364 -> v
-    1:1:boolean hasName():14408:14408 -> w
-    1:1:boolean hasOldFlags():14393:14393 -> x
-    1:1:boolean hasReceiverType():14488:14488 -> y
-    1:1:boolean hasReceiverTypeId():14503:14503 -> z
+    1:1:int getOldFlags():14399:14399 -> j
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReceiverType():14494:14494 -> k
+    1:1:int getReceiverTypeId():14509:14509 -> l
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReturnType():14429:14429 -> m
+    1:1:int getReturnTypeId():14444:14444 -> n
+    1:1:java.util.List getTypeParameterList():14453:14453 -> o
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():14559:14559 -> p
+    1:1:java.util.List getValueParameterList():14518:14518 -> q
+    1:1:java.util.List getVersionRequirementList():14573:14573 -> r
+    1:1:boolean hasContract():14602:14602 -> s
+    1:1:boolean hasFlags():14364:14364 -> t
+    1:1:boolean hasName():14408:14408 -> u
+    1:1:boolean hasOldFlags():14393:14393 -> v
+    1:1:boolean hasReceiverType():14488:14488 -> w
+    1:1:boolean hasReceiverTypeId():14503:14503 -> x
+    1:1:boolean hasReturnType():14423:14423 -> y
+    1:1:boolean hasReturnTypeId():14438:14438 -> z
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> a.a.a.a.k.b.a.b.a.Q:
     1:1:void <init>():14329:14329 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14334:14334 -> a
@@ -35032,29 +34434,29 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable access$11202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):11384:11384 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable access$11302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):11384:11384 -> a
     5:5:int access$11402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,int):11384:11384 -> a
-    6:6:boolean isInitialized():11669:11669 -> a
-    7:7:int getFunctionCount():11544:11544 -> a
-    7:7:boolean isInitialized():11673 -> a
-    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function getFunction(int):11550:11550 -> a
-    8:8:boolean isInitialized():11674 -> a
-    9:10:boolean isInitialized():11674:11675 -> a
-    11:11:int getPropertyCount():11579:11579 -> a
-    11:11:boolean isInitialized():11679 -> a
-    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property getProperty(int):11585:11585 -> a
-    12:12:boolean isInitialized():11680 -> a
-    13:14:boolean isInitialized():11680:11681 -> a
-    15:15:int getTypeAliasCount():11614:11614 -> a
-    15:15:boolean isInitialized():11685 -> a
-    16:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias getTypeAlias(int):11620:11620 -> a
-    16:16:boolean isInitialized():11686 -> a
-    17:22:boolean isInitialized():11686:11691 -> a
-    23:23:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():11642:11642 -> a
-    23:23:boolean isInitialized():11692 -> a
-    24:33:boolean isInitialized():11692:11701 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package getDefaultInstanceForType():11402:11402 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():11384 -> a
     1:1:java.util.List access$11000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):11384:11384 -> b
     2:2:java.util.List access$11002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,java.util.List):11384:11384 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package getDefaultInstanceForType():11402:11402 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():11384 -> b
+    3:3:boolean isInitialized():11669:11669 -> b
+    4:4:int getFunctionCount():11544:11544 -> b
+    4:4:boolean isInitialized():11673 -> b
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function getFunction(int):11550:11550 -> b
+    5:5:boolean isInitialized():11674 -> b
+    6:7:boolean isInitialized():11674:11675 -> b
+    8:8:int getPropertyCount():11579:11579 -> b
+    8:8:boolean isInitialized():11679 -> b
+    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property getProperty(int):11585:11585 -> b
+    9:9:boolean isInitialized():11680 -> b
+    10:11:boolean isInitialized():11680:11681 -> b
+    12:12:int getTypeAliasCount():11614:11614 -> b
+    12:12:boolean isInitialized():11685 -> b
+    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias getTypeAlias(int):11620:11620 -> b
+    13:13:boolean isInitialized():11686 -> b
+    14:19:boolean isInitialized():11686:11691 -> b
+    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():11642:11642 -> b
+    20:20:boolean isInitialized():11692 -> b
+    21:30:boolean isInitialized():11692:11701 -> b
     1:1:java.util.List access$11100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):11384:11384 -> c
     2:2:java.util.List access$11102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,java.util.List):11384:11384 -> c
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder newBuilderForType():11823:11823 -> c
@@ -35217,38 +34619,36 @@
     1693:1711:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):16116 -> <init>
     1712:1724:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16276:16288 -> <init>
     1712:1724:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):16116 -> <init>
-    1:1:boolean hasReturnType():16390:16390 -> A
-    1:1:boolean hasReturnTypeId():16405:16405 -> B
-    1:1:boolean hasSetterFlags():16539:16539 -> C
-    1:1:boolean hasSetterValueParameter():16485:16485 -> D
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder newBuilder():16809:16809 -> E
-    1:12:void initFields():16583:16594 -> F
+    1:1:boolean hasSetterFlags():16539:16539 -> A
+    1:1:boolean hasSetterValueParameter():16485:16485 -> B
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder newBuilder():16809:16809 -> C
+    1:12:void initFields():16583:16594 -> D
     1:1:int access$15102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16116:16116 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$15402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):16116:16116 -> a
     3:3:java.util.List access$15600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):16116:16116 -> a
     4:4:java.util.List access$15602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,java.util.List):16116:16116 -> a
     5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter access$15902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):16116:16116 -> a
-    6:14:boolean isInitialized():16598:16606 -> a
-    15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReturnType():16396:16396 -> a
-    15:15:boolean isInitialized():16607 -> a
-    16:17:boolean isInitialized():16607:16608 -> a
-    18:18:int getTypeParameterCount():16433:16433 -> a
-    18:18:boolean isInitialized():16612 -> a
-    19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getTypeParameter(int):16439:16439 -> a
-    19:19:boolean isInitialized():16613 -> a
-    20:25:boolean isInitialized():16613:16618 -> a
-    26:26:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReceiverType():16461:16461 -> a
-    26:26:boolean isInitialized():16619 -> a
-    27:32:boolean isInitialized():16619:16624 -> a
-    33:33:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getSetterValueParameter():16491:16491 -> a
-    33:33:boolean isInitialized():16625 -> a
-    34:43:boolean isInitialized():16625:16634 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property getDefaultInstanceForType():16134:16134 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():16116 -> a
     1:1:int access$15202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16116:16116 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$15702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):16116:16116 -> b
     3:3:java.util.List access$16200(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):16116:16116 -> b
     4:4:java.util.List access$16202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,java.util.List):16116:16116 -> b
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property getDefaultInstanceForType():16134:16134 -> b
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():16116 -> b
+    5:13:boolean isInitialized():16598:16606 -> b
+    14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReturnType():16396:16396 -> b
+    14:14:boolean isInitialized():16607 -> b
+    15:16:boolean isInitialized():16607:16608 -> b
+    17:17:int getTypeParameterCount():16433:16433 -> b
+    17:17:boolean isInitialized():16612 -> b
+    18:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getTypeParameter(int):16439:16439 -> b
+    18:18:boolean isInitialized():16613 -> b
+    19:24:boolean isInitialized():16613:16618 -> b
+    25:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReceiverType():16461:16461 -> b
+    25:25:boolean isInitialized():16619 -> b
+    26:31:boolean isInitialized():16619:16624 -> b
+    32:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getSetterValueParameter():16491:16491 -> b
+    32:32:boolean isInitialized():16625 -> b
+    33:42:boolean isInitialized():16625:16634 -> b
     1:1:int access$15302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16116:16116 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$16400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):16116:16116 -> c
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder newBuilderForType():16810:16810 -> c
@@ -35260,26 +34660,28 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():16116 -> e
     1:1:int access$16002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16116:16116 -> f
     1:1:int access$16102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16116:16116 -> g
+    1:1:int getFlags():16351:16351 -> getFlags
+    1:1:int getName():16381:16381 -> getName
     1:1:int access$16302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16116:16116 -> h
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property getDefaultInstance():16130:16130 -> h
-    1:1:int getFlags():16351:16351 -> i
-    1:1:int getGetterFlags():16530:16530 -> j
-    1:1:int getName():16381:16381 -> k
-    1:1:int getOldFlags():16366:16366 -> l
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReceiverType():16461:16461 -> m
-    1:1:int getReceiverTypeId():16476:16476 -> n
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReturnType():16396:16396 -> o
-    1:1:int getReturnTypeId():16411:16411 -> p
-    1:1:int getSetterFlags():16545:16545 -> q
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getSetterValueParameter():16491:16491 -> r
-    1:1:java.util.List getTypeParameterList():16420:16420 -> s
-    1:1:java.util.List getVersionRequirementList():16559:16559 -> t
-    1:1:boolean hasFlags():16329:16329 -> u
-    1:1:boolean hasGetterFlags():16512:16512 -> v
-    1:1:boolean hasName():16375:16375 -> w
-    1:1:boolean hasOldFlags():16360:16360 -> x
-    1:1:boolean hasReceiverType():16455:16455 -> y
-    1:1:boolean hasReceiverTypeId():16470:16470 -> z
+    1:1:int getGetterFlags():16530:16530 -> i
+    1:1:int getOldFlags():16366:16366 -> j
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReceiverType():16461:16461 -> k
+    1:1:int getReceiverTypeId():16476:16476 -> l
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReturnType():16396:16396 -> m
+    1:1:int getReturnTypeId():16411:16411 -> n
+    1:1:int getSetterFlags():16545:16545 -> o
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getSetterValueParameter():16491:16491 -> p
+    1:1:java.util.List getTypeParameterList():16420:16420 -> q
+    1:1:java.util.List getVersionRequirementList():16559:16559 -> r
+    1:1:boolean hasFlags():16329:16329 -> s
+    1:1:boolean hasGetterFlags():16512:16512 -> t
+    1:1:boolean hasName():16375:16375 -> u
+    1:1:boolean hasOldFlags():16360:16360 -> v
+    1:1:boolean hasReceiverType():16455:16455 -> w
+    1:1:boolean hasReceiverTypeId():16470:16470 -> x
+    1:1:boolean hasReturnType():16390:16390 -> y
+    1:1:boolean hasReturnTypeId():16405:16405 -> z
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> a.a.a.a.k.b.a.b.a.ba:
     1:1:void <init>():16292:16292 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16297:16297 -> a
@@ -35456,44 +34858,43 @@
     3719:3734:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):4631 -> <init>
     3735:3744:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):4785:4794 -> <init>
     3735:3744:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):4631 -> <init>
-    1:1:boolean hasFlexibleUpperBound():5574:5574 -> A
-    1:1:boolean hasFlexibleUpperBoundId():5589:5589 -> B
-    1:1:boolean hasNullable():5534:5534 -> C
-    1:1:boolean hasOuterType():5694:5694 -> D
-    1:1:boolean hasOuterTypeId():5713:5713 -> E
-    1:1:boolean hasTypeAliasName():5670:5670 -> F
-    1:1:boolean hasTypeParameter():5623:5623 -> G
-    1:1:boolean hasTypeParameterName():5646:5646 -> H
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder newBuilder():6009:6009 -> I
-    1:3:void initFields():5776:5778 -> J
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getDefaultInstance():4645:4645 -> J
-    4:4:void initFields():5779 -> J
-    5:15:void initFields():5779:5789 -> J
+    1:1:boolean hasFlexibleUpperBoundId():5589:5589 -> A
+    1:1:boolean hasNullable():5534:5534 -> B
+    1:1:boolean hasOuterType():5694:5694 -> C
+    1:1:boolean hasOuterTypeId():5713:5713 -> D
+    1:1:boolean hasTypeAliasName():5670:5670 -> E
+    1:1:boolean hasTypeParameter():5623:5623 -> F
+    1:1:boolean hasTypeParameterName():5646:5646 -> G
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder newBuilder():6009:6009 -> H
+    1:3:void initFields():5776:5778 -> I
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getDefaultInstance():4645:4645 -> I
+    4:4:void initFields():5779 -> I
+    5:15:void initFields():5779:5789 -> I
     1:1:java.util.List access$5800(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):4631:4631 -> a
     2:2:java.util.List access$5802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,java.util.List):4631:4631 -> a
     3:3:boolean access$5902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,boolean):4631:4631 -> a
     4:4:int access$6002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,int):4631:4631 -> a
     5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$6102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):4631:4631 -> a
-    6:6:boolean isInitialized():5793:5793 -> a
-    7:7:int getArgumentCount():5512:5512 -> a
-    7:7:boolean isInitialized():5797 -> a
-    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument getArgument(int):5518:5518 -> a
-    8:8:boolean isInitialized():5798 -> a
-    9:14:boolean isInitialized():5798:5803 -> a
-    15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getFlexibleUpperBound():5580:5580 -> a
-    15:15:boolean isInitialized():5804 -> a
-    16:21:boolean isInitialized():5804:5809 -> a
-    22:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getOuterType():5704:5704 -> a
-    22:22:boolean isInitialized():5810 -> a
-    23:28:boolean isInitialized():5810:5815 -> a
-    29:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getAbbreviatedType():5734:5734 -> a
-    29:29:boolean isInitialized():5816 -> a
-    30:39:boolean isInitialized():5816:5825 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getDefaultInstanceForType():4649:4649 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():4631 -> a
     1:1:int access$6202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,int):4631:4631 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$6702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):4631:4631 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$7300(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):4631:4631 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getDefaultInstanceForType():4649:4649 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():4631 -> b
+    4:4:boolean isInitialized():5793:5793 -> b
+    5:5:int getArgumentCount():5512:5512 -> b
+    5:5:boolean isInitialized():5797 -> b
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument getArgument(int):5518:5518 -> b
+    6:6:boolean isInitialized():5798 -> b
+    7:12:boolean isInitialized():5798:5803 -> b
+    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getFlexibleUpperBound():5580:5580 -> b
+    13:13:boolean isInitialized():5804 -> b
+    14:19:boolean isInitialized():5804:5809 -> b
+    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getOuterType():5704:5704 -> b
+    20:20:boolean isInitialized():5810 -> b
+    21:26:boolean isInitialized():5810:5815 -> b
+    27:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getAbbreviatedType():5734:5734 -> b
+    27:27:boolean isInitialized():5816 -> b
+    28:37:boolean isInitialized():5816:5825 -> b
     1:1:int access$6302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,int):4631:4631 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$6902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):4631:4631 -> c
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder newBuilder():6009:6009 -> c
@@ -35508,6 +34909,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():4631 -> e
     1:1:int access$6602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,int):4631:4631 -> f
     1:1:int access$6802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,int):4631:4631 -> g
+    1:1:int getFlags():5772:5772 -> getFlags
     1:1:int access$7002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,int):4631:4631 -> h
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getAbbreviatedType():5734:5734 -> h
     1:1:int access$7102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,int):4631:4631 -> i
@@ -35515,21 +34917,21 @@
     1:1:int access$7202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,int):4631:4631 -> j
     2:2:int getClassName():5610:5610 -> j
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getDefaultInstance():4645:4645 -> k
-    1:1:int getFlags():5772:5772 -> l
-    1:1:int getFlexibleTypeCapabilitiesId():5565:5565 -> m
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getFlexibleUpperBound():5580:5580 -> n
-    1:1:int getFlexibleUpperBoundId():5595:5595 -> o
-    1:1:boolean getNullable():5540:5540 -> p
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getOuterType():5704:5704 -> q
-    1:1:int getOuterTypeId():5719:5719 -> r
-    1:1:int getTypeAliasName():5681:5681 -> s
-    1:1:int getTypeParameter():5633:5633 -> t
-    1:1:int getTypeParameterName():5656:5656 -> u
-    1:1:boolean hasAbbreviatedType():5728:5728 -> v
-    1:1:boolean hasAbbreviatedTypeId():5743:5743 -> w
-    1:1:boolean hasClassName():5604:5604 -> x
-    1:1:boolean hasFlags():5762:5762 -> y
-    1:1:boolean hasFlexibleTypeCapabilitiesId():5554:5554 -> z
+    1:1:int getFlexibleTypeCapabilitiesId():5565:5565 -> l
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getFlexibleUpperBound():5580:5580 -> m
+    1:1:int getFlexibleUpperBoundId():5595:5595 -> n
+    1:1:boolean getNullable():5540:5540 -> o
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getOuterType():5704:5704 -> p
+    1:1:int getOuterTypeId():5719:5719 -> q
+    1:1:int getTypeAliasName():5681:5681 -> r
+    1:1:int getTypeParameter():5633:5633 -> s
+    1:1:int getTypeParameterName():5656:5656 -> t
+    1:1:boolean hasAbbreviatedType():5728:5728 -> u
+    1:1:boolean hasAbbreviatedTypeId():5743:5743 -> v
+    1:1:boolean hasClassName():5604:5604 -> w
+    1:1:boolean hasFlags():5762:5762 -> x
+    1:1:boolean hasFlexibleTypeCapabilitiesId():5554:5554 -> y
+    1:1:boolean hasFlexibleUpperBound():5574:5574 -> z
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> a.a.a.a.k.b.a.b.a.fa:
     1:1:void <init>():4798:4798 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):4803:4803 -> a
@@ -35579,11 +34981,11 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$5202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):4854:4854 -> a
     3:3:int access$5302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument,int):4854:4854 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$5500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument):4854:4854 -> a
-    5:9:boolean isInitialized():5099:5103 -> a
-    10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getType():5074:5074 -> a
-    10:10:boolean isInitialized():5104 -> a
-    11:16:boolean isInitialized():5104:5109 -> a
     1:1:int access$5402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument,int):4854:4854 -> b
+    2:6:boolean isInitialized():5099:5103 -> b
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getType():5074:5074 -> b
+    7:7:boolean isInitialized():5104 -> b
+    8:13:boolean isInitialized():5104:5109 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder newBuilderForType():5212:5212 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():4854 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument):5214:5214 -> e
@@ -35645,10 +35047,10 @@
     1:2:void <init>(java.lang.String,int,int,int):5031:5032 -> <init>
     1:1:int getNumber():5005:5005 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection[] values():4967:4967 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5012:5012 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5011:5011 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5010:5010 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5009:5009 -> c
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5012:5012 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5011:5011 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5010:5010 -> b
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5009:5009 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$ArgumentOrBuilder -> a.a.a.a.k.b.a.b.a.ka:
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> a.a.a.a.k.b.a.b.a.la:
     int outerTypeId_ -> o
@@ -35803,29 +35205,29 @@
     2:2:java.util.List access$18100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):18839:18839 -> a
     3:3:java.util.List access$18102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,java.util.List):18839:18839 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$18202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18839:18839 -> a
-    5:10:boolean isInitialized():19230:19235 -> a
-    11:11:int getTypeParameterCount():19072:19072 -> a
-    11:11:boolean isInitialized():19238 -> a
-    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getTypeParameter(int):19078:19078 -> a
-    12:12:boolean isInitialized():19239 -> a
-    13:18:boolean isInitialized():19239:19244 -> a
-    19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getUnderlyingType():19100:19100 -> a
-    19:19:boolean isInitialized():19245 -> a
-    20:25:boolean isInitialized():19245:19250 -> a
-    26:26:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getExpandedType():19130:19130 -> a
-    26:26:boolean isInitialized():19251 -> a
-    27:28:boolean isInitialized():19251:19252 -> a
-    29:29:int getAnnotationCount():19167:19167 -> a
-    29:29:boolean isInitialized():19256 -> a
-    30:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation getAnnotation(int):19173:19173 -> a
-    30:30:boolean isInitialized():19257 -> a
-    31:40:boolean isInitialized():19257:19266 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias getDefaultInstanceForType():18857:18857 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():18839 -> a
     1:1:int access$18002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,int):18839:18839 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$18402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18839:18839 -> b
     3:3:java.util.List access$18600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):18839:18839 -> b
     4:4:java.util.List access$18602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,java.util.List):18839:18839 -> b
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias getDefaultInstanceForType():18857:18857 -> b
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():18839 -> b
+    5:10:boolean isInitialized():19230:19235 -> b
+    11:11:int getTypeParameterCount():19072:19072 -> b
+    11:11:boolean isInitialized():19238 -> b
+    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getTypeParameter(int):19078:19078 -> b
+    12:12:boolean isInitialized():19239 -> b
+    13:18:boolean isInitialized():19239:19244 -> b
+    19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getUnderlyingType():19100:19100 -> b
+    19:19:boolean isInitialized():19245 -> b
+    20:25:boolean isInitialized():19245:19250 -> b
+    26:26:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getExpandedType():19130:19130 -> b
+    26:26:boolean isInitialized():19251 -> b
+    27:28:boolean isInitialized():19251:19252 -> b
+    29:29:int getAnnotationCount():19167:19167 -> b
+    29:29:boolean isInitialized():19256 -> b
+    30:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation getAnnotation(int):19173:19173 -> b
+    30:30:boolean isInitialized():19257 -> b
+    31:40:boolean isInitialized():19257:19266 -> b
     1:1:int access$18302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,int):18839:18839 -> c
     2:2:java.util.List access$18700(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):18839:18839 -> c
     3:3:java.util.List access$18702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,java.util.List):18839:18839 -> c
@@ -35837,21 +35239,21 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19423:19423 -> e
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder toBuilder():19425 -> e
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():18839 -> e
+    1:1:int getFlags():19035:19035 -> getFlags
+    1:1:int getName():19050:19050 -> getName
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias getDefaultInstance():18853:18853 -> h
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getExpandedType():19130:19130 -> i
     1:1:int getExpandedTypeId():19145:19145 -> j
-    1:1:int getFlags():19035:19035 -> k
-    1:1:int getName():19050:19050 -> l
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getUnderlyingType():19100:19100 -> m
-    1:1:int getUnderlyingTypeId():19115:19115 -> n
-    1:1:boolean hasExpandedType():19124:19124 -> o
-    1:1:boolean hasExpandedTypeId():19139:19139 -> p
-    1:1:boolean hasFlags():19024:19024 -> q
-    1:1:boolean hasName():19044:19044 -> r
-    1:1:boolean hasUnderlyingType():19094:19094 -> s
-    1:1:boolean hasUnderlyingTypeId():19109:19109 -> t
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder newBuilder():19420:19420 -> u
-    1:9:void initFields():19218:19226 -> v
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getUnderlyingType():19100:19100 -> k
+    1:1:int getUnderlyingTypeId():19115:19115 -> l
+    1:1:boolean hasExpandedType():19124:19124 -> m
+    1:1:boolean hasExpandedTypeId():19139:19139 -> n
+    1:1:boolean hasFlags():19024:19024 -> o
+    1:1:boolean hasName():19044:19044 -> p
+    1:1:boolean hasUnderlyingType():19094:19094 -> q
+    1:1:boolean hasUnderlyingTypeId():19109:19109 -> r
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder newBuilder():19420:19420 -> s
+    1:9:void initFields():19218:19226 -> t
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> a.a.a.a.k.b.a.b.a.na:
     1:1:void <init>():18998:18998 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19003:19003 -> a
@@ -35978,17 +35380,17 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance access$8002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance):7076:7076 -> a
     4:4:java.util.List access$8100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):7076:7076 -> a
     5:5:java.util.List access$8102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,java.util.List):7076:7076 -> a
-    6:15:boolean isInitialized():7413:7422 -> a
-    16:16:int getUpperBoundCount():7364:7364 -> a
-    16:16:boolean isInitialized():7425 -> a
-    17:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getUpperBound(int):7370:7370 -> a
-    17:17:boolean isInitialized():7426 -> a
-    18:27:boolean isInitialized():7426:7435 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getDefaultInstanceForType():7094:7094 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():7076 -> a
     1:1:int access$7802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,int):7076:7076 -> b
     2:2:java.util.List access$8200(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):7076:7076 -> b
     3:3:java.util.List access$8202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,java.util.List):7076:7076 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getDefaultInstanceForType():7094:7094 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():7076 -> b
+    4:13:boolean isInitialized():7413:7422 -> b
+    14:14:int getUpperBoundCount():7364:7364 -> b
+    14:14:boolean isInitialized():7425 -> b
+    15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getUpperBound(int):7370:7370 -> b
+    15:15:boolean isInitialized():7426 -> b
+    16:25:boolean isInitialized():7426:7435 -> b
     1:1:int access$8302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,int):7076:7076 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$8400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):7076:7076 -> c
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder newBuilderForType():7578:7578 -> c
@@ -35996,17 +35398,17 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):7580:7580 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder toBuilder():7582 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():7076 -> e
+    1:1:int getName():7312:7312 -> getName
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getDefaultInstance():7090:7090 -> h
     1:1:int getId():7297:7297 -> i
-    1:1:int getName():7312:7312 -> j
-    1:1:boolean getReified():7327:7327 -> k
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance getVariance():7342:7342 -> l
-    1:1:boolean hasId():7291:7291 -> m
-    1:1:boolean hasName():7306:7306 -> n
-    1:1:boolean hasReified():7321:7321 -> o
-    1:1:boolean hasVariance():7336:7336 -> p
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder newBuilder():7577:7577 -> q
-    1:6:void initFields():7404:7409 -> r
+    1:1:boolean getReified():7327:7327 -> j
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance getVariance():7342:7342 -> k
+    1:1:boolean hasId():7291:7291 -> l
+    1:1:boolean hasName():7306:7306 -> m
+    1:1:boolean hasReified():7321:7321 -> n
+    1:1:boolean hasVariance():7336:7336 -> o
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder newBuilder():7577:7577 -> p
+    1:6:void initFields():7404:7409 -> q
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> a.a.a.a.k.b.a.b.a.sa:
     1:1:void <init>():7205:7205 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):7210:7210 -> a
@@ -36065,9 +35467,9 @@
     1:2:void <init>(java.lang.String,int,int,int):7277:7278 -> <init>
     1:1:int getNumber():7252:7252 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance[] values():7222:7222 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7258:7258 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7257:7257 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7256:7256 -> c
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7258:7258 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7257:7257 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7256:7256 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameterOrBuilder -> a.a.a.a.k.b.a.b.a.wa:
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> a.a.a.a.k.b.a.b.a.za:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
@@ -36107,14 +35509,14 @@
     1:1:java.util.List access$11900(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12551:12551 -> a
     2:2:java.util.List access$11902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable,java.util.List):12551:12551 -> a
     3:3:int access$12002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable,int):12551:12551 -> a
-    4:4:boolean isInitialized():12714:12714 -> a
-    5:5:int getTypeCount():12667:12667 -> a
-    5:5:boolean isInitialized():12718 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getType(int):12673:12673 -> a
-    6:6:boolean isInitialized():12719 -> a
-    7:12:boolean isInitialized():12719:12724 -> a
     1:1:int access$12102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable,int):12551:12551 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$12200(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12551:12551 -> b
+    3:3:boolean isInitialized():12714:12714 -> b
+    4:4:int getTypeCount():12667:12667 -> b
+    4:4:boolean isInitialized():12718 -> b
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getType(int):12673:12673 -> b
+    5:5:boolean isInitialized():12719 -> b
+    6:11:boolean isInitialized():12719:12724 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder newBuilder():12819:12819 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12822 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12822:12822 -> c
@@ -36219,20 +35621,20 @@
     1:1:int access$16802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,int):17873:17873 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$17002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17873:17873 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$17500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):17873:17873 -> a
-    4:12:boolean isInitialized():18115:18123 -> a
-    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getType():18057:18057 -> a
-    13:13:boolean isInitialized():18124 -> a
-    14:19:boolean isInitialized():18124:18129 -> a
-    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getVarargElementType():18087:18087 -> a
-    20:20:boolean isInitialized():18130 -> a
-    21:30:boolean isInitialized():18130:18139 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getDefaultInstanceForType():17891:17891 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():17873 -> a
     1:1:int access$16902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,int):17873:17873 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$17202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17873:17873 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getDefaultInstanceForType():17891:17891 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():17873 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder():18267:18267 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18270 -> b
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18270:18270 -> b
+    3:11:boolean isInitialized():18115:18123 -> b
+    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getType():18057:18057 -> b
+    12:12:boolean isInitialized():18124 -> b
+    13:18:boolean isInitialized():18124:18129 -> b
+    19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getVarargElementType():18087:18087 -> b
+    19:19:boolean isInitialized():18130 -> b
+    20:29:boolean isInitialized():18130:18139 -> b
+    30:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder():18267:18267 -> b
+    30:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18270 -> b
+    31:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18270:18270 -> b
     1:1:int access$17102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,int):17873:17873 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilderForType():18268:18268 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():17873 -> c
@@ -36240,21 +35642,21 @@
     1:1:int access$17402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,int):17873:17873 -> e
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():17873:17873 -> e
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder toBuilder():18272:18272 -> e
+    1:1:int getFlags():18027:18027 -> getFlags
+    1:1:int getName():18042:18042 -> getName
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getDefaultInstance():17887:17887 -> h
-    1:1:int getFlags():18027:18027 -> i
-    1:1:int getName():18042:18042 -> j
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getType():18057:18057 -> k
-    1:1:int getTypeId():18072:18072 -> l
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getVarargElementType():18087:18087 -> m
-    1:1:int getVarargElementTypeId():18102:18102 -> n
-    1:1:boolean hasFlags():18014:18014 -> o
-    1:1:boolean hasName():18036:18036 -> p
-    1:1:boolean hasType():18051:18051 -> q
-    1:1:boolean hasTypeId():18066:18066 -> r
-    1:1:boolean hasVarargElementType():18081:18081 -> s
-    1:1:boolean hasVarargElementTypeId():18096:18096 -> t
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder():18267:18267 -> u
-    1:6:void initFields():18106:18111 -> v
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getType():18057:18057 -> i
+    1:1:int getTypeId():18072:18072 -> j
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getVarargElementType():18087:18087 -> k
+    1:1:int getVarargElementTypeId():18102:18102 -> l
+    1:1:boolean hasFlags():18014:18014 -> m
+    1:1:boolean hasName():18036:18036 -> n
+    1:1:boolean hasType():18051:18051 -> o
+    1:1:boolean hasTypeId():18066:18066 -> p
+    1:1:boolean hasVarargElementType():18081:18081 -> q
+    1:1:boolean hasVarargElementTypeId():18096:18096 -> r
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder():18267:18267 -> s
+    1:6:void initFields():18106:18111 -> t
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> a.a.a.a.k.b.a.b.a.Ba:
     1:1:void <init>():17986:17986 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):17991:17991 -> a
@@ -36373,8 +35775,8 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level access$20102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level):20750:20750 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind access$20402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind):20750:20750 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$20600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):20750:20750 -> a
-    5:9:boolean isInitialized():21161:21165 -> a
     1:1:int access$20002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement,int):20750:20750 -> b
+    2:6:boolean isInitialized():21161:21165 -> b
     1:1:int access$20202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement,int):20750:20750 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder newBuilderForType():21289:21289 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():20750 -> c
@@ -36457,9 +35859,9 @@
     10:10:void <clinit>():20877:20877 -> <clinit>
     1:2:void <init>(java.lang.String,int,int,int):20932:20933 -> <init>
     1:1:int getNumber():20907:20907 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):20913:20913 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):20912:20912 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):20911:20911 -> c
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):20913:20913 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):20912:20912 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):20911:20911 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> a.a.a.a.k.b.a.b.a.Ia:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind COMPILER_VERSION -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind LANGUAGE_VERSION -> b
@@ -36471,9 +35873,9 @@
     1:2:void <init>(java.lang.String,int,int,int):20997:20998 -> <init>
     1:1:int getNumber():20972:20972 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind[] values():20942:20942 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):20978:20978 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):20977:20977 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):20976:20976 -> c
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):20978:20978 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):20977:20977 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):20976:20976 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementOrBuilder -> a.a.a.a.k.b.a.b.a.Ka:
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> a.a.a.a.k.b.a.b.a.Na:
     java.util.List requirement_ -> b
@@ -36503,8 +35905,8 @@
     394:401:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):21770 -> <init>
     1:1:java.util.List access$21000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):21770:21770 -> a
     2:2:java.util.List access$21002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable,java.util.List):21770:21770 -> a
-    3:7:boolean isInitialized():21901:21905 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$21100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):21770:21770 -> b
+    2:6:boolean isInitialized():21901:21905 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder newBuilder():21993:21993 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):21996 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):21996:21996 -> c
@@ -36726,11 +36128,11 @@
     410:414:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):2594 -> <init>
     1:1:int access$2702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature,int):2594:2594 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$3000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2594:2594 -> a
-    3:7:boolean isInitialized():2729:2733 -> a
     1:1:int access$2802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature,int):2594:2594 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder():2828:2828 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2831 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2831:2831 -> b
+    2:6:boolean isInitialized():2729:2733 -> b
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder():2828:2828 -> b
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2831 -> b
+    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2831:2831 -> b
     1:1:int access$2902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature,int):2594:2594 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilderForType():2829:2829 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():2594 -> c
@@ -36738,11 +36140,11 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder toBuilder():2833:2833 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature getDefaultInstance():2607:2607 -> f
     1:1:int getDesc():2720:2720 -> g
-    1:1:int getName():2697:2697 -> h
-    1:1:boolean hasDesc():2710:2710 -> i
-    1:1:boolean hasName():2691:2691 -> j
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder():2828:2828 -> k
-    1:2:void initFields():2724:2725 -> l
+    1:1:int getName():2697:2697 -> getName
+    1:1:boolean hasDesc():2710:2710 -> h
+    1:1:boolean hasName():2691:2691 -> i
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder():2828:2828 -> j
+    1:2:void initFields():2724:2725 -> k
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> a.a.a.a.k.b.a.b.a.b.b:
     1:1:void <init>():2670:2670 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2675:2675 -> a
@@ -36817,11 +36219,11 @@
     410:414:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):2132 -> <init>
     1:1:int access$2002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature,int):2132:2132 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$2300(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2132:2132 -> a
-    3:7:boolean isInitialized():2267:2271 -> a
     1:1:int access$2102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature,int):2132:2132 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder():2366:2366 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2369 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2369:2369 -> b
+    2:6:boolean isInitialized():2267:2271 -> b
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder():2366:2366 -> b
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2369 -> b
+    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2369:2369 -> b
     1:1:int access$2202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature,int):2132:2132 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilderForType():2367:2367 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():2132 -> c
@@ -36830,11 +36232,11 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():2132 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getDefaultInstance():2145:2145 -> f
     1:1:int getDesc():2258:2258 -> g
-    1:1:int getName():2235:2235 -> h
-    1:1:boolean hasDesc():2248:2248 -> i
-    1:1:boolean hasName():2229:2229 -> j
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder():2366:2366 -> k
-    1:2:void initFields():2262:2263 -> l
+    1:1:int getName():2235:2235 -> getName
+    1:1:boolean hasDesc():2248:2248 -> h
+    1:1:boolean hasName():2229:2229 -> i
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder():2366:2366 -> j
+    1:2:void initFields():2262:2263 -> k
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> a.a.a.a.k.b.a.b.a.b.f:
     1:1:void <init>():2208:2208 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2213:2213 -> a
@@ -36905,8 +36307,8 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$3502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3074:3074 -> a
     3:3:int access$3802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature,int):3074:3074 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$3900(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3074:3074 -> a
-    5:9:boolean isInitialized():3283:3287 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$3602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3074:3074 -> b
+    2:6:boolean isInitialized():3283:3287 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$3702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3074:3074 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder newBuilderForType():3397:3397 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():3074 -> c
@@ -37005,9 +36407,9 @@
     4747:4757:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):70 -> <init>
     1:1:java.util.List access$1400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):70:70 -> a
     2:2:java.util.List access$1402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes,java.util.List):70:70 -> a
-    3:7:boolean isInitialized():1638:1642 -> a
     1:1:java.util.List access$1500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):70:70 -> b
     2:2:java.util.List access$1502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes,java.util.List):70:70 -> b
+    3:7:boolean isInitialized():1638:1642 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$1600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):70:70 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder newBuilderForType():1752:1752 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():70 -> c
@@ -37132,10 +36534,10 @@
     3:3:java.lang.Object access$602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record,java.lang.Object):328:328 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation access$702(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$Operation):328:328 -> a
     5:5:java.util.List access$802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record,java.util.List):328:328 -> a
-    6:10:boolean isInitialized():782:786 -> a
     1:1:int access$402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record,int):328:328 -> b
     2:2:java.lang.Object access$600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):328:328 -> b
     3:3:java.util.List access$902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record,java.util.List):328:328 -> b
+    4:8:boolean isInitialized():782:786 -> b
     1:1:int access$502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record,int):328:328 -> c
     2:2:java.util.List access$800(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):328:328 -> c
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder newBuilderForType():938:938 -> c
@@ -37214,9 +36616,9 @@
     1:2:void <init>(java.lang.String,int,int,int):562:563 -> <init>
     1:1:int getNumber():537:537 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation[] values():487:487 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):543:543 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):542:542 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):541:541 -> c
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):543:543 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):542:542 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):541:541 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$RecordOrBuilder -> a.a.a.a.k.b.a.b.a.b.t:
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypesOrBuilder -> a.a.a.a.k.b.a.b.a.b.v:
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding -> a.a.a.a.k.b.a.b.a.b.a.a:
@@ -37237,23 +36639,24 @@
     1:2:java.lang.String[] dropMarker(java.lang.String[]):199:200 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite -> a.a.a.a.k.b.a.b.a.b.a.c:
     java.util.Map map -> a
-    1:10:void <clinit>():20:29 -> <clinit>
-    11:11:void <clinit>():21:21 -> <clinit>
-    12:166:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.getIndices(java.util.Collection):0:154 -> <clinit>
-    12:166:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.getIndices(java.util.Collection):0 -> <clinit>
-    12:166:void <clinit>():32 -> <clinit>
-    167:622:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):0:455 -> <clinit>
-    167:622:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):0 -> <clinit>
-    167:622:void <clinit>():32 -> <clinit>
-    623:623:void com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt__RangesKt.checkStepIsPositive(boolean,java.lang.Number):0:0 -> <clinit>
-    623:623:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):455 -> <clinit>
-    623:623:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):0 -> <clinit>
-    623:623:void <clinit>():32 -> <clinit>
-    624:624:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):456:456 -> <clinit>
-    624:624:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):0 -> <clinit>
-    624:624:void <clinit>():32 -> <clinit>
-    625:660:void <clinit>():32:67 -> <clinit>
-    661:661:void <clinit>():20:20 -> <clinit>
+    1:15:void <clinit>():15:29 -> <clinit>
+    16:16:void <clinit>():21:21 -> <clinit>
+    17:171:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.getIndices(java.util.Collection):0:154 -> <clinit>
+    17:171:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.getIndices(java.util.Collection):0 -> <clinit>
+    17:171:void <clinit>():32 -> <clinit>
+    172:627:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):0:455 -> <clinit>
+    172:627:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):0 -> <clinit>
+    172:627:void <clinit>():32 -> <clinit>
+    628:628:void com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt__RangesKt.checkStepIsPositive(boolean,java.lang.Number):0:0 -> <clinit>
+    628:628:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):455 -> <clinit>
+    628:628:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):0 -> <clinit>
+    628:628:void <clinit>():32 -> <clinit>
+    629:629:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):456:456 -> <clinit>
+    629:629:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):0 -> <clinit>
+    629:629:void <clinit>():32 -> <clinit>
+    630:665:void <clinit>():32:67 -> <clinit>
+    666:666:void <clinit>():20:20 -> <clinit>
+    1:1:void <init>():15:15 -> <init>
     1:1:java.lang.String mapClass(java.lang.String):76:76 -> a
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite$map$1$1 -> a.a.a.a.k.b.a.b.a.b.a.b:
     java.util.Map receiver$0 -> a
@@ -37533,16 +36936,16 @@
     1:1:void <clinit>():765:765 -> <clinit>
     1:7:void <init>(int):783:789 -> <init>
     8:8:void <init>(int):785:785 -> <init>
-    1:1:int size():872:872 -> a
-    2:10:void flushFullBuffer(int):898:906 -> a
-    1:1:void flushLastBuffer():914:914 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> b
-    2:3:byte[] copyArray(byte[],int):835:836 -> b
-    2:3:void flushLastBuffer():916 -> b
-    2:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> b
-    4:18:void flushLastBuffer():917:931 -> b
-    4:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> b
-    19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():828:828 -> b
+    1:9:void flushFullBuffer(int):898:906 -> a
+    10:10:void flushLastBuffer():914:914 -> a
+    10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> a
+    11:12:byte[] copyArray(byte[],int):835:836 -> a
+    11:12:void flushLastBuffer():916 -> a
+    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> a
+    13:27:void flushLastBuffer():917:931 -> a
+    13:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> a
+    28:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():828:828 -> a
+    1:1:int size():872:872 -> size
     1:1:java.lang.String toString():888:888 -> toString
     1:4:void write(int):794:797 -> write
     5:19:void write(byte[],int,int):802:816 -> write
@@ -38081,8 +37484,8 @@
     1:3:byte nextByte():330:332 -> nextByte
     1:1:void remove():337:337 -> remove
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> a.a.a.a.k.b.a.b.b.F:
-    boolean isInitialized() -> a
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType() -> b
+    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 -> a.a.a.a.k.b.a.b.b.G:
     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 -> a.a.a.a.k.b.a.b.b.L:
@@ -38274,7 +37677,7 @@
     int pos -> a
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap):532:534 -> <init>
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1):532 -> <init>
-    1:4:java.util.Iterator getOverflowIterator():577:580 -> e
+    1:4:java.util.Iterator getOverflowIterator():577:580 -> d
     1:1:boolean hasNext():540:540 -> hasNext
     1:7:java.util.Map$Entry next():546:552 -> next
     1:7:java.lang.Object next():532 -> next
@@ -38777,7 +38180,7 @@
     com.android.tools.r8.com.google.common.collect.HashBasedTable paramHints -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBasedTable,com.android.tools.r8.graph.DexClass):98:98 -> <init>
     2:8:void <init>(com.android.tools.r8.com.google.common.collect.HashBasedTable,com.android.tools.r8.graph.DexClass):93:99 -> <init>
-    9:9:boolean com.android.tools.r8.graph.DexClass.isEnum():558:558 -> <init>
+    9:9:boolean com.android.tools.r8.graph.DexClass.isEnum():556:556 -> <init>
     9:9:void <init>(com.android.tools.r8.com.google.common.collect.HashBasedTable,com.android.tools.r8.graph.DexClass):103 -> <init>
     10:13:void <init>(com.android.tools.r8.com.google.common.collect.HashBasedTable,com.android.tools.r8.graph.DexClass):105:108 -> <init>
     1:1:int access$400(com.android.tools.r8.kotlin.NonNullParameterHintCollector$ConstructorVisitor):90:90 -> a
@@ -38847,49 +38250,47 @@
     java.util.Map signatureMap -> b
     com.android.tools.r8.com.google.common.collect.ImmutableMap classNameMappings -> a
     1:1:void <clinit>():37:37 -> <clinit>
-    1:1:void <init>(java.util.Map):108:108 -> <init>
+    1:1:void <init>(java.util.Map):104:104 -> <init>
     1:1:void <init>(java.util.Map,com.android.tools.r8.naming.ClassNameMapper$1):37 -> <init>
-    2:9:void <init>(java.util.Map):106:113 -> <init>
+    2:9:void <init>(java.util.Map):102:109 -> <init>
     2:9:void <init>(java.util.Map,com.android.tools.r8.naming.ClassNameMapper$1):37 -> <init>
     1:1:com.android.tools.r8.naming.ClassNameMapper$Builder builder():67:67 -> a
-    2:5:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):126:129 -> a
-    6:6:java.lang.String deobfuscateType(java.lang.String):158:158 -> a
-    6:6:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):129 -> a
-    7:9:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):129:131 -> a
-    10:10:java.lang.String deobfuscateType(java.lang.String):158:158 -> a
-    10:10:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):131 -> a
-    11:11:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):133:133 -> a
-    12:16:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):117:121 -> a
-    12:16:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):135 -> a
-    17:17:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):135:135 -> a
-    18:18:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):139:139 -> a
-    19:19:java.lang.String deobfuscateType(java.lang.String):158:158 -> a
-    19:19:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):139 -> a
-    20:20:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):140:140 -> a
-    21:25:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):117:121 -> a
-    21:25:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):140 -> a
-    26:26:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):140:140 -> a
-    27:31:java.lang.String deobfuscateClassName(java.lang.String):150:154 -> a
-    32:36:void write(java.io.Writer):180:184 -> a
-    37:37:java.lang.String lambda$write$0(com.android.tools.r8.naming.ClassNamingForNameMapper):182:182 -> a
-    38:45:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):223:230 -> a
-    46:55:java.lang.String lookupName(com.android.tools.r8.naming.MemberNaming$Signature,com.android.tools.r8.graph.DexType):235:244 -> a
-    56:56:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):276:276 -> a
-    57:57:java.lang.String deobfuscateType(java.lang.String):158:158 -> a
-    57:57:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):276 -> a
-    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper getClassNaming(java.lang.String):174:174 -> b
-    2:12:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):248:258 -> b
-    13:23:com.android.tools.r8.naming.MemberNaming$FieldSignature originalSignatureOf(com.android.tools.r8.graph.DexField):262:272 -> b
-    1:1:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):91:91 -> c
-    2:3:java.io.BufferedReader com.android.tools.r8.com.google.common.io.CharSource.openBufferedStream():113:114 -> c
-    2:3:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):91 -> c
-    4:8:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader):96:100 -> c
-    4:8:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):91 -> c
-    9:13:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader):96:100 -> c
-    9:13:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):91 -> c
-    1:2:boolean equals(java.lang.Object):213:214 -> equals
-    1:1:int hashCode():219:219 -> hashCode
-    1:5:java.lang.String toString():191:195 -> toString
+    2:5:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):122:125 -> a
+    6:6:java.lang.String deobfuscateType(java.lang.String):154:154 -> a
+    6:6:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):125 -> a
+    7:9:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):125:127 -> a
+    10:10:java.lang.String deobfuscateType(java.lang.String):154:154 -> a
+    10:10:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):127 -> a
+    11:11:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):129:129 -> a
+    12:16:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):113:117 -> a
+    12:16:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):131 -> a
+    17:17:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):131:131 -> a
+    18:18:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):135:135 -> a
+    19:19:java.lang.String deobfuscateType(java.lang.String):154:154 -> a
+    19:19:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):135 -> a
+    20:20:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):136:136 -> a
+    21:25:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):113:117 -> a
+    21:25:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):136 -> a
+    26:26:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):136:136 -> a
+    27:31:java.lang.String deobfuscateClassName(java.lang.String):146:150 -> a
+    32:36:void write(java.io.Writer):176:180 -> a
+    37:37:java.lang.String lambda$write$0(com.android.tools.r8.naming.ClassNamingForNameMapper):178:178 -> a
+    38:45:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):219:226 -> a
+    46:55:java.lang.String lookupName(com.android.tools.r8.naming.MemberNaming$Signature,com.android.tools.r8.graph.DexType):231:240 -> a
+    56:56:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):272:272 -> a
+    57:57:java.lang.String deobfuscateType(java.lang.String):154:154 -> a
+    57:57:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):272 -> a
+    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper getClassNaming(java.lang.String):170:170 -> b
+    2:12:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):244:254 -> b
+    13:23:com.android.tools.r8.naming.MemberNaming$FieldSignature originalSignatureOf(com.android.tools.r8.graph.DexField):258:268 -> b
+    1:2:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):95:96 -> c
+    3:8:com.android.tools.r8.naming.ClassNameMapper mapperFromInputStream(java.io.InputStream):71:76 -> c
+    3:8:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):95 -> c
+    9:13:com.android.tools.r8.naming.ClassNameMapper mapperFromInputStream(java.io.InputStream):72:76 -> c
+    9:13:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):95 -> c
+    1:2:boolean equals(java.lang.Object):209:210 -> equals
+    1:1:int hashCode():215:215 -> hashCode
+    1:5:java.lang.String toString():187:191 -> toString
 com.android.tools.r8.naming.ClassNameMapper$1 -> a.a.a.a.m.b:
 com.android.tools.r8.naming.ClassNameMapper$Builder -> a.a.a.a.m.c:
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder mapBuilder -> a
@@ -38900,97 +38301,104 @@
     4:4:com.android.tools.r8.naming.ClassNameMapper build():62:62 -> a
 com.android.tools.r8.naming.ClassNameMinifier -> a.a.a.a.m.j:
     boolean keepInnerClassStructure -> n
-    boolean $assertionsDisabled -> p
     com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.naming.ClassNameMinifier$Namespace topLevelState -> o
+    com.android.tools.r8.naming.ClassNameMinifier$Namespace topLevelState -> q
     java.lang.Iterable classes -> d
+    boolean $assertionsDisabled -> r
     java.util.Set noObfuscationPrefixes -> g
     com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy classNamingStrategy -> b
     java.util.Set usedPackagePrefixes -> h
     java.util.Set usedTypeNames -> i
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode packageObfuscationMode -> e
     com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy packageNamingStrategy -> c
+    java.util.Set noObfuscationTypes -> o
     boolean isAccessModificationAllowed -> f
     java.util.Map renaming -> j
+    java.util.Set keepPackageName -> p
     java.util.Map states -> k
     java.util.List classDictionary -> m
     java.util.List packageDictionary -> l
     1:1:void <clinit>():40:40 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy,com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy,java.lang.Iterable):64:64 -> <init>
-    2:37:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy,com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy,java.lang.Iterable):48:83 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy,com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy,java.lang.Iterable):68:68 -> <init>
+    2:43:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy,com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy,java.lang.Iterable):48:89 -> <init>
+    44:44:void com.android.tools.r8.naming.ClassNameMinifier$Namespace.<init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String):357:357 -> <init>
+    44:44:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy,com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy,java.lang.Iterable):89 -> <init>
+    45:47:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy,com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy,java.lang.Iterable):89:91 -> <init>
     1:1:java.util.List access$100(com.android.tools.r8.naming.ClassNameMinifier):40:40 -> a
-    2:31:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing,java.util.Map):103:132 -> a
-    32:54:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing,java.util.Map):129:151 -> a
-    55:63:java.util.Map getPackageRenaming():155:163 -> a
-    55:63:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing,java.util.Map):151 -> a
-    64:64:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing,java.util.Map):151:151 -> a
-    65:66:void renameDanglingTypes(com.android.tools.r8.graph.DexClass):167:168 -> a
-    67:67:void renameDanglingTypesInField(com.android.tools.r8.graph.DexEncodedField):172:172 -> a
-    68:71:void renameDanglingTypesInMethod(com.android.tools.r8.graph.DexEncodedMethod):176:179 -> a
-    72:75:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):265:268 -> a
-    76:80:java.lang.String getInnerNameForType(com.android.tools.r8.graph.DexType):256:260 -> a
-    76:80:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):272 -> a
-    81:81:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):272:272 -> a
-    82:84:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):271:273 -> a
-    85:101:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForOuterClass(com.android.tools.r8.graph.DexType,java.lang.String):337:353 -> a
-    85:101:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):274 -> a
-    102:104:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):278:280 -> a
-    105:109:java.lang.String getParentPackagePrefix(java.lang.String):471:475 -> a
-    110:111:boolean isNotKotlinMetadata(com.android.tools.r8.graph.DexAnnotation):479:480 -> a
+    2:35:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing):107:140 -> a
+    36:44:java.util.Map getPackageRenaming():144:152 -> a
+    36:44:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing):140 -> a
+    45:45:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing):140:140 -> a
+    46:47:void renameDanglingTypes(com.android.tools.r8.graph.DexClass):156:157 -> a
+    48:48:void renameDanglingTypesInField(com.android.tools.r8.graph.DexEncodedField):161:161 -> a
+    49:52:void renameDanglingTypesInMethod(com.android.tools.r8.graph.DexEncodedMethod):165:168 -> a
+    53:56:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):244:247 -> a
+    57:73:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForOuterClass(com.android.tools.r8.graph.DexType):311:327 -> a
+    57:73:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):249 -> a
+    74:76:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):253:255 -> a
+    77:81:java.lang.String getParentPackagePrefix(java.lang.String):443:447 -> a
+    82:83:boolean isNotKotlinMetadata(com.android.tools.r8.graph.DexAnnotation):451:452 -> a
     1:1:java.util.List access$200(com.android.tools.r8.naming.ClassNameMinifier):40:40 -> b
-    2:22:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):230:250 -> b
-    23:40:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForPackagePrefix(java.lang.String):314:331 -> b
+    2:20:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):218:236 -> b
+    21:37:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForPackagePrefix(java.lang.String):288:304 -> b
+    38:38:void com.android.tools.r8.naming.ClassNameMinifier$Namespace.<init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String):357:357 -> b
+    38:38:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForPackagePrefix(java.lang.String):304 -> b
+    39:39:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForPackagePrefix(java.lang.String):305:305 -> b
     1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.naming.ClassNameMinifier):40:40 -> c
-    2:22:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):284:304 -> c
-    23:23:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):300:300 -> c
-    24:24:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):296:296 -> c
-    25:25:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):290:290 -> c
-    26:26:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForClass$0(java.lang.String):290:290 -> c
+    2:21:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):259:278 -> c
+    22:22:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):274:274 -> c
+    23:23:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):270:270 -> c
+    24:24:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):264:264 -> c
+    25:25:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForClass$0(java.lang.String):264:264 -> c
+    26:26:void com.android.tools.r8.naming.ClassNameMinifier$Namespace.<init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String):357:357 -> c
+    26:26:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForClass$0(java.lang.String):264 -> c
     1:1:java.util.Set access$400(com.android.tools.r8.naming.ClassNameMinifier):40:40 -> d
-    2:3:void registerClassAsUsed(com.android.tools.r8.graph.DexType):196:197 -> d
+    2:3:void registerClassAsUsed(com.android.tools.r8.graph.DexType):185:186 -> d
     4:4:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> d
-    4:4:void registerClassAsUsed(com.android.tools.r8.graph.DexType):198 -> d
-    5:5:void registerClassAsUsed(com.android.tools.r8.graph.DexType):198:198 -> d
-    6:12:void registerPackagePrefixesAsUsed(java.lang.String):219:225 -> d
-    6:12:void registerClassAsUsed(com.android.tools.r8.graph.DexType):197 -> d
-    13:21:void registerClassAsUsed(com.android.tools.r8.graph.DexType):199:207 -> d
-    22:23:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForClass$1(java.lang.String):305:306 -> d
+    4:4:void registerClassAsUsed(com.android.tools.r8.graph.DexType):187 -> d
+    5:5:void registerClassAsUsed(com.android.tools.r8.graph.DexType):187:187 -> d
+    6:12:void registerPackagePrefixesAsUsed(java.lang.String):207:213 -> d
+    6:12:void registerClassAsUsed(com.android.tools.r8.graph.DexType):186 -> d
+    13:20:void registerClassAsUsed(com.android.tools.r8.graph.DexType):188:195 -> d
+    21:22:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForClass$1(java.lang.String):279:280 -> d
+    23:23:void com.android.tools.r8.naming.ClassNameMinifier$Namespace.<init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String):357:357 -> d
+    23:23:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForClass$1(java.lang.String):280 -> d
     1:1:com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy access$500(com.android.tools.r8.naming.ClassNameMinifier):40:40 -> e
-    2:2:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForPackagePrefix$2(java.lang.String):321:321 -> e
-    3:7:void renameArrayTypeIfNeeded(com.android.tools.r8.graph.DexType):359:363 -> e
-    8:8:int com.android.tools.r8.graph.DexString.numberOfLeadingSquareBrackets():64:64 -> e
-    8:8:void renameArrayTypeIfNeeded(com.android.tools.r8.graph.DexType):363 -> e
-    9:15:void renameArrayTypeIfNeeded(com.android.tools.r8.graph.DexType):364:370 -> e
+    2:2:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForPackagePrefix$2(java.lang.String):295:295 -> e
+    3:3:void com.android.tools.r8.naming.ClassNameMinifier$Namespace.<init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String):357:357 -> e
+    3:3:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForPackagePrefix$2(java.lang.String):295 -> e
+    4:8:void renameArrayTypeIfNeeded(com.android.tools.r8.graph.DexType):333:337 -> e
+    9:9:int com.android.tools.r8.graph.DexString.numberOfLeadingSquareBrackets():64:64 -> e
+    9:9:void renameArrayTypeIfNeeded(com.android.tools.r8.graph.DexType):337 -> e
+    10:16:void renameArrayTypeIfNeeded(com.android.tools.r8.graph.DexType):338:344 -> e
     1:1:com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy access$600(com.android.tools.r8.naming.ClassNameMinifier):40:40 -> f
-    2:9:void renameDanglingType(com.android.tools.r8.graph.DexType):184:191 -> f
+    2:9:void renameDanglingType(com.android.tools.r8.graph.DexType):173:180 -> f
     1:1:java.util.Set access$700(com.android.tools.r8.naming.ClassNameMinifier):40:40 -> g
 com.android.tools.r8.naming.ClassNameMinifier$1 -> a.a.a.a.m.e:
     int[] $SwitchMap$com$android$tools$r8$utils$InternalOptions$PackageObfuscationMode -> a
-    1:1:void <clinit>():293:293 -> <clinit>
+    1:1:void <clinit>():267:267 -> <clinit>
 com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy -> a.a.a.a.m.f:
     boolean bypassDictionary() -> a
     com.android.tools.r8.graph.DexString next(com.android.tools.r8.naming.ClassNameMinifier$Namespace,com.android.tools.r8.graph.DexType,char[]) -> a
-    java.util.Set noObfuscation() -> b
 com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming -> a.a.a.a.m.g:
     java.util.Map packageRenaming -> a
     java.util.Map classRenaming -> b
-    1:3:void <init>(java.util.Map,java.util.Map):91:93 -> <init>
-    1:3:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.naming.ClassNameMinifier$1):86 -> <init>
+    1:3:void <init>(java.util.Map,java.util.Map):99:101 -> <init>
+    1:3:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.naming.ClassNameMinifier$1):94 -> <init>
 com.android.tools.r8.naming.ClassNameMinifier$Namespace -> a.a.a.a.m.h:
     java.util.Iterator classDictionaryIterator -> d
     char[] packagePrefix -> b
     java.util.Iterator packageDictionaryIterator -> c
     com.android.tools.r8.naming.ClassNameMinifier this$0 -> e
     java.lang.String packageName -> a
-    1:1:void <init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String):383:383 -> <init>
-    2:14:void <init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String,java.lang.String):386:398 -> <init>
-    1:1:java.lang.String getPackageName():402:402 -> a
-    2:7:com.android.tools.r8.graph.DexString nextSuggestedNameForClass(com.android.tools.r8.graph.DexType):406:411 -> a
-    2:7:com.android.tools.r8.graph.DexString nextTypeName(com.android.tools.r8.graph.DexType):418 -> a
-    8:9:com.android.tools.r8.graph.DexString nextTypeName(com.android.tools.r8.graph.DexType):419:420 -> a
-    1:6:java.lang.String nextSuggestedNameForSubpackage():429:434 -> b
-    1:6:java.lang.String nextPackagePrefix():441 -> b
-    7:8:java.lang.String nextPackagePrefix():442:443 -> b
+    1:13:void <init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String,char):360:372 -> <init>
+    1:1:java.lang.String getPackageName():376:376 -> a
+    2:7:com.android.tools.r8.graph.DexString nextSuggestedNameForClass(com.android.tools.r8.graph.DexType):380:385 -> a
+    2:7:com.android.tools.r8.graph.DexString nextTypeName(com.android.tools.r8.graph.DexType):392 -> a
+    8:9:com.android.tools.r8.graph.DexString nextTypeName(com.android.tools.r8.graph.DexType):393:394 -> a
+    1:6:java.lang.String nextSuggestedNameForSubpackage():403:408 -> b
+    1:6:java.lang.String nextPackagePrefix():415 -> b
+    7:8:java.lang.String nextPackagePrefix():416:417 -> b
 com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy -> a.a.a.a.m.i:
 com.android.tools.r8.naming.ClassNaming -> a.a.a.a.m.l:
 com.android.tools.r8.naming.ClassNaming$Builder -> a.a.a.a.m.k:
@@ -38998,51 +38406,45 @@
     void addMappedRange(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String) -> a
     com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming) -> a
 com.android.tools.r8.naming.ClassNamingForMapApplier -> a.a.a.a.m.o:
-    com.android.tools.r8.com.google.common.collect.ImmutableMap qualifiedMethodMembers -> d
+    com.android.tools.r8.com.google.common.collect.ImmutableMap methodMembers -> d
     com.android.tools.r8.position.Position position -> c
-    com.android.tools.r8.com.google.common.collect.ImmutableMap fieldMembers -> f
-    com.android.tools.r8.com.google.common.collect.ImmutableMap methodMembers -> e
-    boolean $assertionsDisabled -> g
+    com.android.tools.r8.com.google.common.collect.ImmutableMap fieldMembers -> e
+    boolean $assertionsDisabled -> f
     java.lang.String originalName -> a
     java.lang.String renamedName -> b
-    1:1:void <clinit>():35:35 -> <clinit>
-    1:7:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,java.util.Map,java.util.Map,java.util.Map):122:128 -> <init>
-    1:7:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.naming.ClassNamingForMapApplier$1):35 -> <init>
-    1:1:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder builder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):94:94 -> a
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap getQualifiedMethodMembers():132:132 -> a
-    3:4:void forAllFieldNaming(com.android.tools.r8.utils.ThrowingConsumer):145:146 -> a
-    1:2:void forAllMethodNaming(com.android.tools.r8.utils.ThrowingConsumer):153:154 -> b
-    1:11:boolean equals(java.lang.Object):221:231 -> equals
-    1:1:int hashCode():236:236 -> hashCode
-    2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):76:76 -> hashCode
-    2:2:int hashCode():236 -> hashCode
+    1:1:void <clinit>():32:32 -> <clinit>
+    1:6:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,java.util.Map,java.util.Map):118:123 -> <init>
+    1:6:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,java.util.Map,java.util.Map,com.android.tools.r8.naming.ClassNamingForMapApplier$1):32 -> <init>
+    1:1:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder builder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):93:93 -> a
+    2:3:void forAllFieldNaming(com.android.tools.r8.utils.ThrowingConsumer):136:137 -> a
+    1:2:void forAllMethodNaming(com.android.tools.r8.utils.ThrowingConsumer):144:145 -> b
+    1:10:boolean equals(java.lang.Object):212:221 -> equals
+    1:4:int hashCode():226:229 -> hashCode
 com.android.tools.r8.naming.ClassNamingForMapApplier$1 -> a.a.a.a.m.m:
 com.android.tools.r8.naming.ClassNamingForMapApplier$Builder -> a.a.a.a.m.n:
     com.android.tools.r8.position.Position position -> c
     com.android.tools.r8.utils.Reporter reporter -> d
     java.lang.String originalName -> a
-    java.util.Map qualifiedMethodMembers -> e
+    java.util.Map methodMembers -> e
     java.lang.String renamedName -> b
-    java.util.Map methodMembers -> f
-    java.util.Map fieldMembers -> g
-    1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):46:46 -> <init>
-    1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter,com.android.tools.r8.naming.ClassNamingForMapApplier$1):37 -> <init>
-    2:10:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):42:50 -> <init>
-    2:10:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter,com.android.tools.r8.naming.ClassNamingForMapApplier$1):37 -> <init>
+    java.util.Map fieldMembers -> f
+    1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):42:42 -> <init>
+    1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter,com.android.tools.r8.naming.ClassNamingForMapApplier$1):34 -> <init>
+    2:9:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):39:46 -> <init>
+    2:9:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter,com.android.tools.r8.naming.ClassNamingForMapApplier$1):34 -> <init>
     void addMappedRange(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String) -> a
-    1:1:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):57:57 -> a
-    2:2:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getOriginalSignature():70:70 -> a
-    2:2:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):58 -> a
-    3:9:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):58:64 -> a
-    10:10:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):63:63 -> a
-    11:11:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):62:62 -> a
-    12:12:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getOriginalSignature():70:70 -> a
-    12:12:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):67 -> a
-    13:17:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):67:71 -> a
-    18:18:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):70:70 -> a
-    19:19:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):69:69 -> a
-    20:20:java.util.List lambda$addMemberEntry$0(com.android.tools.r8.naming.MemberNaming$MethodSignature):60:60 -> a
-    21:21:com.android.tools.r8.naming.ClassNamingForMapApplier build():79:79 -> a
+    1:6:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):53:58 -> a
+    7:7:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getOriginalSignature():70:70 -> a
+    7:7:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):59 -> a
+    8:12:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):59:63 -> a
+    13:13:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):62:62 -> a
+    14:14:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):61:61 -> a
+    15:15:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getOriginalSignature():70:70 -> a
+    15:15:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):66 -> a
+    16:20:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):66:70 -> a
+    21:21:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):69:69 -> a
+    22:22:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):68:68 -> a
+    23:23:com.android.tools.r8.naming.ClassNamingForMapApplier build():78:78 -> a
 com.android.tools.r8.naming.ClassNamingForNameMapper -> a.a.a.a.m.t:
     com.android.tools.r8.com.google.common.collect.ImmutableMap fieldMembers -> d
     com.android.tools.r8.com.google.common.collect.ImmutableMap methodMembers -> c
@@ -39063,14 +38465,11 @@
     18:19:void forAllMemberNaming(com.android.tools.r8.utils.ThrowingConsumer):243 -> a
     18:19:void write(java.io.Writer):269 -> a
     20:26:void write(java.io.Writer):278:284 -> a
-    27:36:java.lang.String com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange.toString():399:408 -> a
-    27:36:void write(java.io.Writer):284 -> a
-    37:37:void write(java.io.Writer):284:284 -> a
-    38:39:void lambda$write$0(java.io.Writer,com.android.tools.r8.naming.MemberNaming):271:272 -> a
-    40:40:java.lang.String com.android.tools.r8.naming.MemberNaming.toString():95:95 -> a
-    40:40:void lambda$write$0(java.io.Writer,com.android.tools.r8.naming.MemberNaming):272 -> a
-    41:41:void lambda$write$0(java.io.Writer,com.android.tools.r8.naming.MemberNaming):272:272 -> a
-    42:42:int lambda$write$1(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):282:282 -> a
+    27:28:void lambda$write$0(java.io.Writer,com.android.tools.r8.naming.MemberNaming):271:272 -> a
+    29:29:java.lang.String com.android.tools.r8.naming.MemberNaming.toString():95:95 -> a
+    29:29:void lambda$write$0(java.io.Writer,com.android.tools.r8.naming.MemberNaming):272 -> a
+    30:30:void lambda$write$0(java.io.Writer,com.android.tools.r8.naming.MemberNaming):272:272 -> a
+    31:31:int lambda$write$1(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):282:282 -> a
     1:11:boolean equals(java.lang.Object):304:314 -> equals
     1:5:int hashCode():319:323 -> hashCode
     1:5:java.lang.String toString():291:295 -> toString
@@ -39112,7 +38511,7 @@
     2:2:int getNextSequenceNumber():350:350 -> a
     1:10:boolean equals(java.lang.Object):418:427 -> equals
     1:3:int hashCode():433:435 -> hashCode
-    4:6:int com.android.tools.r8.naming.MemberNaming$MethodSignature.hashCode():299:301 -> hashCode
+    4:6:int com.android.tools.r8.naming.MemberNaming$MethodSignature.hashCode():294:296 -> hashCode
     4:6:int hashCode():435 -> hashCode
     7:7:int hashCode():436:436 -> hashCode
     1:10:java.lang.String toString():399:408 -> toString
@@ -39131,124 +38530,46 @@
     24:31:com.android.tools.r8.com.google.common.collect.ImmutableList readAllNames(java.nio.file.Path,com.android.tools.r8.utils.Reporter):59:66 -> a
     32:43:com.android.tools.r8.com.google.common.collect.ImmutableList readAllNames(java.nio.file.Path,com.android.tools.r8.utils.Reporter):60:71 -> a
     1:2:void close():52:53 -> close
-com.android.tools.r8.naming.FieldNameMinifier -> a.a.a.a.m.y:
-    java.util.Map renaming -> b
-    java.util.Map reservedNamingStates -> c
-    com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> e
-    com.android.tools.r8.naming.MemberNamingStrategy strategy -> d
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):35:35 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):31:37 -> <init>
-    1:1:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):45:45 -> a
-    2:4:void reserveFieldNames():85:87 -> a
-    2:4:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):46 -> a
-    5:9:boolean shouldReserveName(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):113:117 -> a
-    5:9:void reserveFieldNames():88 -> a
-    5:9:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):46 -> a
-    10:29:void reserveFieldNames():90:109 -> a
-    10:29:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):46 -> a
-    30:32:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):47:49 -> a
-    33:34:void renameFieldsInInterfaces(java.util.Collection):172:173 -> a
-    33:34:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):50 -> a
-    35:68:void renameFieldsInInterfacePartition(java.util.Set):179:212 -> a
-    35:68:void renameFieldsInInterfaces(java.util.Collection):174 -> a
-    35:68:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):50 -> a
-    69:76:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):51:58 -> a
-    77:77:com.android.tools.r8.naming.ReservedFieldNamingState getOrCreateReservedFieldNamingState(com.android.tools.r8.graph.DexType):79:79 -> a
-    78:80:void propagateReservedFieldNamesUpwards():124:126 -> a
-    81:81:void propagateReservedFieldNamesUpwards():125:125 -> a
-    82:82:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):128:128 -> a
-    83:83:com.android.tools.r8.naming.ReservedFieldNamingState getReservedFieldNamingState(com.android.tools.r8.graph.DexType):75:75 -> a
-    83:83:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):128 -> a
-    84:87:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):130:133 -> a
-    88:92:void lambda$renameFieldsInClasses$3(java.util.Map,com.android.tools.r8.graph.DexClass):147:151 -> a
-    93:93:void com.android.tools.r8.naming.FieldNamingState.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):28:28 -> a
-    93:93:void lambda$renameFieldsInClasses$3(java.util.Map,com.android.tools.r8.graph.DexClass):151 -> a
-    94:94:void lambda$renameFieldsInClasses$3(java.util.Map,com.android.tools.r8.graph.DexClass):155:155 -> a
-    95:109:void lambda$renameFieldsInClasses$3(java.util.Map,com.android.tools.r8.graph.DexClass):153:167 -> a
-    110:110:com.android.tools.r8.graph.DexString renameField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.naming.FieldNamingState):219:219 -> a
-    111:119:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.FieldNamingState.getOrCreateNameFor(com.android.tools.r8.graph.DexField):56:64 -> a
-    111:119:com.android.tools.r8.graph.DexString renameField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.naming.FieldNamingState):220 -> a
-    120:120:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.FieldNamingState.getOrCreateNameFor(com.android.tools.r8.graph.DexField):60:60 -> a
-    120:120:com.android.tools.r8.graph.DexString renameField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.naming.FieldNamingState):220 -> a
-    121:121:java.lang.Object com.android.tools.r8.naming.FieldNamingStateBase.getOrCreateInternalState(com.android.tools.r8.graph.DexField):30:30 -> a
-    121:121:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.FieldNamingState.getOrCreateNameFor(com.android.tools.r8.graph.DexField):67 -> a
-    121:121:com.android.tools.r8.graph.DexString renameField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.naming.FieldNamingState):220 -> a
-    122:122:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.FieldNamingState.getOrCreateNameFor(com.android.tools.r8.graph.DexField):67:67 -> a
-    122:122:com.android.tools.r8.graph.DexString renameField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.naming.FieldNamingState):220 -> a
-    123:124:com.android.tools.r8.graph.DexString renameField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.naming.FieldNamingState):221:222 -> a
-    125:150:void renameNonReboundReference(com.android.tools.r8.graph.DexField):238:263 -> a
-    1:1:com.android.tools.r8.naming.ReservedFieldNamingState getReservedFieldNamingState(com.android.tools.r8.graph.DexType):75:75 -> b
-    2:6:void renameFieldsInClasses():141:145 -> b
-    7:7:void renameFieldsInClasses():144:144 -> b
-    1:1:com.android.tools.r8.naming.ReservedFieldNamingState lambda$getOrCreateReservedFieldNamingState$0(com.android.tools.r8.graph.DexType):80:80 -> c
-    2:5:void renameNonReboundReferences():229:232 -> c
-    6:9:void renameNonReboundReferences():230:233 -> c
-    1:1:com.android.tools.r8.naming.FieldNamingState lambda$renameFieldsInClasses$2(com.android.tools.r8.graph.DexType):154:154 -> d
-    2:2:void com.android.tools.r8.naming.FieldNamingState.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):28:28 -> d
-    2:2:com.android.tools.r8.naming.FieldNamingState lambda$renameFieldsInClasses$2(com.android.tools.r8.graph.DexType):154 -> d
+com.android.tools.r8.naming.FieldNameMinifier -> a.a.a.a.m.x:
+    boolean $assertionsDisabled -> k
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy):26:26 -> <init>
+    1:6:java.util.function.Function getKeyTransform():31:36 -> a
+    7:13:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(com.android.tools.r8.utils.Timing):45:51 -> a
+    14:14:void com.android.tools.r8.graph.DexType.forAllInterfaces(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):287:287 -> a
+    14:14:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(com.android.tools.r8.utils.Timing):50 -> a
+    15:17:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(com.android.tools.r8.utils.Timing):52:54 -> a
+    18:18:void renameFieldsInClasses():100:100 -> a
+    18:18:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(com.android.tools.r8.utils.Timing):55 -> a
+    19:19:void renameFieldsInInterfaces():122:122 -> a
+    19:19:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(com.android.tools.r8.utils.Timing):56 -> a
+    20:28:void renameFieldsInInterface(com.android.tools.r8.graph.DexType):128:136 -> a
+    20:28:void renameFieldsInInterfaces():123 -> a
+    20:28:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(com.android.tools.r8.utils.Timing):56 -> a
+    29:34:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(com.android.tools.r8.utils.Timing):57:62 -> a
+    35:35:void lambda$computeRenaming$1(com.android.tools.r8.graph.DexType):51:51 -> a
+    36:45:void reserveNamesInSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingState):79:88 -> a
+    46:46:com.android.tools.r8.naming.NamingState lambda$reserveNamesInSubtypes$2(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexType):85:85 -> a
+    47:47:void lambda$reserveNamesInSubtypes$3(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):87:87 -> a
+    48:50:void reserveFieldName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.naming.NamingState,boolean):93:95 -> a
+    48:50:void lambda$reserveNamesInSubtypes$3(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):87 -> a
+    51:64:void renameFieldsInSubclasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):104:117 -> a
+    65:76:void renameField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.naming.NamingState):141:152 -> a
+    77:77:void renameField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.naming.NamingState):151:151 -> a
+    78:103:void renameNonReboundReference(com.android.tools.r8.graph.DexField):167:192 -> a
+    104:108:void print(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingState,java.io.PrintStream):197:201 -> a
+    1:1:java.lang.Object lambda$getKeyTransform$0(com.android.tools.r8.graph.DexType):36:36 -> b
+    2:2:void lambda$reserveNamesInSubtypes$4(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexType):88:88 -> b
+    3:6:void renameNonReboundReferences():158:161 -> b
+    7:10:void renameNonReboundReferences():159:162 -> b
 com.android.tools.r8.naming.FieldNameMinifier$1 -> a.a.a.a.m.v:
 com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming -> a.a.a.a.m.w:
     java.util.Map renaming -> a
-    1:2:void <init>(java.util.Map):65:66 -> <init>
-    3:4:void <init>(java.util.Map):65:66 -> <init>
-    3:4:void <init>(java.util.Map,com.android.tools.r8.naming.FieldNameMinifier$1):61 -> <init>
-    1:1:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming empty():70:70 -> a
-com.android.tools.r8.naming.FieldNameMinifier$InterfacePartitioning -> a.a.a.a.m.x:
-    com.android.tools.r8.graph.AppView appView -> a
-    java.util.Set visited -> b
-    boolean $assertionsDisabled -> c
-    1:1:void <clinit>():267:267 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):272:272 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView):270:273 -> <init>
-    1:1:java.util.List access$100(com.android.tools.r8.naming.FieldNameMinifier$InterfacePartitioning,java.util.Collection):267:267 -> a
-    2:9:java.util.List sortedPartitions(java.util.Collection):277:284 -> a
-    10:43:java.util.Set buildSortedPartition(com.android.tools.r8.graph.DexClass):291:324 -> a
-    44:44:int lambda$buildSortedPartition$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):291:291 -> a
-com.android.tools.r8.naming.FieldNamingState -> a.a.a.a.m.A:
-    com.android.tools.r8.naming.ReservedFieldNamingState reservedNames -> c
-    com.android.tools.r8.naming.MemberNamingStrategy strategy -> d
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy,com.android.tools.r8.naming.ReservedFieldNamingState):35:35 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy,com.android.tools.r8.naming.ReservedFieldNamingState,java.util.Map):43:45 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy,com.android.tools.r8.naming.ReservedFieldNamingState):35 -> <init>
-    5:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy,com.android.tools.r8.naming.ReservedFieldNamingState,java.util.Map):43:45 -> <init>
-    1:1:com.android.tools.r8.naming.ReservedFieldNamingState access$000(com.android.tools.r8.naming.FieldNamingState):22:22 -> a
-    2:4:com.android.tools.r8.naming.FieldNamingState createChildState(com.android.tools.r8.naming.ReservedFieldNamingState):49:51 -> a
-    5:5:void includeReservations(com.android.tools.r8.naming.ReservedFieldNamingState):71:71 -> a
-    5:5:com.android.tools.r8.naming.FieldNamingState createChildState(com.android.tools.r8.naming.ReservedFieldNamingState):51 -> a
-    6:6:com.android.tools.r8.naming.FieldNamingState$InternalState createInternalState():76:76 -> a
-    6:6:java.lang.Object createInternalState():22 -> a
-    7:7:void com.android.tools.r8.naming.FieldNamingState$InternalState.<init>(com.android.tools.r8.naming.FieldNamingState):94:94 -> a
-    7:7:com.android.tools.r8.naming.FieldNamingState$InternalState createInternalState():76 -> a
-    7:7:java.lang.Object createInternalState():22 -> a
-    1:1:com.android.tools.r8.naming.MemberNamingStrategy access$100(com.android.tools.r8.naming.FieldNamingState):22:22 -> b
-    1:1:java.lang.Object clone():22:22 -> clone
-    2:6:com.android.tools.r8.naming.FieldNamingState clone():81:85 -> clone
-com.android.tools.r8.naming.FieldNamingState$InternalState -> a.a.a.a.m.z:
-    java.util.Iterator dictionaryIterator -> a
-    com.android.tools.r8.naming.FieldNamingState this$0 -> c
-    int nextNameIndex -> b
-    1:3:void <init>(com.android.tools.r8.naming.FieldNamingState,int,java.util.Iterator):97:99 -> <init>
-    1:4:com.android.tools.r8.graph.DexString nextNameAccordingToStrategy(com.android.tools.r8.graph.DexField):112:115 -> a
-    1:4:com.android.tools.r8.graph.DexString createNewName(com.android.tools.r8.graph.DexField):105 -> a
-    5:5:com.android.tools.r8.graph.DexString createNewName(com.android.tools.r8.graph.DexField):106:106 -> a
-    6:7:boolean com.android.tools.r8.naming.ReservedFieldNamingState.isReserved(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):25:26 -> a
-    6:7:com.android.tools.r8.graph.DexString createNewName(com.android.tools.r8.graph.DexField):106 -> a
-    8:9:com.android.tools.r8.graph.DexString createNewName(com.android.tools.r8.graph.DexField):106:107 -> a
-    10:12:com.android.tools.r8.graph.DexString nextNameAccordingToState():120:122 -> a
-    1:1:java.lang.Object clone():88:88 -> clone
-    2:2:com.android.tools.r8.naming.FieldNamingState$InternalState clone():127:127 -> clone
-com.android.tools.r8.naming.FieldNamingStateBase -> a.a.a.a.m.B:
-    java.util.Map internalStates -> b
-    com.android.tools.r8.graph.AppView appView -> a
-    1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):19:21 -> <init>
-    java.lang.Object createInternalState() -> a
-    1:2:java.lang.Object getInternalState(com.android.tools.r8.graph.DexType):25:26 -> a
-    1:2:java.lang.Object getOrCreateInternalState(com.android.tools.r8.graph.DexType):34:35 -> b
-    1:4:com.android.tools.r8.graph.DexType getInternalStateKey(com.android.tools.r8.graph.DexType):39:42 -> c
-    1:1:java.lang.Object lambda$getOrCreateInternalState$0(com.android.tools.r8.graph.DexType):35:35 -> d
-com.android.tools.r8.naming.IdentifierMinifier -> a.a.a.a.m.C:
+    1:2:void <init>(java.util.Map):69:70 -> <init>
+    3:4:void <init>(java.util.Map):69:70 -> <init>
+    3:4:void <init>(java.util.Map,com.android.tools.r8.naming.FieldNameMinifier$1):65 -> <init>
+    1:1:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming empty():74:74 -> a
+com.android.tools.r8.naming.IdentifierMinifier -> a.a.a.a.m.y:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.NamingLens lens -> c
     com.android.tools.r8.shaking.ProguardClassFilter adaptClassStrings -> b
@@ -39277,7 +38598,7 @@
     16:22:void replaceDexItemBasedConstStringInStaticField(com.android.tools.r8.graph.DexEncodedField):137:143 -> c
     16:22:void replaceDexItemBasedConstString():123 -> c
     23:23:void replaceDexItemBasedConstString():125:125 -> c
-com.android.tools.r8.naming.IdentifierNameStringMarker -> a.a.a.a.m.D:
+com.android.tools.r8.naming.IdentifierNameStringMarker -> a.a.a.a.m.z:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> b
     boolean $assertionsDisabled -> c
@@ -39293,123 +38614,134 @@
     219:275:void decoupleIdentifierNameStringsInMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):106:162 -> a
     276:276:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringsInMethod$0(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):268:268 -> a
     277:306:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):289:318 -> a
-com.android.tools.r8.naming.IdentifierNameStringUtils -> a.a.a.a.m.E:
+com.android.tools.r8.naming.IdentifierNameStringUtils -> a.a.a.a.m.A:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():34:34 -> <clinit>
+    1:1:void <clinit>():33:33 -> <clinit>
     boolean lambda$evaluateTypeArrayContentFromConstructionToUse$0(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction) -> a
-    1:79:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):54:132 -> a
-    80:86:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):85:91 -> a
-    87:136:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):151:200 -> a
-    137:175:com.android.tools.r8.graph.DexTypeList retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):431:469 -> a
-    137:175:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):200 -> a
-    176:182:com.android.tools.r8.graph.DexTypeList retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):468:474 -> a
-    176:182:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):200 -> a
-    183:183:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):204:204 -> a
-    184:188:com.android.tools.r8.graph.DexReference inferMethodInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexTypeList):296:300 -> a
-    184:188:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):204 -> a
-    189:191:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):206:208 -> a
-    192:219:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):236:263 -> a
-    192:219:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):217 -> a
-    220:220:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> a
-    220:220:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):263 -> a
-    220:220:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):217 -> a
-    221:225:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):264:268 -> a
-    221:225:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):217 -> a
-    226:228:com.android.tools.r8.graph.DexReference inferMethodNameInHolder(com.android.tools.r8.graph.DexClass,java.lang.String):286:288 -> a
-    226:228:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):270 -> a
-    226:228:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):217 -> a
-    229:229:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):220:220 -> a
-    230:233:com.android.tools.r8.graph.DexReference inferFieldInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexType):276:279 -> a
-    234:277:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):329:372 -> a
-    278:286:com.android.tools.r8.graph.DexType getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):308:316 -> a
-    278:286:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):372 -> a
-    287:287:com.android.tools.r8.graph.DexType getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):315:315 -> a
-    287:287:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):372 -> a
-    288:303:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):377:392 -> a
-    1:1:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):227:227 -> b
-    2:3:java.lang.String com.android.tools.r8.utils.DescriptorUtils.javaTypeToDescriptorIfValidJavaType(java.lang.String):90:91 -> b
-    2:3:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):227 -> b
-    4:4:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):229:229 -> b
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> b
-    5:5:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):229 -> b
-com.android.tools.r8.naming.InterfaceMethodNameMinifier -> a.a.a.a.m.G:
-    com.android.tools.r8.naming.MethodNameMinifier$State minifierState -> e
+    1:79:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):53:131 -> a
+    80:86:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):84:90 -> a
+    87:137:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.InvokeMethod):150:200 -> a
+    138:176:com.android.tools.r8.graph.DexTypeList retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):425:463 -> a
+    138:176:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.InvokeMethod):200 -> a
+    177:183:com.android.tools.r8.graph.DexTypeList retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):462:468 -> a
+    177:183:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.InvokeMethod):200 -> a
+    184:184:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.InvokeMethod):204:204 -> a
+    185:189:com.android.tools.r8.graph.DexReference inferMethodInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexTypeList):290:294 -> a
+    185:189:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.InvokeMethod):204 -> a
+    190:192:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.InvokeMethod):206:208 -> a
+    193:210:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):230:247 -> a
+    193:210:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):217 -> a
+    211:212:java.lang.String com.android.tools.r8.utils.DescriptorUtils.javaTypeToDescriptorIfValidJavaType(java.lang.String):89:90 -> a
+    211:212:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):253 -> a
+    211:212:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):217 -> a
+    213:213:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):257:257 -> a
+    213:213:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):217 -> a
+    214:214:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> a
+    214:214:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):257 -> a
+    214:214:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):217 -> a
+    215:219:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):258:262 -> a
+    215:219:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):217 -> a
+    220:222:com.android.tools.r8.graph.DexReference inferMethodNameInHolder(com.android.tools.r8.graph.DexClass,java.lang.String):280:282 -> a
+    220:222:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):264 -> a
+    220:222:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):217 -> a
+    223:223:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):220:220 -> a
+    224:225:java.lang.String com.android.tools.r8.utils.DescriptorUtils.javaTypeToDescriptorIfValidJavaType(java.lang.String):89:90 -> a
+    224:225:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):220 -> a
+    226:226:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):222:222 -> a
+    227:227:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> a
+    227:227:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):222 -> a
+    228:231:com.android.tools.r8.graph.DexReference inferFieldInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexType):270:273 -> a
+    232:275:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):323:366 -> a
+    276:284:com.android.tools.r8.graph.DexType getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):302:310 -> a
+    276:284:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):366 -> a
+    285:285:com.android.tools.r8.graph.DexType getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):309:309 -> a
+    285:285:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):366 -> a
+    286:301:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):371:386 -> a
+com.android.tools.r8.naming.InterfaceMethodNameMinifier -> a.a.a.a.m.B:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> j
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> c
+    com.android.tools.r8.naming.MemberNameMinifier$State minifierState -> e
     java.util.Map sourceMethodsMap -> i
     java.util.Set desugaredCallSites -> b
     java.util.Map callSiteRenamings -> f
     com.android.tools.r8.naming.MethodNameMinifier$FrontierState frontierState -> d
     java.util.Map globalStateMap -> g
     java.util.Map originStates -> h
-    1:1:void <clinit>():38:38 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.com.google.common.base.Equivalence,com.android.tools.r8.naming.MethodNameMinifier$FrontierState,com.android.tools.r8.naming.MethodNameMinifier$State):124:124 -> <init>
-    2:25:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.com.google.common.base.Equivalence,com.android.tools.r8.naming.MethodNameMinifier$FrontierState,com.android.tools.r8.naming.MethodNameMinifier$State):106:129 -> <init>
-    1:1:java.util.Comparator createDefaultInterfaceMethodOrdering():133:133 -> a
-    2:2:int lambda$createDefaultInterfaceMethodOrdering$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):133:133 -> a
-    3:5:void reserveNamesInInterfaces(java.util.Collection):141:143 -> a
-    3:5:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):149 -> a
-    6:99:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):154:247 -> a
-    100:116:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):246:262 -> a
-    117:117:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.MethodNameMinifier$State.getRenaming(com.android.tools.r8.graph.DexMethod):97:97 -> a
-    117:117:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):262 -> a
-    118:127:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):263:272 -> a
-    128:149:void lambda$assignNamesToInterfaceMethods$1(java.util.Map,java.util.Set,java.util.Map,com.android.tools.r8.graph.DexCallSite):183:204 -> a
-    150:150:boolean lambda$assignNamesToInterfaceMethods$3(java.util.Map,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):228:228 -> a
-    151:175:void assignNameToInterfaceMethod(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.util.Map):295:319 -> a
-    176:196:void assignNameForInterfaceMethodInAllStates(java.util.List,java.util.Set,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodNamingState):327:347 -> a
-    176:196:void assignNameToInterfaceMethod(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.util.Map):320 -> a
-    197:197:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):101:101 -> a
-    197:197:void assignNameForInterfaceMethodInAllStates(java.util.List,java.util.Set,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodNamingState):347 -> a
-    197:197:void assignNameToInterfaceMethod(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.util.Map):320 -> a
-    198:202:void addStatesToGlobalMapForMethod(com.android.tools.r8.graph.DexMethod,java.util.Set,com.android.tools.r8.graph.DexType):353:357 -> a
-    203:203:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getState(com.android.tools.r8.graph.DexType):105:105 -> a
-    203:203:void addStatesToGlobalMapForMethod(com.android.tools.r8.graph.DexMethod,java.util.Set,com.android.tools.r8.graph.DexType):357 -> a
-    204:204:void addStatesToGlobalMapForMethod(com.android.tools.r8.graph.DexMethod,java.util.Set,com.android.tools.r8.graph.DexType):357:357 -> a
-    205:205:java.util.Set lambda$addStatesToGlobalMapForMethod$6(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):355:355 -> a
-    206:212:boolean anyIsReserved(java.util.List):378:384 -> a
-    213:216:boolean anyIsReserved(java.util.List):383:386 -> a
-    217:217:java.lang.Boolean lambda$anyIsReserved$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):384:384 -> a
-    218:218:boolean com.android.tools.r8.naming.MethodNameMinifier$State.isReservedInGlobalState(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):113:113 -> a
-    218:218:java.lang.Boolean lambda$anyIsReserved$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):384 -> a
-    219:219:java.lang.Boolean lambda$anyIsReserved$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):384:384 -> a
-    220:226:java.util.Set getReachableInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):413:419 -> a
-    220:226:java.util.Set getReachableStates(com.android.tools.r8.graph.DexType,java.util.Set):394 -> a
-    227:238:java.util.Set getReachableStates(com.android.tools.r8.graph.DexType,java.util.Set):395:406 -> a
-    239:241:void collectSubInterfaces(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Set):439:441 -> a
-    242:251:void print(com.android.tools.r8.graph.DexMethod,java.util.Set,java.util.List,java.io.PrintStream):451:460 -> a
-    252:252:void lambda$print$9(java.io.PrintStream,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodNamingState):459:459 -> a
-    1:1:java.util.Map getCallSiteRenamings():137:137 -> b
-    2:9:boolean propagateReservedNames(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.util.Map):278:285 -> b
-    10:10:java.util.Set lambda$addStatesToGlobalMapForMethod$7(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):356:356 -> b
-    11:17:boolean anyIsReserved(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.util.Map):363:369 -> b
-    11:17:boolean lambda$assignNamesToInterfaceMethods$4(java.util.Map,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):237 -> b
-    18:22:void collectSuperInterfaces(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Set):425:429 -> b
-    1:1:java.util.Set lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):217:217 -> c
-    2:2:boolean lambda$assignNamesToInterfaceMethods$5(java.util.Map,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):247:247 -> c
-com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodNamingState -> a.a.a.a.m.F:
-    com.android.tools.r8.graph.DexString name -> b
-    com.android.tools.r8.graph.DexProto proto -> c
-    boolean $assertionsDisabled -> e
-    com.android.tools.r8.graph.DexMethod method -> d
-    com.android.tools.r8.naming.MethodNamingState parent -> a
-    1:1:void <clinit>():46:46 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):54:59 -> <init>
-    1:1:com.android.tools.r8.graph.DexString assignNewName():63:63 -> a
-    2:2:void addRenaming(com.android.tools.r8.graph.DexString):75:75 -> a
-    3:7:void print(java.lang.String,java.util.function.Function,java.io.PrintStream):90:94 -> a
-    8:8:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    8:8:void print(java.lang.String,java.util.function.Function,java.io.PrintStream):94 -> a
-    9:10:void print(java.lang.String,java.util.function.Function,java.io.PrintStream):94:95 -> a
-    11:11:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():95:95 -> a
-    11:11:void print(java.lang.String,java.util.function.Function,java.io.PrintStream):95 -> a
-    12:13:void print(java.lang.String,java.util.function.Function,java.io.PrintStream):95:96 -> a
-    1:1:boolean isAvailable(com.android.tools.r8.graph.DexString):71:71 -> b
-    2:2:com.android.tools.r8.graph.DexString getName():79:79 -> b
-    1:1:com.android.tools.r8.graph.DexProto getProto():83:83 -> c
-    1:1:boolean isReserved():67:67 -> d
-com.android.tools.r8.naming.MemberNaming -> a.a.a.a.m.L:
+    1:1:void <clinit>():37:37 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.com.google.common.base.Equivalence,com.android.tools.r8.naming.MethodNameMinifier$FrontierState,com.android.tools.r8.naming.MemberNameMinifier$State):64:64 -> <init>
+    2:26:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.com.google.common.base.Equivalence,com.android.tools.r8.naming.MethodNameMinifier$FrontierState,com.android.tools.r8.naming.MemberNameMinifier$State):45:69 -> <init>
+    1:1:java.util.Comparator createDefaultInterfaceMethodOrdering():73:73 -> a
+    2:2:int lambda$createDefaultInterfaceMethodOrdering$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):73:73 -> a
+    3:5:void reserveNamesInInterfaces():81:83 -> a
+    3:5:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing):89 -> a
+    6:95:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing):94:183 -> a
+    96:108:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing):182:194 -> a
+    109:109:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.MemberNameMinifier$State.getRenaming(java.lang.Object):76:76 -> a
+    109:109:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing):194 -> a
+    110:118:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing):195:203 -> a
+    119:140:void lambda$assignNamesToInterfaceMethods$1(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexCallSite):124:145 -> a
+    141:141:boolean lambda$assignNamesToInterfaceMethods$3(java.util.Map,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):168:168 -> a
+    142:166:void assignNameToInterfaceMethod(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.util.Map):226:250 -> a
+    167:199:void assignNameForInterfaceMethodInAllStates(java.util.List,java.util.Set,com.android.tools.r8.naming.MethodNameMinifier$MethodNamingState):258:290 -> a
+    167:199:void assignNameToInterfaceMethod(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.util.Map):251 -> a
+    200:200:void com.android.tools.r8.naming.MemberNameMinifier$State.putRenaming(java.lang.Object,com.android.tools.r8.graph.DexString):80:80 -> a
+    200:200:void assignNameForInterfaceMethodInAllStates(java.util.List,java.util.Set,com.android.tools.r8.naming.MethodNameMinifier$MethodNamingState):290 -> a
+    200:200:void assignNameToInterfaceMethod(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.util.Map):251 -> a
+    201:204:void addStatesToGlobalMapForMethod(com.android.tools.r8.graph.DexMethod,java.util.Set,com.android.tools.r8.graph.DexType):296:299 -> a
+    205:205:java.util.Set lambda$addStatesToGlobalMapForMethod$6(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):297:297 -> a
+    206:212:boolean anyIsReserved(java.util.List):320:326 -> a
+    213:216:boolean anyIsReserved(java.util.List):325:328 -> a
+    217:217:java.lang.Boolean lambda$anyIsReserved$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):326:326 -> a
+    218:218:boolean com.android.tools.r8.naming.MemberNameMinifier$State.isReservedInGlobalState(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.CachedHashValueDexItem):96:96 -> a
+    218:218:java.lang.Boolean lambda$anyIsReserved$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):326 -> a
+    219:219:java.lang.Boolean lambda$anyIsReserved$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):326:326 -> a
+    220:220:java.util.Set getReachableStates(com.android.tools.r8.graph.DexType):336:336 -> a
+    221:221:boolean com.android.tools.r8.naming.MemberNameMinifier$State.useUniqueMemberNames():100:100 -> a
+    221:221:java.util.Set getReachableStates(com.android.tools.r8.graph.DexType):336 -> a
+    222:222:com.android.tools.r8.naming.NamingState com.android.tools.r8.naming.MemberNameMinifier$State.globalState():92:92 -> a
+    222:222:java.util.Set getReachableStates(com.android.tools.r8.graph.DexType):337 -> a
+    223:240:java.util.Set getReachableStates(com.android.tools.r8.graph.DexType):337:354 -> a
+    241:244:void collectSubInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):374:377 -> a
+    245:254:void print(com.android.tools.r8.graph.DexMethod,java.util.Set,java.util.List,java.io.PrintStream):387:396 -> a
+    255:255:void lambda$print$9(java.io.PrintStream,com.android.tools.r8.naming.MethodNameMinifier$MethodNamingState):395:395 -> a
+    1:1:java.util.Map getCallSiteRenamings():77:77 -> b
+    2:9:boolean propagateReservedNames(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.util.Map):209:216 -> b
+    10:10:java.util.Set lambda$addStatesToGlobalMapForMethod$7(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):298:298 -> b
+    11:17:boolean anyIsReserved(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.util.Map):305:311 -> b
+    11:17:boolean lambda$assignNamesToInterfaceMethods$4(java.util.Map,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):175 -> b
+    18:24:void collectSuperInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):361:367 -> b
+    1:1:java.util.Set lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):158:158 -> c
+    2:2:boolean lambda$assignNamesToInterfaceMethods$5(java.util.Map,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):183:183 -> c
+com.android.tools.r8.naming.MemberNameMinifier -> a.a.a.a.m.E:
+    com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet -> b
+    java.util.Map renaming -> d
+    com.android.tools.r8.naming.MemberNameMinifier$State minifierState -> i
+    com.android.tools.r8.naming.NamingState globalState -> e
+    java.util.List dictionary -> c
+    boolean useUniqueMemberNames -> f
+    boolean overloadAggressively -> g
+    boolean useApplyMapping -> h
+    com.android.tools.r8.com.google.common.collect.BiMap states -> j
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy):42:42 -> <init>
+    2:27:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy):29:54 -> <init>
+    28:34:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy):51:57 -> <init>
+    java.util.function.Function getKeyTransform() -> a
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap access$000(com.android.tools.r8.naming.MemberNameMinifier):23:23 -> a
+    2:2:com.android.tools.r8.naming.NamingState computeStateIfAbsent(com.android.tools.r8.graph.DexType,java.util.function.Function):64:64 -> a
+    3:3:boolean alwaysReserveMemberNames(com.android.tools.r8.graph.DexClass):68:68 -> a
+com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy -> a.a.a.a.m.C:
+    boolean breakOnNotAvailable(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString) -> a
+    boolean bypassDictionary() -> a
+    com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.NamingState$InternalState) -> a
+com.android.tools.r8.naming.MemberNameMinifier$State -> a.a.a.a.m.D:
+    com.android.tools.r8.naming.MemberNameMinifier this$0 -> a
+    1:1:void <init>(com.android.tools.r8.naming.MemberNameMinifier):73:73 -> <init>
+    1:1:com.android.tools.r8.naming.NamingState getState(com.android.tools.r8.graph.DexType):84:84 -> a
+    2:2:com.android.tools.r8.graph.DexType getStateKey(com.android.tools.r8.naming.NamingState):88:88 -> a
+    3:3:boolean useUniqueMemberNames():100:100 -> a
+com.android.tools.r8.naming.MemberNaming -> a.a.a.a.m.J:
     com.android.tools.r8.naming.MemberNaming$Signature signature -> a
     com.android.tools.r8.naming.MemberNaming$Signature renamedSignature -> b
     com.android.tools.r8.position.Position position -> c
@@ -39419,7 +38751,7 @@
     1:6:boolean equals(java.lang.Object):37:42 -> equals
     1:2:int hashCode():47:48 -> hashCode
     1:1:java.lang.String toString():95:95 -> toString
-com.android.tools.r8.naming.MemberNaming$FieldSignature -> a.a.a.a.m.H:
+com.android.tools.r8.naming.MemberNaming$FieldSignature -> a.a.a.a.m.F:
     java.lang.String type -> b
     1:2:void <init>(java.lang.String,java.lang.String):143:144 -> <init>
     1:1:com.android.tools.r8.naming.MemberNaming$Signature asRenamed(java.lang.String):166:166 -> a
@@ -39427,196 +38759,101 @@
     1:5:boolean equals(java.lang.Object):179:183 -> equals
     1:1:int hashCode():188:188 -> hashCode
     1:1:java.lang.String toString():193:193 -> toString
-com.android.tools.r8.naming.MemberNaming$MethodSignature -> a.a.a.a.m.I:
+com.android.tools.r8.naming.MemberNaming$MethodSignature -> a.a.a.a.m.G:
     java.lang.String type -> b
     java.lang.String[] parameters -> c
-    boolean $assertionsDisabled -> d
-    1:1:void <clinit>():204:204 -> <clinit>
     1:3:void <init>(java.lang.String,java.lang.String,java.lang.String[]):210:212 -> <init>
     1:1:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod):222:222 -> a
     2:8:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):226:232 -> a
     9:9:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
     9:9:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):232 -> a
     10:11:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):232:233 -> a
-    12:20:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):257:265 -> a
-    21:21:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):262:262 -> a
-    22:22:com.android.tools.r8.naming.MemberNaming$Signature asRenamed(java.lang.String):274:274 -> a
-    1:1:com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind kind():279:279 -> b
-    1:8:boolean equals(java.lang.Object):287:294 -> equals
-    1:3:int hashCode():299:301 -> hashCode
-    1:1:java.lang.String toString():306:306 -> toString
-com.android.tools.r8.naming.MemberNaming$Signature -> a.a.a.a.m.K:
+    12:12:com.android.tools.r8.naming.MemberNaming$Signature asRenamed(java.lang.String):269:269 -> a
+    1:1:com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind kind():274:274 -> b
+    1:8:boolean equals(java.lang.Object):282:289 -> equals
+    1:3:int hashCode():294:296 -> hashCode
+    1:1:java.lang.String toString():301:301 -> toString
+com.android.tools.r8.naming.MemberNaming$Signature -> a.a.a.a.m.I:
     java.lang.String name -> a
     1:2:void <init>(java.lang.String):102:103 -> <init>
     com.android.tools.r8.naming.MemberNaming$Signature asRenamed(java.lang.String) -> a
     1:1:boolean isQualified():118:118 -> a
     com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind kind() -> b
-com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind -> a.a.a.a.m.J:
+com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind -> a.a.a.a.m.H:
     com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind FIELD -> b
     com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind METHOD -> a
     1:2:void <clinit>():133:134 -> <clinit>
     3:3:void <clinit>():132:132 -> <clinit>
     1:1:void <init>(java.lang.String,int):132:132 -> <init>
-com.android.tools.r8.naming.MemberNamingStrategy -> a.a.a.a.m.M:
-    boolean breakOnNotAvailable(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString) -> a
-    boolean bypassDictionary() -> a
-    com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.FieldNamingState$InternalState) -> a
-    com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.MethodNamingState$InternalState) -> a
-    java.util.Set noObfuscation() -> b
-com.android.tools.r8.naming.MethodNameMinifier -> a.a.a.a.m.S:
-    com.android.tools.r8.naming.MethodNamingState globalState -> e
-    com.android.tools.r8.graph.AppView appView -> a
-    java.util.Map renaming -> d
-    boolean $assertionsDisabled -> i
-    com.android.tools.r8.com.google.common.base.Equivalence equivalence -> b
-    com.android.tools.r8.com.google.common.collect.BiMap states -> h
-    com.android.tools.r8.naming.MemberNamingStrategy strategy -> c
-    com.android.tools.r8.naming.MethodNameMinifier$FrontierState frontierState -> g
-    com.android.tools.r8.naming.MethodNameMinifier$State minifierState -> f
-    1:1:void <clinit>():90:90 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):131:131 -> <init>
-    2:19:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):121:138 -> <init>
+com.android.tools.r8.naming.MethodNameMinifier -> a.a.a.a.m.O:
+    boolean $assertionsDisabled -> n
+    com.android.tools.r8.naming.MethodNameMinifier$FrontierState frontierState -> l
+    com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy strategy -> m
+    com.android.tools.r8.com.google.common.base.Equivalence equivalence -> k
+    1:1:void <clinit>():89:89 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy):98:98 -> <init>
+    2:12:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy):93:103 -> <init>
     java.lang.Object lambda$getKeyTransform$0(com.android.tools.r8.graph.DexProto) -> a
-    1:1:java.util.Map access$000(com.android.tools.r8.naming.MethodNameMinifier):90:90 -> a
-    2:2:boolean access$600(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexClass):90:90 -> a
-    3:3:com.android.tools.r8.naming.MethodNamingState computeStateIfAbsent(com.android.tools.r8.graph.DexType,java.util.function.Function):143:143 -> a
-    3:3:com.android.tools.r8.naming.MethodNamingState access$400(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType,java.util.function.Function):90 -> a
-    4:5:boolean alwaysReserveMemberNames(com.android.tools.r8.graph.DexClass):147:148 -> a
-    6:11:java.util.function.Function getKeyTransform():152:157 -> a
-    12:12:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):181:181 -> a
-    13:14:void reserveNamesInClasses():250:251 -> a
-    13:14:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):182 -> a
-    15:15:void reserveNamesInClasses():250:250 -> a
-    15:15:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):182 -> a
-    16:35:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):183:202 -> a
-    36:40:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,boolean):206:210 -> a
-    41:41:com.android.tools.r8.naming.MethodNamingState computeStateIfAbsent(com.android.tools.r8.graph.DexType,java.util.function.Function):143:143 -> a
-    41:41:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,boolean):211 -> a
-    42:54:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,boolean):212:224 -> a
-    55:55:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):552:552 -> a
-    55:55:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,boolean):225 -> a
-    56:56:com.android.tools.r8.naming.MethodNamingState lambda$assignNamesToClassesMethods$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):211:211 -> a
-    57:58:void lambda$assignNamesToClassesMethods$3(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexString):218:219 -> a
-    59:59:void lambda$assignNamesToClassesMethods$4(boolean,com.android.tools.r8.graph.DexType):225:225 -> a
-    60:70:void assignNameToMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState,java.util.Map,boolean):233:243 -> a
-    71:74:void assignNameToMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState,java.util.Map,boolean):242:245 -> a
-    75:75:com.android.tools.r8.graph.DexString lambda$assignNameToMethod$5(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):244:244 -> a
-    76:86:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):256:266 -> a
-    87:87:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):265:265 -> a
-    88:88:java.lang.Iterable shuffleMethods(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):324:324 -> a
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap access$100(com.android.tools.r8.naming.MethodNameMinifier):90:90 -> b
-    2:2:java.lang.Object lambda$getKeyTransform$1(com.android.tools.r8.graph.DexProto):157:157 -> b
-    1:1:com.android.tools.r8.naming.MethodNamingState access$200(com.android.tools.r8.naming.MethodNameMinifier):90:90 -> c
-    1:1:com.android.tools.r8.graph.AppView access$500(com.android.tools.r8.naming.MethodNameMinifier):90:90 -> d
-    1:1:com.android.tools.r8.naming.MemberNamingStrategy access$700(com.android.tools.r8.naming.MethodNameMinifier):90:90 -> e
-    1:1:java.util.function.Function access$800(com.android.tools.r8.naming.MethodNameMinifier):90:90 -> f
-com.android.tools.r8.naming.MethodNameMinifier$1 -> a.a.a.a.m.N:
-com.android.tools.r8.naming.MethodNameMinifier$FrontierState -> a.a.a.a.m.O:
+    1:1:com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy access$100(com.android.tools.r8.naming.MethodNameMinifier):89:89 -> a
+    2:7:java.util.function.Function getKeyTransform():108:113 -> a
+    8:8:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Set,com.android.tools.r8.utils.Timing):136:136 -> a
+    9:10:void reserveNamesInClasses():202:203 -> a
+    9:10:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Set,com.android.tools.r8.utils.Timing):137 -> a
+    11:11:void reserveNamesInClasses():202:202 -> a
+    11:11:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Set,com.android.tools.r8.utils.Timing):137 -> a
+    12:31:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Set,com.android.tools.r8.utils.Timing):138:157 -> a
+    32:49:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,boolean):161:178 -> a
+    50:50:com.android.tools.r8.naming.NamingState lambda$assignNamesToClassesMethods$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):166:166 -> a
+    51:52:void lambda$assignNamesToClassesMethods$3(com.android.tools.r8.naming.NamingState,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexString):173:174 -> a
+    53:53:void lambda$assignNamesToClassesMethods$4(boolean,com.android.tools.r8.graph.DexType):178:178 -> a
+    54:62:void assignNameToMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.NamingState,java.util.Map,boolean):186:194 -> a
+    63:67:void assignNameToMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.NamingState,java.util.Map,boolean):193:197 -> a
+    68:68:com.android.tools.r8.graph.DexString lambda$assignNameToMethod$5(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):196:196 -> a
+    69:79:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingState):208:218 -> a
+    80:80:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingState):217:217 -> a
+    81:81:java.lang.Iterable shuffleMethods(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):338:338 -> a
+    1:1:java.lang.Object lambda$getKeyTransform$1(com.android.tools.r8.graph.DexProto):113:113 -> b
+com.android.tools.r8.naming.MethodNameMinifier$1 -> a.a.a.a.m.K:
+com.android.tools.r8.naming.MethodNameMinifier$FrontierState -> a.a.a.a.m.L:
     java.util.Map frontiers -> a
     com.android.tools.r8.naming.MethodNameMinifier this$0 -> b
-    1:1:void <clinit>():270:270 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.naming.MethodNameMinifier):270:272 -> <init>
-    1:21:com.android.tools.r8.naming.MethodNamingState allocateNamingStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):277:297 -> a
-    22:23:void reserveNamesForMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.MethodNamingState):306:307 -> a
-    22:23:com.android.tools.r8.naming.MethodNamingState allocateNamingStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):297 -> a
-    24:25:com.android.tools.r8.naming.MethodNamingState lambda$allocateNamingStateAndReserve$0(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.DexType):285:286 -> a
-    26:26:com.android.tools.r8.graph.DexType get(com.android.tools.r8.graph.DexType):311:311 -> a
-com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming -> a.a.a.a.m.P:
+    1:1:void <clinit>():222:222 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.naming.MethodNameMinifier):222:224 -> <init>
+    1:24:com.android.tools.r8.naming.NamingState allocateNamingStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingState):229:252 -> a
+    25:26:void reserveNamesForMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingState):261:262 -> a
+    25:26:com.android.tools.r8.naming.NamingState allocateNamingStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingState):252 -> a
+    27:31:com.android.tools.r8.naming.NamingState lambda$allocateNamingStateAndReserve$0(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexType):237:241 -> a
+    32:38:com.android.tools.r8.naming.NamingState lambda$allocateNamingStateAndReserve$0(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexType):237:243 -> a
+    39:39:com.android.tools.r8.graph.DexType get(com.android.tools.r8.graph.DexType):266:266 -> a
+com.android.tools.r8.naming.MethodNameMinifier$MethodNamingState -> a.a.a.a.m.M:
+    com.android.tools.r8.graph.DexString name -> b
+    com.android.tools.r8.graph.DexProto proto -> c
+    boolean $assertionsDisabled -> e
+    com.android.tools.r8.naming.NamingState parent -> a
+    com.android.tools.r8.graph.DexMethod method -> d
+    1:1:void <clinit>():280:280 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):288:293 -> <init>
+    1:1:com.android.tools.r8.graph.DexString assignNewName():297:297 -> a
+    2:2:void addRenaming(com.android.tools.r8.graph.DexString):309:309 -> a
+    3:7:void print(java.lang.String,java.util.function.Function,java.io.PrintStream):324:328 -> a
+    8:8:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
+    8:8:void print(java.lang.String,java.util.function.Function,java.io.PrintStream):328 -> a
+    9:10:void print(java.lang.String,java.util.function.Function,java.io.PrintStream):328:329 -> a
+    11:11:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():95:95 -> a
+    11:11:void print(java.lang.String,java.util.function.Function,java.io.PrintStream):329 -> a
+    12:13:void print(java.lang.String,java.util.function.Function,java.io.PrintStream):329:330 -> a
+    1:1:boolean isAvailable(com.android.tools.r8.graph.DexString):305:305 -> b
+    2:2:com.android.tools.r8.graph.DexString getName():313:313 -> b
+    1:1:com.android.tools.r8.graph.DexProto getProto():317:317 -> c
+    1:1:boolean isReserved():301:301 -> d
+com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming -> a.a.a.a.m.N:
     java.util.Map renaming -> a
     java.util.Map callSiteRenaming -> b
-    1:3:void <init>(java.util.Map,java.util.Map):167:169 -> <init>
-    4:6:void <init>(java.util.Map,java.util.Map):167:169 -> <init>
-    4:6:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.naming.MethodNameMinifier$1):161 -> <init>
-    1:1:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming empty():173:173 -> a
-com.android.tools.r8.naming.MethodNameMinifier$State -> a.a.a.a.m.Q:
-    com.android.tools.r8.naming.MethodNameMinifier this$0 -> a
-    1:1:void <init>(com.android.tools.r8.naming.MethodNameMinifier):94:94 -> <init>
-    1:1:com.android.tools.r8.naming.MethodNamingState getState(com.android.tools.r8.graph.DexType):105:105 -> a
-    2:2:com.android.tools.r8.graph.DexType getStateKey(com.android.tools.r8.naming.MethodNamingState):109:109 -> a
-com.android.tools.r8.naming.MethodNamingState -> a.a.a.a.m.V:
-    java.util.Map usedNames -> c
-    com.android.tools.r8.graph.AppView appView -> a
-    java.util.function.Function keyTransform -> d
-    com.android.tools.r8.naming.MemberNamingStrategy strategy -> e
-    com.android.tools.r8.naming.MethodNamingState parent -> b
-    1:1:void <init>(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.MemberNamingStrategy):46:46 -> <init>
-    2:21:void <init>(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.MemberNamingStrategy):31:50 -> <init>
-    1:1:com.android.tools.r8.naming.MemberNamingStrategy access$400(com.android.tools.r8.naming.MethodNamingState):27:27 -> a
-    2:2:com.android.tools.r8.naming.MethodNamingState createRoot(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.MemberNamingStrategy):39:39 -> a
-    3:3:com.android.tools.r8.naming.MethodNamingState createChild():54:54 -> a
-    4:6:com.android.tools.r8.naming.MethodNamingState$InternalState findInternalStateFor(java.lang.Object):58:60 -> a
-    7:7:com.android.tools.r8.graph.DexString assignNewNameFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):85:85 -> a
-    8:12:com.android.tools.r8.graph.DexString getAssignedNameFor(com.android.tools.r8.graph.DexString,java.lang.Object):77:81 -> a
-    8:12:com.android.tools.r8.graph.DexString assignNewNameFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):86 -> a
-    13:14:com.android.tools.r8.graph.DexString assignNewNameFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):88:89 -> a
-    15:20:boolean isReserved(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):101:106 -> a
-    21:26:boolean isAvailable(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):110:115 -> a
-    27:29:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):119:121 -> a
-    30:35:void printState(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.lang.String,java.io.PrintStream):129:134 -> a
-    36:36:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    36:36:void printState(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.lang.String,java.io.PrintStream):135 -> a
-    37:45:void printState(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.lang.String,java.io.PrintStream):135:143 -> a
-    1:1:com.android.tools.r8.naming.MethodNamingState access$500(com.android.tools.r8.naming.MethodNamingState):27:27 -> b
-    2:6:com.android.tools.r8.naming.MethodNamingState$InternalState getOrCreateInternalStateFor(java.lang.Object):67:71 -> b
-    7:9:void reserveName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):95:97 -> b
-com.android.tools.r8.naming.MethodNamingState$1 -> a.a.a.a.m.T:
-com.android.tools.r8.naming.MethodNamingState$InternalState -> a.a.a.a.m.U:
-    java.util.Iterator dictionaryIterator -> f
-    com.android.tools.r8.naming.MethodNamingState this$0 -> g
-    java.util.Set reservedNames -> c
-    boolean $assertionsDisabled -> h
-    com.android.tools.r8.com.google.common.collect.Table renamings -> d
-    int nameCount -> e
-    com.android.tools.r8.naming.MethodNamingState$InternalState parentInternalState -> b
-    com.android.tools.r8.graph.DexItemFactory itemFactory -> a
-    1:1:void <clinit>():147:147 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MethodNamingState$InternalState):171:173 -> <init>
-    1:3:void <init>(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MethodNamingState$InternalState,com.android.tools.r8.naming.MethodNamingState$1):147 -> <init>
-    4:4:void <init>(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.naming.MethodNamingState$InternalState,java.util.Iterator):161:161 -> <init>
-    4:4:void <init>(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MethodNamingState$InternalState):170 -> <init>
-    4:4:void <init>(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MethodNamingState$InternalState,com.android.tools.r8.naming.MethodNamingState$1):147 -> <init>
-    5:18:void <init>(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.naming.MethodNamingState$InternalState,java.util.Iterator):153:166 -> <init>
-    5:18:void <init>(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MethodNamingState$InternalState):170 -> <init>
-    5:18:void <init>(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MethodNamingState$InternalState,com.android.tools.r8.naming.MethodNamingState$1):147 -> <init>
-    1:1:boolean access$200(com.android.tools.r8.naming.MethodNamingState$InternalState,com.android.tools.r8.graph.DexString):147:147 -> a
-    2:5:void reserveName(com.android.tools.r8.graph.DexString):188:191 -> a
-    6:16:int incrementAndGet():196:206 -> a
-    17:21:com.android.tools.r8.graph.DexString getAssignedNameFor(com.android.tools.r8.graph.DexString,java.lang.Object):211:215 -> a
-    22:25:void addRenaming(com.android.tools.r8.graph.DexString,java.lang.Object,com.android.tools.r8.graph.DexString):229:232 -> a
-    26:29:com.android.tools.r8.graph.DexString nextSuggestedName(com.android.tools.r8.graph.DexMethod):236:239 -> a
-    26:29:com.android.tools.r8.graph.DexString getNewNameFor(com.android.tools.r8.graph.DexMethod):223 -> a
-    26:29:com.android.tools.r8.graph.DexString access$100(com.android.tools.r8.naming.MethodNamingState$InternalState,com.android.tools.r8.graph.DexMethod):147 -> a
-    30:30:com.android.tools.r8.graph.DexString getNewNameFor(com.android.tools.r8.graph.DexMethod):224:224 -> a
-    30:30:com.android.tools.r8.graph.DexString access$100(com.android.tools.r8.naming.MethodNamingState$InternalState,com.android.tools.r8.graph.DexMethod):147 -> a
-    31:39:void printInternalState(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):248:256 -> a
-    40:50:void printLastName(java.lang.String,java.io.PrintStream):267:277 -> a
-    40:50:void printInternalState(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):256 -> a
-    51:51:void printInternalState(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):257:257 -> a
-    52:61:void printReservedNames(java.lang.String,java.io.PrintStream):281:290 -> a
-    52:61:void printInternalState(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):257 -> a
-    62:71:void printReservedNames(java.lang.String,java.io.PrintStream):284:293 -> a
-    62:71:void printInternalState(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):257 -> a
-    72:72:void printInternalState(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):258:258 -> a
-    73:83:void printRenamings(java.lang.String,java.io.PrintStream):297:307 -> a
-    73:83:void printInternalState(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):258 -> a
-    84:84:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    84:84:void printRenamings(java.lang.String,java.io.PrintStream):308 -> a
-    84:84:void printInternalState(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):258 -> a
-    85:88:void printRenamings(java.lang.String,java.io.PrintStream):308:311 -> a
-    85:88:void printInternalState(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):258 -> a
-    89:89:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    89:89:void printRenamings(java.lang.String,java.io.PrintStream):311 -> a
-    89:89:void printInternalState(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):258 -> a
-    90:90:void printRenamings(java.lang.String,java.io.PrintStream):311:311 -> a
-    90:90:void printInternalState(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):258 -> a
-    91:106:void printRenamings(java.lang.String,java.io.PrintStream):300:315 -> a
-    91:106:void printInternalState(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):258 -> a
-    107:109:void printInternalState(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):260:262 -> a
-    110:110:void printInternalState(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):261:261 -> a
-    1:1:boolean access$300(com.android.tools.r8.naming.MethodNamingState$InternalState,com.android.tools.r8.graph.DexString):147:147 -> b
-    2:4:boolean isAvailable(com.android.tools.r8.graph.DexString):182:184 -> b
-    1:2:boolean isReserved(com.android.tools.r8.graph.DexString):177:178 -> c
-com.android.tools.r8.naming.MinifiedNameMapPrinter -> a.a.a.a.m.W:
+    1:3:void <init>(java.util.Map,java.util.Map):123:125 -> <init>
+    4:6:void <init>(java.util.Map,java.util.Map):123:125 -> <init>
+    4:6:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.naming.MethodNameMinifier$1):117 -> <init>
+    1:1:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming empty():129:129 -> a
+com.android.tools.r8.naming.MinifiedNameMapPrinter -> a.a.a.a.m.P:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.naming.NamingLens namingLens -> b
     java.util.Set seenTypes -> c
@@ -39660,7 +38897,7 @@
     6:6:void writeMethods(java.util.List,java.lang.StringBuilder):103 -> b
     7:10:void writeMethod(com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.String,java.lang.StringBuilder):91:94 -> b
     7:10:void writeMethods(java.util.List,java.lang.StringBuilder):104 -> b
-com.android.tools.r8.naming.MinifiedRenaming -> a.a.a.a.m.X:
+com.android.tools.r8.naming.MinifiedRenaming -> a.a.a.a.m.Q:
     java.util.Map packageRenaming -> c
     java.util.Map renaming -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -39671,66 +38908,53 @@
     com.android.tools.r8.graph.DexItem lambda$getRenamedItems$1(com.android.tools.r8.graph.DexItem) -> a
     1:1:java.lang.String lookupPackageName(java.lang.String):53:53 -> a
     2:2:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):58:58 -> a
-    3:8:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):63:68 -> a
-    9:9:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):58:58 -> a
-    9:9:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):74 -> a
-    10:16:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):74:80 -> a
-    17:22:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):79:84 -> a
-    23:23:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):58:58 -> a
-    23:23:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):85 -> a
-    24:26:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):85:87 -> a
-    27:27:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):86:86 -> a
-    28:33:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):84:89 -> a
-    34:34:com.android.tools.r8.graph.DexString lookupMethodName(com.android.tools.r8.graph.DexCallSite):99:99 -> a
-    35:35:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField):104:104 -> a
-    36:37:void forAllRenamedTypes(java.util.function.Consumer):109:110 -> a
-    38:41:java.util.Map getRenamedItems(java.lang.Class,java.util.function.Predicate,java.util.function.Function):116:119 -> a
-    42:42:boolean lambda$getRenamedItems$0(java.lang.Class,java.util.function.Predicate,com.android.tools.r8.graph.DexItem):117:117 -> a
-    43:68:boolean checkTargetCanBeTranslated(com.android.tools.r8.graph.DexMethod):134:159 -> a
-    69:79:void lambda$toString$2(java.lang.StringBuilder,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexString):167:177 -> a
-    1:1:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod):94:94 -> b
-    1:16:java.lang.String toString():164:179 -> toString
-com.android.tools.r8.naming.Minifier -> a.a.a.a.m.ba:
+    3:16:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):63:76 -> a
+    17:17:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):58:58 -> a
+    17:17:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):83 -> a
+    18:30:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):83:95 -> a
+    31:31:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):77:77 -> a
+    32:32:com.android.tools.r8.graph.DexString lookupMethodName(com.android.tools.r8.graph.DexCallSite):105:105 -> a
+    33:33:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField):110:110 -> a
+    34:35:void forAllRenamedTypes(java.util.function.Consumer):115:116 -> a
+    36:39:java.util.Map getRenamedItems(java.lang.Class,java.util.function.Predicate,java.util.function.Function):122:125 -> a
+    40:40:boolean lambda$getRenamedItems$0(java.lang.Class,java.util.function.Predicate,com.android.tools.r8.graph.DexItem):123:123 -> a
+    41:66:boolean checkTargetCanBeTranslated(com.android.tools.r8.graph.DexMethod):140:165 -> a
+    67:77:void lambda$toString$2(java.lang.StringBuilder,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexString):173:183 -> a
+    1:1:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod):100:100 -> b
+    1:16:java.lang.String toString():170:185 -> toString
+com.android.tools.r8.naming.Minifier -> a.a.a.a.m.V:
     com.android.tools.r8.graph.AppView appView -> a
-    java.util.Set desugaredCallSites -> b
-    boolean $assertionsDisabled -> c
-    1:1:void <clinit>():29:29 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):34:36 -> <init>
-    1:14:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):40:53 -> a
-    15:15:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming com.android.tools.r8.naming.ClassNameMinifier.computeRenaming(com.android.tools.r8.utils.Timing):98:98 -> a
-    15:15:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):54 -> a
-    16:43:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):55:82 -> a
-    44:44:int lambda$run$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):42:42 -> a
-com.android.tools.r8.naming.Minifier$MinificationClassNamingStrategy -> a.a.a.a.m.Y:
+    com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet -> b
+    java.util.Set desugaredCallSites -> c
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():28:28 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.Set):35:38 -> <init>
+    1:38:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):42:79 -> a
+com.android.tools.r8.naming.Minifier$MinificationClassNamingStrategy -> a.a.a.a.m.S:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap namespaceCounters -> b
-    java.util.Set noObfuscation -> c
     com.android.tools.r8.graph.DexItemFactory factory -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,java.util.Set):92:92 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory,java.util.Set):89:95 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory):88:88 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):86:90 -> <init>
     boolean bypassDictionary() -> a
-    1:3:com.android.tools.r8.graph.DexString next(com.android.tools.r8.naming.ClassNameMinifier$Namespace,com.android.tools.r8.graph.DexType,char[]):100:102 -> a
-    1:1:java.util.Set noObfuscation():113:113 -> b
-com.android.tools.r8.naming.Minifier$MinificationPackageNamingStrategy -> a.a.a.a.m.Z:
+    1:3:com.android.tools.r8.graph.DexString next(com.android.tools.r8.naming.ClassNameMinifier$Namespace,com.android.tools.r8.graph.DexType,char[]):95:97 -> a
+com.android.tools.r8.naming.Minifier$MinificationPackageNamingStrategy -> a.a.a.a.m.T:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap namespaceCounters -> a
-    1:1:void <init>():121:121 -> <init>
-    2:5:void <init>():119:122 -> <init>
+    1:1:void <init>():111:111 -> <init>
+    2:5:void <init>():109:112 -> <init>
     boolean bypassDictionary() -> a
-    1:2:java.lang.String next(com.android.tools.r8.naming.ClassNameMinifier$Namespace,char[]):131:132 -> a
-com.android.tools.r8.naming.Minifier$MinifierMemberNamingStrategy -> a.a.a.a.m.aa:
-    char[] EMPTY_CHAR_ARRAY -> c
-    java.util.Set noObfuscation -> b
+    1:2:java.lang.String next(com.android.tools.r8.naming.ClassNameMinifier$Namespace,char[]):121:122 -> a
+com.android.tools.r8.naming.Minifier$MinifierMemberNamingStrategy -> a.a.a.a.m.U:
+    char[] EMPTY_CHAR_ARRAY -> b
     com.android.tools.r8.graph.DexItemFactory factory -> a
-    1:1:void <clinit>():143:143 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,java.util.Set):148:150 -> <init>
+    1:1:void <clinit>():133:133 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):137:138 -> <init>
     boolean breakOnNotAvailable(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString) -> a
     boolean bypassDictionary() -> a
-    1:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.MethodNamingState$InternalState):155:156 -> a
-    3:3:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.FieldNamingState$InternalState):161:161 -> a
-    1:1:java.util.Set noObfuscation():176:176 -> b
-com.android.tools.r8.naming.NamingLens -> a.a.a.a.m.ea:
+    1:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.NamingState$InternalState):143:144 -> a
+com.android.tools.r8.naming.NamingLens -> a.a.a.a.m.Y:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():42:42 -> <clinit>
-    1:1:void <init>():42:42 -> <init>
+    1:1:void <clinit>():45:45 -> <clinit>
+    1:1:void <init>():45:45 -> <init>
     boolean checkTargetCanBeTranslated(com.android.tools.r8.graph.DexMethod) -> a
     void forAllRenamedTypes(java.util.function.Consumer) -> a
     java.util.Map getRenamedItems(java.lang.Class,java.util.function.Predicate,java.util.function.Function) -> a
@@ -39739,90 +38963,164 @@
     com.android.tools.r8.graph.DexString lookupMethodName(com.android.tools.r8.graph.DexCallSite) -> a
     com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField) -> a
     java.lang.String lookupPackageName(java.lang.String) -> a
-    1:9:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):57:65 -> a
-    10:14:com.android.tools.r8.graph.DexProto lookupProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):83:87 -> a
-    15:15:com.android.tools.r8.graph.DexProto lookupProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):83:83 -> a
-    16:16:com.android.tools.r8.graph.DexType lambda$lookupProto$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):86:86 -> a
-    17:17:com.android.tools.r8.graph.DexType[] lambda$lookupProto$1(int):87:87 -> a
-    18:26:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):91:99 -> a
-    27:27:com.android.tools.r8.naming.NamingLens getIdentityLens():103:103 -> a
-    28:38:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):131:141 -> a
-    39:42:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):69:72 -> a
-    39:42:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):141 -> a
-    43:43:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):69:69 -> a
-    43:43:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):141 -> a
-    44:50:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):142:148 -> a
-    51:54:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):76:79 -> a
-    51:54:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):148 -> a
-    55:55:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):76:76 -> a
-    55:55:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):148 -> a
-    56:58:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):149:151 -> a
+    1:6:com.android.tools.r8.graph.DexString lookupSimpleName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):52:57 -> a
+    7:15:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):69:77 -> a
+    16:20:com.android.tools.r8.graph.DexProto lookupProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):95:99 -> a
+    21:21:com.android.tools.r8.graph.DexProto lookupProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):95:95 -> a
+    22:22:com.android.tools.r8.graph.DexType lambda$lookupProto$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):98:98 -> a
+    23:23:com.android.tools.r8.graph.DexType[] lambda$lookupProto$1(int):99:99 -> a
+    24:24:com.android.tools.r8.naming.NamingLens getIdentityLens():115:115 -> a
+    25:35:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):143:153 -> a
+    36:39:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):81:84 -> a
+    36:39:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):153 -> a
+    40:40:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):81:81 -> a
+    40:40:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):153 -> a
+    41:47:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):154:160 -> a
+    48:51:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):88:91 -> a
+    48:51:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):160 -> a
+    52:52:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):88:88 -> a
+    52:52:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):160 -> a
+    53:55:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):161:163 -> a
     com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod) -> b
-    1:1:boolean isIdentityLens():107:107 -> b
-    2:3:java.lang.String lookupInternalName(com.android.tools.r8.graph.DexType):111:112 -> b
-com.android.tools.r8.naming.NamingLens$1 -> a.a.a.a.m.ca:
-com.android.tools.r8.naming.NamingLens$IdentityLens -> a.a.a.a.m.da:
-    1:1:void <init>():159:159 -> <init>
-    1:1:void <init>(com.android.tools.r8.naming.NamingLens$1):157 -> <init>
+    1:9:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):103:111 -> b
+    10:10:boolean isIdentityLens():119:119 -> b
+    11:12:java.lang.String lookupInternalName(com.android.tools.r8.graph.DexType):123:124 -> b
+com.android.tools.r8.naming.NamingLens$1 -> a.a.a.a.m.W:
+com.android.tools.r8.naming.NamingLens$IdentityLens -> a.a.a.a.m.X:
+    1:1:void <init>():171:171 -> <init>
+    1:1:void <init>(com.android.tools.r8.naming.NamingLens$1):169 -> <init>
     boolean checkTargetCanBeTranslated(com.android.tools.r8.graph.DexMethod) -> a
     void forAllRenamedTypes(java.util.function.Consumer) -> a
     java.lang.String lookupPackageName(java.lang.String) -> a
-    1:1:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):165:165 -> a
-    2:2:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):170:170 -> a
-    3:3:com.android.tools.r8.graph.DexString lookupMethodName(com.android.tools.r8.graph.DexCallSite):180:180 -> a
-    4:4:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField):185:185 -> a
-    5:5:java.util.Map getRenamedItems(java.lang.Class,java.util.function.Predicate,java.util.function.Function):201:201 -> a
-    1:1:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod):175:175 -> b
-com.android.tools.r8.naming.ProguardMap -> a.a.a.a.m.ga:
-com.android.tools.r8.naming.ProguardMap$Builder -> a.a.a.a.m.fa:
+    1:1:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):177:177 -> a
+    2:2:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):182:182 -> a
+    3:3:com.android.tools.r8.graph.DexString lookupMethodName(com.android.tools.r8.graph.DexCallSite):192:192 -> a
+    4:4:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField):197:197 -> a
+    5:5:java.util.Map getRenamedItems(java.lang.Class,java.util.function.Predicate,java.util.function.Function):213:213 -> a
+    1:1:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod):187:187 -> b
+com.android.tools.r8.naming.NamingState -> a.a.a.a.m.ba:
+    java.util.Map usedNames -> b
+    com.android.tools.r8.graph.DexItemFactory itemFactory -> c
+    java.util.List dictionary -> d
+    com.android.tools.r8.naming.NamingState parent -> a
+    java.util.function.Function keyTransform -> e
+    boolean useUniqueMemberNames -> g
+    boolean $assertionsDisabled -> h
+    com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy strategy -> f
+    1:1:void <clinit>():28:28 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.function.Function,com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy,boolean):54:54 -> <init>
+    2:31:void <init>(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.function.Function,com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy,boolean):31:60 -> <init>
+    1:1:boolean access$300(com.android.tools.r8.naming.NamingState):28:28 -> a
+    2:2:com.android.tools.r8.naming.NamingState createRoot(com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.function.Function,com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy,boolean):44:44 -> a
+    3:3:com.android.tools.r8.naming.NamingState createChild():64:64 -> a
+    4:6:com.android.tools.r8.naming.NamingState$InternalState findInternalStateFor(java.lang.Object):69:71 -> a
+    7:7:com.android.tools.r8.graph.DexString assignNewNameFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.CachedHashValueDexItem,boolean):97:97 -> a
+    8:12:com.android.tools.r8.graph.DexString getAssignedNameFor(com.android.tools.r8.graph.DexString,java.lang.Object):88:92 -> a
+    8:12:com.android.tools.r8.graph.DexString assignNewNameFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.CachedHashValueDexItem,boolean):98 -> a
+    13:14:com.android.tools.r8.graph.DexString assignNewNameFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.CachedHashValueDexItem,boolean):100:101 -> a
+    15:20:boolean isReserved(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.CachedHashValueDexItem):113:118 -> a
+    21:23:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.CachedHashValueDexItem,com.android.tools.r8.graph.DexString):137:139 -> a
+    24:38:void printState(com.android.tools.r8.graph.CachedHashValueDexItem,java.util.function.Function,java.lang.String,java.io.PrintStream):147:161 -> a
+    1:1:com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy access$400(com.android.tools.r8.naming.NamingState):28:28 -> b
+    2:6:com.android.tools.r8.naming.NamingState$InternalState getOrCreateInternalStateFor(java.lang.Object):78:82 -> b
+    7:9:void reserveName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.CachedHashValueDexItem):107:109 -> b
+    10:16:boolean isAvailable(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.CachedHashValueDexItem,com.android.tools.r8.graph.DexString):122:128 -> b
+    17:19:boolean isAvailable(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.CachedHashValueDexItem,com.android.tools.r8.graph.DexString):127:129 -> b
+    1:1:com.android.tools.r8.naming.NamingState access$500(com.android.tools.r8.naming.NamingState):28:28 -> c
+com.android.tools.r8.naming.NamingState$1 -> a.a.a.a.m.Z:
+com.android.tools.r8.naming.NamingState$InternalState -> a.a.a.a.m.aa:
+    java.util.Iterator dictionaryIterator -> f
+    java.util.Set reservedNames -> c
+    com.android.tools.r8.naming.NamingState this$0 -> g
+    com.android.tools.r8.naming.NamingState$InternalState parentInternalState -> b
+    boolean $assertionsDisabled -> h
+    com.android.tools.r8.com.google.common.collect.Table renamings -> d
+    int nameCount -> e
+    com.android.tools.r8.graph.DexItemFactory itemFactory -> a
+    1:1:void <clinit>():165:165 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.naming.NamingState$InternalState,java.util.List):189:189 -> <init>
+    1:1:void <init>(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.naming.NamingState$InternalState,java.util.List,com.android.tools.r8.naming.NamingState$1):165 -> <init>
+    2:2:void <init>(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.naming.NamingState$InternalState,java.util.Iterator):179:179 -> <init>
+    2:2:void <init>(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.naming.NamingState$InternalState,java.util.List):189 -> <init>
+    2:2:void <init>(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.naming.NamingState$InternalState,java.util.List,com.android.tools.r8.naming.NamingState$1):165 -> <init>
+    3:16:void <init>(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.naming.NamingState$InternalState,java.util.Iterator):171:184 -> <init>
+    3:16:void <init>(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.naming.NamingState$InternalState,java.util.List):189 -> <init>
+    3:16:void <init>(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.naming.NamingState$InternalState,java.util.List,com.android.tools.r8.naming.NamingState$1):165 -> <init>
+    1:1:boolean access$100(com.android.tools.r8.naming.NamingState$InternalState,com.android.tools.r8.graph.DexString):165:165 -> a
+    2:5:void reserveName(com.android.tools.r8.graph.DexString):204:207 -> a
+    6:6:int incrementAndGet():211:211 -> a
+    7:14:com.android.tools.r8.graph.DexString getAssignedNameFor(com.android.tools.r8.graph.DexString,java.lang.Object):216:223 -> a
+    15:15:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getOnlyElement(java.lang.Iterable,java.lang.Object):280:280 -> a
+    15:15:com.android.tools.r8.graph.DexString getAssignedNameFor(com.android.tools.r8.graph.DexString,java.lang.Object):224 -> a
+    16:16:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getOnlyElement(java.util.Iterator,java.lang.Object):341:341 -> a
+    16:16:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getOnlyElement(java.lang.Iterable,java.lang.Object):280 -> a
+    16:16:com.android.tools.r8.graph.DexString getAssignedNameFor(com.android.tools.r8.graph.DexString,java.lang.Object):224 -> a
+    17:24:com.android.tools.r8.graph.DexString getAssignedNameFor(com.android.tools.r8.graph.DexString,java.lang.Object):224:231 -> a
+    25:25:com.android.tools.r8.graph.DexString getNameFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,java.lang.Object,boolean):238:238 -> a
+    26:29:com.android.tools.r8.graph.DexString nextSuggestedName(com.android.tools.r8.graph.DexReference):259:262 -> a
+    26:29:com.android.tools.r8.graph.DexString getNameFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,java.lang.Object,boolean):243 -> a
+    30:32:com.android.tools.r8.graph.DexString getNameFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,java.lang.Object,boolean):244:246 -> a
+    33:36:void addRenaming(com.android.tools.r8.graph.DexString,java.lang.Object,com.android.tools.r8.graph.DexString):252:255 -> a
+    37:45:void printInternalState(com.android.tools.r8.naming.NamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):271:279 -> a
+    46:56:void printLastName(java.lang.String,java.io.PrintStream):290:300 -> a
+    46:56:void printInternalState(com.android.tools.r8.naming.NamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):279 -> a
+    57:57:void printInternalState(com.android.tools.r8.naming.NamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):280:280 -> a
+    58:67:void printReservedNames(java.lang.String,java.io.PrintStream):304:313 -> a
+    58:67:void printInternalState(com.android.tools.r8.naming.NamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):280 -> a
+    68:77:void printReservedNames(java.lang.String,java.io.PrintStream):307:316 -> a
+    68:77:void printInternalState(com.android.tools.r8.naming.NamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):280 -> a
+    78:78:void printInternalState(com.android.tools.r8.naming.NamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):281:281 -> a
+    79:89:void printRenamings(java.lang.String,java.io.PrintStream):320:330 -> a
+    79:89:void printInternalState(com.android.tools.r8.naming.NamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):281 -> a
+    90:90:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
+    90:90:void printRenamings(java.lang.String,java.io.PrintStream):331 -> a
+    90:90:void printInternalState(com.android.tools.r8.naming.NamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):281 -> a
+    91:94:void printRenamings(java.lang.String,java.io.PrintStream):331:334 -> a
+    91:94:void printInternalState(com.android.tools.r8.naming.NamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):281 -> a
+    95:95:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
+    95:95:void printRenamings(java.lang.String,java.io.PrintStream):334 -> a
+    95:95:void printInternalState(com.android.tools.r8.naming.NamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):281 -> a
+    96:96:void printRenamings(java.lang.String,java.io.PrintStream):334:334 -> a
+    96:96:void printInternalState(com.android.tools.r8.naming.NamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):281 -> a
+    97:112:void printRenamings(java.lang.String,java.io.PrintStream):323:338 -> a
+    97:112:void printInternalState(com.android.tools.r8.naming.NamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):281 -> a
+    113:115:void printInternalState(com.android.tools.r8.naming.NamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):283:285 -> a
+    116:116:void printInternalState(com.android.tools.r8.naming.NamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):284:284 -> a
+    1:1:boolean access$200(com.android.tools.r8.naming.NamingState$InternalState,com.android.tools.r8.graph.DexString):165:165 -> b
+    2:4:boolean isAvailable(com.android.tools.r8.graph.DexString):198:200 -> b
+    1:2:boolean isReserved(com.android.tools.r8.graph.DexString):193:194 -> c
+com.android.tools.r8.naming.ProguardMap -> a.a.a.a.m.da:
+com.android.tools.r8.naming.ProguardMap$Builder -> a.a.a.a.m.ca:
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position) -> a
-com.android.tools.r8.naming.ProguardMapError -> a.a.a.a.m.ha:
+com.android.tools.r8.naming.ProguardMapError -> a.a.a.a.m.ea:
     1:1:void <init>(java.lang.String,com.android.tools.r8.position.Position):21:21 -> <init>
     1:1:com.android.tools.r8.naming.ProguardMapError duplicateSourceClass(java.lang.String,com.android.tools.r8.position.Position):25:25 -> a
     2:3:com.android.tools.r8.naming.ProguardMapError duplicateSourceMember(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):30:31 -> a
     4:5:com.android.tools.r8.naming.ProguardMapError duplicateTargetClass(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.Position):36:37 -> a
     6:7:com.android.tools.r8.naming.ProguardMapError duplicateTargetSignature(com.android.tools.r8.naming.MemberNaming$Signature,com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String,com.android.tools.r8.position.Position):42:43 -> a
-com.android.tools.r8.naming.ProguardMapMinifier -> a.a.a.a.m.ka:
+com.android.tools.r8.naming.ProguardMapMinifier -> a.a.a.a.m.ha:
     com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.naming.SeedMapper seedMapper -> b
-    java.util.Set desugaredCallSites -> c
-    boolean $assertionsDisabled -> d
+    com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet -> b
+    com.android.tools.r8.naming.SeedMapper seedMapper -> c
+    java.util.Set desugaredCallSites -> d
+    boolean $assertionsDisabled -> e
     1:1:void <clinit>():38:38 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper,java.util.Set):47:50 -> <init>
-    1:17:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):54:70 -> a
-    18:23:void computeDefaultInterfaceMethodMappings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):169:174 -> a
-    18:23:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):72 -> a
-    24:30:void computeDefaultInterfaceMethodMappings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):173:179 -> a
-    24:30:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):72 -> a
-    31:39:void computeDefaultInterfaceMethodMappings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):178:186 -> a
-    31:39:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):72 -> a
-    40:40:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getOriginalSignature():70:70 -> a
-    40:40:void computeDefaultInterfaceMethodMappings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):187 -> a
-    40:40:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):72 -> a
-    41:42:void computeDefaultInterfaceMethodMappings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):187:188 -> a
-    41:42:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):72 -> a
-    43:44:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.toUnqualified():252:253 -> a
-    43:44:void computeDefaultInterfaceMethodMappings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):191 -> a
-    43:44:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):72 -> a
-    45:46:void computeDefaultInterfaceMethodMappings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):191:192 -> a
-    45:46:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):72 -> a
-    47:52:void computeDefaultInterfaceMethodMappings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):190:195 -> a
-    47:52:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):72 -> a
-    53:53:void computeDefaultInterfaceMethodMappings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):194:194 -> a
-    53:53:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):72 -> a
-    54:63:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):79:88 -> a
-    64:64:java.lang.String com.android.tools.r8.graph.DexType.toString():118:118 -> a
-    64:64:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):92 -> a
-    65:65:java.lang.String com.android.tools.r8.graph.DexType.toString():118:118 -> a
-    65:65:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):92 -> a
-    66:66:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):92:92 -> a
-    67:67:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):91:91 -> a
-    68:135:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):90:157 -> a
-    136:136:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getOriginalSignature():70:70 -> a
-    136:136:void lambda$run$0(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):98 -> a
-    137:141:void lambda$run$0(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):99:103 -> a
-    142:142:int lambda$run$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):132:132 -> a
+    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.naming.SeedMapper,java.util.Set):49:53 -> <init>
+    1:32:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):57:88 -> a
+    33:33:java.lang.String com.android.tools.r8.graph.DexType.toString():360:360 -> a
+    33:33:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):92 -> a
+    34:34:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):92:92 -> a
+    35:35:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):91:91 -> a
+    36:98:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):90:152 -> a
+    99:99:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getOriginalSignature():70:70 -> a
+    99:99:void lambda$run$0(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):98 -> a
+    100:102:void lambda$run$0(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):99:101 -> a
+    103:111:com.android.tools.r8.graph.DexMethod com.android.tools.r8.naming.MemberNaming$MethodSignature.toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):252:260 -> a
+    103:111:void lambda$run$0(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):101 -> a
+    112:112:com.android.tools.r8.graph.DexMethod com.android.tools.r8.naming.MemberNaming$MethodSignature.toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):257:257 -> a
+    112:112:void lambda$run$0(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):101 -> a
+    113:114:void lambda$run$0(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):102:103 -> a
     1:1:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getOriginalSignature():70:70 -> b
     1:1:void lambda$run$1(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):107 -> b
     2:4:void lambda$run$1(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):108:110 -> b
@@ -39831,32 +39129,24 @@
     9:9:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):158:158 -> b
     9:9:void lambda$run$1(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):110 -> b
     10:11:void lambda$run$1(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):111:112 -> b
-com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingClassNamingStrategy -> a.a.a.a.m.ia:
+com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingClassNamingStrategy -> a.a.a.a.m.fa:
     java.util.Map mappings -> a
-    java.util.Set noObfuscation -> b
-    1:1:void <init>(java.util.Map):206:206 -> <init>
-    2:5:void <init>(java.util.Map):204:207 -> <init>
+    1:2:void <init>(java.util.Map):161:162 -> <init>
     boolean bypassDictionary() -> a
-    1:1:com.android.tools.r8.graph.DexString next(com.android.tools.r8.naming.ClassNameMinifier$Namespace,com.android.tools.r8.graph.DexType,char[]):212:212 -> a
-    1:1:java.util.Set noObfuscation():222:222 -> b
-com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingMemberNamingStrategy -> a.a.a.a.m.ja:
+    1:1:com.android.tools.r8.graph.DexString next(com.android.tools.r8.naming.ClassNameMinifier$Namespace,com.android.tools.r8.graph.DexType,char[]):167:167 -> a
+com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingMemberNamingStrategy -> a.a.a.a.m.ga:
     java.util.Map mappedNames -> a
     com.android.tools.r8.graph.DexItemFactory factory -> b
-    java.util.Set noObfuscation -> d
-    boolean $assertionsDisabled -> e
+    boolean $assertionsDisabled -> d
     com.android.tools.r8.utils.Reporter reporter -> c
-    1:1:void <clinit>():226:226 -> <clinit>
-    1:1:void <init>(java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):235:235 -> <init>
-    2:8:void <init>(java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):232:238 -> <init>
+    1:1:void <clinit>():176:176 -> <clinit>
+    1:4:void <init>(java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):183:186 -> <init>
     boolean bypassDictionary() -> a
-    1:1:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.MethodNamingState$InternalState):243:243 -> a
-    2:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.FieldNamingState$InternalState):248:248 -> a
-    3:9:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexReference):252:258 -> a
-    10:16:boolean breakOnNotAvailable(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):271:277 -> a
-    17:17:boolean breakOnNotAvailable(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):274:274 -> a
-    18:18:boolean breakOnNotAvailable(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):273:273 -> a
-    1:1:java.util.Set noObfuscation():283:283 -> b
-com.android.tools.r8.naming.ProguardMapReader -> a.a.a.a.m.ma:
+    1:7:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.NamingState$InternalState):191:197 -> a
+    8:14:boolean breakOnNotAvailable(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):210:216 -> a
+    15:15:boolean breakOnNotAvailable(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):213:213 -> a
+    16:16:boolean breakOnNotAvailable(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):212:212 -> a
+com.android.tools.r8.naming.ProguardMapReader -> a.a.a.a.m.ja:
     java.io.BufferedReader reader -> a
     boolean $assertionsDisabled -> f
     int lineNo -> b
@@ -39981,14 +39271,14 @@
     1:1:int peekCodePoint():75:75 -> i
     1:6:boolean skipLine():129:134 -> j
     1:2:void skipWhitespace():143:144 -> k
-com.android.tools.r8.naming.ProguardMapReader$ParseException -> a.a.a.a.m.la:
+com.android.tools.r8.naming.ProguardMapReader$ParseException -> a.a.a.a.m.ia:
     int lineOffset -> b
     boolean eol -> c
     int lineNo -> a
     java.lang.String msg -> d
     1:5:void <init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String,boolean):477:481 -> <init>
     1:4:java.lang.String toString():486:489 -> toString
-com.android.tools.r8.naming.ProguardMapSupplier -> a.a.a.a.m.oa:
+com.android.tools.r8.naming.ProguardMapSupplier -> a.a.a.a.m.la:
     com.android.tools.r8.naming.ClassNameMapper classNameMapper -> b
     java.lang.Integer minApiLevel -> e
     com.android.tools.r8.naming.NamingLens namingLens -> c
@@ -40006,38 +39296,20 @@
     24:24:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapAndId getProguardMapAndId():69 -> a
     25:51:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapAndId getProguardMapAndId():70:96 -> a
     52:58:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapAndId getProguardMapAndId():95:101 -> a
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapAndId -> a.a.a.a.m.na:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapAndId -> a.a.a.a.m.ka:
     java.lang.String map -> a
     java.lang.String id -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():38:38 -> <clinit>
     1:4:void <init>(java.lang.String,java.lang.String):42:45 -> <init>
-com.android.tools.r8.naming.Range -> a.a.a.a.m.pa:
+com.android.tools.r8.naming.Range -> a.a.a.a.m.ma:
     int to -> b
     int from -> a
     1:3:void <init>(int,int):12:14 -> <init>
     1:6:boolean equals(java.lang.Object):31:36 -> equals
     1:2:int hashCode():41:42 -> hashCode
     1:1:java.lang.String toString():23:23 -> toString
-com.android.tools.r8.naming.ReservedFieldNamingState -> a.a.a.a.m.ra:
-    1:1:void <init>(com.android.tools.r8.graph.AppView):21:21 -> <init>
-    1:1:void markReservedDirectly(com.android.tools.r8.graph.DexField):30:30 -> a
-    2:2:void markReservedDirectly(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):34:34 -> a
-    2:2:void markReservedDirectly(com.android.tools.r8.graph.DexField):30 -> a
-    3:3:void markReservedDirectly(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):34:34 -> a
-    4:5:void includeReservations(com.android.tools.r8.naming.ReservedFieldNamingState):38:39 -> a
-    6:6:com.android.tools.r8.naming.ReservedFieldNamingState$InternalState createInternalState():51:51 -> a
-    6:6:java.lang.Object createInternalState():18 -> a
-    1:2:void includeReservationsFromBelow(com.android.tools.r8.naming.ReservedFieldNamingState):44:45 -> b
-com.android.tools.r8.naming.ReservedFieldNamingState$InternalState -> a.a.a.a.m.qa:
-    java.util.Set reservedNamesDirect -> a
-    java.util.Set reservedNamesBelow -> b
-    1:4:void <init>():54:57 -> <init>
-    1:1:boolean isReserved(com.android.tools.r8.graph.DexString):60:60 -> a
-    2:2:void includeReservations(com.android.tools.r8.naming.ReservedFieldNamingState$InternalState):68:68 -> a
-    1:1:void markReservedDirectly(com.android.tools.r8.graph.DexString):64:64 -> b
-    2:3:void includeReservationsFromBelow(com.android.tools.r8.naming.ReservedFieldNamingState$InternalState):72:73 -> b
-com.android.tools.r8.naming.SeedMapper -> a.a.a.a.m.ua:
+com.android.tools.r8.naming.SeedMapper -> a.a.a.a.m.pa:
     com.android.tools.r8.com.google.common.collect.ImmutableMap mappings -> a
     com.android.tools.r8.utils.Reporter reporter -> b
     1:8:void <init>(java.util.Map,com.android.tools.r8.utils.Reporter):87:94 -> <init>
@@ -40060,11 +39332,11 @@
     1:10:void verifyMappingsAreConflictFree():98:107 -> b
     11:11:void verifyMappingsAreConflictFree():104:104 -> b
     12:20:void verifyMappingsAreConflictFree():103:111 -> b
-    21:22:void com.android.tools.r8.naming.ClassNamingForMapApplier.forAllMemberNaming(com.android.tools.r8.utils.ThrowingConsumer):138:139 -> b
+    21:22:void com.android.tools.r8.naming.ClassNamingForMapApplier.forAllMemberNaming(com.android.tools.r8.utils.ThrowingConsumer):129:130 -> b
     21:22:void verifyMappingsAreConflictFree():111 -> b
     23:23:void verifyMappingsAreConflictFree():125:125 -> b
-com.android.tools.r8.naming.SeedMapper$1 -> a.a.a.a.m.sa:
-com.android.tools.r8.naming.SeedMapper$Builder -> a.a.a.a.m.ta:
+com.android.tools.r8.naming.SeedMapper$1 -> a.a.a.a.m.na:
+com.android.tools.r8.naming.SeedMapper$Builder -> a.a.a.a.m.oa:
     java.util.Map map -> a
     com.android.tools.r8.utils.Reporter reporter -> b
     1:1:void <init>(com.android.tools.r8.utils.Reporter):42:42 -> <init>
@@ -40076,7 +39348,7 @@
     5:8:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):51:54 -> a
     5:8:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):38 -> a
     9:10:com.android.tools.r8.naming.SeedMapper build():61:62 -> a
-com.android.tools.r8.naming.SourceFileRewriter -> a.a.a.a.m.va:
+com.android.tools.r8.naming.SourceFileRewriter -> a.a.a.a.m.qa:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():22:22 -> <clinit>
@@ -40144,16 +39416,16 @@
     24:25:void lambda$run$4(com.android.tools.r8.naming.signature.GenericSignatureParser,com.android.tools.r8.naming.signature.GenericSignatureRewriter$GenericSignatureCollector,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):68:69 -> a
     26:55:com.android.tools.r8.graph.DexAnnotationSet rewriteGenericSignatures(com.android.tools.r8.graph.DexAnnotationSet,java.util.function.Consumer,java.util.function.Supplier,java.util.function.BiConsumer):85:114 -> a
     56:61:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):119:124 -> a
-    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():632:632 -> a
+    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():628:628 -> a
     62:62:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):124 -> a
     63:76:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):124:137 -> a
-    77:77:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():628:628 -> a
+    77:77:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():624:624 -> a
     77:77:void lambda$run$0(com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):57 -> a
     78:78:void lambda$run$0(com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):57:57 -> a
-    79:79:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():628:628 -> a
+    79:79:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():624:624 -> a
     79:79:void lambda$run$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):65 -> a
     80:80:void lambda$run$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):65:65 -> a
-    81:81:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():628:628 -> a
+    81:81:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():624:624 -> a
     81:81:void lambda$run$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):73 -> a
     82:82:void lambda$run$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):73:73 -> a
     1:1:java.util.Map access$200(com.android.tools.r8.naming.signature.GenericSignatureRewriter):29:29 -> b
@@ -40186,23 +39458,24 @@
     void stop() -> c
 com.android.tools.r8.optimize.ClassAndMemberPublicizer -> a.a.a.a.n.a:
     com.android.tools.r8.graph.DexApplication application -> a
-    com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> c
-    com.android.tools.r8.optimize.PublicizerLense$PublicizedLenseBuilder lenseBuilder -> d
+    com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet -> c
+    com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> d
+    com.android.tools.r8.optimize.PublicizerLense$PublicizedLenseBuilder lenseBuilder -> e
     com.android.tools.r8.graph.AppView appView -> b
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):32:32 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):29:35 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):50:50 -> a
-    2:12:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):56:66 -> a
-    2:12:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):50 -> a
-    13:28:void publicizeType(com.android.tools.r8.graph.DexType):70:85 -> a
-    29:29:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):552:552 -> a
-    29:29:void publicizeType(com.android.tools.r8.graph.DexType):85 -> a
-    30:30:void lambda$publicizeType$0(com.android.tools.r8.graph.DexEncodedField):73:73 -> a
-    31:75:boolean publicizeMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):89:133 -> a
-    31:75:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):76 -> a
-    76:76:boolean publicizeMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):94:94 -> a
-    76:76:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):76 -> a
-    77:77:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod) -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet):33:33 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet):30:37 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet):53:53 -> a
+    2:6:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):59:63 -> a
+    7:7:void com.android.tools.r8.graph.DexType.forAllInterfaces(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):287:287 -> a
+    7:7:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):63 -> a
+    8:11:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):64:67 -> a
+    12:27:void publicizeType(com.android.tools.r8.graph.DexType):71:86 -> a
+    28:28:void lambda$publicizeType$0(com.android.tools.r8.graph.DexEncodedField):74:74 -> a
+    29:73:boolean publicizeMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):90:134 -> a
+    29:73:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):77 -> a
+    74:74:boolean publicizeMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):95:95 -> a
+    74:74:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):77 -> a
+    75:75:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):78:78 -> a
 com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> a.a.a.a.n.c:
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind kind -> c
     boolean $assertionsDisabled -> e
@@ -40240,40 +39513,40 @@
     com.android.tools.r8.utils.InternalOptions options -> c
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.GraphLense lense -> b
-    1:1:void <clinit>():29:29 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.graph.AppView):37:42 -> <init>
-    1:13:com.android.tools.r8.graph.DexMethod validTargetFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):46:58 -> a
-    14:31:com.android.tools.r8.graph.DexType firstLibraryClassForInterfaceTarget(java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):79:96 -> a
-    32:37:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):103:108 -> a
-    38:38:com.android.tools.r8.graph.DexEncodedMethod anyLookup(com.android.tools.r8.graph.DexMethod):120:120 -> a
-    39:53:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):127:141 -> a
-    54:57:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):171:174 -> a
-    54:57:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):147 -> a
-    58:58:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):150:150 -> a
-    59:65:com.android.tools.r8.graph.DexEncodedMethod insertBridgeForInterfaceMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,java.util.function.Function):191:197 -> a
-    59:65:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):149 -> a
-    66:67:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):156:157 -> a
-    68:76:com.android.tools.r8.graph.DexEncodedMethod insertBridgeForVisibilityIfNeeded(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.util.function.Function):240:248 -> a
-    68:76:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):160 -> a
-    77:77:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):164:164 -> a
-    78:78:boolean lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):158:158 -> a
-    79:90:boolean mayNeedBridgeForVisibility(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):215:226 -> a
-    79:90:boolean lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):158 -> a
-    91:100:com.android.tools.r8.graph.DexProgramClass findHolderForInterfaceMethodBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):202:211 -> a
-    101:123:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):256:278 -> a
-    124:139:void computeFieldRebinding(java.util.Map,java.util.function.BiFunction,java.util.function.BiFunction):287:302 -> a
-    140:151:com.android.tools.r8.graph.DexField validTargetFor(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,java.util.function.BiFunction):63:74 -> a
-    140:151:void computeFieldRebinding(java.util.Map,java.util.function.BiFunction,java.util.function.BiFunction):303 -> a
-    152:152:void computeFieldRebinding(java.util.Map,java.util.function.BiFunction,java.util.function.BiFunction):303:303 -> a
-    153:153:void computeFieldRebinding(java.util.Map,java.util.function.BiFunction,java.util.function.BiFunction):302:302 -> a
-    154:154:boolean lambda$computeFieldRebinding$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):297:297 -> a
-    155:166:boolean isMemberVisibleFromOriginalContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):310:321 -> a
-    167:175:java.util.Map mergeFieldAccessContexts(java.util.Map,java.util.Map):327:335 -> a
-    176:189:com.android.tools.r8.graph.GraphLense run():339:352 -> a
-    190:194:com.android.tools.r8.graph.GraphLense run():351:355 -> a
-    195:199:com.android.tools.r8.graph.GraphLense run():354:358 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMethod classLookup(com.android.tools.r8.graph.DexMethod):112:112 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod interfaceLookup(com.android.tools.r8.graph.DexMethod):116:116 -> c
+    1:1:void <clinit>():30:30 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.graph.AppView):38:43 -> <init>
+    1:13:com.android.tools.r8.graph.DexMethod validTargetFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):47:59 -> a
+    14:31:com.android.tools.r8.graph.DexType firstLibraryClassForInterfaceTarget(java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):80:97 -> a
+    32:37:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):104:109 -> a
+    38:38:com.android.tools.r8.graph.DexEncodedMethod anyLookup(com.android.tools.r8.graph.DexMethod):121:121 -> a
+    39:53:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):128:142 -> a
+    54:57:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):172:175 -> a
+    54:57:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):148 -> a
+    58:58:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):151:151 -> a
+    59:65:com.android.tools.r8.graph.DexEncodedMethod insertBridgeForInterfaceMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,java.util.function.Function):192:198 -> a
+    59:65:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):150 -> a
+    66:67:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):157:158 -> a
+    68:76:com.android.tools.r8.graph.DexEncodedMethod insertBridgeForVisibilityIfNeeded(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.util.function.Function):241:249 -> a
+    68:76:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):161 -> a
+    77:77:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):165:165 -> a
+    78:78:boolean lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):159:159 -> a
+    79:90:boolean mayNeedBridgeForVisibility(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):216:227 -> a
+    79:90:boolean lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):159 -> a
+    91:100:com.android.tools.r8.graph.DexProgramClass findHolderForInterfaceMethodBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):203:212 -> a
+    101:123:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):257:279 -> a
+    124:139:void computeFieldRebinding(java.util.Map,java.util.function.BiFunction,java.util.function.BiFunction):288:303 -> a
+    140:151:com.android.tools.r8.graph.DexField validTargetFor(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,java.util.function.BiFunction):64:75 -> a
+    140:151:void computeFieldRebinding(java.util.Map,java.util.function.BiFunction,java.util.function.BiFunction):304 -> a
+    152:152:void computeFieldRebinding(java.util.Map,java.util.function.BiFunction,java.util.function.BiFunction):304:304 -> a
+    153:153:void computeFieldRebinding(java.util.Map,java.util.function.BiFunction,java.util.function.BiFunction):303:303 -> a
+    154:154:boolean lambda$computeFieldRebinding$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):298:298 -> a
+    155:166:boolean isMemberVisibleFromOriginalContext(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):314:325 -> a
+    167:175:java.util.Map mergeFieldAccessContexts(java.util.Map,java.util.Map):331:339 -> a
+    176:189:com.android.tools.r8.graph.GraphLense run():343:356 -> a
+    190:194:com.android.tools.r8.graph.GraphLense run():355:359 -> a
+    195:199:com.android.tools.r8.graph.GraphLense run():358:362 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod classLookup(com.android.tools.r8.graph.DexMethod):113:113 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod interfaceLookup(com.android.tools.r8.graph.DexMethod):117:117 -> c
 com.android.tools.r8.optimize.MemberRebindingLense -> a.a.a.a.n.f:
     com.android.tools.r8.graph.AppView appView -> k
     1:7:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map,com.android.tools.r8.graph.GraphLense):44:50 -> <init>
@@ -40331,13 +39604,13 @@
     37:43:void run():94 -> a
 com.android.tools.r8.org.objectweb.asm.AnnotationVisitor -> a.a.a.a.o.a.a.a:
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor av -> a
-    1:1:void <init>(int):56:56 -> <init>
-    2:7:void <init>(int,com.android.tools.r8.org.objectweb.asm.AnnotationVisitor):67:72 -> <init>
-    1:2:void visit(java.lang.String,java.lang.Object):87:88 -> a
-    3:4:void visitEnum(java.lang.String,java.lang.String,java.lang.String):100:101 -> a
-    5:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):115:116 -> a
-    7:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):133:134 -> a
-    9:10:void visitEnd():141:142 -> a
+    1:1:void <init>(int):57:57 -> <init>
+    2:10:void <init>(int,com.android.tools.r8.org.objectweb.asm.AnnotationVisitor):69:77 -> <init>
+    1:2:void visit(java.lang.String,java.lang.Object):92:93 -> a
+    3:4:void visitEnum(java.lang.String,java.lang.String,java.lang.String):105:106 -> a
+    5:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):120:121 -> a
+    7:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):138:139 -> a
+    9:10:void visitEnd():146:147 -> a
 com.android.tools.r8.org.objectweb.asm.AnnotationWriter -> a.a.a.a.o.a.a.b:
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter nextAnnotation -> h
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter previousAnnotation -> g
@@ -40347,30 +39620,16 @@
     int numElementValuePairsOffset -> e
     boolean useNamedValues -> c
     1:9:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,boolean,com.android.tools.r8.org.objectweb.asm.ByteVector,com.android.tools.r8.org.objectweb.asm.AnnotationWriter):115:123 -> <init>
-    1:4:com.android.tools.r8.org.objectweb.asm.AnnotationWriter create(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter):142:145 -> a
-    5:5:com.android.tools.r8.org.objectweb.asm.AnnotationWriter create(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter):173:173 -> a
-    6:6:void com.android.tools.r8.org.objectweb.asm.TypeReference.putTarget(int,com.android.tools.r8.org.objectweb.asm.ByteVector):433:433 -> a
-    6:6:com.android.tools.r8.org.objectweb.asm.AnnotationWriter create(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter):175 -> a
-    7:25:void com.android.tools.r8.org.objectweb.asm.TypeReference.putTarget(int,com.android.tools.r8.org.objectweb.asm.ByteVector):412:430 -> a
-    7:25:com.android.tools.r8.org.objectweb.asm.AnnotationWriter create(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter):175 -> a
-    26:26:void com.android.tools.r8.org.objectweb.asm.TypeReference.putTarget(int,com.android.tools.r8.org.objectweb.asm.ByteVector):407:407 -> a
-    26:26:com.android.tools.r8.org.objectweb.asm.AnnotationWriter create(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter):175 -> a
-    27:30:com.android.tools.r8.org.objectweb.asm.AnnotationWriter create(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter):176:179 -> a
-    31:98:void visit(java.lang.String,java.lang.Object):191:258 -> a
-    99:105:void visitEnum(java.lang.String,java.lang.String,java.lang.String):266:272 -> a
-    106:112:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):279:285 -> a
-    113:125:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):292:304 -> a
-    126:129:void visitEnd():309:312 -> a
-    130:145:int computeAnnotationsSize(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):373:388 -> a
-    146:158:void putAnnotations(int,com.android.tools.r8.org.objectweb.asm.ByteVector):410:422 -> a
-    159:159: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):455:455 -> a
-    160:165: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):454:459 -> a
-    166:171: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):458:463 -> a
-    172:177: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):462:467 -> a
-    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):466:466 -> a
-    179:181:int computeParameterAnnotationsSize(java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter[],int):496:498 -> a
-    182:205:void putParameterAnnotations(int,com.android.tools.r8.org.objectweb.asm.AnnotationWriter[],int,com.android.tools.r8.org.objectweb.asm.ByteVector):524:547 -> a
-    1:8:int computeAnnotationsSize(java.lang.String):332:339 -> b
+    10:10:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,com.android.tools.r8.org.objectweb.asm.ByteVector,com.android.tools.r8.org.objectweb.asm.AnnotationWriter):142:142 -> <init>
+    1:68:void visit(java.lang.String,java.lang.Object):153:220 -> a
+    69:75:void visitEnum(java.lang.String,java.lang.String,java.lang.String):228:234 -> a
+    76:82:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):241:247 -> a
+    83:95:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):254:266 -> a
+    96:99:void visitEnd():271:274 -> a
+    100:112:void putAnnotations(int,com.android.tools.r8.org.objectweb.asm.ByteVector):322:334 -> a
+    113:115:int computeParameterAnnotationsSize(java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter[],int):363:365 -> a
+    116:139:void putParameterAnnotations(int,com.android.tools.r8.org.objectweb.asm.AnnotationWriter[],int,com.android.tools.r8.org.objectweb.asm.ByteVector):391:414 -> a
+    1:8:int computeAnnotationsSize(java.lang.String):294:301 -> b
 com.android.tools.r8.org.objectweb.asm.Attribute -> a.a.a.a.o.a.a.d:
     byte[] content -> b
     java.lang.String type -> a
@@ -40379,34 +39638,32 @@
     1:3:com.android.tools.r8.org.objectweb.asm.Attribute read(com.android.tools.r8.org.objectweb.asm.ClassReader,int,int,char[],int,com.android.tools.r8.org.objectweb.asm.Label[]):128:130 -> a
     4:4:int getAttributeCount():172:172 -> a
     5:5:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable):191:191 -> a
-    6:10:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int):219:223 -> a
+    6:10:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int):218:222 -> a
     11:11:com.android.tools.r8.org.objectweb.asm.ByteVector write(com.android.tools.r8.org.objectweb.asm.ClassWriter,byte[],int,int,int):159:159 -> a
-    11:11:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int):224 -> a
+    11:11:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int):223 -> a
     12:12:void com.android.tools.r8.org.objectweb.asm.ByteVector.<init>(byte[]):65:65 -> a
     12:12:com.android.tools.r8.org.objectweb.asm.ByteVector write(com.android.tools.r8.org.objectweb.asm.ClassWriter,byte[],int,int,int):159 -> a
-    12:12:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int):224 -> a
-    13:13:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int):225:225 -> a
-    14:27:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int):247:260 -> a
-    28:28:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,com.android.tools.r8.org.objectweb.asm.ByteVector):279:279 -> a
-    29:29:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):307:307 -> a
-    30:30:com.android.tools.r8.org.objectweb.asm.ByteVector write(com.android.tools.r8.org.objectweb.asm.ClassWriter,byte[],int,int,int):159:159 -> a
-    30:30:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):311 -> a
-    31:31:void com.android.tools.r8.org.objectweb.asm.ByteVector.<init>(byte[]):65:65 -> a
-    31:31:com.android.tools.r8.org.objectweb.asm.ByteVector write(com.android.tools.r8.org.objectweb.asm.ClassWriter,byte[],int,int,int):159 -> a
-    31:31:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):311 -> a
-    32:34:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):313:315 -> a
-    35:45:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):336:346 -> a
+    12:12:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int):223 -> a
+    13:13:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int):224:224 -> a
+    14:14:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,com.android.tools.r8.org.objectweb.asm.ByteVector):242:242 -> a
+    15:15:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):269:269 -> a
+    16:16:com.android.tools.r8.org.objectweb.asm.ByteVector write(com.android.tools.r8.org.objectweb.asm.ClassWriter,byte[],int,int,int):159:159 -> a
+    16:16:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):273 -> a
+    17:17:void com.android.tools.r8.org.objectweb.asm.ByteVector.<init>(byte[]):65:65 -> a
+    17:17:com.android.tools.r8.org.objectweb.asm.ByteVector write(com.android.tools.r8.org.objectweb.asm.ClassWriter,byte[],int,int,int):159 -> a
+    17:17:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):273 -> a
+    18:20:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):275:277 -> a
     boolean isCodeAttribute() -> b
 com.android.tools.r8.org.objectweb.asm.Attribute$Set -> a.a.a.a.o.a.a.c:
     com.android.tools.r8.org.objectweb.asm.Attribute[] data -> b
     int size -> a
-    1:6:void <init>():351:356 -> <init>
-    1:2:com.android.tools.r8.org.objectweb.asm.Attribute[] toArray():369:370 -> a
-    3:4:boolean contains(com.android.tools.r8.org.objectweb.asm.Attribute):375:376 -> a
-    3:4:void addAttributes(com.android.tools.r8.org.objectweb.asm.Attribute):361 -> a
-    5:10:void 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
+    1:6:void <init>():282:287 -> <init>
+    1:2:com.android.tools.r8.org.objectweb.asm.Attribute[] toArray():300:301 -> a
+    3:4:boolean contains(com.android.tools.r8.org.objectweb.asm.Attribute):306:307 -> a
+    3:4:void addAttributes(com.android.tools.r8.org.objectweb.asm.Attribute):292 -> a
+    5:10:void add(com.android.tools.r8.org.objectweb.asm.Attribute):315:320 -> a
+    5:10:void addAttributes(com.android.tools.r8.org.objectweb.asm.Attribute):293 -> a
+    11:11:void addAttributes(com.android.tools.r8.org.objectweb.asm.Attribute):295:295 -> a
 com.android.tools.r8.org.objectweb.asm.ByteVector -> a.a.a.a.o.a.a.e:
     byte[] data -> a
     int length -> b
@@ -40416,225 +39673,221 @@
     7:14:com.android.tools.r8.org.objectweb.asm.ByteVector put11(int,int):92:99 -> a
     15:24:com.android.tools.r8.org.objectweb.asm.ByteVector put112(int,int,int):152:161 -> a
     25:40:com.android.tools.r8.org.objectweb.asm.ByteVector putLong(long):216:231 -> a
-    41:65:com.android.tools.r8.org.objectweb.asm.ByteVector putUTF8(java.lang.String):244:268 -> a
-    66:66:com.android.tools.r8.org.objectweb.asm.ByteVector putUTF8(java.lang.String):246:246 -> a
-    67:105:com.android.tools.r8.org.objectweb.asm.ByteVector encodeUtf8(java.lang.String,int,int):285:323 -> a
-    106:106:com.android.tools.r8.org.objectweb.asm.ByteVector encodeUtf8(java.lang.String,int,int):298:298 -> a
-    107:113:com.android.tools.r8.org.objectweb.asm.ByteVector putByteArray(byte[],int,int):339:345 -> a
+    41:65:com.android.tools.r8.org.objectweb.asm.ByteVector putUTF8(java.lang.String):243:267 -> a
+    66:66:com.android.tools.r8.org.objectweb.asm.ByteVector putUTF8(java.lang.String):245:245 -> a
+    67:105:com.android.tools.r8.org.objectweb.asm.ByteVector encodeUTF8(java.lang.String,int,int):284:322 -> a
+    106:106:com.android.tools.r8.org.objectweb.asm.ByteVector encodeUTF8(java.lang.String,int,int):297:297 -> a
+    107:113:com.android.tools.r8.org.objectweb.asm.ByteVector putByteArray(byte[],int,int):338:344 -> a
     1:9:com.android.tools.r8.org.objectweb.asm.ByteVector put12(int,int):130:138 -> b
     10:19:com.android.tools.r8.org.objectweb.asm.ByteVector putInt(int):172:181 -> b
     20:30:com.android.tools.r8.org.objectweb.asm.ByteVector put122(int,int,int):195:205 -> b
     1:8:com.android.tools.r8.org.objectweb.asm.ByteVector putShort(int):110:117 -> c
-    1:5:void enlarge(int):355:359 -> d
+    1:5:void enlarge(int):354:358 -> d
 com.android.tools.r8.org.objectweb.asm.ClassReader -> a.a.a.a.o.a.a.f:
-    int[] bootstrapMethodOffsets -> f
-    byte[] classFileBuffer -> b
     byte[] b -> a
-    int[] cpInfoOffsets -> c
-    com.android.tools.r8.org.objectweb.asm.ConstantDynamic[] constantDynamicValues -> e
-    int header -> h
-    java.lang.String[] constantUtf8Values -> d
-    int maxStringLength -> g
-    1:1:void <init>(byte[]):162:162 -> <init>
-    2:2:void <init>(byte[],int,int):176:176 -> <init>
-    2:2:void <init>(byte[]):162 -> <init>
-    3:73:void <init>(byte[],int,boolean):188:258 -> <init>
-    74:102:void <init>(byte[],int,boolean):239:267 -> <init>
-    103:127:int[] readBootstrapMethodsAttribute(int):3241:3265 -> <init>
-    103:127:void <init>(byte[],int,boolean):271 -> <init>
-    128:128:void <init>(byte[],int,boolean):271:271 -> <init>
-    1:114:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):421:534 -> a
-    115:121:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):533:539 -> a
-    122:122:void readModuleAttributes(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):716:716 -> a
-    122:122:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):544 -> a
-    123:123:java.lang.String readStringish(int,char[]):3493:3493 -> a
-    123:123:java.lang.String readModule(int,char[]):3523 -> a
-    123:123:void readModuleAttributes(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):720 -> a
-    123:123:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):544 -> a
-    124:225:void readModuleAttributes(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):721:822 -> a
-    124:225:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):544 -> a
-    226:249:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):550:573 -> a
-    250:269:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):572:591 -> a
-    270:291:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):590:611 -> a
-    292:317:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):610:635 -> a
-    318:358:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):634:674 -> a
-    359:369:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):670:680 -> a
-    370:457:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):835:922 -> a
-    370:457:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
-    458:477:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):921:940 -> a
-    458:477:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
-    478:499:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):939:960 -> a
-    478:499:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
-    500:525:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):959:984 -> a
-    500:525:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
-    526:548:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):983:1005 -> a
-    526:548:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
-    549:549:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):685:685 -> a
-    550:657:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1019:1126 -> a
-    550:657:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    658:678:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1122:1142 -> a
-    658:678:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    679:699:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1138:1158 -> a
-    679:699:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    700:727:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1156:1183 -> a
-    700:727:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    728:747:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1182:1201 -> a
-    728:747:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    748:769:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1200:1221 -> a
-    748:769:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    770:795:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1220:1245 -> a
-    770:795:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    796:839:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1244:1287 -> a
-    796:839:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    840:840:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):692:692 -> a
-    841:1142:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1308:1609 -> a
-    1143:1196:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1511:1564 -> a
-    1197:1202:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1546:1551 -> a
-    1203:1471:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1490:1758 -> a
-    1472:1527:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2964:3019 -> a
-    1472:1527:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1760 -> a
-    1528:1546:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2997:3015 -> a
-    1528:1546:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1760 -> a
-    1547:1547:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2991:2991 -> a
-    1547:1547:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1760 -> a
-    1548:1554:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2988:2994 -> a
-    1548:1554:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1760 -> a
-    1555:1555:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2985:2985 -> a
-    1555:1555:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1760 -> a
-    1556:1627:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1770:1841 -> a
-    1628:1628:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1834:1834 -> a
-    1629:1704:int readStackMapFrame(int,boolean,boolean,com.android.tools.r8.org.objectweb.asm.Context):3045:3120 -> a
-    1629:1704:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1854 -> a
-    1705:1705:int readStackMapFrame(int,boolean,boolean,com.android.tools.r8.org.objectweb.asm.Context):3117:3117 -> a
-    1705:1705:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1854 -> a
-    1706:2106:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1863:2263 -> a
-    2107:2107:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2110:2110 -> a
-    2108:2108:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2109:2109 -> a
-    2109:2120:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2088:2099 -> a
-    2121:2121:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2091:2091 -> a
-    2122:2122:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2056:2056 -> a
-    2123:2328:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2054:2259 -> a
-    2329:2329:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2258:2258 -> a
-    2330:2333:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2118:2121 -> a
-    2334:2463:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2120:2249 -> a
-    2464:2479:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2225:2240 -> a
-    2480:2490:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2204:2214 -> a
-    2491:2501:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2150:2160 -> a
-    2502:2511:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2133:2142 -> a
-    2512:2512:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2049:2049 -> a
-    2513:2718:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2048:2253 -> a
-    2719:2719:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2027:2027 -> a
-    2720:2909:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2003:2192 -> a
-    2910:2910:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2187:2187 -> a
-    2911:2911:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2183:2183 -> a
-    2912:2912:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2179:2179 -> a
-    2913:3214:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1979:2280 -> a
-    3215:3244:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2279:2308 -> a
-    3245:3316:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2307:2378 -> a
-    3317:3346:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2377:2406 -> a
-    3347:3373:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2405:2431 -> a
-    3374:3374:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2475:2475 -> a
-    3375:3378:com.android.tools.r8.org.objectweb.asm.Label readLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2445:2448 -> a
-    3375:3378:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2476 -> a
-    3379:3379:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2476:2476 -> a
-    3380:3385:int getTypeAnnotationBytecodeOffset(int[],int):2603:2608 -> a
-    3386:3444:int readTypeAnnotationTarget(com.android.tools.r8.org.objectweb.asm.Context,int):2624:2682 -> a
-    3445:3491:int readTypeAnnotationTarget(com.android.tools.r8.org.objectweb.asm.Context,int):2641:2687 -> a
-    3492:3505:void readParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2710:2723 -> a
-    3506:3506:void readParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2722:2722 -> a
-    3507:3524:int readElementValues(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,boolean,char[]):2752:2769 -> a
-    3525:3531:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2791:2797 -> a
-    3532:3685:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2795:2948 -> a
-    3686:3693:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2836:2843 -> a
-    3694:3717:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2840:2863 -> a
-    3718:3796:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2862:2940 -> a
-    3797:3797:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2939:2939 -> a
-    3798:3835:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2878:2915 -> a
-    3836:3856:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2902:2922 -> a
-    3857:3868:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2921:2932 -> a
-    3869:3873:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2931:2935 -> a
-    3874:3879:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2894:2899 -> a
-    3880:3885:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2870:2875 -> a
-    3886:3888:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2828:2830 -> a
-    3889:3889:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2828:2828 -> a
-    3890:3891:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2822:2823 -> a
-    3892:3892:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2822:2822 -> a
-    3893:3893:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2818:2818 -> a
-    3894:3894:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2817:2817 -> a
-    3895:3896:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2809:2810 -> a
-    3897:3897:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2809:2809 -> a
-    3898:3899:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2804:2805 -> a
-    3900:3949:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2804:2853 -> a
-    3950:3950:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2852:2852 -> a
-    3951:3983:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3145:3177 -> a
-    3984:3984:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3173:3173 -> a
-    3985:3985:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3169:3169 -> a
-    3986:3986:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3166:3166 -> a
-    3987:3987:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3163:3163 -> a
-    3988:3988:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3160:3160 -> a
-    3989:3989:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3157:3157 -> a
-    3990:3990:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3154:3154 -> a
-    3991:3991:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3151:3151 -> a
-    3992:3992:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3148:3148 -> a
-    3993:4022:int getFirstAttributeOffset():3196:3225 -> a
-    4023:4029:com.android.tools.r8.org.objectweb.asm.Attribute readAttribute(com.android.tools.r8.org.objectweb.asm.Attribute[],java.lang.String,int,int,char[],int,com.android.tools.r8.org.objectweb.asm.Label[]):3296:3302 -> a
-    4030:4030:int getItem(int):3329:3329 -> a
-    4031:4047:java.lang.String readUtf(int,int,char[]):3458:3474 -> a
-    4048:4048:java.lang.String readStringish(int,char[]):3493:3493 -> a
-    4048:4048:java.lang.String readClass(int,char[]):3508 -> a
-    1:4:com.android.tools.r8.org.objectweb.asm.Label readLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2445:2448 -> b
-    1:4:com.android.tools.r8.org.objectweb.asm.Label createLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2461 -> b
-    5:5:com.android.tools.r8.org.objectweb.asm.Label createLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2462:2462 -> b
-    6:59:int[] readTypeAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2503:2556 -> b
-    60:112:int[] readTypeAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2519:2571 -> b
-    113:127:int[] readTypeAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2570:2584 -> b
-    128:128:int getItemCount():3315:3315 -> b
-    129:129:int readByte(int):3351:3351 -> b
-    130:159:java.lang.Object readConst(int,char[]):3587:3616 -> b
-    160:176:com.android.tools.r8.org.objectweb.asm.ConstantDynamic readConstantDynamic(int,char[]):3552:3568 -> b
-    160:176:java.lang.Object readConst(int,char[]):3614 -> b
-    177:187:java.lang.Object readConst(int,char[]):3602:3612 -> b
-    188:188:java.lang.Object readConst(int,char[]):3600:3600 -> b
-    189:189:java.lang.Object readConst(int,char[]):3598:3598 -> b
-    190:190:java.lang.Object readConst(int,char[]):3596:3596 -> b
-    191:191:java.lang.Object readConst(int,char[]):3594:3594 -> b
-    192:192:java.lang.Object readConst(int,char[]):3592:3592 -> b
-    193:193:java.lang.Object readConst(int,char[]):3590:3590 -> b
-    1:1:int getMaxStringLength():3340:3340 -> c
-    2:3:int readInt(int):3386:3387 -> c
-    4:4:java.lang.String readStringish(int,char[]):3493:3493 -> c
-    4:4:java.lang.String readModule(int,char[]):3523 -> c
-    1:2:long readLong(int):3401:3402 -> d
-    3:3:java.lang.String readStringish(int,char[]):3493:3493 -> d
-    3:3:java.lang.String readPackage(int,char[]):3538 -> d
-    1:2:short readShort(int):3374:3375 -> e
-    3:7:java.lang.String readUTF8(int,char[]):3419:3423 -> e
-    1:2:int readUnsignedShort(int):3362:3363 -> f
-    3:9:java.lang.String readUtf(int,char[]):3436:3442 -> f
+    java.lang.Object[] cpInfoValues -> c
+    int[] cpInfoOffsets -> b
+    int[] bootstrapMethodOffsets -> d
+    int header -> f
+    int maxStringLength -> e
+    1:1:void <init>(byte[]):146:146 -> <init>
+    2:2:void <init>(byte[],int,int):158:158 -> <init>
+    2:2:void <init>(byte[]):146 -> <init>
+    3:63:void <init>(byte[],int,boolean):170:230 -> <init>
+    64:114:void <init>(byte[],int,boolean):211:261 -> <init>
+    1:115:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):412:526 -> a
+    116:122:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):525:531 -> a
+    123:123:void readModule(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):707:707 -> a
+    123:123:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):536 -> a
+    124:124:java.lang.String readStringish(int,char[]):3445:3445 -> a
+    124:124:java.lang.String readModule(int,char[]):3473 -> a
+    124:124:void readModule(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):711 -> a
+    124:124:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):536 -> a
+    125:226:void readModule(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):712:813 -> a
+    125:226:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):536 -> a
+    227:250:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):541:564 -> a
+    251:270:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):563:582 -> a
+    271:292:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):581:602 -> a
+    293:318:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):601:626 -> a
+    319:359:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):625:665 -> a
+    360:370:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):661:671 -> a
+    371:458:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):826:913 -> a
+    371:458:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):674 -> a
+    459:478:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):912:931 -> a
+    459:478:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):674 -> a
+    479:500:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):930:951 -> a
+    479:500:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):674 -> a
+    501:526:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):950:975 -> a
+    501:526:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):674 -> a
+    527:549:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):974:996 -> a
+    527:549:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):674 -> a
+    550:550:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):676:676 -> a
+    551:658:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1010:1117 -> a
+    551:658:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):679 -> a
+    659:681:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1113:1135 -> a
+    659:681:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):679 -> a
+    682:703:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1129:1150 -> a
+    682:703:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):679 -> a
+    704:731:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1148:1175 -> a
+    704:731:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):679 -> a
+    732:751:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1174:1193 -> a
+    732:751:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):679 -> a
+    752:773:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1192:1213 -> a
+    752:773:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):679 -> a
+    774:799:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1212:1237 -> a
+    774:799:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):679 -> a
+    800:843:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1236:1279 -> a
+    800:843:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):679 -> a
+    844:844:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683:683 -> a
+    845:1146:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1300:1601 -> a
+    1147:1200:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1503:1556 -> a
+    1201:1206:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1538:1543 -> a
+    1207:1478:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1482:1753 -> a
+    1479:1534:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2962:3017 -> a
+    1479:1534:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1755 -> a
+    1535:1553:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2995:3013 -> a
+    1535:1553:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1755 -> a
+    1554:1554:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2989:2989 -> a
+    1554:1554:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1755 -> a
+    1555:1561:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2986:2992 -> a
+    1555:1561:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1755 -> a
+    1562:1562:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2983:2983 -> a
+    1562:1562:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1755 -> a
+    1563:1634:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1765:1836 -> a
+    1635:1635:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1829:1829 -> a
+    1636:1711:int readStackMapFrame(int,boolean,boolean,com.android.tools.r8.org.objectweb.asm.Context):3043:3118 -> a
+    1636:1711:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1849 -> a
+    1712:1712:int readStackMapFrame(int,boolean,boolean,com.android.tools.r8.org.objectweb.asm.Context):3115:3115 -> a
+    1712:1712:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1849 -> a
+    1713:2116:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1858:2261 -> a
+    2117:2117:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2106:2106 -> a
+    2118:2118:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2105:2105 -> a
+    2119:2130:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2083:2094 -> a
+    2131:2131:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2086:2086 -> a
+    2132:2132:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2051:2051 -> a
+    2133:2341:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2049:2257 -> a
+    2342:2342:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2256:2256 -> a
+    2343:2346:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2115:2118 -> a
+    2347:2477:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2117:2247 -> a
+    2478:2493:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2223:2238 -> a
+    2494:2504:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2202:2212 -> a
+    2505:2515:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2147:2157 -> a
+    2516:2525:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2130:2139 -> a
+    2526:2526:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2044:2044 -> a
+    2527:2735:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2043:2251 -> a
+    2736:2736:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2022:2022 -> a
+    2737:2929:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1998:2190 -> a
+    2930:2931:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2184:2185 -> a
+    2932:2932:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2184:2184 -> a
+    2933:2933:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2180:2180 -> a
+    2934:2934:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2176:2176 -> a
+    2935:3239:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1974:2278 -> a
+    3240:3269:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2277:2306 -> a
+    3270:3341:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2305:2376 -> a
+    3342:3371:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2375:2404 -> a
+    3372:3398:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2403:2429 -> a
+    3399:3399:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2473:2473 -> a
+    3400:3403:com.android.tools.r8.org.objectweb.asm.Label readLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2443:2446 -> a
+    3400:3403:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2474 -> a
+    3404:3404:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2474:2474 -> a
+    3405:3410:int getTypeAnnotationBytecodeOffset(int[],int):2601:2606 -> a
+    3411:3469:int readTypeAnnotationTarget(com.android.tools.r8.org.objectweb.asm.Context,int):2622:2680 -> a
+    3470:3516:int readTypeAnnotationTarget(com.android.tools.r8.org.objectweb.asm.Context,int):2639:2685 -> a
+    3517:3530:void readParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2708:2721 -> a
+    3531:3531:void readParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2720:2720 -> a
+    3532:3549:int readElementValues(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,boolean,char[]):2750:2767 -> a
+    3550:3556:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2789:2795 -> a
+    3557:3710:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2793:2946 -> a
+    3711:3718:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2834:2841 -> a
+    3719:3742:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2838:2861 -> a
+    3743:3821:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2860:2938 -> a
+    3822:3822:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2937:2937 -> a
+    3823:3860:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2876:2913 -> a
+    3861:3881:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2900:2920 -> a
+    3882:3893:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2919:2930 -> a
+    3894:3898:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2929:2933 -> a
+    3899:3904:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2892:2897 -> a
+    3905:3910:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2868:2873 -> a
+    3911:3913:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2826:2828 -> a
+    3914:3914:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2826:2826 -> a
+    3915:3916:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2820:2821 -> a
+    3917:3917:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2820:2820 -> a
+    3918:3918:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2816:2816 -> a
+    3919:3919:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2815:2815 -> a
+    3920:3921:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2807:2808 -> a
+    3922:3922:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2807:2807 -> a
+    3923:3924:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2802:2803 -> a
+    3925:3974:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2802:2851 -> a
+    3975:3975:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2850:2850 -> a
+    3976:4008:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3143:3175 -> a
+    4009:4009:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3171:3171 -> a
+    4010:4010:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3167:3167 -> a
+    4011:4011:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3164:3164 -> a
+    4012:4012:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3161:3161 -> a
+    4013:4013:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3158:3158 -> a
+    4014:4014:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3155:3155 -> a
+    4015:4015:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3152:3152 -> a
+    4016:4016:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3149:3149 -> a
+    4017:4017:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3146:3146 -> a
+    4018:4047:int getFirstAttributeOffset():3188:3217 -> a
+    4048:4054:com.android.tools.r8.org.objectweb.asm.Attribute readAttribute(com.android.tools.r8.org.objectweb.asm.Attribute[],java.lang.String,int,int,char[],int,com.android.tools.r8.org.objectweb.asm.Label[]):3251:3257 -> a
+    4055:4055:int getItem(int):3283:3283 -> a
+    4056:4072:java.lang.String readUTF(int,int,char[]):3411:3427 -> a
+    4073:4073:java.lang.String readStringish(int,char[]):3445:3445 -> a
+    4073:4073:java.lang.String readClass(int,char[]):3459 -> a
+    1:4:com.android.tools.r8.org.objectweb.asm.Label readLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2443:2446 -> b
+    1:4:com.android.tools.r8.org.objectweb.asm.Label createLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2459 -> b
+    5:5:com.android.tools.r8.org.objectweb.asm.Label createLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2460:2460 -> b
+    6:59:int[] readTypeAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2501:2554 -> b
+    60:112:int[] readTypeAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2517:2569 -> b
+    113:127:int[] readTypeAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2568:2582 -> b
+    128:128:int getItemCount():3270:3270 -> b
+    129:129:int readByte(int):3305:3305 -> b
+    130:159:java.lang.Object readConst(int,char[]):3536:3565 -> b
+    160:177:com.android.tools.r8.org.objectweb.asm.ConstantDynamic readConstantDynamic(int,char[]):3501:3518 -> b
+    160:177:java.lang.Object readConst(int,char[]):3563 -> b
+    178:188:java.lang.Object readConst(int,char[]):3551:3561 -> b
+    189:189:java.lang.Object readConst(int,char[]):3549:3549 -> b
+    190:190:java.lang.Object readConst(int,char[]):3547:3547 -> b
+    191:191:java.lang.Object readConst(int,char[]):3545:3545 -> b
+    192:192:java.lang.Object readConst(int,char[]):3543:3543 -> b
+    193:193:java.lang.Object readConst(int,char[]):3541:3541 -> b
+    194:194:java.lang.Object readConst(int,char[]):3539:3539 -> b
+    1:1:int getMaxStringLength():3294:3294 -> c
+    2:3:int readInt(int):3340:3341 -> c
+    4:4:java.lang.String readStringish(int,char[]):3445:3445 -> c
+    4:4:java.lang.String readModule(int,char[]):3473 -> c
+    1:2:long readLong(int):3355:3356 -> d
+    3:3:java.lang.String readStringish(int,char[]):3445:3445 -> d
+    3:3:java.lang.String readPackage(int,char[]):3487 -> d
+    1:2:short readShort(int):3328:3329 -> e
+    3:9:java.lang.String readUTF(int,char[]):3388:3394 -> e
+    1:2:int readUnsignedShort(int):3316:3317 -> f
+    3:7:java.lang.String readUTF8(int,char[]):3371:3375 -> f
 com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> a.a.a.a.o.a.a.g:
-    1:1:void <init>(java.lang.String,int):49:49 -> <init>
+    1:1:void <init>(java.lang.String,int):48:48 -> <init>
 com.android.tools.r8.org.objectweb.asm.ClassVisitor -> a.a.a.a.o.a.a.h:
     com.android.tools.r8.org.objectweb.asm.ClassVisitor cv -> b
     int api -> a
-    1:6:void <init>(int,com.android.tools.r8.org.objectweb.asm.ClassVisitor):68:73 -> <init>
-    1:6:void <init>(int):57 -> <init>
+    1:9:void <init>(int,com.android.tools.r8.org.objectweb.asm.ClassVisitor):70:78 -> <init>
+    1:9:void <init>(int):58 -> <init>
     com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]) -> a
-    1:2:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):99:100 -> a
-    3:4:void visitSource(java.lang.String,java.lang.String):113:114 -> a
-    5:9:com.android.tools.r8.org.objectweb.asm.ModuleVisitor visitModule(java.lang.String,int,java.lang.String):129:133 -> a
-    10:10:com.android.tools.r8.org.objectweb.asm.ModuleVisitor visitModule(java.lang.String,int,java.lang.String):130:130 -> a
-    11:15:void visitNestHost(java.lang.String):149:153 -> a
-    16:16:void visitNestHost(java.lang.String):150:150 -> a
-    17:18:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):168:169 -> a
-    19:20:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):182:183 -> a
-    21:25:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):205:209 -> a
-    26:26:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):206:206 -> a
-    27:28:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):220:221 -> a
-    29:30:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):257:258 -> a
-    31:32:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):286:287 -> a
-    33:34:void visitEnd():325:326 -> a
-    1:5:void visitNestMember(java.lang.String):235:239 -> b
-    6:6:void visitNestMember(java.lang.String):236:236 -> b
+    1:2:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):104:105 -> a
+    3:4:void visitSource(java.lang.String,java.lang.String):118:119 -> a
+    5:9:com.android.tools.r8.org.objectweb.asm.ModuleVisitor visitModule(java.lang.String,int,java.lang.String):134:138 -> a
+    10:10:com.android.tools.r8.org.objectweb.asm.ModuleVisitor visitModule(java.lang.String,int,java.lang.String):135:135 -> a
+    11:15:void visitNestHostExperimental(java.lang.String):157:161 -> a
+    16:16:void visitNestHostExperimental(java.lang.String):158:158 -> a
+    17:18:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):176:177 -> a
+    19:20:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):190:191 -> a
+    21:25:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):213:217 -> a
+    26:26:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):214:214 -> a
+    27:28:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):228:229 -> a
+    29:30:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):269:270 -> a
+    31:32:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):298:299 -> a
+    33:34:void visitEnd():337:338 -> a
+    1:5:void visitNestMemberExperimental(java.lang.String):247:251 -> b
+    6:6:void visitNestMemberExperimental(java.lang.String):248:248 -> b
 com.android.tools.r8.org.objectweb.asm.ClassWriter -> a.a.a.a.o.a.a.i:
     int numberOfInnerClasses -> n
     com.android.tools.r8.org.objectweb.asm.FieldWriter firstField -> j
@@ -40670,42 +39923,46 @@
     1:16:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):260:275 -> a
     17:20:void visitSource(java.lang.String,java.lang.String):282:285 -> a
     21:26:com.android.tools.r8.org.objectweb.asm.ModuleVisitor visitModule(java.lang.String,int,java.lang.String):292:297 -> a
-    27:27:void visitNestHost(java.lang.String):302:302 -> a
+    27:27:void visitNestHostExperimental(java.lang.String):302:302 -> a
     28:30:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):308:310 -> a
-    31:35:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):317:321 -> a
-    36:41:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):329:334 -> a
-    42:43:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):342:343 -> a
-    44:60:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):358:374 -> a
-    61:68:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):387:394 -> a
-    69:76:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):404:411 -> a
-    77:77:int newConst(java.lang.Object):714:714 -> a
-    1:5:void visitNestMember(java.lang.String):348:352 -> b
-    6:210:byte[] toByteArray():435:639 -> b
-    211:223:com.android.tools.r8.org.objectweb.asm.Attribute[] getAttributePrototypes():685:697 -> b
-    211:223:byte[] replaceAsmInstructions(byte[],boolean):656 -> b
-    211:223:byte[] toByteArray():639 -> b
-    224:243:byte[] replaceAsmInstructions(byte[],boolean):657:676 -> b
-    224:243:byte[] toByteArray():639 -> b
-    244:244:byte[] toByteArray():641:641 -> b
-    245:245:byte[] toByteArray():538:538 -> b
-    246:246:java.lang.ClassLoader getClassLoader():963:963 -> b
-    246:246:java.lang.String getCommonSuperClass(java.lang.String,java.lang.String):926 -> b
-    247:269:java.lang.String getCommonSuperClass(java.lang.String,java.lang.String):929:951 -> b
-    270:270:java.lang.String getCommonSuperClass(java.lang.String,java.lang.String):937:937 -> b
-    271:271:java.lang.String getCommonSuperClass(java.lang.String,java.lang.String):931:931 -> b
+    31:38:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):318:325 -> a
+    39:49:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):335:345 -> a
+    50:51:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):353:354 -> a
+    52:68:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):369:385 -> a
+    69:76:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):399:406 -> a
+    77:84:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):416:423 -> a
+    85:85:int newConst(java.lang.Object):735:735 -> a
+    1:5:void visitNestMemberExperimental(java.lang.String):359:363 -> b
+    6:182:byte[] toByteArray():447:623 -> b
+    183:188:byte[] toByteArray():622:627 -> b
+    189:194:byte[] toByteArray():626:631 -> b
+    195:200:byte[] toByteArray():630:635 -> b
+    201:227:byte[] toByteArray():634:660 -> b
+    228:240:com.android.tools.r8.org.objectweb.asm.Attribute[] getAttributePrototypes():706:718 -> b
+    228:240:byte[] replaceAsmInstructions(byte[],boolean):677 -> b
+    228:240:byte[] toByteArray():660 -> b
+    241:260:byte[] replaceAsmInstructions(byte[],boolean):678:697 -> b
+    241:260:byte[] toByteArray():660 -> b
+    261:261:byte[] toByteArray():662:662 -> b
+    262:262:byte[] toByteArray():550:550 -> b
+    263:263:java.lang.ClassLoader getClassLoader():983:983 -> b
+    263:263:java.lang.String getCommonSuperClass(java.lang.String,java.lang.String):946 -> b
+    264:286:java.lang.String getCommonSuperClass(java.lang.String,java.lang.String):949:971 -> b
+    287:287:java.lang.String getCommonSuperClass(java.lang.String,java.lang.String):957:957 -> b
+    288:288:java.lang.String getCommonSuperClass(java.lang.String,java.lang.String):951:951 -> b
 com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> a.a.a.a.o.a.a.j:
     java.lang.Object[] bootstrapMethodArguments -> d
     java.lang.String name -> a
     java.lang.String descriptor -> b
     com.android.tools.r8.org.objectweb.asm.Handle bootstrapMethod -> c
-    1:5:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):67:71 -> <init>
-    1:1:com.android.tools.r8.org.objectweb.asm.Handle getBootstrapMethod():98:98 -> a
-    1:1:java.lang.Object[] getBootstrapMethodArgumentsUnsafe():132:132 -> b
-    1:1:java.lang.String getDescriptor():89:89 -> c
-    1:1:java.lang.String getName():80:80 -> d
-    1:8:boolean equals(java.lang.Object):155:162 -> equals
-    1:4:int hashCode():167:170 -> hashCode
-    1:7:java.lang.String toString():175:181 -> toString
+    1:5:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):69:73 -> <init>
+    1:1:com.android.tools.r8.org.objectweb.asm.Handle getBootstrapMethod():100:100 -> a
+    1:1:java.lang.Object[] getBootstrapMethodArguments():111:111 -> b
+    1:1:java.lang.String getDescriptor():91:91 -> c
+    1:1:java.lang.String getName():82:82 -> d
+    1:8:boolean equals(java.lang.Object):119:126 -> equals
+    1:4:int hashCode():131:134 -> hashCode
+    1:7:java.lang.String toString():139:145 -> toString
 com.android.tools.r8.org.objectweb.asm.Context -> a.a.a.a.o.a.a.k:
     int currentFrameType -> n
     java.lang.String currentMethodDescriptor -> f
@@ -40737,12 +39994,12 @@
     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 -> a.a.a.a.o.a.a.n:
     com.android.tools.r8.org.objectweb.asm.FieldVisitor fv -> a
-    1:6:void <init>(int,com.android.tools.r8.org.objectweb.asm.FieldVisitor):66:71 -> <init>
-    1:6:void <init>(int):55 -> <init>
+    1:9:void <init>(int,com.android.tools.r8.org.objectweb.asm.FieldVisitor):68:76 -> <init>
+    1:9:void <init>(int):56 -> <init>
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean) -> a
     void visitEnd() -> a
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
-    1:2:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):119:120 -> a
+    1:2:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):124:125 -> a
 com.android.tools.r8.org.objectweb.asm.FieldWriter -> a.a.a.a.o.a.a.o:
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> h
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleAnnotation -> i
@@ -40757,12 +40014,16 @@
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleTypeAnnotation -> k
     1:10:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):127:136 -> <init>
     void visitEnd() -> a
-    1:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):147:151 -> a
-    6:11:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):159:164 -> a
-    12:13:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):172:173 -> a
-    14:66:void putFieldInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):220:272 -> a
-    67:67:void collectAttributePrototypes(com.android.tools.r8.org.objectweb.asm.Attribute$Set):282:282 -> a
-    1:14:int computeFieldInfoSize():195:208 -> b
+    1:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):148:155 -> a
+    9:19:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):165:175 -> a
+    20:21:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):183:184 -> a
+    22:79:void putFieldInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):262:319 -> a
+    80:85:void putFieldInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):318:323 -> a
+    86:91:void putFieldInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):322:327 -> a
+    92:97:void putFieldInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):326:331 -> a
+    98:102:void putFieldInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):330:334 -> a
+    103:103:void collectAttributePrototypes(com.android.tools.r8.org.objectweb.asm.Attribute$Set):344:344 -> a
+    1:45:int computeFieldInfoSize():206:250 -> b
 com.android.tools.r8.org.objectweb.asm.Frame -> a.a.a.a.o.a.a.p:
     short outputStackTop -> g
     short outputStackStart -> f
@@ -40773,94 +40034,93 @@
     int initializationCount -> h
     int[] outputStack -> e
     com.android.tools.r8.org.objectweb.asm.Label owner -> a
-    1:2:void <init>(com.android.tools.r8.org.objectweb.asm.Label):242:243 -> <init>
-    1:8:void copyFrom(com.android.tools.r8.org.objectweb.asm.Frame):255:262 -> a
-    9:16:int getAbstractTypeFromApiFormat(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.Object):281:288 -> a
-    17:17:int getAbstractTypeFromInternalName(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String):302:302 -> a
-    18:76:int getAbstractTypeFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,int):316:374 -> a
-    77:111:int getAbstractTypeFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,int):336:370 -> a
-    112:113:int getAbstractTypeFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,int):366:367 -> a
-    114:115:int getAbstractTypeFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,int):332:333 -> a
-    116:136:void setInputFrameFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.String,int):397:417 -> a
-    137:160:void setInputFrameFromApiFormat(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.Object[],int,java.lang.Object[]):440:463 -> a
-    161:161:int getInputStackSize():467:467 -> a
-    162:171:int getLocal(int):481:490 -> a
-    172:178:void pop(java.lang.String):597:603 -> a
-    179:179:void pop(java.lang.String):601:601 -> a
-    180:195:int getInitializedType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int):645:660 -> a
-    196:196:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1106:1106 -> a
-    197:198:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1102:1103 -> a
-    199:204:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1093:1098 -> a
-    205:210:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1084:1089 -> a
-    211:238:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1053:1080 -> a
-    239:239:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1077:1077 -> a
-    240:240:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1068:1068 -> a
-    241:241:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1065:1065 -> a
-    242:254:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1062:1074 -> a
-    255:255:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1071:1071 -> a
-    256:256:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1059:1059 -> a
-    257:257:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1056:1056 -> a
-    258:258:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1050:1050 -> a
-    259:260:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1046:1047 -> a
-    261:264:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1036:1039 -> a
-    265:276:void addInitializedType(int):619:630 -> a
-    265:276:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1040 -> a
-    277:277:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1043:1043 -> a
-    278:279:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1029:1030 -> a
-    280:281:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1025:1026 -> a
-    282:282:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1022:1022 -> a
-    283:283:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1019:1019 -> a
-    284:284:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1017:1017 -> a
-    285:286:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1012:1013 -> a
-    287:288:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1006:1007 -> a
-    289:291:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):999:1001 -> a
-    292:293:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):994:995 -> a
-    294:296:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):989:991 -> a
-    297:297:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):985:985 -> a
-    298:300:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):980:982 -> a
-    301:303:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):973:975 -> a
-    304:306:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):953:955 -> a
-    307:310:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):918:921 -> a
-    311:320:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):906:915 -> a
-    321:328:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):896:903 -> a
-    329:334:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):888:893 -> a
-    335:341:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):879:885 -> a
-    342:346:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):872:876 -> a
-    347:349:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):867:869 -> a
-    350:350:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):864:864 -> a
-    351:351:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):851:851 -> a
-    352:352:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):832:832 -> a
-    353:353:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):828:828 -> a
-    354:366:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):806:818 -> a
-    367:367:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):813:813 -> a
-    368:378:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):790:800 -> a
-    379:379:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):795:795 -> a
-    380:382:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):783:785 -> a
-    383:571:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):778:966 -> a
-    572:743:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):772:943 -> a
-    744:744:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):768:768 -> a
-    745:776:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):733:764 -> a
-    777:777:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):761:761 -> a
-    778:781:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):755:758 -> a
-    782:782:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):752:752 -> a
-    783:783:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):749:749 -> a
-    784:785:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):745:746 -> a
-    786:790:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):738:742 -> a
-    791:791:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):735:735 -> a
-    792:793:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):729:730 -> a
-    794:794:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):724:724 -> a
-    795:796:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):717:718 -> a
-    797:797:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):712:712 -> a
-    798:798:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):700:700 -> a
-    799:809:int getConcreteOutputType(int,int):1129:1139 -> a
-    810:885:boolean merge(com.android.tools.r8.org.objectweb.asm.SymbolTable,com.android.tools.r8.org.objectweb.asm.Frame,int):1169:1244 -> a
-    886:953:boolean merge(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int[],int):1268:1335 -> a
-    954:991:void accept(com.android.tools.r8.org.objectweb.asm.MethodWriter):1356:1393 -> a
-    1:11:void setLocal(int,int):504:514 -> b
-    12:17:void push(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String):551:556 -> b
-    18:22:int pop():567:571 -> b
-    23:29:void pop(int):581:587 -> b
-    1:16:void push(int):524:539 -> c
+    1:2:void <init>(com.android.tools.r8.org.objectweb.asm.Label):348:349 -> <init>
+    1:8:int getAbstractTypeFromApiFormat(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.Object):242:249 -> a
+    9:9:int getAbstractTypeFromInternalName(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String):263:263 -> a
+    10:68:int getAbstractTypeFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,int):277:335 -> a
+    69:103:int getAbstractTypeFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,int):297:331 -> a
+    104:105:int getAbstractTypeFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,int):327:328 -> a
+    106:107:int getAbstractTypeFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,int):293:294 -> a
+    108:115:void copyFrom(com.android.tools.r8.org.objectweb.asm.Frame):361:368 -> a
+    116:136:void setInputFrameFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.String,int):390:410 -> a
+    137:160:void setInputFrameFromApiFormat(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.Object[],int,java.lang.Object[]):433:456 -> a
+    161:161:int getInputStackSize():460:460 -> a
+    162:171:int getLocal(int):474:483 -> a
+    172:182:void setLocal(int,int):497:507 -> a
+    183:189:void pop(java.lang.String):589:595 -> a
+    190:190:void pop(java.lang.String):593:593 -> a
+    191:206:int getInitializedType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int):637:652 -> a
+    207:207:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1098:1098 -> a
+    208:209:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1094:1095 -> a
+    210:215:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1085:1090 -> a
+    216:221:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1076:1081 -> a
+    222:249:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1045:1072 -> a
+    250:250:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1069:1069 -> a
+    251:251:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1060:1060 -> a
+    252:252:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1057:1057 -> a
+    253:265:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1054:1066 -> a
+    266:266:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1063:1063 -> a
+    267:267:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1051:1051 -> a
+    268:268:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1048:1048 -> a
+    269:269:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1042:1042 -> a
+    270:271:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1038:1039 -> a
+    272:275:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1028:1031 -> a
+    276:287:void addInitializedType(int):611:622 -> a
+    276:287:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1032 -> a
+    288:288:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1035:1035 -> a
+    289:290:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1021:1022 -> a
+    291:292:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1017:1018 -> a
+    293:293:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1014:1014 -> a
+    294:294:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1011:1011 -> a
+    295:295:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1009:1009 -> a
+    296:297:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1004:1005 -> a
+    298:299:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):998:999 -> a
+    300:302:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):991:993 -> a
+    303:304:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):986:987 -> a
+    305:307:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):981:983 -> a
+    308:308:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):977:977 -> a
+    309:311:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):972:974 -> a
+    312:314:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):965:967 -> a
+    315:317:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):945:947 -> a
+    318:321:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):910:913 -> a
+    322:331:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):898:907 -> a
+    332:339:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):888:895 -> a
+    340:345:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):880:885 -> a
+    346:352:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):871:877 -> a
+    353:357:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):864:868 -> a
+    358:360:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):859:861 -> a
+    361:361:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):856:856 -> a
+    362:362:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):843:843 -> a
+    363:363:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):824:824 -> a
+    364:364:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):820:820 -> a
+    365:377:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):798:810 -> a
+    378:378:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):805:805 -> a
+    379:389:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):782:792 -> a
+    390:390:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):787:787 -> a
+    391:393:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):775:777 -> a
+    394:582:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):770:958 -> a
+    583:754:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):764:935 -> a
+    755:755:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):760:760 -> a
+    756:787:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):725:756 -> a
+    788:788:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):753:753 -> a
+    789:792:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):747:750 -> a
+    793:793:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):744:744 -> a
+    794:794:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):741:741 -> a
+    795:796:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):737:738 -> a
+    797:801:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):730:734 -> a
+    802:802:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):727:727 -> a
+    803:804:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):721:722 -> a
+    805:805:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):716:716 -> a
+    806:807:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):709:710 -> a
+    808:808:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):704:704 -> a
+    809:809:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):692:692 -> a
+    810:923:boolean merge(com.android.tools.r8.org.objectweb.asm.SymbolTable,com.android.tools.r8.org.objectweb.asm.Frame,int):1125:1238 -> a
+    924:991:boolean merge(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int[],int):1262:1329 -> a
+    992:1029:void accept(com.android.tools.r8.org.objectweb.asm.MethodWriter):1350:1387 -> a
+    1:6:void push(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String):543:548 -> b
+    7:11:int pop():559:563 -> b
+    12:18:void pop(int):573:579 -> b
+    1:16:void push(int):517:532 -> c
 com.android.tools.r8.org.objectweb.asm.Handle -> a.a.a.a.o.a.a.q:
     boolean isInterface -> e
     java.lang.String name -> c
@@ -40917,224 +40177,226 @@
     1:13:com.android.tools.r8.org.objectweb.asm.Label pushSuccessors(com.android.tools.r8.org.objectweb.asm.Label):591:603 -> b
     1:1:java.lang.String toString():619:619 -> toString
 com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> a.a.a.a.o.a.a.t:
-    1:1:void <init>(java.lang.String,java.lang.String,java.lang.String,int):57:57 -> <init>
+    1:1:void <init>(java.lang.String,java.lang.String,java.lang.String,int):56:56 -> <init>
 com.android.tools.r8.org.objectweb.asm.MethodVisitor -> a.a.a.a.o.a.a.u:
-    int api -> h
-    com.android.tools.r8.org.objectweb.asm.MethodVisitor mv -> i
-    1:1:void <init>(int):69:69 -> <init>
-    2:7:void <init>(int,com.android.tools.r8.org.objectweb.asm.MethodVisitor):80:85 -> <init>
-    1:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():117:118 -> a
-    3:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):132:133 -> a
-    5:6:void visitAnnotableParameterCount(int,boolean):180:181 -> a
-    7:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):201:202 -> a
-    9:10:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):213:214 -> a
-    11:12:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):288:289 -> a
-    13:14:void visitInsn(int):312:313 -> a
-    15:16:void visitTypeInsn(int,java.lang.String):362:363 -> a
-    17:18:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):379:380 -> a
-    19:19:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):419:419 -> a
-    20:21:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):398:399 -> a
-    20:21:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):423 -> a
-    22:28:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):421:427 -> a
-    29:33:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):447:451 -> a
-    34:34:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):448:448 -> a
-    35:36:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):466:467 -> a
-    37:38:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):477:478 -> a
-    39:48:void visitLdcInsn(java.lang.Object):530:539 -> a
-    49:50:void visitIincInsn(int,int):550:551 -> a
-    51:52:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):566:567 -> a
-    53:54:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):580:581 -> a
-    55:56:void visitMultiANewArrayInsn(java.lang.String,int):592:593 -> a
-    57:61:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):618:622 -> a
-    62:62:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):619:619 -> a
-    63:64: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):644:645 -> a
-    65:66: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):696:697 -> a
-    67: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):729:733 -> a
-    72:72: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):730:730 -> a
-    1:5:void visitParameter(java.lang.String,int):100:104 -> b
-    6:6:void visitParameter(java.lang.String,int):101:101 -> b
-    7:8:void visitCode():220:221 -> b
-    9:10:void visitIntInsn(int,int):332:333 -> b
-    11:15:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):666:670 -> b
-    16:16:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):667:667 -> b
-    17:18:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):749:750 -> 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):156:160 -> 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):157:157 -> c
-    7:8:void visitMaxs(int,int):761:762 -> c
-    9:10:void visitEnd():771:772 -> c
-    1:2:void visitVarInsn(int,int):347:348 -> d
+    com.android.tools.r8.org.objectweb.asm.MethodVisitor mv -> b
+    int api -> a
+    1:1:void <init>(int):70:70 -> <init>
+    2:10:void <init>(int,com.android.tools.r8.org.objectweb.asm.MethodVisitor):82:90 -> <init>
+    1:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():122:123 -> a
+    3:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):137:138 -> a
+    5:6:void visitAnnotableParameterCount(int,boolean):185:186 -> a
+    7:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):206:207 -> a
+    9:10:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):218:219 -> a
+    11:12:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):293:294 -> a
+    13:14:void visitInsn(int):317:318 -> a
+    15:16:void visitTypeInsn(int,java.lang.String):367:368 -> a
+    17:18:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):384:385 -> a
+    19:23:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):430:434 -> a
+    24:30:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):432:438 -> a
+    31:35:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):458:462 -> a
+    36:36:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):459:459 -> a
+    37:38:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):477:478 -> a
+    39:40:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):488:489 -> a
+    41:50:void visitLdcInsn(java.lang.Object):541:550 -> a
+    51:52:void visitIincInsn(int,int):561:562 -> a
+    53:54:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):577:578 -> a
+    55:56:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):591:592 -> a
+    57:58:void visitMultiANewArrayInsn(java.lang.String,int):603:604 -> a
+    59:63: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
+    64:64: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
+    65:66: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
+    67:68: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
+    69:73: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
+    74:74: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):105:109 -> b
+    6:6:void visitParameter(java.lang.String,int):106:106 -> b
+    7:8:void visitCode():225:226 -> b
+    9:10:void visitIntInsn(int,int):337:338 -> b
+    11:17:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):403:409 -> b
+    18:22:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):677:681 -> b
+    23:23:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):678:678 -> b
+    24:25: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):161:165 -> 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):162:162 -> c
+    7:8:void visitMaxs(int,int):772:773 -> c
+    9:10:void visitEnd():782:783 -> c
+    1:2:void visitVarInsn(int,int):352:353 -> d
 com.android.tools.r8.org.objectweb.asm.MethodWriter -> a.a.a.a.o.a.a.v:
-    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> I
-    int nameIndex -> l
-    com.android.tools.r8.org.objectweb.asm.ByteVector defaultValue -> Q
-    com.android.tools.r8.org.objectweb.asm.ByteVector code -> r
-    int visibleAnnotableParameterCount -> K
-    com.android.tools.r8.org.objectweb.asm.Label currentBasicBlock -> X
-    com.android.tools.r8.org.objectweb.asm.ByteVector lineNumberTable -> v
-    com.android.tools.r8.org.objectweb.asm.ByteVector localVariableTypeTable -> z
-    int[] previousFrame -> ca
-    boolean hasAsmInstructions -> fa
-    int previousFrameOffset -> ba
-    int sourceOffset -> ha
-    int localVariableTypeTableLength -> y
-    com.android.tools.r8.org.objectweb.asm.Attribute firstAttribute -> T
-    int lineNumberTableLength -> u
-    int maxLocals -> q
-    java.lang.String name -> m
-    int signatureIndex -> H
-    com.android.tools.r8.org.objectweb.asm.Label lastBasicBlock -> W
-    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleAnnotation -> J
-    com.android.tools.r8.org.objectweb.asm.AnnotationWriter[] lastRuntimeVisibleParameterAnnotations -> L
-    int relativeStackSize -> Y
-    int compute -> U
-    int descriptorIndex -> n
-    int invisibleAnnotableParameterCount -> M
-    int[] STACK_SIZE_DELTA -> ja
-    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastCodeRuntimeVisibleTypeAnnotation -> C
-    com.android.tools.r8.org.objectweb.asm.Label firstBasicBlock -> V
-    int[] currentFrame -> da
-    com.android.tools.r8.org.objectweb.asm.ByteVector parameters -> S
-    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleTypeAnnotation -> O
-    int currentLocals -> aa
-    com.android.tools.r8.org.objectweb.asm.ByteVector localVariableTable -> x
-    int stackMapTableNumberOfEntries -> A
-    boolean hasSubroutines -> ea
-    int[] exceptionIndexTable -> G
-    int maxRelativeStackSize -> Z
-    int sourceLength -> ia
-    com.android.tools.r8.org.objectweb.asm.ByteVector stackMapTableEntries -> B
-    int lastBytecodeOffset -> ga
-    int localVariableTableLength -> w
-    com.android.tools.r8.org.objectweb.asm.Handler lastHandler -> t
-    int parametersCount -> R
-    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastCodeRuntimeInvisibleTypeAnnotation -> D
-    int accessFlags -> k
-    java.lang.String descriptor -> o
-    com.android.tools.r8.org.objectweb.asm.Attribute firstCodeAttribute -> E
-    int numberOfExceptions -> F
-    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleTypeAnnotation -> P
-    com.android.tools.r8.org.objectweb.asm.SymbolTable symbolTable -> j
-    com.android.tools.r8.org.objectweb.asm.AnnotationWriter[] lastRuntimeInvisibleParameterAnnotations -> N
-    com.android.tools.r8.org.objectweb.asm.Handler firstHandler -> s
-    int maxStack -> p
+    int[] previousFrame -> V
+    java.lang.String name -> f
+    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleTypeAnnotation -> I
+    int parametersCount -> K
+    int accessFlags -> d
+    boolean hasSubroutines -> X
+    int[] STACK_SIZE_DELTA -> ca
+    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastCodeRuntimeVisibleTypeAnnotation -> v
+    int sourceLength -> ba
+    int numberOfExceptions -> y
+    int currentLocals -> T
+    com.android.tools.r8.org.objectweb.asm.AnnotationWriter[] lastRuntimeVisibleParameterAnnotations -> E
+    com.android.tools.r8.org.objectweb.asm.Label firstBasicBlock -> O
+    com.android.tools.r8.org.objectweb.asm.ByteVector parameters -> L
+    com.android.tools.r8.org.objectweb.asm.ByteVector localVariableTable -> q
+    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> B
+    int maxStack -> i
+    com.android.tools.r8.org.objectweb.asm.ByteVector stackMapTableEntries -> u
+    int visibleAnnotableParameterCount -> D
+    int nameIndex -> e
+    int[] exceptionIndexTable -> z
+    com.android.tools.r8.org.objectweb.asm.Handler lastHandler -> m
+    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastCodeRuntimeInvisibleTypeAnnotation -> w
+    boolean hasAsmInstructions -> Y
+    com.android.tools.r8.org.objectweb.asm.Attribute firstCodeAttribute -> x
+    int previousFrameOffset -> U
+    int localVariableTypeTableLength -> r
+    int lineNumberTableLength -> n
+    java.lang.String descriptor -> h
+    int maxLocals -> j
+    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleAnnotation -> C
+    int sourceOffset -> aa
+    int signatureIndex -> A
+    com.android.tools.r8.org.objectweb.asm.Handler firstHandler -> l
+    int lastBytecodeOffset -> Z
+    com.android.tools.r8.org.objectweb.asm.SymbolTable symbolTable -> c
+    com.android.tools.r8.org.objectweb.asm.AnnotationWriter[] lastRuntimeInvisibleParameterAnnotations -> G
+    com.android.tools.r8.org.objectweb.asm.Label currentBasicBlock -> Q
+    int relativeStackSize -> R
+    com.android.tools.r8.org.objectweb.asm.ByteVector defaultValue -> J
+    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleTypeAnnotation -> H
+    com.android.tools.r8.org.objectweb.asm.Attribute firstAttribute -> M
+    int compute -> N
+    int[] currentFrame -> W
+    com.android.tools.r8.org.objectweb.asm.ByteVector code -> k
+    com.android.tools.r8.org.objectweb.asm.ByteVector lineNumberTable -> o
+    int invisibleAnnotableParameterCount -> F
+    int descriptorIndex -> g
+    com.android.tools.r8.org.objectweb.asm.ByteVector localVariableTypeTable -> s
+    int stackMapTableNumberOfEntries -> t
+    com.android.tools.r8.org.objectweb.asm.Label lastBasicBlock -> P
+    int maxRelativeStackSize -> S
+    int localVariableTableLength -> p
     1:1:void <clinit>():81:81 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],int):595:595 -> <init>
-    2:306:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],int):320:624 -> <init>
-    1:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():651:652 -> a
-    3:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):658:662 -> a
-    8:10:void visitAnnotableParameterCount(int,boolean):683:685 -> a
-    11:24:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):693:706 -> a
-    25:30:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):716:721 -> a
-    31:128:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):737:834 -> a
-    129:135:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):825:831 -> a
-    136:138:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):818:820 -> a
-    139:140:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):813:814 -> a
-    141:144:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):806:809 -> a
-    145:204:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):795:854 -> a
-    205:217:void visitInsn(int):859:871 -> a
-    218:227:void visitInsn(int):865:874 -> a
-    228:242:void visitTypeInsn(int,java.lang.String):967:981 -> a
-    243:243:void visitTypeInsn(int,java.lang.String):974:974 -> a
-    244:267:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):989:1012 -> a
-    268:268:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):1008:1008 -> a
-    269:269:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):1005:1005 -> a
-    270:286:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):1002:1018 -> a
-    287:287:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):996:996 -> a
-    288:313:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):1030:1055 -> a
-    314:314:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):1042:1042 -> a
-    315:333:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1066:1084 -> a
-    334:334:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1076:1076 -> a
-    335:434:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):1091:1190 -> a
-    435:505:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):1198:1268 -> a
-    506:533:void visitLdcInsn(java.lang.Object):1274:1301 -> a
-    534:534:void visitLdcInsn(java.lang.Object):1295:1295 -> a
-    535:540:void visitIincInsn(int,int):1308:1313 -> a
-    541:553:void visitIincInsn(int,int):1311:1323 -> a
-    554:563:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):1331:1340 -> a
-    564:574:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):1345:1355 -> a
-    575:595:void visitSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):1359:1379 -> a
-    596:607:void visitMultiANewArrayInsn(java.lang.String,int):1385:1396 -> a
-    608:608:void visitMultiANewArrayInsn(java.lang.String,int):1392:1392 -> a
-    609:618:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1405:1414 -> a
-    619:627: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):1426:1434 -> a
-    628:653: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):1460:1485 -> a
-    654:674: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):1501:1521 -> a
-    675:680:int visitFrameStart(int,int,int):1818:1823 -> a
-    681:699:boolean canCopyMethodAttributes(com.android.tools.r8.org.objectweb.asm.ClassReader,boolean,boolean,int,int,int):2023:2041 -> a
-    700:804:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2178:2282 -> a
-    805:805:int com.android.tools.r8.org.objectweb.asm.Handler.getExceptionTableLength(com.android.tools.r8.org.objectweb.asm.Handler):163:163 -> a
-    805:805: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
-    805:805:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2282 -> a
-    806:814: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
-    806:814:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2282 -> a
-    815:820:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2283:2288 -> a
-    821:851:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2287:2317 -> a
-    852:857:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2316:2321 -> a
-    858:885:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2320:2347 -> a
-    886:896:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2346:2356 -> a
-    897:919:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2355:2377 -> a
-    920:921:void collectAttributePrototypes(com.android.tools.r8.org.objectweb.asm.Attribute$Set):2387:2388 -> a
+    1:1:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],int):594:594 -> <init>
+    2:305:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],int):320:623 -> <init>
+    1:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():650:651 -> a
+    3:10:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):658:665 -> a
+    11:13:void visitAnnotableParameterCount(int,boolean):693:695 -> a
+    14:30:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):704:720 -> a
+    31:36:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):729:734 -> a
+    37:135:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):750:848 -> a
+    136:142:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):839:845 -> a
+    143:145:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):832:834 -> a
+    146:147:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):827:828 -> a
+    148:151:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):820:823 -> a
+    152:211:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):809:868 -> a
+    212:224:void visitInsn(int):873:885 -> a
+    225:234:void visitInsn(int):879:888 -> a
+    235:249:void visitTypeInsn(int,java.lang.String):981:995 -> a
+    250:250:void visitTypeInsn(int,java.lang.String):988:988 -> a
+    251:274:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):1003:1026 -> a
+    275:275:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):1022:1022 -> a
+    276:276:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):1019:1019 -> a
+    277:293:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):1016:1032 -> a
+    294:294:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):1010:1010 -> a
+    295:320:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):1044:1069 -> a
+    321:321:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):1056:1056 -> a
+    322:340:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1080:1098 -> a
+    341:341:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1090:1090 -> a
+    342:441:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):1105:1204 -> a
+    442:512:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):1212:1282 -> a
+    513:536:void visitLdcInsn(java.lang.Object):1288:1311 -> a
+    537:537:void visitLdcInsn(java.lang.Object):1305:1305 -> a
+    538:543:void visitIincInsn(int,int):1318:1323 -> a
+    544:556:void visitIincInsn(int,int):1321:1333 -> a
+    557:566:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):1341:1350 -> a
+    567:577:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):1355:1365 -> a
+    578:598:void visitSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):1369:1389 -> a
+    599:610:void visitMultiANewArrayInsn(java.lang.String,int):1395:1406 -> a
+    611:611:void visitMultiANewArrayInsn(java.lang.String,int):1402:1402 -> a
+    612:622:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1416:1426 -> a
+    623:631: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):1434:1442 -> a
+    632:657: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):1474:1499 -> a
+    658:674: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):1515:1531 -> a
+    675:680:int visitFrameStart(int,int,int):1824:1829 -> a
+    681:709:boolean canCopyMethodAttributes(com.android.tools.r8.org.objectweb.asm.ClassReader,int,int,boolean,boolean,int,int,int):2030:2058 -> a
+    710:814:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2200:2304 -> a
+    815:815:int com.android.tools.r8.org.objectweb.asm.Handler.getExceptionTableLength(com.android.tools.r8.org.objectweb.asm.Handler):163:163 -> a
+    815:815: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
+    815:815:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2304 -> a
+    816:824: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
+    816:824:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2304 -> a
+    825:830:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2305:2310 -> a
+    831:861:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2309:2339 -> a
+    862:867:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2338:2343 -> a
+    868:899:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2342:2373 -> a
+    900:905:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2372:2377 -> a
+    906:911:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2376:2381 -> a
+    912:922:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2380:2390 -> a
+    923:933:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2389:2399 -> a
+    934:939:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2398:2403 -> a
+    940:957:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2402:2419 -> a
+    958:959:void collectAttributePrototypes(com.android.tools.r8.org.objectweb.asm.Attribute$Set):2429:2430 -> a
     void visitCode() -> b
-    1:5:void visitParameter(java.lang.String,int):642:646 -> b
-    6:23:void visitIntInsn(int,int):881:898 -> b
-    24:24:void visitIntInsn(int,int):891:891 -> b
-    25:30:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1441:1446 -> b
-    31:36:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):1532:1537 -> b
-    37:46:void putFrameType(java.lang.Object):1971:1980 -> b
+    1:5:void visitParameter(java.lang.String,int):641:645 -> b
+    6:23:void visitIntInsn(int,int):895:912 -> b
+    24:24:void visitIntInsn(int,int):905:905 -> b
+    25:35:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1450:1460 -> b
+    36:41:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):1538:1543 -> b
+    42:51:void putFrameType(java.lang.Object):1972:1981 -> 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:7:void visitMaxs(int,int):1542:1542 -> c
-    8:104:void computeAllFrames():1557:1653 -> c
-    8:104:void visitMaxs(int,int):1543 -> c
-    105:206:void computeMaxStackAndLocal():1659:1760 -> c
-    105:206:void visitMaxs(int,int):1545 -> c
-    207:210:void visitMaxs(int,int):1547:1550 -> c
-    211:211:void addSuccessorToCurrentBasicBlock(int,com.android.tools.r8.org.objectweb.asm.Label):1779:1779 -> c
-    1:31:void visitVarInsn(int,int):905:935 -> d
-    32:70:void visitVarInsn(int,int):923:961 -> d
-    71:120:int computeMethodInfoSize():2074:2123 -> d
-    121:204:int computeMethodInfoSize():2083:2166 -> d
-    1:1:boolean hasAsmInstructions():633:633 -> e
-    2:3:void setMethodAttributesSource(int,int):2062:2063 -> e
-    1:1:boolean hasFrames():629:629 -> f
-    2:2:void visitAbstractType(int,int):1834:1834 -> f
-    1:3:void visitFrameEnd():1843:1845 -> g
-    4:90:void putFrame():1856:1942 -> g
-    4:90:void visitFrameEnd():1847 -> g
-    91:94:void putFrame():1932:1935 -> g
-    91:94:void visitFrameEnd():1847 -> g
-    95:100:void putFrame():1924:1929 -> g
-    95:100:void visitFrameEnd():1847 -> g
-    101:104:void putFrame():1918:1921 -> g
-    101:104:void visitFrameEnd():1847 -> g
-    105:106:void putFrame():1914:1915 -> g
-    105:106:void visitFrameEnd():1847 -> g
-    107:107:void putFrame():1911:1911 -> g
-    107:107:void visitFrameEnd():1847 -> g
-    108:111:void visitFrameEnd():1848:1851 -> g
-    112:112:void putAbstractTypes(int,int):1956:1956 -> g
-    113:116:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1422:1425 -> g
-    113:116:void putAbstractTypes(int,int):1956 -> g
-    117:118:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1418:1419 -> g
-    117:118:void putAbstractTypes(int,int):1956 -> g
-    119:170:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1414:1465 -> g
-    119:170:void putAbstractTypes(int,int):1956 -> g
-    171:171:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1450:1450 -> g
-    171:171:void putAbstractTypes(int,int):1956 -> g
-    172:172:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1447:1447 -> g
-    172:172:void putAbstractTypes(int,int):1956 -> g
-    173:173:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1444:1444 -> g
-    173:173:void putAbstractTypes(int,int):1956 -> g
-    174:195:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1441:1462 -> g
-    174:195:void putAbstractTypes(int,int):1956 -> g
-    196:196:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1456:1456 -> g
-    196:196:void putAbstractTypes(int,int):1956 -> g
-    197:214:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1453:1470 -> g
-    197:214:void putAbstractTypes(int,int):1956 -> g
-    1:10:void endCurrentBasicBlockWithNoSuccessor():1791:1800 -> h
+    1:11:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):675:685 -> c
+    12:12:void visitMaxs(int,int):1548:1548 -> c
+    13:109:void computeAllFrames():1563:1659 -> c
+    13:109:void visitMaxs(int,int):1549 -> c
+    110:211:void computeMaxStackAndLocal():1665:1766 -> c
+    110:211:void visitMaxs(int,int):1551 -> c
+    212:215:void visitMaxs(int,int):1553:1556 -> c
+    216:216:void addSuccessorToCurrentBasicBlock(int,com.android.tools.r8.org.objectweb.asm.Label):1785:1785 -> c
+    1:31:void visitVarInsn(int,int):919:949 -> d
+    32:70:void visitVarInsn(int,int):937:975 -> d
+    71:120:int computeMethodInfoSize():2070:2119 -> d
+    121:230:int computeMethodInfoSize():2079:2188 -> d
+    1:1:boolean hasAsmInstructions():632:632 -> e
+    2:2:void visitAbstractType(int,int):1840:1840 -> e
+    1:1:boolean hasFrames():628:628 -> f
+    2:2:void putAbstractTypes(int,int):1957:1957 -> f
+    3:6:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1416:1419 -> f
+    3:6:void putAbstractTypes(int,int):1957 -> f
+    7:8:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1412:1413 -> f
+    7:8:void putAbstractTypes(int,int):1957 -> f
+    9:60:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1408:1459 -> f
+    9:60:void putAbstractTypes(int,int):1957 -> f
+    61:61:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1444:1444 -> f
+    61:61:void putAbstractTypes(int,int):1957 -> f
+    62:62:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1441:1441 -> f
+    62:62:void putAbstractTypes(int,int):1957 -> f
+    63:63:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1438:1438 -> f
+    63:63:void putAbstractTypes(int,int):1957 -> f
+    64:85:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1435:1456 -> f
+    64:85:void putAbstractTypes(int,int):1957 -> f
+    86:86:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1450:1450 -> f
+    86:86:void putAbstractTypes(int,int):1957 -> f
+    87:104:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1447:1464 -> f
+    87:104:void putAbstractTypes(int,int):1957 -> f
+    1:3:void visitFrameEnd():1849:1851 -> g
+    4:86:void putFrame():1862:1944 -> g
+    4:86:void visitFrameEnd():1853 -> g
+    87:88:void putFrame():1936:1937 -> g
+    87:88:void visitFrameEnd():1853 -> g
+    89:92:void putFrame():1930:1933 -> g
+    89:92:void visitFrameEnd():1853 -> g
+    93:96:void putFrame():1924:1927 -> g
+    93:96:void visitFrameEnd():1853 -> g
+    97:98:void putFrame():1920:1921 -> g
+    97:98:void visitFrameEnd():1853 -> g
+    99:99:void putFrame():1917:1917 -> g
+    99:99:void visitFrameEnd():1853 -> g
+    100:103:void visitFrameEnd():1854:1857 -> g
+    1:10:void endCurrentBasicBlockWithNoSuccessor():1797:1806 -> h
 com.android.tools.r8.org.objectweb.asm.ModuleVisitor -> a.a.a.a.o.a.a.w:
-    1:3:void <init>(int,com.android.tools.r8.org.objectweb.asm.ModuleVisitor):66:68 -> <init>
-    1:3:void <init>(int):55 -> <init>
+    1:3:void <init>(int,com.android.tools.r8.org.objectweb.asm.ModuleVisitor):67:69 -> <init>
+    1:3:void <init>(int):56 -> <init>
     void visitExport(java.lang.String,int,java.lang.String[]) -> a
     void visitMainClass(java.lang.String) -> a
     void visitProvide(java.lang.String,java.lang.String[]) -> a
@@ -41179,7 +40441,7 @@
     java.lang.Integer UNINITIALIZED_THIS -> g
     java.lang.Integer TOP -> a
     java.lang.Integer INTEGER -> b
-    1:7:void <clinit>():376:382 -> <clinit>
+    1:7:void <clinit>():179:185 -> <clinit>
 com.android.tools.r8.org.objectweb.asm.SymbolTable -> a.a.a.a.o.a.a.A:
     com.android.tools.r8.org.objectweb.asm.ClassWriter classWriter -> a
     int typeCount -> k
@@ -41193,85 +40455,85 @@
     com.android.tools.r8.org.objectweb.asm.ClassReader sourceClassReader -> b
     java.lang.String className -> d
     com.android.tools.r8.org.objectweb.asm.ByteVector constantPool -> h
-    1:6:void <init>(com.android.tools.r8.org.objectweb.asm.ClassWriter):121:126 -> <init>
-    1:2:int setMajorVersionAndClassName(int,java.lang.String):318:319 -> a
-    3:3:com.android.tools.r8.org.objectweb.asm.Symbol addConstantClass(java.lang.String):513:513 -> a
-    3:3:int setMajorVersionAndClassName(int,java.lang.String):320 -> a
-    4:4:int setMajorVersionAndClassName(int,java.lang.String):320:320 -> a
-    5:7:int computeBootstrapMethodsSize():358:360 -> a
-    8:13:void putBootstrapMethods(com.android.tools.r8.org.objectweb.asm.ByteVector):373:378 -> a
-    14:31:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):457:474 -> a
-    32:32:com.android.tools.r8.org.objectweb.asm.Symbol addConstantString(java.lang.String):604:604 -> a
-    32:32:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):474 -> a
-    33:39:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):475:481 -> a
-    40:40:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodType(java.lang.String):865:865 -> a
-    40:40:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):481 -> a
-    41:50:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):483:492 -> a
-    51:63:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):487:499 -> a
-    64:65:com.android.tools.r8.org.objectweb.asm.Symbol addConstantDynamic(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):884:885 -> a
-    64:65:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):495 -> a
-    66:66:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):501:501 -> a
-    67:67:com.android.tools.r8.org.objectweb.asm.Symbol addConstantClass(java.lang.String):513:513 -> a
-    68:68:com.android.tools.r8.org.objectweb.asm.Symbol addConstantFieldref(java.lang.String,java.lang.String,java.lang.String):526:526 -> a
-    69:69:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodref(java.lang.String,java.lang.String,java.lang.String,boolean):542:542 -> a
-    70:70:com.android.tools.r8.org.objectweb.asm.Symbol addConstantInteger(int):615:615 -> a
-    71:71:com.android.tools.r8.org.objectweb.asm.Symbol addConstantFloat(float):626:626 -> a
-    72:72:com.android.tools.r8.org.objectweb.asm.Symbol addConstantLong(long):670:670 -> a
-    73:73:com.android.tools.r8.org.objectweb.asm.Symbol addConstantDouble(double):681:681 -> a
-    74:84:com.android.tools.r8.org.objectweb.asm.Symbol addConstantLongOrDouble(int,long):694:704 -> a
-    85:102:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):811:828 -> a
-    103:106:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):827:830 -> a
-    107:108:com.android.tools.r8.org.objectweb.asm.Symbol addConstantInvokeDynamic(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):905:906 -> a
-    109:122:com.android.tools.r8.org.objectweb.asm.Symbol addConstantDynamicOrInvokeDynamicReference(int,java.lang.String,java.lang.String,int):924:937 -> a
-    123:146:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1040:1063 -> a
-    147:147:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1058:1058 -> a
-    148:166:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1057:1075 -> a
-    167:167:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(int,int,int):1094:1094 -> a
-    167:167:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1080 -> a
-    168:168:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry get(int):394:394 -> a
-    168:168:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(int,int,int):1095 -> a
-    168:168:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1080 -> a
-    169:185:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(int,int,int):1097:1113 -> a
-    169:185:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1080 -> a
-    186:197:int addMergedType(int,int):1190:1201 -> a
-    198:207:int addTypeInternal(com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry):1214:1223 -> a
-    208:208:int hash(int,java.lang.String,int):1243:1243 -> a
-    208:208:int addUninitializedType(java.lang.String,int):1159 -> a
-    209:219:int addUninitializedType(java.lang.String,int):1160:1170 -> a
-    220:220:int hash(int,java.lang.String,java.lang.String):1247:1247 -> a
-    220:220:int addConstantNameAndType(java.lang.String,java.lang.String):729 -> a
-    221:232:int addConstantNameAndType(java.lang.String,java.lang.String):730:741 -> a
-    233:233:int hash(int,java.lang.String,java.lang.String,java.lang.String):1257:1257 -> a
-    233:233:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):559 -> a
-    234:245:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):560:571 -> a
-    246:246:com.android.tools.r8.org.objectweb.asm.Symbol addConstantClass(java.lang.String):513:513 -> a
-    246:246:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):572 -> a
-    247:247:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):572:572 -> a
-    248:250:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):571:573 -> a
-    251:251:int hash(int,java.lang.String,java.lang.String,java.lang.String,int):1266:1266 -> 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:22:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry put(com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry):407:426 -> b
-    23:32:com.android.tools.r8.org.objectweb.asm.Symbol addConstantIntegerOrFloat(int,int):638:647 -> b
-    33:33:com.android.tools.r8.org.objectweb.asm.Symbol addConstantModule(java.lang.String):972:972 -> b
-    34:34:com.android.tools.r8.org.objectweb.asm.Symbol getType(int):1127:1127 -> b
-    35:35:int hash(int,java.lang.String):1239:1239 -> b
-    35:35:com.android.tools.r8.org.objectweb.asm.Symbol addConstantUtf8Reference(int,java.lang.String):999 -> b
-    36:44:com.android.tools.r8.org.objectweb.asm.Symbol addConstantUtf8Reference(int,java.lang.String):1000:1008 -> b
-    45:45:int hash(int,java.lang.String,java.lang.String,int):1252:1252 -> b
+    1:6:void <init>(com.android.tools.r8.org.objectweb.asm.ClassWriter):173:178 -> <init>
+    1:2:int setMajorVersionAndClassName(int,java.lang.String):342:343 -> a
+    3:3:com.android.tools.r8.org.objectweb.asm.Symbol addConstantClass(java.lang.String):527:527 -> a
+    3:3:int setMajorVersionAndClassName(int,java.lang.String):344 -> a
+    4:4:int setMajorVersionAndClassName(int,java.lang.String):344:344 -> a
+    5:7:int computeBootstrapMethodsSize():374:376 -> a
+    8:13:void putBootstrapMethods(com.android.tools.r8.org.objectweb.asm.ByteVector):389:394 -> a
+    14:31:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):471:488 -> a
+    32:32:com.android.tools.r8.org.objectweb.asm.Symbol addConstantString(java.lang.String):618:618 -> a
+    32:32:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):488 -> a
+    33:39:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):489:495 -> a
+    40:40:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodType(java.lang.String):878:878 -> a
+    40:40:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):495 -> a
+    41:50:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):497:506 -> a
+    51:63:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):501:513 -> a
+    64:65:com.android.tools.r8.org.objectweb.asm.Symbol addConstantDynamic(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):897:898 -> a
+    64:65:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):509 -> a
+    66:66:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):515:515 -> a
+    67:67:com.android.tools.r8.org.objectweb.asm.Symbol addConstantClass(java.lang.String):527:527 -> a
+    68:68:com.android.tools.r8.org.objectweb.asm.Symbol addConstantFieldref(java.lang.String,java.lang.String,java.lang.String):540:540 -> a
+    69:69:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodref(java.lang.String,java.lang.String,java.lang.String,boolean):556:556 -> a
+    70:70:com.android.tools.r8.org.objectweb.asm.Symbol addConstantInteger(int):629:629 -> a
+    71:71:com.android.tools.r8.org.objectweb.asm.Symbol addConstantFloat(float):640:640 -> a
+    72:72:com.android.tools.r8.org.objectweb.asm.Symbol addConstantLong(long):684:684 -> a
+    73:73:com.android.tools.r8.org.objectweb.asm.Symbol addConstantDouble(double):695:695 -> a
+    74:84:com.android.tools.r8.org.objectweb.asm.Symbol addConstantLong(int,long):708:718 -> a
+    85:102:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):824:841 -> a
+    103:106:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):840:843 -> a
+    107:108:com.android.tools.r8.org.objectweb.asm.Symbol addConstantInvokeDynamic(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):918:919 -> a
+    109:122:com.android.tools.r8.org.objectweb.asm.Symbol addConstantDynamicOrInvokeDynamicReference(int,java.lang.String,java.lang.String,int):937:950 -> a
+    123:146:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1053:1076 -> a
+    147:147:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1071:1071 -> a
+    148:166:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1070:1088 -> a
+    167:167:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(int,int,int):1107:1107 -> a
+    167:167:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1093 -> a
+    168:168:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry get(int):408:408 -> a
+    168:168:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(int,int,int):1108 -> a
+    168:168:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1093 -> a
+    169:185:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(int,int,int):1110:1126 -> a
+    169:185:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1093 -> a
+    186:197:int addMergedType(int,int):1199:1210 -> a
+    198:207:int addType(com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry):1223:1232 -> a
+    208:208:int hash(int,java.lang.String,int):1252:1252 -> a
+    208:208:int addUninitializedType(java.lang.String,int):1170 -> a
+    209:219:int addUninitializedType(java.lang.String,int):1171:1181 -> a
+    220:220:int hash(int,java.lang.String,java.lang.String):1256:1256 -> a
+    220:220:int addConstantNameAndType(java.lang.String,java.lang.String):742 -> a
+    221:232:int addConstantNameAndType(java.lang.String,java.lang.String):743:754 -> a
+    233:233:int hash(int,java.lang.String,java.lang.String,java.lang.String):1266:1266 -> a
+    233:233:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):573 -> a
+    234:245:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):574:585 -> a
+    246:246:com.android.tools.r8.org.objectweb.asm.Symbol addConstantClass(java.lang.String):527:527 -> a
+    246:246:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):586 -> a
+    247:247:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):586:586 -> a
+    248:250:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):585:587 -> a
+    251:251:int hash(int,java.lang.String,java.lang.String,java.lang.String,int):1275:1275 -> a
+    1:1:java.lang.String getClassName():330:330 -> b
+    2:2:void putConstantPool(com.android.tools.r8.org.objectweb.asm.ByteVector):364:364 -> b
+    3:22:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry put(com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry):421:440 -> b
+    23:32:com.android.tools.r8.org.objectweb.asm.Symbol addConstantInteger(int,int):652:661 -> b
+    33:33:com.android.tools.r8.org.objectweb.asm.Symbol addConstantModule(java.lang.String):985:985 -> b
+    34:34:com.android.tools.r8.org.objectweb.asm.Symbol getType(int):1138:1138 -> b
+    35:35:int hash(int,java.lang.String):1248:1248 -> b
+    35:35:com.android.tools.r8.org.objectweb.asm.Symbol addConstantUtf8Reference(int,java.lang.String):1012 -> b
+    36:44:com.android.tools.r8.org.objectweb.asm.Symbol addConstantUtf8Reference(int,java.lang.String):1013:1021 -> b
+    45:45:int hash(int,java.lang.String,java.lang.String,int):1261:1261 -> b
     int hash(int,int) -> c
-    1:1:int getConstantPoolCount():329:329 -> c
-    2:2:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry get(int):394:394 -> c
-    3:3:com.android.tools.r8.org.objectweb.asm.Symbol addConstantPackage(java.lang.String):983:983 -> c
-    1:1:int getConstantPoolLength():338:338 -> d
-    2:2:int hash(int,java.lang.String):1239:1239 -> d
-    2:2:int addConstantUtf8(java.lang.String):764 -> d
-    3:13:int addConstantUtf8(java.lang.String):765:775 -> d
-    1:1:int getMajorVersion():297:297 -> e
-    2:2:int hash(int,java.lang.String):1239:1239 -> e
-    2:2:int addType(java.lang.String):1138 -> e
-    3:10:int addType(java.lang.String):1139:1146 -> e
-    1:1:com.android.tools.r8.org.objectweb.asm.ClassReader getSource():288:288 -> f
+    1:1:int getConstantPoolCount():349:349 -> c
+    2:2:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry get(int):408:408 -> c
+    3:3:com.android.tools.r8.org.objectweb.asm.Symbol addConstantPackage(java.lang.String):996:996 -> c
+    1:1:int getConstantPoolLength():354:354 -> d
+    2:2:int hash(int,java.lang.String):1248:1248 -> d
+    2:2:int addConstantUtf8(java.lang.String):777 -> d
+    3:13:int addConstantUtf8(java.lang.String):778:788 -> d
+    1:1:int getMajorVersion():325:325 -> e
+    2:2:int hash(int,java.lang.String):1248:1248 -> e
+    2:2:int addType(java.lang.String):1149 -> e
+    3:10:int addType(java.lang.String):1150:1157 -> e
+    1:1:com.android.tools.r8.org.objectweb.asm.ClassReader getSource():320:320 -> f
 com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry -> a.a.a.a.o.a.a.z:
     long com.android.tools.r8.org.objectweb.asm.Symbol.data -> f
     int hashCode -> h
@@ -41282,22 +40544,22 @@
     java.lang.String com.android.tools.r8.org.objectweb.asm.Symbol.value -> e
     int com.android.tools.r8.org.objectweb.asm.Symbol.index -> a
     java.lang.String com.android.tools.r8.org.objectweb.asm.Symbol.name -> d
-    1:7: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>
-    1:7:void <init>(int,int,long,int):1316 -> <init>
-    8:8:void <init>(int,int,long,int):1317:1317 -> <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,int):1300 -> <init>
-    16:16:void <init>(int,int,java.lang.String,int):1301:1301 -> <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,long,int):1305 -> <init>
-    24:24:void <init>(int,int,java.lang.String,long,int):1306:1306 -> <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,java.lang.String,int):1311 -> <init>
-    32:32:void <init>(int,int,java.lang.String,java.lang.String,int):1312:1312 -> <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,java.lang.String,java.lang.String,long,int):1295 -> <init>
-    40:40:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,long,int):1296:1296 -> <init>
-    1:4:int com.android.tools.r8.org.objectweb.asm.Symbol.getArgumentsAndReturnSizes():238:241 -> a
+    1:7:void com.android.tools.r8.org.objectweb.asm.Symbol.<init>(int,int,java.lang.String,java.lang.String,java.lang.String,long):219:225 -> <init>
+    1:7:void <init>(int,int,long,int):89 -> <init>
+    8:8:void <init>(int,int,long,int):90:90 -> <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):219:225 -> <init>
+    9:15:void <init>(int,int,java.lang.String,int):73 -> <init>
+    16:16:void <init>(int,int,java.lang.String,int):74:74 -> <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):219:225 -> <init>
+    17:23:void <init>(int,int,java.lang.String,long,int):78 -> <init>
+    24:24:void <init>(int,int,java.lang.String,long,int):79:79 -> <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):219:225 -> <init>
+    25:31:void <init>(int,int,java.lang.String,java.lang.String,int):84 -> <init>
+    32:32:void <init>(int,int,java.lang.String,java.lang.String,int):85:85 -> <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):219:225 -> <init>
+    33:39:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,long,int):68 -> <init>
+    40:40:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,long,int):69:69 -> <init>
+    1:4:int com.android.tools.r8.org.objectweb.asm.Symbol.getArgumentsAndReturnSizes():235:238 -> a
     1:4:int com.android.tools.r8.org.objectweb.asm.Symbol.getArgumentsAndReturnSizes():0 -> a
 com.android.tools.r8.org.objectweb.asm.Type -> a.a.a.a.o.a.a.B:
     com.android.tools.r8.org.objectweb.asm.Type FLOAT_TYPE -> k
@@ -41314,33 +40576,32 @@
     com.android.tools.r8.org.objectweb.asm.Type SHORT_TYPE -> i
     com.android.tools.r8.org.objectweb.asm.Type BYTE_TYPE -> h
     1:26:void <clinit>():85:110 -> <clinit>
-    1:5:void <init>(int,java.lang.String,int,int):159:163 -> <init>
-    1:28:com.android.tools.r8.org.objectweb.asm.Type[] getArgumentTypes(java.lang.String):302:329 -> a
-    29:55:com.android.tools.r8.org.objectweb.asm.Type getTypeInternal(java.lang.String,int,int):414:440 -> a
-    56:56:com.android.tools.r8.org.objectweb.asm.Type getTypeInternal(java.lang.String,int,int):434:434 -> a
-    57:57:com.android.tools.r8.org.objectweb.asm.Type getTypeInternal(java.lang.String,int,int):418:418 -> a
-    58:78:com.android.tools.r8.org.objectweb.asm.Type getTypeInternal(java.lang.String,int,int):416:436 -> a
-    79:79:com.android.tools.r8.org.objectweb.asm.Type getTypeInternal(java.lang.String,int,int):430:430 -> a
-    80:86:com.android.tools.r8.org.objectweb.asm.Type getTypeInternal(java.lang.String,int,int):426:432 -> a
-    87:105:com.android.tools.r8.org.objectweb.asm.Type getTypeInternal(java.lang.String,int,int):420:438 -> a
-    106:135:java.lang.String getClassName():455:484 -> a
-    136:136:java.lang.String getClassName():482:482 -> a
-    137:137:java.lang.String getClassName():475:475 -> a
-    138:139:com.android.tools.r8.org.objectweb.asm.Type getElementType():241:242 -> a
-    138:139:java.lang.String getClassName():475 -> a
-    140:144:java.lang.String getClassName():475:479 -> a
-    1:6:java.lang.String getDescriptor():516:521 -> b
-    7:25:int getArgumentsAndReturnSizes(java.lang.String):728:746 -> b
-    1:1:com.android.tools.r8.org.objectweb.asm.Type getMethodType(java.lang.String):264:264 -> c
-    2:2:int getDimensions():668:668 -> c
-    1:2:com.android.tools.r8.org.objectweb.asm.Type getObjectType(java.lang.String):252:253 -> d
-    3:3:java.lang.String getInternalName():496:496 -> d
-    1:7:int getReturnTypeOffset(java.lang.String):390:396 -> e
-    8:8:int getSort():657:657 -> e
-    1:17:boolean equals(java.lang.Object):843:859 -> equals
-    1:1:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String):177:177 -> f
-    1:4:int hashCode():873:876 -> hashCode
-    1:1:java.lang.String toString():889:889 -> toString
+    1:5:void <init>(int,java.lang.String,int,int):163:167 -> <init>
+    1:30:com.android.tools.r8.org.objectweb.asm.Type[] getArgumentTypes(java.lang.String):281:310 -> a
+    31:57:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String,int,int):416:442 -> a
+    58:58:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String,int,int):436:436 -> a
+    59:59:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String,int,int):420:420 -> a
+    60:80:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String,int,int):418:438 -> a
+    81:81:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String,int,int):432:432 -> a
+    82:88:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String,int,int):428:434 -> a
+    89:107:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String,int,int):422:440 -> a
+    108:137:java.lang.String getClassName():493:522 -> a
+    138:138:java.lang.String getClassName():520:520 -> a
+    139:139:java.lang.String getClassName():513:513 -> a
+    140:141:com.android.tools.r8.org.objectweb.asm.Type getElementType():482:483 -> a
+    140:141:java.lang.String getClassName():513 -> a
+    142:146:java.lang.String getClassName():513:517 -> a
+    1:20:int getArgumentsAndReturnSizes(java.lang.String):376:395 -> b
+    21:30:java.lang.String getDescriptor():580:589 -> b
+    1:1:com.android.tools.r8.org.objectweb.asm.Type getMethodType(java.lang.String):199:199 -> c
+    2:2:int getDimensions():469:469 -> c
+    1:2:com.android.tools.r8.org.objectweb.asm.Type getObjectType(java.lang.String):187:188 -> d
+    3:3:java.lang.String getInternalName():534:534 -> d
+    1:1:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String):177:177 -> e
+    2:2:int getSort():458:458 -> e
+    1:17:boolean equals(java.lang.Object):858:874 -> equals
+    1:4:int hashCode():888:891 -> hashCode
+    1:1:java.lang.String toString():904:904 -> toString
 com.android.tools.r8.org.objectweb.asm.TypePath -> a.a.a.a.o.a.a.C:
     byte[] typePathContainer -> a
     int typePathOffset -> b
@@ -41362,6 +40623,10 @@
     int targetTypeAndInfo -> a
     1:2:void <init>(int):193:194 -> <init>
     1:1:int getExceptionIndex():359:359 -> a
+    2:2:void putTarget(int,com.android.tools.r8.org.objectweb.asm.ByteVector):433:433 -> a
+    3:3:void putTarget(int,com.android.tools.r8.org.objectweb.asm.ByteVector):419:419 -> a
+    4:22:void putTarget(int,com.android.tools.r8.org.objectweb.asm.ByteVector):412:430 -> a
+    23:23:void putTarget(int,com.android.tools.r8.org.objectweb.asm.ByteVector):407:407 -> a
     1:1:int getFormalParameterIndex():348:348 -> b
     1:1:int getSort():303:303 -> c
     1:1:int getSuperTypeIndex():338:338 -> d
@@ -41370,44 +40635,44 @@
     1:1:int getTypeParameterBoundIndex():327:327 -> g
     1:1:int getTypeParameterIndex():315:315 -> h
 com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter -> a.a.a.a.o.a.a.a.b:
-    java.util.BitSet mainSubroutineInsns -> F
-    java.util.BitSet sharedSubroutineInsns -> H
-    java.util.Map subroutinesInsns -> G
+    java.util.BitSet mainSubroutineInsns -> y
+    java.util.Map subroutinesInsns -> z
+    java.util.BitSet sharedSubroutineInsns -> A
     1:1:void <init>(int,com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):129:129 -> <init>
-    1:1:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):101 -> <init>
-    2:67:void <init>(int,com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):65:130 -> <init>
-    2:67:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):101 -> <init>
-    68:69:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):102:103 -> <init>
+    1:1:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):100 -> <init>
+    2:68:void <init>(int,com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):64:130 -> <init>
+    2:68:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):100 -> <init>
+    69:70:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):101:102 -> <init>
     1:4:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):135:138 -> a
-    5:27:void findReachableInsns(int,java.util.BitSet,java.util.BitSet):231:253 -> a
-    28:36:void findReachableInsns(int,java.util.BitSet,java.util.BitSet):252:260 -> a
-    37:45:void findReachableInsns(int,java.util.BitSet,java.util.BitSet):259:267 -> a
+    5:28:void findReachableInsns(int,java.util.BitSet,java.util.BitSet):231:254 -> a
+    29:37:void findReachableInsns(int,java.util.BitSet,java.util.BitSet):253:261 -> a
+    38:46:void findReachableInsns(int,java.util.BitSet,java.util.BitSet):260:268 -> a
     1:20:void findSubroutineInsns(int,java.util.BitSet,java.util.BitSet):181:200 -> b
     1:1:void visitEnd():144:144 -> c
     2:8:void findSubroutinesInsns():157:163 -> c
     2:8:void visitEnd():146 -> c
-    9:18:void emitCode():294:303 -> c
+    9:18:void emitCode():295:304 -> c
     9:18:void visitEnd():147 -> c
-    19:23:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):332:336 -> c
-    19:23:void emitCode():304 -> c
+    19:23:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):333:337 -> c
+    19:23:void emitCode():305 -> c
     19:23:void visitEnd():147 -> c
-    24:24:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.getClonedLabel(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):538:538 -> c
-    24:24:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):337 -> c
-    24:24:void emitCode():304 -> c
+    24:24:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.getClonedLabel(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):539:539 -> c
+    24:24:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):338 -> c
+    24:24:void emitCode():305 -> c
     24:24:void visitEnd():147 -> c
-    25:43:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):339:357 -> c
-    25:43:void emitCode():304 -> c
+    25:43:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):340:358 -> c
+    25:43:void emitCode():305 -> c
     25:43:void visitEnd():147 -> c
-    44:55:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):355:366 -> c
-    44:55:void emitCode():304 -> c
+    44:55:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):356:367 -> c
+    44:55:void emitCode():305 -> c
     44:55:void visitEnd():147 -> c
-    56:90:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):363:397 -> c
-    56:90:void emitCode():304 -> c
+    56:90:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):364:398 -> c
+    56:90:void emitCode():305 -> c
     56:90:void visitEnd():147 -> c
-    91:102:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):395:406 -> c
-    91:102:void emitCode():304 -> c
+    91:102:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):396:407 -> c
+    91:102:void emitCode():305 -> c
     91:102:void visitEnd():147 -> c
-    103:105:void emitCode():307:309 -> c
+    103:105:void emitCode():308:310 -> c
     103:105:void visitEnd():147 -> c
     106:107:void visitEnd():149:150 -> c
 com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> a.a.a.a.o.a.a.a.a:
@@ -41416,17 +40681,17 @@
     java.util.BitSet subroutineInsns -> b
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode returnLabel -> d
     com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter this$0 -> e
-    1:5:void <init>(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter,com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.BitSet):446:450 -> <init>
-    6:29:void <init>(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter,com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.BitSet):449:472 -> <init>
-    1:1:com.android.tools.r8.org.objectweb.asm.tree.LabelNode getClonedLabel(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):538:538 -> a
-    1:1:com.android.tools.r8.org.objectweb.asm.tree.LabelNode getClonedLabelForJumpInsn(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):526:526 -> b
-    1:11:com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation findOwner(int):499:509 -> c
-    12:12:com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation findOwner(int):508:508 -> c
-    1:1:java.util.Set entrySet():545:545 -> entrySet
-    1:1:boolean equals(java.lang.Object):555:555 -> equals
-    1:1:com.android.tools.r8.org.objectweb.asm.tree.LabelNode get(java.lang.Object):550:550 -> get
-    1:1:java.lang.Object get(java.lang.Object):419 -> get
-    1:1:int hashCode():560:560 -> hashCode
+    1:5:void <init>(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter,com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.BitSet):447:451 -> <init>
+    6:29:void <init>(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter,com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.BitSet):450:473 -> <init>
+    1:1:com.android.tools.r8.org.objectweb.asm.tree.LabelNode getClonedLabel(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):539:539 -> a
+    1:1:com.android.tools.r8.org.objectweb.asm.tree.LabelNode getClonedLabelForJumpInsn(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):527:527 -> b
+    1:11:com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation findOwner(int):500:510 -> c
+    12:12:com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation findOwner(int):509:509 -> c
+    1:1:java.util.Set entrySet():546:546 -> entrySet
+    1:1:boolean equals(java.lang.Object):556:556 -> equals
+    1:1:com.android.tools.r8.org.objectweb.asm.tree.LabelNode get(java.lang.Object):551:551 -> get
+    1:1:java.lang.Object get(java.lang.Object):420 -> get
+    1:1:int hashCode():561:561 -> hashCode
 com.android.tools.r8.org.objectweb.asm.signature.SignatureReader -> a.a.a.a.o.a.a.b.a:
     java.lang.String signatureValue -> a
     1:2:void <init>(java.lang.String):49:50 -> <init>
@@ -41440,7 +40705,7 @@
     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 -> a.a.a.a.o.a.a.b.b:
-    1:3:void <init>(int):74:76 -> <init>
+    1:6:void <init>(int):75:80 -> <init>
     com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitArrayType() -> a
     void visitBaseType(char) -> a
     void visitClassType(java.lang.String) -> a
@@ -41479,44 +40744,44 @@
 com.android.tools.r8.org.objectweb.asm.tree.AnnotationNode -> a.a.a.a.o.a.a.c.b:
     java.util.List values -> c
     java.lang.String desc -> b
-    1:1:void com.android.tools.r8.org.objectweb.asm.AnnotationVisitor.<init>(int):56:56 -> <init>
-    1:1:void <init>(int,java.lang.String):77 -> <init>
-    2:2:void <init>(int,java.lang.String):78:78 -> <init>
-    3:3:void com.android.tools.r8.org.objectweb.asm.AnnotationVisitor.<init>(int):56:56 -> <init>
-    3:3:void <init>(int,java.lang.String):77 -> <init>
+    1:1:void com.android.tools.r8.org.objectweb.asm.AnnotationVisitor.<init>(int):57:57 -> <init>
+    1:1:void <init>(int,java.lang.String):78 -> <init>
+    2:2:void <init>(int,java.lang.String):79:79 -> <init>
+    3:3:void com.android.tools.r8.org.objectweb.asm.AnnotationVisitor.<init>(int):57:57 -> <init>
+    3:3:void <init>(int,java.lang.String):78 -> <init>
     3:3:void <init>(java.lang.String):63 -> <init>
-    4:4:void <init>(int,java.lang.String):78:78 -> <init>
+    4:4:void <init>(int,java.lang.String):79:79 -> <init>
     4:4:void <init>(java.lang.String):63 -> <init>
     5:6:void <init>(java.lang.String):64:65 -> <init>
-    7:8:void <init>(java.util.List):87:88 -> <init>
+    7:8:void <init>(java.util.List):88:89 -> <init>
     void visitEnd() -> a
-    1:8:void visit(java.lang.String,java.lang.Object):97:104 -> a
+    1:8:void visit(java.lang.String,java.lang.Object):98:105 -> a
     9:13:java.util.List com.android.tools.r8.org.objectweb.asm.tree.Util.asArrayList(byte[]):64:68 -> a
-    9:13:void visit(java.lang.String,java.lang.Object):104 -> a
-    14:16:void visit(java.lang.String,java.lang.Object):104:106 -> a
+    9:13:void visit(java.lang.String,java.lang.Object):105 -> a
+    14:16:void visit(java.lang.String,java.lang.Object):105:107 -> a
     17:21:java.util.List com.android.tools.r8.org.objectweb.asm.tree.Util.asArrayList(boolean[]):75:79 -> a
-    17:21:void visit(java.lang.String,java.lang.Object):106 -> a
-    22:24:void visit(java.lang.String,java.lang.Object):106:108 -> a
+    17:21:void visit(java.lang.String,java.lang.Object):107 -> a
+    22:24:void visit(java.lang.String,java.lang.Object):107:109 -> a
     25:29:java.util.List com.android.tools.r8.org.objectweb.asm.tree.Util.asArrayList(short[]):86:90 -> a
-    25:29:void visit(java.lang.String,java.lang.Object):108 -> a
-    30:32:void visit(java.lang.String,java.lang.Object):108:110 -> a
+    25:29:void visit(java.lang.String,java.lang.Object):109 -> a
+    30:32:void visit(java.lang.String,java.lang.Object):109:111 -> a
     33:37:java.util.List com.android.tools.r8.org.objectweb.asm.tree.Util.asArrayList(char[]):97:101 -> a
-    33:37:void visit(java.lang.String,java.lang.Object):110 -> a
-    38:42:void visit(java.lang.String,java.lang.Object):110:114 -> a
+    33:37:void visit(java.lang.String,java.lang.Object):111 -> a
+    38:42:void visit(java.lang.String,java.lang.Object):111:115 -> a
     43:47:java.util.List com.android.tools.r8.org.objectweb.asm.tree.Util.asArrayList(long[]):130:134 -> a
-    43:47:void visit(java.lang.String,java.lang.Object):114 -> a
-    48:50:void visit(java.lang.String,java.lang.Object):114:116 -> a
+    43:47:void visit(java.lang.String,java.lang.Object):115 -> a
+    48:50:void visit(java.lang.String,java.lang.Object):115:117 -> a
     51:55:java.util.List com.android.tools.r8.org.objectweb.asm.tree.Util.asArrayList(float[]):119:123 -> a
-    51:55:void visit(java.lang.String,java.lang.Object):116 -> a
-    56:58:void visit(java.lang.String,java.lang.Object):116:118 -> a
+    51:55:void visit(java.lang.String,java.lang.Object):117 -> a
+    56:58:void visit(java.lang.String,java.lang.Object):117:119 -> a
     59:63:java.util.List com.android.tools.r8.org.objectweb.asm.tree.Util.asArrayList(double[]):141:145 -> a
-    59:63:void visit(java.lang.String,java.lang.Object):118 -> a
-    64:66:void visit(java.lang.String,java.lang.Object):118:120 -> a
-    67:73:void visitEnum(java.lang.String,java.lang.String,java.lang.String):126:132 -> a
-    74:81:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):137:144 -> a
-    82:90:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):150:158 -> a
-    91:98:void accept(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor):189:196 -> a
-    99:115:void accept(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,java.lang.Object):210:226 -> a
+    59:63:void visit(java.lang.String,java.lang.Object):119 -> a
+    64:66:void visit(java.lang.String,java.lang.Object):119:121 -> a
+    67:73:void visitEnum(java.lang.String,java.lang.String,java.lang.String):127:133 -> a
+    74:81:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):138:145 -> a
+    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.FieldInsnNode -> a.a.a.a.o.a.a.c.c:
     java.lang.String owner -> g
     java.lang.String desc -> i
@@ -41563,16 +40828,16 @@
     2:8:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode get(int):93:99 -> a
     9:9:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode get(int):94:94 -> a
     10:13:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):142:145 -> a
-    14:24:void add(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):225:235 -> a
-    25:36:void insert(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):313:324 -> a
+    14:25:void add(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):225:236 -> a
+    26:37:void insert(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):314:325 -> a
     1:1:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode getLast():79:79 -> b
     2:5:int indexOf(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):130:133 -> b
-    6:17:void insertBefore(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):363:374 -> b
+    6:17:void insertBefore(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):364:375 -> b
     1:1:java.util.ListIterator iterator(int):166:166 -> c
     1:1:java.util.ListIterator iterator():155 -> c
     2:25:void set(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):193:216 -> c
-    26:49:void remove(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):411:434 -> c
-    1:6:void resetLabels():469:474 -> d
+    26:49:void remove(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):412:435 -> c
+    1:6:void resetLabels():470:475 -> d
     1:1:int size():61:61 -> e
     1:6:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode[] toArray():176:181 -> f
 com.android.tools.r8.org.objectweb.asm.tree.InsnList$InsnListIterator -> a.a.a.a.o.a.a.c.f:
@@ -41580,18 +40845,17 @@
     com.android.tools.r8.org.objectweb.asm.tree.InsnList this$0 -> d
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode previousInsn -> b
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode remove -> c
-    1:7:void <init>(com.android.tools.r8.org.objectweb.asm.tree.InsnList,int):488:494 -> <init>
-    1:9:void add(java.lang.Object):571:579 -> add
+    1:7:void <init>(com.android.tools.r8.org.objectweb.asm.tree.InsnList,int):489:495 -> <init>
+    1:9:void add(java.lang.Object):561:569 -> add
     1:1:boolean hasNext():500:500 -> hasNext
-    1:1:boolean hasPrevious():532:532 -> hasPrevious
-    1:7:java.lang.Object next():505:511 -> next
-    8:8:java.lang.Object next():506:506 -> next
-    1:7:int nextIndex():549:555 -> nextIndex
-    1:7:java.lang.Object previous():537:543 -> previous
-    8:8:java.lang.Object previous():538:538 -> previous
-    1:7:int previousIndex():560:566 -> previousIndex
-    1:10:void remove():517:526 -> remove
-    1:9:void set(java.lang.Object):584:592 -> set
+    1:1:boolean hasPrevious():529:529 -> hasPrevious
+    1:7:java.lang.Object next():504:510 -> next
+    8:8:java.lang.Object next():505:505 -> next
+    1:7:int nextIndex():541:547 -> nextIndex
+    1:4:java.lang.Object previous():533:536 -> previous
+    1:7:int previousIndex():551:557 -> previousIndex
+    1:10:void remove():515:524 -> remove
+    1:9:void set(java.lang.Object):573:581 -> set
 com.android.tools.r8.org.objectweb.asm.tree.InsnNode -> a.a.a.a.o.a.a.c.h:
     1:1:void <init>(int):55:55 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):65:66 -> a
@@ -41624,11 +40888,11 @@
 com.android.tools.r8.org.objectweb.asm.tree.LabelNode -> a.a.a.a.o.a.a.c.l:
     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
-    2:2:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):73:73 -> a
+    1:1:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):62:62 -> a
+    2:2:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):67:67 -> a
     int getType() -> d
-    1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():60:63 -> e
-    1:1:void resetLabel():77:77 -> f
+    1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():54:57 -> e
+    1:1:void resetLabel():71:71 -> f
 com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode -> a.a.a.a.o.a.a.c.m:
     java.lang.Object cst -> g
     1:2:void <init>(java.lang.Object):55:56 -> <init>
@@ -41649,10 +40913,10 @@
     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):115:118 -> <init>
+    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:4:void <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 -> <init>
-    1:10:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor,boolean):128:137 -> a
-    11:11:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor,boolean):136:136 -> a
+    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 -> a.a.a.a.o.a.a.c.p:
     int index -> f
     java.lang.String name -> a
@@ -41677,103 +40941,107 @@
     java.lang.String desc -> i
     java.lang.String name -> h
     boolean itf -> j
-    1:5:void <init>(int,java.lang.String,java.lang.String,java.lang.String,boolean):91:95 -> <init>
-    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
+    1:5:void <init>(int,java.lang.String,java.lang.String,java.lang.String,boolean):93:97 -> <init>
+    1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):117:118 -> a
+    3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):123:123 -> a
     int getType() -> d
 com.android.tools.r8.org.objectweb.asm.tree.MethodNode -> a.a.a.a.o.a.a.c.t:
-    java.util.List attrs -> r
-    java.util.List invisibleTypeAnnotations -> q
-    com.android.tools.r8.org.objectweb.asm.tree.InsnList instructions -> x
-    java.util.List visibleTypeAnnotations -> p
-    java.util.List invisibleAnnotations -> o
-    int access -> j
-    java.lang.String name -> k
-    java.lang.String desc -> l
-    java.lang.Object annotationDefault -> s
-    java.util.List tryCatchBlocks -> y
-    int maxLocals -> A
-    java.util.List localVariables -> B
-    java.util.List[] visibleParameterAnnotations -> u
-    int maxStack -> z
-    java.util.List[] invisibleParameterAnnotations -> w
-    java.util.List invisibleLocalVariableAnnotations -> D
-    java.util.List visibleLocalVariableAnnotations -> C
-    int invisibleAnnotableParameterCount -> v
-    boolean visited -> E
-    int visibleAnnotableParameterCount -> t
-    java.util.List visibleAnnotations -> n
-    java.util.List parameters -> m
-    1:1:void com.android.tools.r8.org.objectweb.asm.MethodVisitor.<init>(int):69:69 -> <init>
-    1:1:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):220 -> <init>
-    2:11:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):221:230 -> <init>
-    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():248:248 -> a
-    2:12:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):260:270 -> a
-    13:15:void visitAnnotableParameterCount(int,boolean):296:298 -> a
-    16:34:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):306:324 -> a
-    35:38:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):331:334 -> a
-    39:45:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):349:355 -> a
-    46:46:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):349:349 -> a
-    47:47:void visitInsn(int):360:360 -> a
-    48:48:void visitTypeInsn(int,java.lang.String):375:375 -> a
-    49:49:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):381:381 -> a
-    50:57:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):391:398 -> a
-    58:58:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):407:407 -> a
-    59:59:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):414:414 -> a
-    60:60:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):419:419 -> a
-    61:61:void visitLdcInsn(java.lang.Object):424:424 -> a
-    62:62:void visitIincInsn(int,int):429:429 -> a
-    63:63:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):435:435 -> a
-    64:64:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):440:440 -> a
-    65:65:void visitMultiANewArrayInsn(java.lang.String,int):445:445 -> a
-    66:66:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):452:452 -> a
-    67:67:int com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.getOpcode():137:137 -> a
-    67:67:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):453 -> a
-    68:81:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):454:467 -> a
-    82:86: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):475:479 -> a
-    87:87: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):478:478 -> a
-    88:93: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):509:514 -> a
-    94:94: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):512:512 -> a
-    95:107: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):526:538 -> a
-    108:110:com.android.tools.r8.org.objectweb.asm.tree.LabelNode[] getLabelNodes(com.android.tools.r8.org.objectweb.asm.Label[]):575:577 -> a
-    111:117:java.lang.Object[] getLabelNodes(java.lang.Object[]):583:589 -> a
-    118:120:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):693:695 -> a
-    121:121:void com.android.tools.r8.org.objectweb.asm.tree.ParameterNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:66 -> a
-    121:121:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):695 -> a
-    122:145:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):699:722 -> a
-    146:155:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):721:730 -> a
-    156:206:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):729:779 -> a
-    207:214:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.updateIndex(int):89:96 -> a
-    207:214:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):779 -> a
-    215:215:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):780:780 -> a
-    216:217:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):107:108 -> a
-    216:217:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):780 -> a
-    218:224:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):107:113 -> a
-    218:224:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):780 -> a
-    225:234:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):112:121 -> a
-    225:234:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):780 -> a
-    235:235:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):120:120 -> a
-    235:235:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):780 -> a
-    236:240:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):784:788 -> a
-    241:242:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):89:90 -> a
-    241:242:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):788 -> a
-    243:243:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):89:89 -> a
-    243:243:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):788 -> a
-    244:257:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):792:805 -> a
+    java.util.List tryCatchBlocks -> r
+    int invisibleAnnotableParameterCount -> o
+    int visibleAnnotableParameterCount -> m
+    java.util.List visibleLocalVariableAnnotations -> v
+    java.util.List localVariables -> u
+    com.android.tools.r8.org.objectweb.asm.tree.InsnList instructions -> q
+    java.util.List invisibleLocalVariableAnnotations -> w
+    boolean visited -> x
+    int access -> c
+    java.util.List[] visibleParameterAnnotations -> n
+    java.lang.Object annotationDefault -> l
+    java.util.List[] invisibleParameterAnnotations -> p
+    java.util.List parameters -> f
+    java.util.List invisibleTypeAnnotations -> j
+    java.util.List visibleTypeAnnotations -> i
+    java.util.List invisibleAnnotations -> h
+    int maxLocals -> t
+    java.util.List visibleAnnotations -> g
+    int maxStack -> s
+    java.lang.String desc -> e
+    java.lang.String name -> d
+    java.util.List attrs -> k
+    1:1:void com.android.tools.r8.org.objectweb.asm.MethodVisitor.<init>(int):70:70 -> <init>
+    1:1:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):222 -> <init>
+    2:11:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):223:232 -> <init>
+    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():250:250 -> a
+    2:12:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):262:272 -> a
+    13:15:void visitAnnotableParameterCount(int,boolean):298:300 -> a
+    16:34:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):308:326 -> a
+    35:38:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):333:336 -> a
+    39:45:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):351:357 -> a
+    46:46:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):351:351 -> a
+    47:47:void visitInsn(int):362:362 -> a
+    48:48:void visitTypeInsn(int,java.lang.String):377:377 -> a
+    49:49:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):383:383 -> a
+    50:54:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):405:409 -> a
+    55:55:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):418:418 -> a
+    56:56:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):425:425 -> a
+    57:57:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):430:430 -> a
+    58:58:void visitLdcInsn(java.lang.Object):435:435 -> a
+    59:59:void visitIincInsn(int,int):440:440 -> a
+    60:60:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):446:446 -> a
+    61:61:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):451:451 -> a
+    62:62:void visitMultiANewArrayInsn(java.lang.String,int):456:456 -> a
+    63:63:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):463:463 -> a
+    64:64:int com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.getOpcode():137:137 -> a
+    64:64:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):464 -> a
+    65:78:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):465:478 -> a
+    79:80: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):486:487 -> a
+    81: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):486:486 -> a
+    82:84: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):517:519 -> a
+    85: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):517:517 -> a
+    86: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):531:543 -> a
+    99:101:com.android.tools.r8.org.objectweb.asm.tree.LabelNode[] getLabelNodes(com.android.tools.r8.org.objectweb.asm.Label[]):580:582 -> a
+    102:108:java.lang.Object[] getLabelNodes(java.lang.Object[]):588:594 -> a
+    109:111:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):699:701 -> a
+    112:112:void com.android.tools.r8.org.objectweb.asm.tree.ParameterNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):67:67 -> a
+    112:112:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):701 -> a
+    113:136:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):705:728 -> a
+    137:146:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):727:736 -> a
+    147:197:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):735:785 -> a
+    198:205:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.updateIndex(int):87:94 -> a
+    198:205:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):785 -> a
+    206:206:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):786:786 -> a
+    207:208:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):105:106 -> a
+    207:208:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):786 -> a
+    209:215:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):105:111 -> a
+    209:215:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):786 -> a
+    216:225:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):110:119 -> a
+    216:225:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):786 -> a
+    226:226:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):118:118 -> a
+    226:226:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):786 -> a
+    227:231:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):790:794 -> a
+    232:233:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):89:90 -> a
+    232:233:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):794 -> a
+    234:234:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):89:89 -> a
+    234:234:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):794 -> a
+    235:248:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):798:811 -> a
     void visitCode() -> b
-    1:4:void visitParameter(java.lang.String,int):239:242 -> b
-    5:5:void visitIntInsn(int,int):365:365 -> b
-    6:17:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):485:496 -> b
-    18:18:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):545:545 -> b
-    19:22:com.android.tools.r8.org.objectweb.asm.tree.LabelNode getLabelNode(com.android.tools.r8.org.objectweb.asm.Label):568:571 -> b
+    1:4:void visitParameter(java.lang.String,int):241:244 -> b
+    5:5:void visitIntInsn(int,int):367:367 -> b
+    6:10:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):391:395 -> b
+    11:11:void com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode.<init>(int,java.lang.String,java.lang.String,java.lang.String):73:73 -> b
+    11:11:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):395 -> b
+    12:12:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):395:395 -> b
+    13:24:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):493:504 -> b
+    25:25:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):550:550 -> b
+    26:29:com.android.tools.r8.org.objectweb.asm.tree.LabelNode getLabelNode(com.android.tools.r8.org.objectweb.asm.Label):573:576 -> b
     void visitEnd() -> c
-    1:11:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):278:288 -> c
-    12:13:void visitMaxs(int,int):550:551 -> c
-    1:1:void visitVarInsn(int,int):370:370 -> d
+    1:11:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):280:290 -> c
+    12:13:void visitMaxs(int,int):555:556 -> c
+    1:1:void visitVarInsn(int,int):372:372 -> d
 com.android.tools.r8.org.objectweb.asm.tree.MethodNode$1 -> a.a.a.a.o.a.a.c.s:
     com.android.tools.r8.org.objectweb.asm.tree.MethodNode this$0 -> a
-    1:1:void <init>(com.android.tools.r8.org.objectweb.asm.tree.MethodNode,int):249:249 -> <init>
-    1:2:boolean add(java.lang.Object):252:253 -> add
+    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.MultiANewArrayInsnNode -> a.a.a.a.o.a.a.c.u:
     java.lang.String desc -> g
     int dims -> h
@@ -41784,7 +41052,7 @@
 com.android.tools.r8.org.objectweb.asm.tree.ParameterNode -> a.a.a.a.o.a.a.c.v:
     java.lang.String name -> a
     int access -> b
-    1:3:void <init>(java.lang.String,int):55:57 -> <init>
+    1:3:void <init>(java.lang.String,int):56:58 -> <init>
 com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode -> a.a.a.a.o.a.a.c.w:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> i
     int max -> h
@@ -41804,12 +41072,12 @@
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode handler -> c
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode end -> b
     java.lang.String type -> d
-    1:5:void <init>(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.lang.String):73:77 -> <init>
+    1:5:void <init>(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.lang.String):71:75 -> <init>
 com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> a.a.a.a.o.a.a.c.y:
     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):81:83 -> <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 -> a.a.a.a.o.a.a.c.z:
     java.lang.String desc -> g
     1:2:void <init>(int,java.lang.String):56:57 -> <init>
@@ -41832,8 +41100,8 @@
     java.lang.StringBuilder stringBuilder -> b
     java.lang.String[] OPCODES -> d
     int api -> a
-    1:224:void <clinit>():53:276 -> <clinit>
-    1:4:void <init>(int):323:326 -> <init>
+    1:224:void <clinit>():52:275 -> <clinit>
+    1:5:void <init>(int):330:334 -> <init>
     void visit(java.lang.String,java.lang.Object) -> a
     com.android.tools.r8.org.objectweb.asm.util.Printer visitAnnotation(java.lang.String,java.lang.String) -> a
     com.android.tools.r8.org.objectweb.asm.util.Printer visitArray(java.lang.String) -> a
@@ -41846,11 +41114,12 @@
     void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean) -> a
     com.android.tools.r8.org.objectweb.asm.util.Printer visitParameterAnnotation(int,java.lang.String,boolean) -> a
     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:1:java.util.List getText():1120:1120 -> a
-    2:2:void print(java.io.PrintWriter):1129:1129 -> a
-    3:7:void printList(java.io.PrintWriter,java.util.List):1140:1144 -> a
-    8:30:void appendString(java.lang.StringBuilder,java.lang.String):1156:1178 -> a
-    31:44:void appendString(java.lang.StringBuilder,java.lang.String):1168:1181 -> a
+    1:6:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):895:900 -> a
+    7:7:java.util.List getText():1147:1147 -> a
+    8:8:void print(java.io.PrintWriter):1156:1156 -> a
+    9:13:void printList(java.io.PrintWriter,java.util.List):1167:1171 -> a
+    14:36:void appendString(java.lang.StringBuilder,java.lang.String):1197:1219 -> a
+    37:50:void appendString(java.lang.StringBuilder,java.lang.String):1209:1222 -> a
     com.android.tools.r8.org.objectweb.asm.util.Printer visitAnnotationDefault() -> b
     void visitAnnotationEnd() -> c
     void visitCode() -> d
@@ -41863,139 +41132,153 @@
     java.lang.String tab3 -> h
     int access -> k
     java.util.Map labelNames -> j
-    java.util.List FRAME_TYPES -> m
-    1:2:void <clinit>():104:105 -> <clinit>
-    1:3:void <init>():135:137 -> <init>
-    4:4:void <init>(int):148:148 -> <init>
-    5:14:void <init>(int):108:117 -> <init>
-    1:3:void visit(java.lang.String,java.lang.Object):542:544 -> a
-    4:4:void visitString(java.lang.String):652:652 -> a
-    4:4:void visit(java.lang.String,java.lang.Object):544 -> a
-    5:6:void visit(java.lang.String,java.lang.Object):545:546 -> a
-    7:7:void visitType(com.android.tools.r8.org.objectweb.asm.Type):656:656 -> a
-    7:7:void visit(java.lang.String,java.lang.Object):546 -> a
-    8:9:void visit(java.lang.String,java.lang.Object):547:548 -> a
-    10:10:void visitByte(byte):644:644 -> a
-    10:10:void visit(java.lang.String,java.lang.Object):548 -> a
-    11:12:void visit(java.lang.String,java.lang.Object):549:550 -> a
-    13:13:void visitBoolean(boolean):648:648 -> a
-    13:13:void visit(java.lang.String,java.lang.Object):550 -> a
-    14:15:void visit(java.lang.String,java.lang.Object):551:552 -> a
-    16:16:void visitShort(short):640:640 -> a
-    16:16:void visit(java.lang.String,java.lang.Object):552 -> a
-    17:18:void visit(java.lang.String,java.lang.Object):553:554 -> a
-    19:19:void visitChar(char):636:636 -> a
-    19:19:void visit(java.lang.String,java.lang.Object):554 -> a
-    20:21:void visit(java.lang.String,java.lang.Object):555:556 -> a
-    22:22:void visitInt(int):620:620 -> a
-    22:22:void visit(java.lang.String,java.lang.Object):556 -> a
-    23:24:void visit(java.lang.String,java.lang.Object):557:558 -> a
-    25:25:void visitFloat(float):628:628 -> a
-    25:25:void visit(java.lang.String,java.lang.Object):558 -> a
-    26:27:void visit(java.lang.String,java.lang.Object):559:560 -> a
-    28:28:void visitLong(long):624:624 -> a
-    28:28:void visit(java.lang.String,java.lang.Object):560 -> a
-    29:30:void visit(java.lang.String,java.lang.Object):561:562 -> a
-    31:31:void visitDouble(double):632:632 -> a
-    31:31:void visit(java.lang.String,java.lang.Object):562 -> a
-    32:38:void visit(java.lang.String,java.lang.Object):563:569 -> a
-    39:39:void visitByte(byte):644:644 -> a
-    39:39:void visit(java.lang.String,java.lang.Object):569 -> a
-    40:44:void visit(java.lang.String,java.lang.Object):571:575 -> a
-    45:45:void visitBoolean(boolean):648:648 -> a
-    45:45:void visit(java.lang.String,java.lang.Object):575 -> a
-    46:50:void visit(java.lang.String,java.lang.Object):577:581 -> a
-    51:51:void visitShort(short):640:640 -> a
-    51:51:void visit(java.lang.String,java.lang.Object):581 -> a
-    52:56:void visit(java.lang.String,java.lang.Object):583:587 -> a
-    57:57:void visitChar(char):636:636 -> a
-    57:57:void visit(java.lang.String,java.lang.Object):587 -> a
-    58:62:void visit(java.lang.String,java.lang.Object):589:593 -> a
-    63:63:void visitInt(int):620:620 -> a
-    63:63:void visit(java.lang.String,java.lang.Object):593 -> a
-    64:68:void visit(java.lang.String,java.lang.Object):595:599 -> a
-    69:69:void visitLong(long):624:624 -> a
-    69:69:void visit(java.lang.String,java.lang.Object):599 -> a
-    70:74:void visit(java.lang.String,java.lang.Object):601:605 -> a
-    75:75:void visitFloat(float):628:628 -> a
-    75:75:void visit(java.lang.String,java.lang.Object):605 -> a
-    76:80:void visit(java.lang.String,java.lang.Object):607:611 -> a
-    81:81:void visitDouble(double):632:632 -> a
-    81:81:void visit(java.lang.String,java.lang.Object):611 -> a
-    82:84:void visit(java.lang.String,java.lang.Object):614:616 -> a
-    85:88:void visitEnum(java.lang.String,java.lang.String,java.lang.String):661:664 -> a
-    89:94:com.android.tools.r8.org.objectweb.asm.util.Textifier visitAnnotation(java.lang.String,java.lang.String):669:674 -> a
-    89:94:com.android.tools.r8.org.objectweb.asm.util.Printer visitAnnotation(java.lang.String,java.lang.String):51 -> a
-    95:98:com.android.tools.r8.org.objectweb.asm.util.Textifier visitArray(java.lang.String):679:682 -> a
-    95:98:com.android.tools.r8.org.objectweb.asm.util.Printer visitArray(java.lang.String):51 -> a
-    99:110:com.android.tools.r8.org.objectweb.asm.util.Textifier visitParameterAnnotation(int,java.lang.String,boolean):766:777 -> a
-    99:110:com.android.tools.r8.org.objectweb.asm.util.Printer visitParameterAnnotation(int,java.lang.String,boolean):51 -> a
-    111:139:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):797:825 -> a
-    140:141:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):821:822 -> a
-    142:142:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):818:818 -> a
-    143:143:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):815:815 -> a
-    144:146:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):810:812 -> a
-    147:172:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):803:828 -> a
-    173:182:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):885:894 -> a
-    183:204:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):903:924 -> a
-    205:205:void visitType(com.android.tools.r8.org.objectweb.asm.Type):656:656 -> a
-    205:205:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):926 -> a
-    206:217:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):928:939 -> a
-    218:229:com.android.tools.r8.org.objectweb.asm.util.Printer visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1053:1064 -> a
-    230:242: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):1075:1087 -> a
-    243:255:void appendJavaDeclaration(java.lang.String,java.lang.String):1307:1319 -> a
-    243:255: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):1088 -> a
-    256:256: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):1090:1090 -> a
-    257:275:com.android.tools.r8.org.objectweb.asm.util.Printer 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):1102:1120 -> a
-    276:281:com.android.tools.r8.org.objectweb.asm.util.Textifier visitAnnotation(java.lang.String,boolean):1161:1166 -> a
-    276:281:com.android.tools.r8.org.objectweb.asm.util.Textifier visitMethodAnnotation(java.lang.String,boolean):744 -> a
-    276:281:com.android.tools.r8.org.objectweb.asm.util.Printer visitMethodAnnotation(java.lang.String,boolean):51 -> a
-    282:282:void appendDescriptor(int,java.lang.String):1296:1296 -> a
-    283:283:void appendDescriptor(int,java.lang.String):1293:1293 -> a
-    284:292:void appendLabel(com.android.tools.r8.org.objectweb.asm.Label):1329:1337 -> a
-    293:330:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1346:1383 -> a
-    331:347:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1363:1379 -> a
-    348:356:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1367:1375 -> a
-    357:357:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1360:1360 -> a
-    358:358:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1357:1357 -> a
-    359:359:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1354:1354 -> a
-    360:407:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1351:1398 -> a
-    408:497:void appendTypeReference(int):1420:1509 -> a
-    498:500:void appendTypeReference(int):1504:1506 -> a
-    501:503:void appendTypeReference(int):1499:1501 -> a
-    504:506:void appendTypeReference(int):1494:1496 -> a
-    507:509:void appendTypeReference(int):1489:1491 -> a
-    510:510:void appendTypeReference(int):1486:1486 -> a
-    511:511:void appendTypeReference(int):1483:1483 -> a
-    512:512:void appendTypeReference(int):1480:1480 -> a
-    513:513:void appendTypeReference(int):1477:1477 -> a
-    514:514:void appendTypeReference(int):1474:1474 -> a
-    515:515:void appendTypeReference(int):1471:1471 -> a
-    516:516:void appendTypeReference(int):1468:1468 -> a
-    517:517:void appendTypeReference(int):1465:1465 -> a
-    518:518:void appendTypeReference(int):1462:1462 -> a
-    519:521:void appendTypeReference(int):1457:1459 -> a
-    522:522:void appendTypeReference(int):1454:1454 -> a
-    523:523:void appendTypeReference(int):1451:1451 -> a
-    524:524:void appendTypeReference(int):1448:1448 -> a
-    525:529:void appendTypeReference(int):1441:1445 -> a
-    530:534:void appendTypeReference(int):1434:1438 -> a
-    535:535:void appendTypeReference(int):1431:1431 -> a
-    536:538:void appendTypeReference(int):1426:1428 -> a
-    539:539:void appendTypeReference(int):1423:1423 -> a
-    540:552:void appendFrameTypes(int,java.lang.Object[]):1523:1535 -> a
-    1:2:com.android.tools.r8.org.objectweb.asm.util.Textifier visitAnnotationDefault():738:739 -> b
-    1:2:com.android.tools.r8.org.objectweb.asm.util.Printer visitAnnotationDefault():51 -> b
-    3:14:com.android.tools.r8.org.objectweb.asm.util.Textifier visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1182:1193 -> b
-    15:15:void maybeAppendComma(int):1410:1410 -> b
-    16:16:com.android.tools.r8.org.objectweb.asm.util.Textifier createTextifier():1561:1561 -> b
-    16:16:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1547 -> b
-    17:17:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1548:1548 -> b
-    18:18:java.util.List com.android.tools.r8.org.objectweb.asm.util.Printer.getText():1120:1120 -> b
-    18:18:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1548 -> b
-    19:21:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1548:1550 -> b
+    1:1:void <init>(int):125:125 -> <init>
+    1:1:void <init>():111 -> <init>
+    2:11:void <init>(int):84:93 -> <init>
+    2:11:void <init>():111 -> <init>
+    12:13:void <init>():112:113 -> <init>
+    1:3:void visit(java.lang.String,java.lang.Object):515:517 -> a
+    4:4:void visitString(java.lang.String):625:625 -> a
+    4:4:void visit(java.lang.String,java.lang.Object):517 -> a
+    5:6:void visit(java.lang.String,java.lang.Object):518:519 -> a
+    7:7:void visitType(com.android.tools.r8.org.objectweb.asm.Type):629:629 -> a
+    7:7:void visit(java.lang.String,java.lang.Object):519 -> a
+    8:9:void visit(java.lang.String,java.lang.Object):520:521 -> a
+    10:10:void visitByte(byte):617:617 -> a
+    10:10:void visit(java.lang.String,java.lang.Object):521 -> a
+    11:12:void visit(java.lang.String,java.lang.Object):522:523 -> a
+    13:13:void visitBoolean(boolean):621:621 -> a
+    13:13:void visit(java.lang.String,java.lang.Object):523 -> a
+    14:15:void visit(java.lang.String,java.lang.Object):524:525 -> a
+    16:16:void visitShort(short):613:613 -> a
+    16:16:void visit(java.lang.String,java.lang.Object):525 -> a
+    17:18:void visit(java.lang.String,java.lang.Object):526:527 -> a
+    19:19:void visitChar(char):609:609 -> a
+    19:19:void visit(java.lang.String,java.lang.Object):527 -> a
+    20:21:void visit(java.lang.String,java.lang.Object):528:529 -> a
+    22:22:void visitInt(int):593:593 -> a
+    22:22:void visit(java.lang.String,java.lang.Object):529 -> a
+    23:24:void visit(java.lang.String,java.lang.Object):530:531 -> a
+    25:25:void visitFloat(float):601:601 -> a
+    25:25:void visit(java.lang.String,java.lang.Object):531 -> a
+    26:27:void visit(java.lang.String,java.lang.Object):532:533 -> a
+    28:28:void visitLong(long):597:597 -> a
+    28:28:void visit(java.lang.String,java.lang.Object):533 -> a
+    29:30:void visit(java.lang.String,java.lang.Object):534:535 -> a
+    31:31:void visitDouble(double):605:605 -> a
+    31:31:void visit(java.lang.String,java.lang.Object):535 -> a
+    32:38:void visit(java.lang.String,java.lang.Object):536:542 -> a
+    39:39:void visitByte(byte):617:617 -> a
+    39:39:void visit(java.lang.String,java.lang.Object):542 -> a
+    40:44:void visit(java.lang.String,java.lang.Object):544:548 -> a
+    45:45:void visitBoolean(boolean):621:621 -> a
+    45:45:void visit(java.lang.String,java.lang.Object):548 -> a
+    46:50:void visit(java.lang.String,java.lang.Object):550:554 -> a
+    51:51:void visitShort(short):613:613 -> a
+    51:51:void visit(java.lang.String,java.lang.Object):554 -> a
+    52:56:void visit(java.lang.String,java.lang.Object):556:560 -> a
+    57:57:void visitChar(char):609:609 -> a
+    57:57:void visit(java.lang.String,java.lang.Object):560 -> a
+    58:62:void visit(java.lang.String,java.lang.Object):562:566 -> a
+    63:63:void visitInt(int):593:593 -> a
+    63:63:void visit(java.lang.String,java.lang.Object):566 -> a
+    64:68:void visit(java.lang.String,java.lang.Object):568:572 -> a
+    69:69:void visitLong(long):597:597 -> a
+    69:69:void visit(java.lang.String,java.lang.Object):572 -> a
+    70:74:void visit(java.lang.String,java.lang.Object):574:578 -> a
+    75:75:void visitFloat(float):601:601 -> a
+    75:75:void visit(java.lang.String,java.lang.Object):578 -> a
+    76:80:void visit(java.lang.String,java.lang.Object):580:584 -> a
+    81:81:void visitDouble(double):605:605 -> a
+    81:81:void visit(java.lang.String,java.lang.Object):584 -> a
+    82:84:void visit(java.lang.String,java.lang.Object):587:589 -> a
+    85:88:void visitEnum(java.lang.String,java.lang.String,java.lang.String):634:637 -> a
+    89:94:com.android.tools.r8.org.objectweb.asm.util.Textifier visitAnnotation(java.lang.String,java.lang.String):642:647 -> a
+    89:94:com.android.tools.r8.org.objectweb.asm.util.Printer visitAnnotation(java.lang.String,java.lang.String):47 -> a
+    95:98:com.android.tools.r8.org.objectweb.asm.util.Textifier visitArray(java.lang.String):652:655 -> a
+    95:98:com.android.tools.r8.org.objectweb.asm.util.Printer visitArray(java.lang.String):47 -> a
+    99:110:com.android.tools.r8.org.objectweb.asm.util.Textifier visitParameterAnnotation(int,java.lang.String,boolean):739:750 -> a
+    99:110:com.android.tools.r8.org.objectweb.asm.util.Printer visitParameterAnnotation(int,java.lang.String,boolean):47 -> a
+    111:139:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):782:810 -> a
+    140:141:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):806:807 -> a
+    142:142:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):803:803 -> a
+    143:143:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):800:800 -> a
+    144:146:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):795:797 -> a
+    147:172:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):788:813 -> a
+    173:177:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):868:872 -> a
+    178:178:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):882:882 -> a
+    179:179:void com.android.tools.r8.org.objectweb.asm.util.Printer.visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):924:924 -> a
+    179:179:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):883 -> a
+    180:185:void com.android.tools.r8.org.objectweb.asm.util.Printer.visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):922:927 -> a
+    180:185:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):883 -> a
+    186:186:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):886:886 -> a
+    187:209:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):913:935 -> a
+    210:210:void visitType(com.android.tools.r8.org.objectweb.asm.Type):629:629 -> a
+    210:210:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):937 -> a
+    211:222:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):939:950 -> a
+    223:234:com.android.tools.r8.org.objectweb.asm.util.Printer visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1064:1075 -> a
+    235:247: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):1086:1098 -> a
+    248:259:void appendJavaDeclaration(java.lang.String):1315:1326 -> a
+    248:259: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):1099 -> a
+    260:260: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):1101:1101 -> a
+    261:279:com.android.tools.r8.org.objectweb.asm.util.Printer 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):1113:1131 -> a
+    280:285:com.android.tools.r8.org.objectweb.asm.util.Textifier visitAnnotation(java.lang.String,boolean):1171:1176 -> a
+    280:285:com.android.tools.r8.org.objectweb.asm.util.Textifier visitMethodAnnotation(java.lang.String,boolean):717 -> a
+    280:285:com.android.tools.r8.org.objectweb.asm.util.Printer visitMethodAnnotation(java.lang.String,boolean):47 -> a
+    286:286:void appendDescriptor(int,java.lang.String):1305:1305 -> a
+    287:287:void appendDescriptor(int,java.lang.String):1302:1302 -> a
+    288:296:void appendLabel(com.android.tools.r8.org.objectweb.asm.Label):1336:1344 -> a
+    297:334:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1353:1390 -> a
+    335:351:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1370:1386 -> a
+    352:360:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1374:1382 -> a
+    361:361:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1367:1367 -> a
+    362:362:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1364:1364 -> a
+    363:363:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1361:1361 -> a
+    364:411:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1358:1405 -> a
+    412:501:void appendTypeReference(int):1427:1516 -> a
+    502:504:void appendTypeReference(int):1511:1513 -> a
+    505:507:void appendTypeReference(int):1506:1508 -> a
+    508:510:void appendTypeReference(int):1501:1503 -> a
+    511:513:void appendTypeReference(int):1496:1498 -> a
+    514:514:void appendTypeReference(int):1493:1493 -> a
+    515:515:void appendTypeReference(int):1490:1490 -> a
+    516:516:void appendTypeReference(int):1487:1487 -> a
+    517:517:void appendTypeReference(int):1484:1484 -> a
+    518:518:void appendTypeReference(int):1481:1481 -> a
+    519:519:void appendTypeReference(int):1478:1478 -> a
+    520:520:void appendTypeReference(int):1475:1475 -> a
+    521:521:void appendTypeReference(int):1472:1472 -> a
+    522:522:void appendTypeReference(int):1469:1469 -> a
+    523:525:void appendTypeReference(int):1464:1466 -> a
+    526:526:void appendTypeReference(int):1461:1461 -> a
+    527:527:void appendTypeReference(int):1458:1458 -> a
+    528:528:void appendTypeReference(int):1455:1455 -> a
+    529:533:void appendTypeReference(int):1448:1452 -> a
+    534:538:void appendTypeReference(int):1441:1445 -> a
+    539:539:void appendTypeReference(int):1438:1438 -> a
+    540:542:void appendTypeReference(int):1433:1435 -> a
+    543:543:void appendTypeReference(int):1430:1430 -> a
+    544:577:void appendFrameTypes(int,java.lang.Object[]):1530:1563 -> a
+    578:578:void appendFrameTypes(int,java.lang.Object[]):1560:1560 -> a
+    579:579:void appendFrameTypes(int,java.lang.Object[]):1557:1557 -> a
+    580:580:void appendFrameTypes(int,java.lang.Object[]):1554:1554 -> a
+    581:581:void appendFrameTypes(int,java.lang.Object[]):1551:1551 -> a
+    582:582:void appendFrameTypes(int,java.lang.Object[]):1548:1548 -> a
+    583:583:void appendFrameTypes(int,java.lang.Object[]):1545:1545 -> a
+    584:608:void appendFrameTypes(int,java.lang.Object[]):1542:1566 -> a
+    1:2:com.android.tools.r8.org.objectweb.asm.util.Textifier visitAnnotationDefault():711:712 -> b
+    1:2:com.android.tools.r8.org.objectweb.asm.util.Printer visitAnnotationDefault():47 -> b
+    3:12:void doVisitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):895:904 -> b
+    13:24:com.android.tools.r8.org.objectweb.asm.util.Textifier visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1192:1203 -> b
+    25:25:void maybeAppendComma(int):1417:1417 -> b
+    26:26:com.android.tools.r8.org.objectweb.asm.util.Textifier createTextifier():1592:1592 -> b
+    26:26:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1578 -> b
+    27:27:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1579:1579 -> b
+    28:28:java.util.List com.android.tools.r8.org.objectweb.asm.util.Printer.getText():1147:1147 -> b
+    28:28:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1579 -> b
+    29:31:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1579:1581 -> b
     void visitAnnotationEnd() -> c
-    1:4:void visitAnnotationValue(java.lang.String):691:694 -> c
+    1:4:void visitAnnotationValue(java.lang.String):664:667 -> c
     void visitCode() -> d
     void visitMethodEnd() -> e
 com.android.tools.r8.org.objectweb.asm.util.TraceAnnotationVisitor -> a.a.a.a.o.a.a.d.c:
@@ -42007,110 +41290,107 @@
     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 -> a.a.a.a.o.a.a.d.d:
-    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:2:void <init>(com.android.tools.r8.org.objectweb.asm.util.Printer):55 -> <init>
-    1:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):77:79 -> a
-    4:4:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):92:92 -> a
-    5:18:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):1202:1215 -> a
-    5:18:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMethodAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):782 -> a
-    5:18:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):92 -> a
-    19:19:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):93:93 -> a
-    20:21:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():98:99 -> a
-    22:22:void visitAnnotableParameterCount(int,boolean):104:104 -> a
-    23:27:com.android.tools.r8.org.objectweb.asm.util.Textifier com.android.tools.r8.org.objectweb.asm.util.Textifier.visitAnnotableParameterCount(int,boolean):755:759 -> a
-    23:27:com.android.tools.r8.org.objectweb.asm.util.Printer com.android.tools.r8.org.objectweb.asm.util.Textifier.visitAnnotableParameterCount(int,boolean):51 -> a
-    23:27:void visitAnnotableParameterCount(int,boolean):104 -> a
-    28:28:void visitAnnotableParameterCount(int,boolean):105:105 -> a
-    29:31:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):111:113 -> a
-    32:33:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):129:130 -> a
-    34:34:void visitInsn(int):135:135 -> a
-    35:37:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitInsn(int):833:835 -> a
-    35:37:void visitInsn(int):135 -> a
-    38:38:void visitInsn(int):136:136 -> a
-    39:39:void visitTypeInsn(int,java.lang.String):153:153 -> a
-    40:44:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitTypeInsn(int,java.lang.String):859:863 -> a
-    40:44:void visitTypeInsn(int,java.lang.String):153 -> a
-    45:45:void visitTypeInsn(int,java.lang.String):154:154 -> a
-    46:46:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):160:160 -> a
-    47:53:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):869:875 -> a
-    47:53:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):160 -> a
-    54:54:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):161:161 -> a
-    55:63:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):173:181 -> a
-    64:64:void com.android.tools.r8.org.objectweb.asm.util.Printer.visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):880:880 -> a
-    64:64:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):181 -> a
-    65:76:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):175:186 -> a
-    77:78:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):196:197 -> a
-    79:79:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):202:202 -> a
-    80:84:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):944:948 -> a
-    80:84:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):202 -> a
-    85:85:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):203:203 -> a
-    86:86:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):208:208 -> a
-    87:91:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLabel(com.android.tools.r8.org.objectweb.asm.Label):953:957 -> a
-    87:91:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):208 -> a
-    92:92:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):209:209 -> a
-    93:93:void visitLdcInsn(java.lang.Object):214:214 -> a
-    94:104:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLdcInsn(java.lang.Object):962:972 -> a
-    94:104:void visitLdcInsn(java.lang.Object):214 -> a
-    105:105:void visitLdcInsn(java.lang.Object):215:215 -> a
-    106:106:void visitIincInsn(int,int):220:220 -> a
-    107:115:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitIincInsn(int,int):977:985 -> a
-    107:115:void visitIincInsn(int,int):220 -> a
-    116:116:void visitIincInsn(int,int):221:221 -> a
-    117:117:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):227:227 -> a
-    118:128: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[]):991:1001 -> a
-    118:128:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):227 -> a
-    129:129:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):228:228 -> a
-    130:130:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):233:233 -> a
-    131:141: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[]):1006:1016 -> a
-    131:141:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):233 -> a
-    142:142:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):234:234 -> a
-    143:143:void visitMultiANewArrayInsn(java.lang.String,int):239:239 -> a
-    144:148:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMultiANewArrayInsn(java.lang.String,int):1021:1025 -> a
-    144:148:void visitMultiANewArrayInsn(java.lang.String,int):239 -> a
-    149:149:void visitMultiANewArrayInsn(java.lang.String,int):240:240 -> a
-    150:150: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
-    151:151: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):1031:1031 -> a
-    151:151:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):246 -> a
-    152:153: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
-    154:154: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
-    155:165: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):1037:1047 -> a
-    155:165: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
-    166:166: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
-    167:168: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:275 -> a
-    169:172: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:3:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitParameter(java.lang.String,int):729:730 -> b
-    2:3:void visitParameter(java.lang.String,int):71 -> b
-    4:40:void com.android.tools.r8.org.objectweb.asm.util.Textifier.appendAccess(int):1229:1265 -> b
-    4:40:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitParameter(java.lang.String,int):731 -> b
-    4:40:void visitParameter(java.lang.String,int):71 -> b
-    41:42:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitParameter(java.lang.String,int):732:733 -> b
-    41:42:void visitParameter(java.lang.String,int):71 -> b
-    43:43:void visitParameter(java.lang.String,int):72:72 -> b
-    44:45:void visitCode():118:119 -> b
-    46:46:void visitIntInsn(int,int):141:141 -> b
-    47:54:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitIntInsn(int,int):840:847 -> b
-    47:54:void visitIntInsn(int,int):141 -> b
-    55:55:void visitIntInsn(int,int):142:142 -> b
-    56:58:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):261:263 -> b
-    59:59:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):297:297 -> b
-    60:64:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):1125:1129 -> b
-    60:64:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):297 -> b
-    65:65:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):298:298 -> b
-    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):85:85 -> c
-    2:2:com.android.tools.r8.org.objectweb.asm.util.Printer com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMethodTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):750:750 -> c
-    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
-    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 visitMaxs(int,int):303:303 -> c
-    6:12:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMaxs(int,int):1134:1140 -> c
-    6:12:void visitMaxs(int,int):303 -> c
-    13:13:void visitMaxs(int,int):304:304 -> c
-    14:15:void visitEnd():309:310 -> c
-    1:1:void visitVarInsn(int,int):147:147 -> d
-    2:4:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitVarInsn(int,int):852:854 -> d
-    2:4:void visitVarInsn(int,int):147 -> d
-    5:5:void visitVarInsn(int,int):148:148 -> d
+    com.android.tools.r8.org.objectweb.asm.util.Printer p -> c
+    1:2:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.util.Printer):64:65 -> <init>
+    1:2:void <init>(com.android.tools.r8.org.objectweb.asm.util.Printer):54 -> <init>
+    1:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):76:78 -> a
+    4:4:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):91:91 -> a
+    5:17:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMethodAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):755:767 -> a
+    5:17:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):91 -> a
+    18:18:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):92:92 -> a
+    19:20:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():97:98 -> a
+    21:21:void visitAnnotableParameterCount(int,boolean):103:103 -> a
+    22:26:com.android.tools.r8.org.objectweb.asm.util.Textifier com.android.tools.r8.org.objectweb.asm.util.Textifier.visitAnnotableParameterCount(int,boolean):728:732 -> a
+    22:26:com.android.tools.r8.org.objectweb.asm.util.Printer com.android.tools.r8.org.objectweb.asm.util.Textifier.visitAnnotableParameterCount(int,boolean):47 -> a
+    22:26:void visitAnnotableParameterCount(int,boolean):103 -> a
+    27:27:void visitAnnotableParameterCount(int,boolean):104:104 -> a
+    28:30:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):110:112 -> a
+    31:32:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):128:129 -> a
+    33:33:void visitInsn(int):134:134 -> a
+    34:36:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitInsn(int):818:820 -> a
+    34:36:void visitInsn(int):134 -> a
+    37:37:void visitInsn(int):135:135 -> a
+    38:38:void visitTypeInsn(int,java.lang.String):152:152 -> a
+    39:43:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitTypeInsn(int,java.lang.String):844:848 -> a
+    39:43:void visitTypeInsn(int,java.lang.String):152 -> a
+    44:44:void visitTypeInsn(int,java.lang.String):153:153 -> a
+    45:45:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):159:159 -> a
+    46:52:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):854:860 -> a
+    46:52:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):159 -> a
+    53:53:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):160:160 -> a
+    54:60:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):185:191 -> a
+    61:62:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):201:202 -> a
+    63:63:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):207:207 -> a
+    64:68:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):955:959 -> a
+    64:68:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):207 -> a
+    69:69:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):208:208 -> a
+    70:70:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):213:213 -> a
+    71:75:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLabel(com.android.tools.r8.org.objectweb.asm.Label):964:968 -> a
+    71:75:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):213 -> a
+    76:76:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):214:214 -> a
+    77:77:void visitLdcInsn(java.lang.Object):219:219 -> a
+    78:88:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLdcInsn(java.lang.Object):973:983 -> a
+    78:88:void visitLdcInsn(java.lang.Object):219 -> a
+    89:89:void visitLdcInsn(java.lang.Object):220:220 -> a
+    90:90:void visitIincInsn(int,int):225:225 -> a
+    91:99:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitIincInsn(int,int):988:996 -> a
+    91:99:void visitIincInsn(int,int):225 -> a
+    100:100:void visitIincInsn(int,int):226:226 -> a
+    101:101:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):232:232 -> a
+    102:112: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[]):1002:1012 -> a
+    102:112:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):232 -> a
+    113:113:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):233:233 -> a
+    114:114:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):238:238 -> a
+    115:125: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[]):1017:1027 -> a
+    115:125:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):238 -> a
+    126:126:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):239:239 -> a
+    127:127:void visitMultiANewArrayInsn(java.lang.String,int):244:244 -> a
+    128:132:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMultiANewArrayInsn(java.lang.String,int):1032:1036 -> a
+    128:132:void visitMultiANewArrayInsn(java.lang.String,int):244 -> a
+    133:133:void visitMultiANewArrayInsn(java.lang.String,int):245:245 -> a
+    134:134:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):251:251 -> a
+    135:135: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):1042:1042 -> a
+    135:135:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):251 -> a
+    136:137:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):252:253 -> a
+    138:138: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):259:259 -> a
+    139:149: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):1048:1058 -> a
+    139:149: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):259 -> a
+    150:150: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):260:260 -> a
+    151:152: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):279:280 -> a
+    153:156: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):292:295 -> a
+    1:1:void visitParameter(java.lang.String,int):70:70 -> b
+    2:3:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitParameter(java.lang.String,int):702:703 -> b
+    2:3:void visitParameter(java.lang.String,int):70 -> b
+    4:40:void com.android.tools.r8.org.objectweb.asm.util.Textifier.appendAccess(int):1238:1274 -> b
+    4:40:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitParameter(java.lang.String,int):704 -> b
+    4:40:void visitParameter(java.lang.String,int):70 -> b
+    41:42:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitParameter(java.lang.String,int):705:706 -> b
+    41:42:void visitParameter(java.lang.String,int):70 -> b
+    43:43:void visitParameter(java.lang.String,int):71:71 -> b
+    44:45:void visitCode():117:118 -> b
+    46:46:void visitIntInsn(int,int):140:140 -> b
+    47:54:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitIntInsn(int,int):825:832 -> b
+    47:54:void visitIntInsn(int,int):140 -> b
+    55:55:void visitIntInsn(int,int):141:141 -> b
+    56:62:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):168:174 -> b
+    63:65:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):266:268 -> b
+    66:66:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):302:302 -> b
+    67:71:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):1136:1140 -> b
+    67:71:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):302 -> b
+    72:72:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):303:303 -> b
+    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):84:84 -> c
+    2:2:com.android.tools.r8.org.objectweb.asm.util.Printer com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMethodTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):723:723 -> c
+    2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):84 -> c
+    3:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):85:86 -> c
+    5:5:void visitMaxs(int,int):308:308 -> c
+    6:12:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMaxs(int,int):1145:1151 -> c
+    6:12:void visitMaxs(int,int):308 -> c
+    13:13:void visitMaxs(int,int):309:309 -> c
+    14:15:void visitEnd():314:315 -> c
+    1:1:void visitVarInsn(int,int):146:146 -> d
+    2:4:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitVarInsn(int,int):837:839 -> d
+    2:4:void visitVarInsn(int,int):146 -> d
+    5:5:void visitVarInsn(int,int):147:147 -> d
 com.android.tools.r8.org.objectweb.asm.util.TraceSignatureVisitor -> a.a.a.a.o.a.a.d.e:
     int arrayStack -> j
     java.lang.String separator -> k
@@ -42119,39 +41399,41 @@
     boolean formalTypeParameterVisited -> e
     boolean interfaceBoundVisited -> f
     boolean parameterTypeVisited -> g
-    java.util.Map BASE_TYPES -> l
     boolean interfaceVisited -> h
     boolean isInterface -> a
     java.lang.StringBuilder exceptions -> d
     java.lang.StringBuilder returnType -> c
-    1:11:void <clinit>():52:62 -> <clinit>
-    1:1:void <init>(int):112:112 -> <init>
-    2:12:void <init>(int):104:114 -> <init>
-    13:13:void <init>(java.lang.StringBuilder):118:118 -> <init>
-    14:30:void <init>(java.lang.StringBuilder):104:120 -> <init>
-    1:6:void visitBaseType(char):203:208 -> a
-    7:7:void visitBaseType(char):205:205 -> a
-    8:9:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitArrayType():220:221 -> a
-    10:21:void visitClassType(java.lang.String):227:238 -> a
-    1:3:void visitFormalTypeParameter(java.lang.String):125:127 -> b
-    4:5:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitClassBound():132:133 -> b
-    6:19:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitTypeArgument(char):266:279 -> b
-    1:8:void visitInnerClassType(java.lang.String):243:250 -> c
-    9:13:void visitEnd():285:289 -> c
-    1:6:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitExceptionType():193:198 -> d
-    7:9:void visitTypeVariable(java.lang.String):213:215 -> d
-    1:7:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitInterface():155:161 -> e
-    1:3:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitInterfaceBound():139:141 -> f
-    1:8:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitParameterType():167:174 -> g
-    1:9:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitReturnType():180:188 -> h
-    1:3:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitSuperclass():147:149 -> i
-    1:7:void visitTypeArgument():255:261 -> j
-    1:1:java.lang.String getDeclaration():300:300 -> k
-    1:1:java.lang.String getExceptions():318:318 -> l
-    1:1:java.lang.String getReturnType():309:309 -> m
-    1:3:void endFormals():324:326 -> n
-    1:6:void endType():335:340 -> o
-    1:1:void startType():331:331 -> p
+    1:1:void <init>(int):93:93 -> <init>
+    2:12:void <init>(int):85:95 -> <init>
+    13:13:void <init>(java.lang.StringBuilder):99:99 -> <init>
+    14:30:void <init>(java.lang.StringBuilder):85:101 -> <init>
+    1:1:void visitBaseType(char):213:213 -> a
+    2:2:void visitBaseType(char):195:195 -> a
+    3:18:void visitBaseType(char):186:201 -> a
+    19:37:void visitBaseType(char):192:210 -> a
+    38:38:void visitBaseType(char):204:204 -> a
+    39:65:void visitBaseType(char):189:215 -> a
+    66:67:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitArrayType():227:228 -> a
+    68:79:void visitClassType(java.lang.String):234:245 -> a
+    1:3:void visitFormalTypeParameter(java.lang.String):106:108 -> b
+    4:5:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitClassBound():113:114 -> b
+    6:19:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitTypeArgument(char):273:286 -> b
+    1:8:void visitInnerClassType(java.lang.String):250:257 -> c
+    9:13:void visitEnd():292:296 -> c
+    1:6:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitExceptionType():174:179 -> d
+    7:9:void visitTypeVariable(java.lang.String):220:222 -> d
+    1:7:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitInterface():136:142 -> e
+    1:3:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitInterfaceBound():120:122 -> f
+    1:8:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitParameterType():148:155 -> g
+    1:9:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitReturnType():161:169 -> h
+    1:3:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitSuperclass():128:130 -> i
+    1:7:void visitTypeArgument():262:268 -> j
+    1:1:java.lang.String getDeclaration():303:303 -> k
+    1:1:java.lang.String getExceptions():317:317 -> l
+    1:1:java.lang.String getReturnType():310:310 -> m
+    1:3:void endFormals():323:325 -> n
+    1:6:void endType():334:339 -> o
+    1:1:void startType():330:330 -> p
 com.android.tools.r8.origin.ArchiveEntryOrigin -> a.a.a.a.p.a:
     java.lang.String entryName -> e
     1:2:void <init>(java.lang.String,com.android.tools.r8.origin.Origin):18:19 -> <init>
@@ -42172,11 +41454,11 @@
     3:5:void <init>(com.android.tools.r8.origin.Origin):71:73 -> <init>
     java.lang.String part() -> a
     1:10:int compareTo(com.android.tools.r8.origin.Origin):130:139 -> a
-    1:1:java.util.List parts():83:83 -> b
+    1:1:com.android.tools.r8.origin.Origin parent():79:79 -> b
+    1:1:java.util.List buildParts(int):87 -> b
+    2:3:java.util.List buildParts(int):87:88 -> b
+    4:4:java.util.List parts():83:83 -> b
     1:1:com.android.tools.r8.origin.Origin root():58:58 -> c
-    2:2:com.android.tools.r8.origin.Origin parent():79:79 -> c
-    2:2:java.util.List buildParts(int):87 -> c
-    3:4:java.util.List buildParts(int):87:88 -> c
     1:1:int compareTo(java.lang.Object):26:26 -> compareTo
     1:1:com.android.tools.r8.origin.Origin unknown():62:62 -> d
     1:6:boolean equals(java.lang.Object):115:120 -> equals
@@ -42189,12 +41471,12 @@
 com.android.tools.r8.origin.Origin$1 -> a.a.a.a.p.c:
     1:1:void <init>():30:30 -> <init>
     java.lang.String part() -> a
-    1:1:java.util.List buildParts(int):38:38 -> c
+    1:1:java.util.List buildParts(int):38:38 -> b
     1:1:int compareTo(java.lang.Object):30:30 -> compareTo
 com.android.tools.r8.origin.Origin$2 -> a.a.a.a.p.d:
     1:1:void <init>():43:43 -> <init>
     java.lang.String part() -> a
-    1:2:java.util.List buildParts(int):51:52 -> c
+    1:2:java.util.List buildParts(int):51:52 -> b
     1:1:int compareTo(java.lang.Object):43:43 -> compareTo
 com.android.tools.r8.origin.PathOrigin -> a.a.a.a.p.f:
     java.nio.file.Path path -> e
@@ -42213,40 +41495,37 @@
     1:2:void <init>(java.lang.String,java.lang.Class):13:14 -> <init>
     1:1:java.lang.String part():20:20 -> a
 com.android.tools.r8.position.MethodPosition -> a.a.a.a.q.a:
-    com.android.tools.r8.graph.DexMethod method -> b
+    com.android.tools.r8.graph.DexMethod method -> a
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):20:21 -> <init>
-    1:1:java.lang.String toString():48:48 -> a
-    1:1:java.lang.String getDescription():53 -> a
     1:2:boolean equals(java.lang.Object):63:64 -> equals
+    1:1:java.lang.String toString():48:48 -> getDescription
+    1:1:java.lang.String getDescription():53 -> getDescription
     1:1:int hashCode():58:58 -> hashCode
     1:1:java.lang.String toString():48:48 -> toString
 com.android.tools.r8.position.Position -> a.a.a.a.q.c:
     com.android.tools.r8.position.Position UNKNOWN -> a
     1:1:void <clinit>():19:19 -> <clinit>
-    java.lang.String getDescription() -> a
 com.android.tools.r8.position.Position$1 -> a.a.a.a.q.b:
     1:1:void <init>():19:19 -> <init>
-    java.lang.String getDescription() -> a
 com.android.tools.r8.position.TextPosition -> a.a.a.a.q.d:
-    boolean $assertionsDisabled -> e
-    long offset -> b
-    int column -> d
-    int line -> c
+    long offset -> a
+    int line -> b
+    int column -> c
+    boolean $assertionsDisabled -> d
     1:1:void <clinit>():12:12 -> <clinit>
     1:7:void <init>(long,int,int):27:33 -> <init>
-    1:1:java.lang.String getDescription():62:62 -> a
-    1:1:int getColumn():48:48 -> b
-    1:1:int getLine():40:40 -> c
-    1:1:long getOffset():52:52 -> d
+    1:1:int getColumn():48:48 -> a
+    1:1:int getLine():40:40 -> b
+    1:1:long getOffset():52:52 -> c
     1:3:boolean equals(java.lang.Object):75:77 -> equals
+    1:1:java.lang.String getDescription():62:62 -> getDescription
     1:1:int hashCode():67:67 -> hashCode
     1:1:java.lang.String toString():57:57 -> toString
 com.android.tools.r8.position.TextRange -> a.a.a.a.q.e:
-    com.android.tools.r8.position.TextPosition end -> c
-    com.android.tools.r8.position.TextPosition start -> b
+    com.android.tools.r8.position.TextPosition end -> b
+    com.android.tools.r8.position.TextPosition start -> a
     1:3:void <init>(com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):14:16 -> <init>
-    1:1:java.lang.String getDescription():57:57 -> a
-    1:1:com.android.tools.r8.position.TextPosition getStart():23:23 -> b
+    1:1:com.android.tools.r8.position.TextPosition getStart():23:23 -> a
     1:3:boolean equals(java.lang.Object):43:45 -> equals
     4:4:com.android.tools.r8.position.TextPosition getStart():23:23 -> equals
     4:4:boolean equals(java.lang.Object):45 -> equals
@@ -42254,6 +41533,7 @@
     6:6:com.android.tools.r8.position.TextPosition getEnd():30:30 -> equals
     6:6:boolean equals(java.lang.Object):45 -> equals
     7:7:boolean equals(java.lang.Object):45:45 -> equals
+    1:1:java.lang.String getDescription():57:57 -> getDescription
     1:1:int hashCode():35:35 -> hashCode
     1:1:java.lang.String toString():52:52 -> toString
     2:2:com.android.tools.r8.position.TextPosition getStart():23:23 -> toString
@@ -42268,13 +41548,13 @@
     1:1:void <clinit>():10:10 -> <clinit>
     1:5:void <init>(int,com.android.tools.r8.references.TypeReference,java.lang.String):17:21 -> <init>
     1:10:com.android.tools.r8.references.ArrayReference fromDescriptor(java.lang.String):25:34 -> a
-    11:11:java.lang.String getDescriptor():56:56 -> a
+    1:1:java.lang.String getDescriptor():56:56 -> getDescriptor
     1:1:int hashCode():66:66 -> hashCode
 com.android.tools.r8.references.ClassReference -> a.a.a.a.r.b:
     java.lang.String descriptor -> a
     1:2:void <init>(java.lang.String):14:15 -> <init>
     1:1:com.android.tools.r8.references.ClassReference fromDescriptor(java.lang.String):19:19 -> a
-    2:2:java.lang.String getDescriptor():29:29 -> a
+    1:1:java.lang.String getDescriptor():29:29 -> getDescriptor
     1:1:int hashCode():39:39 -> hashCode
     1:1:java.lang.String getDescriptor():29:29 -> toString
     1:1:java.lang.String toString():44 -> toString
@@ -42345,28 +41625,20 @@
     1:1:int hashCode():117:117 -> hashCode
 com.android.tools.r8.references.PrimitiveReference$1 -> a.a.a.a.r.e:
     1:1:void <init>():13:13 -> <init>
-    java.lang.String getDescriptor() -> a
 com.android.tools.r8.references.PrimitiveReference$2 -> a.a.a.a.r.f:
     1:1:void <init>():21:21 -> <init>
-    java.lang.String getDescriptor() -> a
 com.android.tools.r8.references.PrimitiveReference$3 -> a.a.a.a.r.g:
     1:1:void <init>():29:29 -> <init>
-    java.lang.String getDescriptor() -> a
 com.android.tools.r8.references.PrimitiveReference$4 -> a.a.a.a.r.h:
     1:1:void <init>():37:37 -> <init>
-    java.lang.String getDescriptor() -> a
 com.android.tools.r8.references.PrimitiveReference$5 -> a.a.a.a.r.i:
     1:1:void <init>():45:45 -> <init>
-    java.lang.String getDescriptor() -> a
 com.android.tools.r8.references.PrimitiveReference$6 -> a.a.a.a.r.j:
     1:1:void <init>():53:53 -> <init>
-    java.lang.String getDescriptor() -> a
 com.android.tools.r8.references.PrimitiveReference$7 -> a.a.a.a.r.k:
     1:1:void <init>():61:61 -> <init>
-    java.lang.String getDescriptor() -> a
 com.android.tools.r8.references.PrimitiveReference$8 -> a.a.a.a.r.l:
     1:1:void <init>():69:69 -> <init>
-    java.lang.String getDescriptor() -> a
 com.android.tools.r8.references.Reference -> a.a.a.a.r.n:
     com.android.tools.r8.references.Reference instance -> e
     java.util.concurrent.ConcurrentMap methods -> c
@@ -42402,264 +41674,142 @@
     44:44:com.android.tools.r8.references.TypeReference typeFromDescriptor(java.lang.String):72:72 -> c
     45:45:com.android.tools.r8.references.TypeReference typeFromDescriptor(java.lang.String):70:70 -> c
 com.android.tools.r8.references.TypeReference -> a.a.a.a.r.o:
-    java.lang.String getDescriptor() -> a
-    1:1:java.lang.String getTypeName():35:35 -> b
+    1:1:java.lang.String getTypeName():35:35 -> getTypeName
 com.android.tools.r8.shaking.AbstractMethodRemover -> a.a.a.a.s.a:
-    com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> a
+    com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness appInfo -> a
     boolean $assertionsDisabled -> c
     com.android.tools.r8.shaking.ScopedDexMethodSet scope -> b
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):27:27 -> <init>
-    2:5:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):25:28 -> <init>
-    1:2:void run():32:33 -> a
-    3:6:void processClass(com.android.tools.r8.graph.DexType):37:40 -> a
-    7:19:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):55:67 -> a
-    7:19:void processClass(com.android.tools.r8.graph.DexType):40 -> a
-    20:35:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):61:76 -> a
-    20:35:void processClass(com.android.tools.r8.graph.DexType):40 -> a
-    36:39:void processClass(com.android.tools.r8.graph.DexType):42:45 -> a
-    40:40:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):552:552 -> a
-    40:40:void processClass(com.android.tools.r8.graph.DexType):45 -> a
-    41:41:void processClass(com.android.tools.r8.graph.DexType):46:46 -> a
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness):28:28 -> <init>
+    2:5:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness):26:29 -> <init>
+    1:2:void run():33:34 -> a
+    3:6:void processClass(com.android.tools.r8.graph.DexType):38:41 -> a
+    7:19:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):56:68 -> a
+    7:19:void processClass(com.android.tools.r8.graph.DexType):41 -> a
+    20:35:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):62:77 -> a
+    20:35:void processClass(com.android.tools.r8.graph.DexType):41 -> a
+    36:40:void processClass(com.android.tools.r8.graph.DexType):43:47 -> a
 com.android.tools.r8.shaking.AnnotationRemover -> a.a.a.a.s.b:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set classesToRetainInnerClassAttributeFor -> c
     com.android.tools.r8.shaking.ProguardKeepAttributes keep -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):35:38 -> <init>
-    1:9:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):55:63 -> a
+    1:1:void <clinit>():30:30 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):37:40 -> <init>
+    1:9:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):57:65 -> a
     10:10:boolean com.android.tools.r8.graph.DexAnnotation.isMemberClassesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):113:113 -> a
-    10:10:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):63 -> a
-    11:12:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):63:64 -> a
+    10:10:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):65 -> a
+    11:12:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):65:66 -> a
     13:13:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingMethodAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):104:104 -> a
-    13:13:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):64 -> a
-    14:15:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):64:65 -> a
+    13:13:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):66 -> a
+    14:15:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):66:67 -> a
     16:16:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):99:99 -> a
-    16:16:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):65 -> a
-    17:18:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):65:66 -> a
+    16:16:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):67 -> a
+    17:18:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):67:68 -> a
     19:19:boolean com.android.tools.r8.graph.DexAnnotation.isThrowingAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):244:244 -> a
-    19:19:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):66 -> a
-    20:23:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):69:72 -> a
+    19:19:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):68 -> a
+    20:23:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):71:74 -> a
     24:24:boolean com.android.tools.r8.graph.DexAnnotation.isSourceDebugExtension(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):261:261 -> a
-    24:24:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):73 -> a
-    25:25:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):76:76 -> a
+    24:24:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):75 -> a
+    25:25:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):78:78 -> a
     26:26:boolean com.android.tools.r8.graph.DexAnnotation.isParameterNameAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):266:266 -> a
-    26:26:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):77 -> a
+    26:26:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):79 -> a
     27:27:boolean com.android.tools.r8.graph.DexAnnotation.isAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):255:255 -> a
-    27:27:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):80 -> a
-    28:28:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):104:104 -> a
-    29:29:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):88:88 -> a
+    27:27:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):82 -> a
+    28:28:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):106:106 -> a
+    29:29:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):90:90 -> a
     30:30:boolean com.android.tools.r8.graph.DexAnnotation.isSynthesizedClassMapAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):376:376 -> a
-    30:30:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):94 -> a
-    31:31:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):98:98 -> a
-    32:46:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):124:138 -> a
-    47:59:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):128:140 -> a
-    60:60:com.android.tools.r8.shaking.AnnotationRemover ensureValid(com.android.tools.r8.shaking.ProguardConfiguration$Builder):144:144 -> a
+    30:30:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):96 -> a
+    31:31:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):100:100 -> a
+    32:46:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):126:140 -> a
+    47:59:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):130:142 -> a
+    60:60:com.android.tools.r8.shaking.AnnotationRemover ensureValid(com.android.tools.r8.shaking.ProguardConfiguration$Builder):146:146 -> a
     61:66:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean,com.android.tools.r8.shaking.ProguardConfiguration$Builder):142:147 -> a
-    61:66:com.android.tools.r8.shaking.AnnotationRemover ensureValid(com.android.tools.r8.shaking.ProguardConfiguration$Builder):144 -> a
+    61:66:com.android.tools.r8.shaking.AnnotationRemover ensureValid(com.android.tools.r8.shaking.ProguardConfiguration$Builder):146 -> a
     67:86:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean,com.android.tools.r8.shaking.ProguardConfiguration$Builder):146:165 -> a
-    67:86:com.android.tools.r8.shaking.AnnotationRemover ensureValid(com.android.tools.r8.shaking.ProguardConfiguration$Builder):144 -> a
+    67:86:com.android.tools.r8.shaking.AnnotationRemover ensureValid(com.android.tools.r8.shaking.ProguardConfiguration$Builder):146 -> a
     87:91:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean,com.android.tools.r8.shaking.ProguardConfiguration$Builder):164:168 -> a
-    87:91:com.android.tools.r8.shaking.AnnotationRemover ensureValid(com.android.tools.r8.shaking.ProguardConfiguration$Builder):144 -> a
-    92:104:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):187:199 -> a
-    105:106:boolean hasSignatureAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):165:166 -> a
-    105:106:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):199 -> a
-    107:134:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):200:227 -> a
-    135:139:boolean hasGenericEnclosingClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.Set):153:157 -> a
-    135:139:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):228 -> a
-    140:140:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):229:229 -> a
-    141:141:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):189:189 -> a
-    142:146:void run():236:240 -> a
-    147:149:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):245:247 -> a
-    150:150:void processField(com.android.tools.r8.graph.DexEncodedField):251:251 -> a
-    151:153:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):264:266 -> a
-    154:163:com.android.tools.r8.graph.DexEncodedAnnotation com.android.tools.r8.graph.DexEncodedAnnotation.rewrite(java.util.function.Function,java.util.function.Function):81:90 -> a
-    154:163:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):266 -> a
-    164:164:com.android.tools.r8.graph.DexAnnotationElement lambda$rewriteEncodedAnnotation$0(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):268:268 -> a
-    165:173:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):273:281 -> a
-    174:174:boolean lambda$rewriteAnnotationElement$1(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexEncodedMethod):281:281 -> a
-    175:176:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):307:308 -> a
-    177:179:boolean enclosingMethodPinned(com.android.tools.r8.graph.DexClass):286:288 -> a
-    177:179:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):309 -> a
-    180:186:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):309:315 -> a
-    187:188:boolean hasInnerClassesFromSet(com.android.tools.r8.graph.DexProgramClass,java.util.Set):292:293 -> a
-    187:188:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):316 -> a
-    189:190:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):350:351 -> a
-    191:200:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):319:328 -> a
-    201:212:boolean lambda$stripAttributes$2(boolean,com.android.tools.r8.graph.DexProgramClass,boolean,com.android.tools.r8.graph.InnerClassAttribute):330:341 -> a
-    1:9:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):109:117 -> b
-    1:1:boolean filterAnnotations(com.android.tools.r8.graph.DexAnnotation):46:46 -> c
-    1:1:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):256 -> c
-    2:2:boolean filterAnnotations(com.android.tools.r8.graph.DexAnnotation):45:45 -> c
-    2:2:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):256 -> c
-    3:3:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):260:260 -> c
+    87:91:com.android.tools.r8.shaking.AnnotationRemover ensureValid(com.android.tools.r8.shaking.ProguardConfiguration$Builder):146 -> a
+    92:104:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.utils.InternalOptions):189:201 -> a
+    105:106:boolean hasSignatureAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):167:168 -> a
+    105:106:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.utils.InternalOptions):201 -> a
+    107:120:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.utils.InternalOptions):202:215 -> a
+    121:125:boolean hasGenericEnclosingClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.Set):155:159 -> a
+    121:125:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.utils.InternalOptions):216 -> a
+    126:126:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.utils.InternalOptions):217:217 -> a
+    127:127:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.utils.InternalOptions):191:191 -> a
+    128:132:void run():224:228 -> a
+    133:135:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):233:235 -> a
+    136:136:void processField(com.android.tools.r8.graph.DexEncodedField):239:239 -> a
+    137:139:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):252:254 -> a
+    140:149:com.android.tools.r8.graph.DexEncodedAnnotation com.android.tools.r8.graph.DexEncodedAnnotation.rewrite(java.util.function.Function,java.util.function.Function):81:90 -> a
+    140:149:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):254 -> a
+    150:150:com.android.tools.r8.graph.DexAnnotationElement lambda$rewriteEncodedAnnotation$0(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):256:256 -> a
+    151:159:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):261:269 -> a
+    160:160:boolean lambda$rewriteAnnotationElement$1(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexEncodedMethod):269:269 -> a
+    161:162:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):309:310 -> a
+    163:165:boolean enclosingMethodPinned(com.android.tools.r8.graph.DexClass):274:276 -> a
+    163:165:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):311 -> a
+    166:172:boolean innerClassPinned(com.android.tools.r8.graph.DexClass):280:286 -> a
+    166:172:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):312 -> a
+    173:179:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):312:318 -> a
+    180:181:boolean hasInnerClassesFromSet(com.android.tools.r8.graph.DexProgramClass,java.util.Set):294:295 -> a
+    180:181:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):319 -> a
+    182:183:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):347:348 -> a
+    184:193:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):322:331 -> a
+    194:199:boolean lambda$stripAttributes$2(boolean,com.android.tools.r8.graph.DexProgramClass,boolean,com.android.tools.r8.graph.InnerClassAttribute):333:338 -> a
+    1:9:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):111:119 -> b
+    1:1:boolean filterAnnotations(com.android.tools.r8.graph.DexAnnotation):48:48 -> c
+    1:1:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):244 -> c
+    2:2:boolean filterAnnotations(com.android.tools.r8.graph.DexAnnotation):47:47 -> c
+    2:2:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):244 -> c
+    3:3:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):248:248 -> c
     4:11:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.rewrite(java.util.function.Function):380:387 -> c
-    4:11:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):260 -> c
-com.android.tools.r8.shaking.AppInfoWithLiveness -> a.a.a.a.s.c:
-    java.util.SortedMap instanceFieldWrites -> z
-    java.util.Set neverMerge -> T
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> V
-    java.util.SortedSet staticFieldsWrittenOnlyInEnclosingStaticInitializer -> x
-    java.util.SortedSet fieldsRead -> v
-    java.util.Map switchMaps -> X
-    java.util.SortedSet virtualMethodsTargetedByInvokeDirect -> t
-    java.util.Set callSites -> H
-    java.util.SortedSet bootstrapMethods -> r
-    java.util.IdentityHashMap indirectlyInstantiatedTypes -> p
-    java.util.Set pinnedItems -> J
-    boolean $assertionsDisabled -> aa
-    java.util.SortedSet instantiatedAppServices -> n
-    com.android.tools.r8.com.google.common.collect.ImmutableSortedSet instantiatedLambdas -> Z
-    java.util.SortedSet liveTypes -> l
-    java.util.SortedMap staticInvokes -> G
-    java.util.Set neverInline -> P
-    java.util.SortedMap superInvokes -> E
-    java.util.Map noSideEffects -> L
-    java.util.Set keepUnusedArguments -> R
-    java.util.SortedMap virtualInvokes -> C
-    java.util.SortedSet brokenSuperInvokes -> I
-    java.util.SortedMap staticFieldReads -> A
-    java.util.Set alwaysInline -> N
-    java.util.Set prunedTypes -> W
-    java.util.Map assumedValues -> M
-    java.util.Set neverClassInline -> S
-    java.util.Set neverPropagateValue -> U
-    java.util.SortedMap instanceFieldReads -> y
-    java.util.Map ordinalsMaps -> Y
-    java.util.SortedSet fieldsWritten -> w
-    java.util.SortedSet liveMethods -> u
-    java.util.SortedSet methodsTargetedByInvokeDynamic -> s
-    java.util.SortedSet targetedMethods -> q
-    java.util.SortedSet instantiatedTypes -> o
-    java.util.SortedMap directInvokes -> F
-    java.util.Set forceInline -> O
-    java.util.SortedSet instantiatedAnnotationTypes -> m
-    java.util.SortedMap interfaceInvokes -> D
-    java.util.Map mayHaveSideEffects -> K
-    java.util.Set keepConstantArguments -> Q
-    java.util.SortedMap staticFieldWrites -> B
-    1:1:void <clinit>():48:48 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableSortedSet):303:303 -> <init>
-    2:283:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableSortedSet):65:346 -> <init>
-    284:324:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):357:397 -> <init>
-    325:328:java.util.Set com.android.tools.r8.utils.CollectionUtils.mergeSets(java.util.Collection,java.util.Collection):13:16 -> <init>
-    325:328:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):397 -> <init>
-    329:329:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):397:397 -> <init>
-    330:330:void <init>(com.android.tools.r8.graph.DexApplication,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableSortedSet):215:215 -> <init>
-    330:330:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):357 -> <init>
-    331:524:void <init>(com.android.tools.r8.graph.DexApplication,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableSortedSet):65:258 -> <init>
-    331:524:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):357 -> <init>
-    525:526:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):401:402 -> <init>
-    527:538:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):616:627 -> <init>
-    527:538:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):402 -> <init>
-    539:540:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):403:404 -> <init>
-    541:541:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):409:409 -> <init>
-    542:944:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):65:467 -> <init>
-    945:961:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):463:479 -> <init>
-    962:970:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):475:483 -> <init>
-    971:984:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap com.android.tools.r8.graph.GraphLense.rewriteReferencesConservatively(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):546:559 -> <init>
-    971:984:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):484 -> <init>
-    985:991:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):484:490 -> <init>
-    992:1001:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):486:495 -> <init>
-    1002:1002:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):502:502 -> <init>
-    1003:1482:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):65:544 -> <init>
-    1:33:java.util.Collection computeReachableInterfaces(java.util.Set):548:580 -> a
-    34:34:boolean lambda$withoutStaticFieldsWrites$0(java.util.Set,com.android.tools.r8.graph.DexField):591:591 -> a
-    35:37:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):600:602 -> a
-    38:38:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):600:600 -> a
-    39:44:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):703:708 -> a
-    45:54:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):727:736 -> a
-    55:55:java.util.Set lambda$rewriteKeysConservativelyWhileMergingValues$2(com.android.tools.r8.graph.PresortedComparable):732:732 -> a
-    56:57:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection):773:774 -> a
-    58:59:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):779:780 -> a
-    60:75:com.android.tools.r8.graph.DexEncodedMethod lookup(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):798:813 -> a
-    76:76:com.android.tools.r8.graph.DexEncodedMethod lookup(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):811:811 -> a
-    77:77:com.android.tools.r8.graph.DexEncodedMethod lookup(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):809:809 -> a
-    78:79:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod):974:975 -> a
-    78:79:com.android.tools.r8.graph.DexEncodedMethod lookup(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):807 -> a
-    80:81:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod):821:822 -> a
-    80:81:com.android.tools.r8.graph.DexEncodedMethod lookup(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):805 -> a
-    82:120:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):903:941 -> a
-    121:130:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):957:966 -> a
-    131:133:com.android.tools.r8.shaking.AppInfoWithLiveness addEnumOrdinalMaps(java.util.Map):1044:1046 -> a
-    1:5:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):586:590 -> b
-    6:6:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):350:350 -> b
-    6:6:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):590 -> b
-    7:10:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):591:594 -> b
-    11:18:java.util.SortedMap rewriteKeysWhileMergingValues(java.util.Map,java.util.function.Function):714:721 -> b
-    19:19:java.util.Set lambda$rewriteKeysWhileMergingValues$1(com.android.tools.r8.graph.PresortedComparable):718:718 -> b
-    20:21:boolean isPinned(com.android.tools.r8.graph.DexReference):758:759 -> b
-    22:47:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):980:1005 -> b
-    48:48:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> b
-    48:48:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1004 -> b
-    49:76:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1006:1033 -> b
-    77:79:com.android.tools.r8.shaking.AppInfoWithLiveness addSwitchMaps(java.util.Map):1037:1039 -> b
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMapFor(com.android.tools.r8.graph.DexField):611:612 -> c
-    3:4:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):692:693 -> c
-    5:54:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):826:875 -> c
-    55:63:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):871:879 -> c
-    64:64:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):857:857 -> c
-    1:7:boolean isFieldRead(com.android.tools.r8.graph.DexField):666:672 -> d
-    1:7:boolean isFieldWritten(com.android.tools.r8.graph.DexField):676:682 -> e
-    1:3:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexField):686:688 -> f
-    1:2:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexField):697:698 -> g
-    3:3:boolean hasLiveness():747:747 -> g
-    1:2:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):741:742 -> h
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():753:753 -> l
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap getOrdinalsMapFor(com.android.tools.r8.graph.DexType):606:607 -> p
-    1:2:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):660:661 -> q
-    3:8:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexType):633:638 -> q
-    3:8:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):662 -> q
-    9:9:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):662:662 -> q
-    10:11:java.lang.Iterable getPinnedItems():763:764 -> q
-    1:15:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexType):642:656 -> r
-    16:17:java.util.Set getPrunedTypes():793:794 -> r
-    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):788:789 -> s
-com.android.tools.r8.shaking.ClassInlineRule -> a.a.a.a.s.g:
+    4:11:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):248 -> c
+com.android.tools.r8.shaking.ClassInlineRule -> a.a.a.a.s.f:
     com.android.tools.r8.shaking.ClassInlineRule$Type type -> o
     1:15:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ClassInlineRule$Type):72:86 -> <init>
     1:5:java.lang.String typeString():99:103 -> r
     1:1:com.android.tools.r8.shaking.ClassInlineRule$Builder builder():90:90 -> s
     1:1:com.android.tools.r8.shaking.ClassInlineRule$Type getType():94:94 -> t
-com.android.tools.r8.shaking.ClassInlineRule$1 -> a.a.a.a.s.d:
+com.android.tools.r8.shaking.ClassInlineRule$1 -> a.a.a.a.s.c:
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassInlineRule$Type -> a
     1:1:void <clinit>():99:99 -> <clinit>
-com.android.tools.r8.shaking.ClassInlineRule$Builder -> a.a.a.a.s.e:
+com.android.tools.r8.shaking.ClassInlineRule$Builder -> a.a.a.a.s.d:
     com.android.tools.r8.shaking.ClassInlineRule$Type type -> o
     1:1:void <init>():20:20 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ClassInlineRule$1):17 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ClassInlineRule$Type -> a.a.a.a.s.f:
+com.android.tools.r8.shaking.ClassInlineRule$Type -> a.a.a.a.s.e:
     com.android.tools.r8.shaking.ClassInlineRule$Type NEVER -> a
     com.android.tools.r8.shaking.ClassInlineRule$Type[] $VALUES -> b
     1:1:void <clinit>():14:14 -> <clinit>
     2:2:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):13:13 -> <init>
     1:1:com.android.tools.r8.shaking.ClassInlineRule$Type[] values():13:13 -> a
-com.android.tools.r8.shaking.ClassMergingRule -> a.a.a.a.s.k:
+com.android.tools.r8.shaking.ClassMergingRule -> a.a.a.a.s.j:
     com.android.tools.r8.shaking.ClassMergingRule$Type type -> o
     1:4:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ClassMergingRule$Type):60:63 -> <init>
     1:4:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.shaking.ClassMergingRule$1):11 -> <init>
     1:5:java.lang.String typeString():76:80 -> r
     1:1:com.android.tools.r8.shaking.ClassMergingRule$Builder builder():67:67 -> s
     1:1:com.android.tools.r8.shaking.ClassMergingRule$Type getType():71:71 -> t
-com.android.tools.r8.shaking.ClassMergingRule$1 -> a.a.a.a.s.h:
+com.android.tools.r8.shaking.ClassMergingRule$1 -> a.a.a.a.s.g:
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassMergingRule$Type -> a
     1:1:void <clinit>():76:76 -> <clinit>
-com.android.tools.r8.shaking.ClassMergingRule$Builder -> a.a.a.a.s.i:
+com.android.tools.r8.shaking.ClassMergingRule$Builder -> a.a.a.a.s.h:
     com.android.tools.r8.shaking.ClassMergingRule$Type type -> o
     1:1:void <init>():20:20 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ClassMergingRule$1):17 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ClassMergingRule$Type -> a.a.a.a.s.j:
+com.android.tools.r8.shaking.ClassMergingRule$Type -> a.a.a.a.s.i:
     com.android.tools.r8.shaking.ClassMergingRule$Type NEVER -> a
     com.android.tools.r8.shaking.ClassMergingRule$Type[] $VALUES -> b
     1:1:void <clinit>():14:14 -> <clinit>
     2:2:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):13:13 -> <init>
     1:1:com.android.tools.r8.shaking.ClassMergingRule$Type[] values():13:13 -> a
-com.android.tools.r8.shaking.CollectingGraphConsumer -> a.a.a.a.s.l:
+com.android.tools.r8.shaking.CollectingGraphConsumer -> a.a.a.a.s.k:
     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):24:24 -> <init>
@@ -42668,21 +41818,21 @@
     7:7:java.util.Map getSourcesTargeting(com.android.tools.r8.experimental.graphinfo.GraphNode):44:44 -> a
     1:1:java.util.Map lambda$acceptEdge$0(com.android.tools.r8.experimental.graphinfo.GraphNode):31:31 -> b
     1:1:java.util.Set lambda$acceptEdge$1(com.android.tools.r8.experimental.graphinfo.GraphNode):32:32 -> c
-com.android.tools.r8.shaking.ConstantArgumentRule -> a.a.a.a.s.o:
+com.android.tools.r8.shaking.ConstantArgumentRule -> a.a.a.a.s.n:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ConstantArgumentRule$1):10 -> <init>
     java.lang.String typeString() -> r
     1:1:com.android.tools.r8.shaking.ConstantArgumentRule$Builder builder():74:74 -> s
-com.android.tools.r8.shaking.ConstantArgumentRule$1 -> a.a.a.a.s.m:
-com.android.tools.r8.shaking.ConstantArgumentRule$Builder -> a.a.a.a.s.n:
+com.android.tools.r8.shaking.ConstantArgumentRule$1 -> a.a.a.a.s.l:
+com.android.tools.r8.shaking.ConstantArgumentRule$Builder -> a.a.a.a.s.m:
     1:1:void <init>():16:16 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ConstantArgumentRule$1):12 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.DexStringCache -> a.a.a.a.s.p:
+com.android.tools.r8.shaking.DexStringCache -> a.a.a.a.s.o:
     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 -> a.a.a.a.s.q:
+com.android.tools.r8.shaking.DiscardedChecker -> a.a.a.a.s.p:
     java.util.List classes -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.utils.InternalOptions options -> d
@@ -42748,326 +41898,305 @@
     com.android.tools.r8.shaking.Enqueuer$SetWithReason instantiatedTypes -> F
     java.util.Map superInvokes -> j
     java.util.Set callSites -> r
-    1:1:void <clinit>():104:104 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer):279:279 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):286:286 -> <init>
-    3:124:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):107:228 -> <init>
+    1:1:void <clinit>():113:113 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer):288:288 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):295:295 -> <init>
+    3:124:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):116:237 -> <init>
     125:125:java.util.ArrayDeque com.android.tools.r8.com.google.common.collect.Queues.newArrayDeque():66:66 -> <init>
-    125:125:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):234 -> <init>
-    126:126:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):234:234 -> <init>
+    125:125:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):243 -> <init>
+    126:126:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):243:243 -> <init>
     127:127:java.util.ArrayDeque com.android.tools.r8.com.google.common.collect.Queues.newArrayDeque():66:66 -> <init>
-    127:127:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):239 -> <init>
-    128:128:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):239:239 -> <init>
+    127:127:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):248 -> <init>
+    128:128:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):248:248 -> <init>
     129:129:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet():347:347 -> <init>
-    129:129:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):244 -> <init>
-    130:179:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):244:293 -> <init>
+    129:129:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):253 -> <init>
+    130:179:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):253:302 -> <init>
+    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason access$4800(com.android.tools.r8.shaking.Enqueuer):113:113 -> A
+    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason access$4900(com.android.tools.r8.shaking.Enqueuer):113:113 -> B
+    1:1:java.util.Map access$500(com.android.tools.r8.shaking.Enqueuer):113:113 -> C
+    1:1:java.util.Set access$5100(com.android.tools.r8.shaking.Enqueuer):113:113 -> D
+    1:1:java.util.Set access$5200(com.android.tools.r8.shaking.Enqueuer):113:113 -> E
+    1:1:java.util.Set access$5300(com.android.tools.r8.shaking.Enqueuer):113:113 -> F
+    1:1:com.android.tools.r8.shaking.RootSetBuilder$RootSet access$5400(com.android.tools.r8.shaking.Enqueuer):113:113 -> G
+    1:1:java.util.Queue access$700(com.android.tools.r8.shaking.Enqueuer):113:113 -> H
+    1:1:java.util.Map access$800(com.android.tools.r8.shaking.Enqueuer):113:113 -> I
     void lambda$newSetWithoutReasonReporter$0(java.lang.Object,com.android.tools.r8.shaking.KeepReason) -> a
-    1:1:java.util.Map access$1000(com.android.tools.r8.shaking.Enqueuer):104:104 -> a
-    2:2:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):104:104 -> a
-    3:3:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):104:104 -> a
-    4:4:void access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedField):104:104 -> a
-    5:5:void access$2400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):104:104 -> a
-    6:6:void access$3300(com.android.tools.r8.shaking.Enqueuer,java.lang.Iterable,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):104:104 -> a
-    7:7:void access$3400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):104:104 -> a
-    8:8:void access$3600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexClass):104:104 -> a
-    9:9:void access$4100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):104:104 -> a
-    10:10:boolean access$600(com.android.tools.r8.shaking.Enqueuer,java.util.Map,com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod):104:104 -> a
-    11:11:com.android.tools.r8.shaking.Enqueuer$SetWithReason newSetWithoutReasonReporter():322:322 -> a
-    12:14:void enqueueRootItem(java.util.Map$Entry):330:332 -> a
-    15:22:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):340:347 -> a
-    23:33:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):359:369 -> a
-    34:34:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):367:367 -> a
-    35:40:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):366:371 -> a
-    41:41:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):695:695 -> a
-    41:41:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):371 -> a
-    42:42:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.isExternalizable(com.android.tools.r8.graph.DexType):593:593 -> a
-    42:42:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):695 -> a
-    42:42:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):371 -> a
-    43:53:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):372:382 -> a
-    54:54:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):380:380 -> a
-    55:66:void enqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Map):402:413 -> a
-    67:79:boolean registerItemWithTargetAndContext(java.util.Map,com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod):442:454 -> a
-    80:90:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):814:824 -> a
-    80:90:com.android.tools.r8.graph.DexMethod access$1300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):104 -> a
-    91:91:boolean lambda$markTypeAsLive$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexAnnotation):882:882 -> a
-    92:92:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):897:897 -> a
-    93:93:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):903:903 -> a
-    93:93:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):898 -> a
-    94:94:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):903:903 -> a
-    94:94:void lambda$markMethodAsTargeted$8(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1018 -> a
-    95:107:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):907:919 -> a
-    108:108:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.annotatedOn(com.android.tools.r8.graph.DexDefinition):22:22 -> a
-    108:108:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):919 -> a
-    109:112:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):919:922 -> a
-    113:128:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):944:959 -> a
-    129:129:void lambda$handleInvokeOfDirectTarget$7(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):949:949 -> a
-    130:150:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):965:985 -> a
-    151:151:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):983:983 -> a
-    152:161:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1111:1120 -> a
-    162:166:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1119:1123 -> a
-    167:173:void transitionNonAbstractMethodsToLiveAndShadow(java.lang.Iterable,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1129:1135 -> a
-    174:174:void transitionNonAbstractMethodsToLiveAndShadow(java.lang.Iterable,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1134:1134 -> a
-    175:175:void markStaticFieldAsLive(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason):1168:1168 -> a
-    175:175:void access$1900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason):104 -> a
-    176:208:void markStaticFieldAsLive(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedField):1175:1207 -> a
-    209:232:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1241:1264 -> a
-    209:232:void access$2600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):104 -> a
-    233:241:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1270:1278 -> a
-    242:264:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason):1305:1327 -> a
-    265:313:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1334:1382 -> a
-    314:332:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1381:1399 -> a
-    333:337:void fillWorkList(java.util.Deque,com.android.tools.r8.graph.DexType):1431:1435 -> a
-    338:338:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):576:576 -> a
-    338:338:void fillWorkList(java.util.Deque,com.android.tools.r8.graph.DexType):1435 -> a
-    339:339:void fillWorkList(java.util.Deque,com.android.tools.r8.graph.DexType):1436:1436 -> a
-    340:340:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):552:552 -> a
-    340:340:void fillWorkList(java.util.Deque,com.android.tools.r8.graph.DexType):1436 -> a
-    341:341:void fillWorkList(java.util.Deque,com.android.tools.r8.graph.DexType):1438:1438 -> a
-    342:342:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):552:552 -> a
-    342:342:void fillWorkList(java.util.Deque,com.android.tools.r8.graph.DexType):1438 -> a
-    343:351:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1448:1456 -> a
-    352:352:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.targetedBySuperFrom(com.android.tools.r8.graph.DexEncodedMethod):82:82 -> a
-    352:352:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1458 -> a
-    353:373:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1458:1478 -> a
-    374:380:java.util.SortedSet traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1487:1493 -> a
-    381:388:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1502:1509 -> a
-    389:408:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):1514:1533 -> a
-    409:421:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):1532:1544 -> a
-    422:429:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):1542:1549 -> a
-    430:437:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):1547:1554 -> a
-    438:451:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):1552:1565 -> a
-    452:457:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):1601:1606 -> a
-    452:457:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):1578 -> a
-    458:462:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):1580:1584 -> a
-    463:465:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):1583:1585 -> a
-    466:466:void lambda$createAppInfo$12(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):1516:1516 -> a
-    467:467:boolean lambda$createAppInfo$13(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedField):1546:1546 -> a
-    468:473:java.util.SortedSet toSortedDescriptorSet(java.util.Set):1591:1596 -> a
-    474:509:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1612:1647 -> a
-    510:510:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1644:1644 -> a
-    511:511:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1641:1641 -> a
-    512:512:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1638:1638 -> a
-    513:513:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1634:1634 -> a
-    514:514:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1631:1631 -> a
-    515:515:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1628:1628 -> a
-    516:516:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1625:1625 -> a
-    517:551:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1622:1656 -> a
-    552:552:void com.android.tools.r8.shaking.RootSetBuilder.<init>(com.android.tools.r8.graph.AppView,java.util.Collection):103:103 -> a
-    552:552:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1656 -> a
-    553:557:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1657:1661 -> a
-    558:558:com.android.tools.r8.shaking.RootSetBuilder$IfRuleEvaluator com.android.tools.r8.shaking.RootSetBuilder.getIfRuleEvaluator(java.util.Set,java.util.Set,java.util.Set,java.util.concurrent.ExecutorService):289:289 -> a
-    558:558:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1658 -> a
-    559:611:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1663:1715 -> a
-    612:614:void unpinLambdaMethods():1721:1723 -> a
-    612:614:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1717 -> a
-    615:619:void com.android.tools.r8.shaking.RootSetBuilder$RootSet.prune(com.android.tools.r8.graph.DexReference):1178:1182 -> a
-    615:619:void unpinLambdaMethods():1723 -> a
-    615:619:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1717 -> a
-    620:620:void unpinLambdaMethods():1725:1725 -> a
-    620:620:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1717 -> a
-    621:648:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1688:1715 -> a
-    649:654:void lambda$trace$15(com.android.tools.r8.graph.DexReference,java.util.Map):1670:1675 -> a
-    655:661:void markFieldAsKept(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1762:1768 -> a
-    662:667:void markAllLibraryVirtualMethodsReachable(com.android.tools.r8.graph.DexClass):1773:1778 -> a
-    668:668:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.isLibraryMethod():54:54 -> a
-    668:668:void markAllLibraryVirtualMethodsReachable(com.android.tools.r8.graph.DexClass):1779 -> a
-    669:670:void markAllLibraryVirtualMethodsReachable(com.android.tools.r8.graph.DexClass):1779:1780 -> a
-    671:671:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.isLibraryMethod():54:54 -> a
-    671:671:void markAllLibraryVirtualMethodsReachable(com.android.tools.r8.graph.DexClass):1781 -> a
-    672:672:void markAllLibraryVirtualMethodsReachable(com.android.tools.r8.graph.DexClass):1780:1780 -> a
-    673:682:java.util.SortedMap collectDescriptors(java.util.Map):1832:1841 -> a
-    683:683:java.util.Set lambda$collectDescriptors$17(com.android.tools.r8.graph.Descriptor):1837:1837 -> a
-    684:687:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1845:1848 -> a
-    688:693:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1872:1877 -> a
-    694:700:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1883:1889 -> a
-    694:700:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    701:708:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):1966:1973 -> a
-    701:708:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1890 -> a
-    701:708:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    709:723:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):1972:1986 -> a
-    709:723:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1890 -> a
-    709:723:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    724:724:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1893:1893 -> a
-    724:724:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    725:745:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):1994:2014 -> a
-    725:745:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1894 -> a
-    725:745:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    746:794:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2013:2061 -> a
-    746:794:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1894 -> a
-    746:794:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    795:820:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2060:2085 -> a
-    795:820:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1894 -> a
-    795:820:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    821:821:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1897:1897 -> a
-    821:821:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    822:826:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2133:2137 -> a
-    822:826:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1898 -> a
-    822:826:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    827:831:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):1409:1413 -> a
-    827:831:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1421 -> a
-    827:831:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2137 -> a
-    827:831:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1898 -> a
-    827:831:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    832:837:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):1412:1417 -> a
-    832:837:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1421 -> a
-    832:837:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2137 -> a
-    832:837:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1898 -> a
-    832:837:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    838:838:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1421:1421 -> a
-    838:838:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2137 -> a
-    838:838:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1898 -> a
-    838:838:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    839:842:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):351:354 -> a
-    839:842:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1425 -> a
-    839:842:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2137 -> a
-    839:842:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1898 -> a
-    839:842:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    843:843:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1426:1426 -> a
-    843:843:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2137 -> a
-    843:843:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1898 -> a
-    843:843:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    844:844:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1901:1901 -> a
-    844:844:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    845:872:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2096:2123 -> a
-    845:872:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1902 -> a
-    845:872:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    873:873:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1905:1905 -> a
-    873:873:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    874:901:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2143:2170 -> a
-    874:901:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1906 -> a
-    874:901:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    902:915:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1909:1922 -> a
-    902:915:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    916:953:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1921:1958 -> a
-    916:953:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    954:954:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1956:1956 -> a
-    954:954:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    955:955:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1955:1955 -> a
-    955:955:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    956:968:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2176:2188 -> a
-    969:969:void registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):2408:2408 -> a
-    970:970:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):2445:2445 -> a
-    970:970:void registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):2408 -> a
-    971:975:void registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):2408:2412 -> a
-    976:976:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):2445:2445 -> a
-    976:976:void registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):2437 -> a
-    977:978:void registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):2439:2440 -> a
-    979:988:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):2449:2458 -> a
-    989:989:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):2462:2462 -> a
-    990:990:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo lambda$getEdgeInfo$18(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):2462:2462 -> a
-    991:991:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):2466:2466 -> a
-    992:995:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$19(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):2467:2470 -> a
-    996:996:com.android.tools.r8.experimental.graphinfo.ClassGraphNode getClassGraphNode(com.android.tools.r8.graph.DexType):2475:2475 -> a
-    997:997:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):2486:2486 -> a
-    998:1011:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$21(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):2489:2502 -> a
-    1012:1012:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$21(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):2496:2496 -> a
-    1013:1013:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):2507:2507 -> a
-    1014:1020:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$22(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):2510:2516 -> a
-    1021:1021:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$22(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):2513:2513 -> a
-    1022:1022:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.shaking.ProguardKeepRule):2521:2521 -> a
+    1:1:java.util.Map access$1000(com.android.tools.r8.shaking.Enqueuer):113:113 -> a
+    2:2:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):113:113 -> a
+    3:3:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):113:113 -> a
+    4:4:void access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedField):113:113 -> a
+    5:5:void access$2400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):113:113 -> a
+    6:6:void access$3300(com.android.tools.r8.shaking.Enqueuer,java.lang.Iterable,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):113:113 -> a
+    7:7:void access$3400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):113:113 -> a
+    8:8:void access$3600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexClass):113:113 -> a
+    9:9:java.util.SortedSet access$5000(com.android.tools.r8.shaking.Enqueuer,java.util.Set,java.util.Set):113:113 -> a
+    10:10:void access$5600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):113:113 -> a
+    11:11:boolean access$600(com.android.tools.r8.shaking.Enqueuer,java.util.Map,com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod):113:113 -> a
+    12:12:com.android.tools.r8.shaking.Enqueuer$SetWithReason newSetWithoutReasonReporter():331:331 -> a
+    13:15:void enqueueRootItem(java.util.Map$Entry):339:341 -> a
+    16:23:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):349:356 -> a
+    24:34:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):368:378 -> a
+    35:35:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):376:376 -> a
+    36:41:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):375:380 -> a
+    42:42:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.DexDefinitionSupplier):686:686 -> a
+    42:42:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):380 -> a
+    43:44:boolean com.android.tools.r8.graph.DexType.isExternalizable(com.android.tools.r8.graph.DexDefinitionSupplier):120:121 -> a
+    43:44:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.DexDefinitionSupplier):686 -> a
+    43:44:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):380 -> a
+    45:55:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):381:391 -> a
+    56:56:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):389:389 -> a
+    57:68:void enqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Map):411:422 -> a
+    69:81:boolean registerItemWithTargetAndContext(java.util.Map,com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod):451:463 -> a
+    82:92:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):816:826 -> a
+    82:92:com.android.tools.r8.graph.DexMethod access$1300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):113 -> a
+    93:93:boolean lambda$markTypeAsLive$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexAnnotation):884:884 -> a
+    94:94:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):899:899 -> a
+    95:95:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):905:905 -> a
+    95:95:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):900 -> a
+    96:96:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):905:905 -> a
+    96:96:void lambda$markMethodAsTargeted$8(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1020 -> a
+    97:109:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):909:921 -> a
+    110:110:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.annotatedOn(com.android.tools.r8.graph.DexDefinition):22:22 -> a
+    110:110:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):921 -> a
+    111:114:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):921:924 -> a
+    115:130:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):946:961 -> a
+    131:131:void lambda$handleInvokeOfDirectTarget$7(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):951:951 -> a
+    132:152:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):967:987 -> a
+    153:153:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):985:985 -> a
+    154:165:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1041:1052 -> a
+    166:202:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType):1072:1108 -> a
+    166:202:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1052 -> a
+    203:203:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1054:1054 -> a
+    204:218:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexType):1150:1164 -> a
+    204:218:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1054 -> a
+    219:219:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1056:1056 -> a
+    220:229:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1114:1123 -> a
+    230:234:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1122:1126 -> a
+    235:241:void transitionNonAbstractMethodsToLiveAndShadow(java.lang.Iterable,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1132:1138 -> a
+    242:242:void transitionNonAbstractMethodsToLiveAndShadow(java.lang.Iterable,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1137:1137 -> a
+    243:243:void markStaticFieldAsLive(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason):1168:1168 -> a
+    243:243:void access$1900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason):113 -> a
+    244:270:void markStaticFieldAsLive(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedField):1175:1201 -> a
+    271:294:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1234:1257 -> a
+    271:294:void access$2600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):113 -> a
+    295:303:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1263:1271 -> a
+    304:323:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason):1298:1317 -> a
+    324:372:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1324:1372 -> a
+    373:391:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1371:1389 -> a
+    392:399:void fillWorkList(java.util.Deque,com.android.tools.r8.graph.DexType):1421:1428 -> a
+    400:408:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1438:1446 -> a
+    409:409:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.targetedBySuperFrom(com.android.tools.r8.graph.DexEncodedMethod):82:82 -> a
+    409:409:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1448 -> a
+    410:430:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1448:1468 -> a
+    431:437:java.util.SortedSet traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1477:1483 -> a
+    438:445:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1492:1499 -> a
+    446:481:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1503:1538 -> a
+    482:482:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1535:1535 -> a
+    483:483:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1532:1532 -> a
+    484:484:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1529:1529 -> a
+    485:502:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1620:1637 -> a
+    485:502:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1529 -> a
+    503:503:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1525:1525 -> a
+    504:504:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1522:1522 -> a
+    505:505:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1519:1519 -> a
+    506:506:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1516:1516 -> a
+    507:541:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1513:1547 -> a
+    542:542:void com.android.tools.r8.shaking.RootSetBuilder.<init>(com.android.tools.r8.graph.AppView,java.util.Collection):105:105 -> a
+    542:542:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1547 -> a
+    543:547:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1548:1552 -> a
+    548:548:com.android.tools.r8.shaking.RootSetBuilder$IfRuleEvaluator com.android.tools.r8.shaking.RootSetBuilder.getIfRuleEvaluator(java.util.Set,java.util.Set,java.util.Set,java.util.concurrent.ExecutorService):291:291 -> a
+    548:548:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1549 -> a
+    549:601:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1554:1606 -> a
+    602:604:void unpinLambdaMethods():1612:1614 -> a
+    602:604:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1608 -> a
+    605:609:void com.android.tools.r8.shaking.RootSetBuilder$RootSet.prune(com.android.tools.r8.graph.DexReference):1178:1182 -> a
+    605:609:void unpinLambdaMethods():1614 -> a
+    605:609:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1608 -> a
+    610:610:void unpinLambdaMethods():1616:1616 -> a
+    610:610:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1608 -> a
+    611:638:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1579:1606 -> a
+    639:644:void lambda$trace$12(com.android.tools.r8.graph.DexReference,java.util.Map):1561:1566 -> a
+    645:651:void markFieldAsKept(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1643:1649 -> a
+    652:657:void markAllLibraryVirtualMethodsReachable(com.android.tools.r8.graph.DexClass):1654:1659 -> a
+    658:658:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.isLibraryMethod():54:54 -> a
+    658:658:void markAllLibraryVirtualMethodsReachable(com.android.tools.r8.graph.DexClass):1660 -> a
+    659:660:void markAllLibraryVirtualMethodsReachable(com.android.tools.r8.graph.DexClass):1660:1661 -> a
+    661:661:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.isLibraryMethod():54:54 -> a
+    661:661:void markAllLibraryVirtualMethodsReachable(com.android.tools.r8.graph.DexClass):1662 -> a
+    662:662:void markAllLibraryVirtualMethodsReachable(com.android.tools.r8.graph.DexClass):1661:1661 -> a
+    663:672:java.util.SortedMap collectDescriptors(java.util.Map):1713:1722 -> a
+    673:673:java.util.Set lambda$collectDescriptors$14(com.android.tools.r8.graph.Descriptor):1718:1718 -> a
+    674:677:java.util.Set collectReachedFields(java.util.Set,java.util.function.Function):1727:1730 -> a
+    678:682:java.util.SortedSet mergeFieldAccesses(java.util.Set,java.util.Set):1745:1749 -> a
+    683:683:java.util.SortedSet mergeFieldAccesses(java.util.Set,java.util.Set):1747:1747 -> a
+    684:684:java.util.SortedSet mergeFieldAccesses(java.util.Set,java.util.Set):1745:1745 -> a
+    685:690:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1779:1784 -> a
+    691:696:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1790:1795 -> a
+    691:696:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    697:701:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):1863:1867 -> a
+    697:701:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1796 -> a
+    697:701:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    702:706:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):1399:1403 -> a
+    702:706:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1411 -> a
+    702:706:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):1867 -> a
+    702:706:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1796 -> a
+    702:706:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    707:712:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):1402:1407 -> a
+    707:712:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1411 -> a
+    707:712:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):1867 -> a
+    707:712:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1796 -> a
+    707:712:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    713:713:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1411:1411 -> a
+    713:713:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):1867 -> a
+    713:713:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1796 -> a
+    713:713:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    714:717:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):360:363 -> a
+    714:717:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1415 -> a
+    714:717:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):1867 -> a
+    714:717:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1796 -> a
+    714:717:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    718:718:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1416:1416 -> a
+    718:718:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):1867 -> a
+    718:718:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1796 -> a
+    718:718:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    719:719:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1799:1799 -> a
+    719:719:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    720:747:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):1873:1900 -> a
+    720:747:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1800 -> a
+    720:747:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    748:761:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1803:1816 -> a
+    748:761:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    762:799:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1815:1852 -> a
+    762:799:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    800:800:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1850:1850 -> a
+    800:800:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    801:801:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1849:1849 -> a
+    801:801:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    802:813:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1906:1917 -> a
+    814:816:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1753:1755 -> a
+    814:816:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1918 -> a
+    817:817:void registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):3068:3068 -> a
+    818:818:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):3105:3105 -> a
+    818:818:void registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):3068 -> a
+    819:823:void registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):3068:3072 -> a
+    824:824:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):3105:3105 -> a
+    824:824:void registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3097 -> a
+    825:826:void registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3099:3100 -> a
+    827:836:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):3109:3118 -> a
+    837:837:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):3122:3122 -> a
+    838:838:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo lambda$getEdgeInfo$15(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):3122:3122 -> a
+    839:839:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):3126:3126 -> a
+    840:843:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$16(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):3127:3130 -> a
+    844:844:com.android.tools.r8.experimental.graphinfo.ClassGraphNode getClassGraphNode(com.android.tools.r8.graph.DexType):3135:3135 -> a
+    845:845:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):3146:3146 -> a
+    846:859:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$18(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3149:3162 -> a
+    860:860:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$18(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3156:3156 -> a
+    861:861:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):3167:3167 -> a
+    862:868:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$19(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3170:3176 -> a
+    869:869:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$19(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3173:3173 -> a
+    870:870:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.shaking.ProguardKeepRule):3181:3181 -> a
     void reportMissingClass(com.android.tools.r8.graph.DexType) -> b
-    1:1:java.util.Map access$1200(com.android.tools.r8.shaking.Enqueuer):104:104 -> b
-    2:2:void access$3100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):104:104 -> b
-    3:3:void access$4000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason):104:104 -> b
-    4:4:void access$4200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):104:104 -> b
-    5:5:void access$900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):104:104 -> b
-    6:6:void enqueueRootItems(java.util.Map):326:326 -> b
-    7:7:void lambda$markTypeAsLive$4(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexAnnotation):883:883 -> b
-    8:8:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):903:903 -> b
-    8:8:void lambda$processNewlyLiveMethod$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1809 -> b
-    9:18:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):928:937 -> b
-    19:19:void lambda$handleInvokeOfStaticTarget$6(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):933:933 -> b
-    20:31:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1038:1049 -> b
-    32:68:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType):1069:1105 -> b
-    32:68:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1049 -> b
-    69:69:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1051:1051 -> b
-    70:87:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexType):1147:1164 -> b
-    70:87:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1051 -> b
-    88:88:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1053:1053 -> b
-    89:89:void markStaticFieldAsLive(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason):1168:1168 -> b
-    90:101:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1211:1222 -> b
-    102:113:void markInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1226:1237 -> b
-    114:115:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexType):1297:1298 -> b
-    116:116:java.util.Set lambda$markSuperMethodAsReachable$11(com.android.tools.r8.graph.DexEncodedMethod):1474:1474 -> b
-    117:117:boolean lambda$createAppInfo$14(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedField):1551:1551 -> b
-    118:145:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1729:1756 -> b
-    146:147:void collectProguardCompatibilityRule(com.android.tools.r8.shaking.KeepReason):1825:1826 -> b
-    148:150:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexClass):1853:1855 -> b
-    151:156:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexClass):1854:1859 -> b
-    157:157:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexClass):1858:1858 -> b
-    158:158:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexClass):1857:1857 -> b
-    1:1:java.util.Map access$1400(com.android.tools.r8.shaking.Enqueuer):104:104 -> c
-    2:22:java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer():297:317 -> c
-    23:23:java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer():313:313 -> c
-    24:41:void markMethodAsTargeted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1010:1027 -> c
-    42:46:void markMethodAsKeptWithCompatRule(com.android.tools.r8.graph.DexEncodedMethod):1864:1868 -> c
-    42:46:void markMethodAsTargeted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1028 -> c
-    47:47:void markMethodAsKeptWithCompatRule(com.android.tools.r8.graph.DexEncodedMethod):1867:1867 -> c
-    47:47:void markMethodAsTargeted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1028 -> c
-    48:51:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):1818:1821 -> c
-    52:52:void registerType(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2400:2400 -> c
-    53:53:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):2445:2445 -> c
-    53:53:void registerType(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2400 -> c
-    54:58:void registerType(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2400:2404 -> c
-    59:59:void registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2429:2429 -> c
-    60:60:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):2445:2445 -> c
-    60:60:void registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2429 -> c
-    61:65:void registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2429:2433 -> c
-    66:69:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$20(com.android.tools.r8.graph.DexType):2478:2481 -> c
-    1:1:java.util.Map access$1500(com.android.tools.r8.shaking.Enqueuer):104:104 -> d
-    2:2:java.util.Set lambda$handleAnnotation$5(com.android.tools.r8.graph.DexType):915:915 -> d
-    3:7:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1283:1287 -> d
-    8:15:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1285:1292 -> d
-    1:1:java.util.Map access$1600(com.android.tools.r8.shaking.Enqueuer):104:104 -> e
-    2:2:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$9(com.android.tools.r8.graph.DexType):1326:1326 -> e
-    3:30:void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1786:1813 -> e
-    1:1:java.util.Map access$1800(com.android.tools.r8.shaking.Enqueuer):104:104 -> f
-    2:2:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markVirtualMethodAsReachable$10(com.android.tools.r8.graph.DexType):1371:1371 -> f
-    3:8:void registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2416:2421 -> f
-    9:9:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):2445:2445 -> f
-    9:9:void registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2421 -> f
-    10:14:void registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2421:2425 -> f
-    1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.shaking.Enqueuer):104:104 -> g
-    2:2:java.util.Set lambda$registerItemWithTargetAndContext$2(com.android.tools.r8.graph.DexType):453:453 -> g
-    1:1:java.util.Map access$2000(com.android.tools.r8.shaking.Enqueuer):104:104 -> h
-    2:40:void markTypeAsLive(com.android.tools.r8.graph.DexType):832:870 -> h
-    41:48:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):386:393 -> h
-    41:48:void markTypeAsLive(com.android.tools.r8.graph.DexType):871 -> h
-    49:67:void markTypeAsLive(com.android.tools.r8.graph.DexType):874:892 -> h
-    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping access$2100(com.android.tools.r8.shaking.Enqueuer):104:104 -> i
-    1:1:java.util.Set access$2200(com.android.tools.r8.shaking.Enqueuer):104:104 -> j
-    1:1:java.util.Set access$2500(com.android.tools.r8.shaking.Enqueuer):104:104 -> k
-    1:1:com.android.tools.r8.utils.InternalOptions access$2700(com.android.tools.r8.shaking.Enqueuer):104:104 -> l
-    1:1:java.util.Set access$2800(com.android.tools.r8.shaking.Enqueuer):104:104 -> m
-    1:1:java.util.Set access$2900(com.android.tools.r8.shaking.Enqueuer):104:104 -> n
-    1:1:java.util.Set access$300(com.android.tools.r8.shaking.Enqueuer):104:104 -> o
-    1:1:java.util.Set access$3000(com.android.tools.r8.shaking.Enqueuer):104:104 -> p
-    1:1:java.util.Map access$3200(com.android.tools.r8.shaking.Enqueuer):104:104 -> q
-    1:1:boolean access$3500(com.android.tools.r8.shaking.Enqueuer):104:104 -> r
-    1:1:java.util.Set access$400(com.android.tools.r8.shaking.Enqueuer):104:104 -> s
-    1:1:java.util.Map access$500(com.android.tools.r8.shaking.Enqueuer):104:104 -> t
-    1:1:java.util.Queue access$700(com.android.tools.r8.shaking.Enqueuer):104:104 -> u
-    1:1:java.util.Map access$800(com.android.tools.r8.shaking.Enqueuer):104:104 -> v
-com.android.tools.r8.shaking.Enqueuer$1 -> a.a.a.a.s.r:
+    1:1:java.util.Map access$1200(com.android.tools.r8.shaking.Enqueuer):113:113 -> b
+    2:2:void access$3100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):113:113 -> b
+    3:3:void access$5500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason):113:113 -> b
+    4:4:void access$5700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):113:113 -> b
+    5:5:void access$900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):113:113 -> b
+    6:6:void enqueueRootItems(java.util.Map):335:335 -> b
+    7:7:void lambda$markTypeAsLive$4(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexAnnotation):885:885 -> b
+    8:8:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):905:905 -> b
+    8:8:void lambda$processNewlyLiveMethod$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1690 -> b
+    9:18:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):930:939 -> b
+    19:19:void lambda$handleInvokeOfStaticTarget$6(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):935:935 -> b
+    20:38:void markMethodAsTargeted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1012:1030 -> b
+    39:43:void markMethodAsKeptWithCompatRule(com.android.tools.r8.graph.DexEncodedMethod):1771:1775 -> b
+    39:43:void markMethodAsTargeted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1031 -> b
+    44:44:void markMethodAsKeptWithCompatRule(com.android.tools.r8.graph.DexEncodedMethod):1774:1774 -> b
+    44:44:void markMethodAsTargeted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1031 -> b
+    45:45:void markStaticFieldAsLive(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason):1168:1168 -> b
+    46:56:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1205:1215 -> b
+    57:68:void markInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1219:1230 -> b
+    69:70:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexType):1290:1291 -> b
+    71:71:java.util.Set lambda$markSuperMethodAsReachable$11(com.android.tools.r8.graph.DexEncodedMethod):1464:1464 -> b
+    72:73:void collectProguardCompatibilityRule(com.android.tools.r8.shaking.KeepReason):1706:1707 -> b
+    74:75:com.android.tools.r8.graph.DexField tryLookupInstanceField(com.android.tools.r8.graph.DexField):1734:1735 -> b
+    76:78:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexClass):1760:1762 -> b
+    79:84:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexClass):1761:1766 -> b
+    85:85:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexClass):1765:1765 -> b
+    86:86:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexClass):1764:1764 -> b
+    1:1:java.util.Map access$1400(com.android.tools.r8.shaking.Enqueuer):113:113 -> c
+    2:22:java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer():306:326 -> c
+    23:23:java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer():322:322 -> c
+    24:28:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1276:1280 -> c
+    29:36:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1278:1285 -> c
+    37:40:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):1699:1702 -> c
+    41:42:com.android.tools.r8.graph.DexField tryLookupStaticField(com.android.tools.r8.graph.DexField):1739:1740 -> c
+    43:43:void registerType(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):3060:3060 -> c
+    44:44:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):3105:3105 -> c
+    44:44:void registerType(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):3060 -> c
+    45:49:void registerType(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):3060:3064 -> c
+    50:50:void registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):3089:3089 -> c
+    51:51:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):3105:3105 -> c
+    51:51:void registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):3089 -> c
+    52:56:void registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):3089:3093 -> c
+    57:60:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$17(com.android.tools.r8.graph.DexType):3138:3141 -> c
+    1:1:java.util.Map access$1500(com.android.tools.r8.shaking.Enqueuer):113:113 -> d
+    2:2:java.util.Set lambda$handleAnnotation$5(com.android.tools.r8.graph.DexType):917:917 -> d
+    3:30:void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1667:1694 -> d
+    1:1:java.util.Map access$1600(com.android.tools.r8.shaking.Enqueuer):113:113 -> e
+    2:2:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$9(com.android.tools.r8.graph.DexType):1316:1316 -> e
+    3:8:void registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3076:3081 -> e
+    9:9:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):3105:3105 -> e
+    9:9:void registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3081 -> e
+    10:14:void registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3081:3085 -> e
+    1:1:java.util.Map access$1800(com.android.tools.r8.shaking.Enqueuer):113:113 -> f
+    2:2:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markVirtualMethodAsReachable$10(com.android.tools.r8.graph.DexType):1361:1361 -> f
+    1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.shaking.Enqueuer):113:113 -> g
+    2:2:java.util.Set lambda$registerItemWithTargetAndContext$2(com.android.tools.r8.graph.DexType):462:462 -> g
+    1:1:java.util.Map access$2000(com.android.tools.r8.shaking.Enqueuer):113:113 -> h
+    2:40:void markTypeAsLive(com.android.tools.r8.graph.DexType):834:872 -> h
+    41:48:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):395:402 -> h
+    41:48:void markTypeAsLive(com.android.tools.r8.graph.DexType):873 -> h
+    49:67:void markTypeAsLive(com.android.tools.r8.graph.DexType):876:894 -> h
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping access$2100(com.android.tools.r8.shaking.Enqueuer):113:113 -> i
+    1:1:java.util.Set access$2200(com.android.tools.r8.shaking.Enqueuer):113:113 -> j
+    1:1:java.util.Set access$2500(com.android.tools.r8.shaking.Enqueuer):113:113 -> k
+    1:1:com.android.tools.r8.utils.InternalOptions access$2700(com.android.tools.r8.shaking.Enqueuer):113:113 -> l
+    1:1:java.util.Set access$2800(com.android.tools.r8.shaking.Enqueuer):113:113 -> m
+    1:1:java.util.Set access$2900(com.android.tools.r8.shaking.Enqueuer):113:113 -> n
+    1:1:java.util.Set access$300(com.android.tools.r8.shaking.Enqueuer):113:113 -> o
+    1:1:java.util.Set access$3000(com.android.tools.r8.shaking.Enqueuer):113:113 -> p
+    1:1:java.util.Map access$3200(com.android.tools.r8.shaking.Enqueuer):113:113 -> q
+    1:1:boolean access$3500(com.android.tools.r8.shaking.Enqueuer):113:113 -> r
+    1:1:java.util.Set access$400(com.android.tools.r8.shaking.Enqueuer):113:113 -> s
+    1:1:java.util.Set access$4100(com.android.tools.r8.shaking.Enqueuer):113:113 -> t
+    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason access$4200(com.android.tools.r8.shaking.Enqueuer):113:113 -> u
+    1:1:java.util.Set access$4300(com.android.tools.r8.shaking.Enqueuer):113:113 -> v
+    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason access$4400(com.android.tools.r8.shaking.Enqueuer):113:113 -> w
+    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason access$4500(com.android.tools.r8.shaking.Enqueuer):113:113 -> x
+    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason access$4600(com.android.tools.r8.shaking.Enqueuer):113:113 -> y
+    1:1:java.util.Set access$4700(com.android.tools.r8.shaking.Enqueuer):113:113 -> z
+com.android.tools.r8.shaking.Enqueuer$1 -> a.a.a.a.s.q:
     int[] $SwitchMap$com$android$tools$r8$shaking$Enqueuer$Action$Kind -> b
+    int[] $SwitchMap$com$android$tools$r8$ir$code$Invoke$Type -> c
     int[] $SwitchMap$com$android$tools$r8$graph$DexMethodHandle$MethodHandleType -> a
-    1:1:void <clinit>():1620:1620 -> <clinit>
-    2:2:void <clinit>():725:725 -> <clinit>
-com.android.tools.r8.shaking.Enqueuer$Action -> a.a.a.a.s.t:
+    1:1:void <clinit>():2669:2669 -> <clinit>
+    2:2:void <clinit>():1511:1511 -> <clinit>
+    3:3:void <clinit>():727:727 -> <clinit>
+com.android.tools.r8.shaking.Enqueuer$Action -> a.a.a.a.s.s:
     com.android.tools.r8.shaking.KeepReason reason -> d
     com.android.tools.r8.graph.DexItem target -> b
     com.android.tools.r8.graph.DexItem context -> c
     com.android.tools.r8.shaking.Enqueuer$Action$Kind kind -> a
-    1:5:void <init>(com.android.tools.r8.shaking.Enqueuer$Action$Kind,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem,com.android.tools.r8.shaking.KeepReason):2200:2204 -> <init>
-    1:1:com.android.tools.r8.shaking.Enqueuer$Action markReachableInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):2212:2212 -> a
-    2:2:com.android.tools.r8.shaking.Enqueuer$Action markReachableSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2216:2216 -> a
-    3:3:com.android.tools.r8.shaking.Enqueuer$Action markReachableField(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason):2220:2220 -> a
-    4:4:com.android.tools.r8.shaking.Enqueuer$Action markInstantiated(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):2224:2224 -> a
-    5:5:com.android.tools.r8.shaking.Enqueuer$Action markMethodKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2232:2232 -> a
-    6:6:com.android.tools.r8.shaking.Enqueuer$Action markFieldKept(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2236:2236 -> a
-    1:1:com.android.tools.r8.shaking.Enqueuer$Action markReachableVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):2208:2208 -> b
-    2:2:com.android.tools.r8.shaking.Enqueuer$Action markMethodLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2228:2228 -> b
-com.android.tools.r8.shaking.Enqueuer$Action$Kind -> a.a.a.a.s.s:
+    1:5:void <init>(com.android.tools.r8.shaking.Enqueuer$Action$Kind,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem,com.android.tools.r8.shaking.KeepReason):1930:1934 -> <init>
+    1:1:com.android.tools.r8.shaking.Enqueuer$Action markReachableInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1942:1942 -> a
+    2:2:com.android.tools.r8.shaking.Enqueuer$Action markReachableSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1946:1946 -> a
+    3:3:com.android.tools.r8.shaking.Enqueuer$Action markReachableField(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason):1950:1950 -> a
+    4:4:com.android.tools.r8.shaking.Enqueuer$Action markInstantiated(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1954:1954 -> a
+    5:5:com.android.tools.r8.shaking.Enqueuer$Action markMethodKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1962:1962 -> a
+    6:6:com.android.tools.r8.shaking.Enqueuer$Action markFieldKept(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1966:1966 -> a
+    1:1:com.android.tools.r8.shaking.Enqueuer$Action markReachableVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1938:1938 -> b
+    2:2:com.android.tools.r8.shaking.Enqueuer$Action markMethodLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1958:1958 -> b
+com.android.tools.r8.shaking.Enqueuer$Action$Kind -> a.a.a.a.s.r:
     com.android.tools.r8.shaking.Enqueuer$Action$Kind MARK_INSTANTIATED -> e
     com.android.tools.r8.shaking.Enqueuer$Action$Kind MARK_METHOD_LIVE -> f
     com.android.tools.r8.shaking.Enqueuer$Action$Kind MARK_METHOD_KEPT -> g
@@ -43077,106 +42206,232 @@
     com.android.tools.r8.shaking.Enqueuer$Action$Kind MARK_REACHABLE_INTERFACE -> b
     com.android.tools.r8.shaking.Enqueuer$Action$Kind MARK_REACHABLE_SUPER -> c
     com.android.tools.r8.shaking.Enqueuer$Action$Kind MARK_REACHABLE_FIELD -> d
-    1:8:void <clinit>():2240:2247 -> <clinit>
-    9:9:void <clinit>():2239:2239 -> <clinit>
-    1:1:void <init>(java.lang.String,int):2239:2239 -> <init>
-    1:1:com.android.tools.r8.shaking.Enqueuer$Action$Kind[] values():2239:2239 -> a
-com.android.tools.r8.shaking.Enqueuer$AnnotationReferenceMarker -> a.a.a.a.s.u:
+    1:8:void <clinit>():1970:1977 -> <clinit>
+    9:9:void <clinit>():1969:1969 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1969:1969 -> <init>
+    1:1:com.android.tools.r8.shaking.Enqueuer$Action$Kind[] values():1969:1969 -> a
+com.android.tools.r8.shaking.Enqueuer$AnnotationReferenceMarker -> a.a.a.a.s.t:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.DexItem annotationHolder -> a
     com.android.tools.r8.shaking.Enqueuer this$0 -> c
-    1:3:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory):2313:2315 -> <init>
-    1:3:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.Enqueuer$1):2308 -> <init>
+    1:3:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory):2973:2975 -> <init>
+    1:3:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.Enqueuer$1):2968 -> <init>
     boolean addCallSite(com.android.tools.r8.graph.DexCallSite) -> a
     boolean addClass(com.android.tools.r8.graph.DexProgramClass) -> a
     boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle) -> a
     boolean addProto(com.android.tools.r8.graph.DexProto) -> a
     boolean addString(com.android.tools.r8.graph.DexString) -> a
-    1:15:boolean addField(com.android.tools.r8.graph.DexField):2325:2339 -> b
-    16:25:boolean addMethod(com.android.tools.r8.graph.DexMethod):2347:2356 -> b
-    26:33:boolean addMethod(com.android.tools.r8.graph.DexMethod):2355:2362 -> b
-    34:35:boolean addType(com.android.tools.r8.graph.DexType):2392:2393 -> b
+    1:15:boolean addField(com.android.tools.r8.graph.DexField):2985:2999 -> a
+    16:25:boolean addMethod(com.android.tools.r8.graph.DexMethod):3007:3016 -> a
+    26:33:boolean addMethod(com.android.tools.r8.graph.DexMethod):3015:3022 -> a
+    34:35:boolean addType(com.android.tools.r8.graph.DexType):3052:3053 -> a
+com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness -> a.a.a.a.s.u:
+    java.util.SortedMap staticFieldReads -> z
+    java.util.Set neverPropagateValue -> T
+    java.util.SortedMap instanceFieldReads -> x
+    java.util.Set prunedTypes -> V
+    java.util.SortedSet fieldsWritten -> v
+    java.util.Map ordinalsMaps -> X
+    java.util.SortedSet liveFields -> t
+    java.util.IdentityHashMap indirectlyInstantiatedTypes -> n
+    java.util.SortedSet virtualMethodsTargetedByInvokeDirect -> r
+    java.util.SortedSet bootstrapMethods -> p
+    boolean $assertionsDisabled -> Z
+    java.util.SortedSet instantiatedAppServices -> l
+    java.util.Map mayHaveSideEffects -> J
+    java.util.Set keepConstantArguments -> P
+    java.util.SortedSet liveTypes -> j
+    java.util.SortedMap directInvokes -> E
+    java.util.Map assumedValues -> L
+    java.util.Set neverClassInline -> R
+    java.util.SortedMap interfaceInvokes -> C
+    java.util.SortedMap staticFieldWrites -> A
+    java.util.Set forceInline -> N
+    java.util.Set neverMerge -> S
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> U
+    java.util.SortedMap instanceFieldWrites -> y
+    java.util.Map switchMaps -> W
+    java.util.SortedSet staticFieldsWrittenOnlyInEnclosingStaticInitializer -> w
+    java.util.Set callSites -> G
+    java.util.SortedSet fieldsRead -> u
+    java.util.Set pinnedItems -> I
+    java.util.SortedSet liveMethods -> s
+    java.util.SortedSet methodsTargetedByInvokeDynamic -> q
+    com.android.tools.r8.com.google.common.collect.ImmutableSortedSet instantiatedLambdas -> Y
+    java.util.SortedSet targetedMethods -> o
+    java.util.SortedMap staticInvokes -> F
+    java.util.Set neverInline -> O
+    java.util.SortedSet instantiatedTypes -> m
+    java.util.SortedMap superInvokes -> D
+    java.util.Map noSideEffects -> K
+    java.util.Set keepUnusedArguments -> Q
+    java.util.SortedSet instantiatedAnnotationTypes -> k
+    java.util.SortedMap virtualInvokes -> B
+    java.util.SortedSet brokenSuperInvokes -> H
+    java.util.Set alwaysInline -> M
+    1:1:void <clinit>():1984:1984 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.Enqueuer$1):1984:1984 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2167:2167 -> <init>
+    3:167:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2005:2169 -> <init>
+    168:170:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2168:2170 -> <init>
+    171:171:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSortedSet.orderedBy(java.util.Comparator):416:416 -> <init>
+    171:171:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2171 -> <init>
+    172:176:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2172:2176 -> <init>
+    177:180:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2175:2178 -> <init>
+    181:185:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2177:2181 -> <init>
+    186:193:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2180:2187 -> <init>
+    194:198:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2186:2190 -> <init>
+    199:214:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2189:2204 -> <init>
+    215:239:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2202:2226 -> <init>
+    240:245:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):2549:2554 -> <init>
+    240:245:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2225 -> <init>
+    246:253:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2225:2232 -> <init>
+    254:254:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):2243:2243 -> <init>
+    255:514:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):2005:2264 -> <init>
+    515:526:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):2465:2476 -> <init>
+    515:526:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):2264 -> <init>
+    527:550:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):2265:2288 -> <init>
+    551:554:java.util.Set com.android.tools.r8.utils.CollectionUtils.mergeSets(java.util.Collection,java.util.Collection):13:16 -> <init>
+    551:554:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):2288 -> <init>
+    555:559:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):2288:2292 -> <init>
+    560:560:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):2299:2299 -> <init>
+    561:909:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):2005:2353 -> <init>
+    910:926:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):2349:2365 -> <init>
+    927:936:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):2361:2370 -> <init>
+    937:950:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap com.android.tools.r8.graph.GraphLense.rewriteReferencesConservatively(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):546:559 -> <init>
+    937:950:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):2371 -> <init>
+    951:957:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):2371:2377 -> <init>
+    958:967:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):2373:2382 -> <init>
+    968:968:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,java.util.Map,java.util.Map):2388:2388 -> <init>
+    969:1395:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,java.util.Map,java.util.Map):2005:2431 -> <init>
+    1:1:void lambda$new$0(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):2172:2172 -> a
+    2:6:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):2435:2439 -> a
+    7:7:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication):2236:2236 -> a
+    7:7:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):2439 -> a
+    8:11:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):2440:2443 -> a
+    12:12:boolean lambda$withoutStaticFieldsWrites$1(java.util.Set,com.android.tools.r8.graph.DexField):2440:2440 -> a
+    13:15:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):2449:2451 -> a
+    16:16:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):2449:2449 -> a
+    17:22:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):2571:2576 -> a
+    23:31:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):2594:2602 -> a
+    32:32:java.util.Set lambda$rewriteKeysConservativelyWhileMergingValues$3(com.android.tools.r8.graph.PresortedComparable):2598:2598 -> a
+    33:34:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection):2639:2640 -> a
+    35:36:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):2645:2646 -> a
+    37:52:com.android.tools.r8.graph.DexEncodedMethod lookup(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2664:2679 -> a
+    53:53:com.android.tools.r8.graph.DexEncodedMethod lookup(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2677:2677 -> a
+    54:54:com.android.tools.r8.graph.DexEncodedMethod lookup(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2675:2675 -> a
+    55:56:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod):2835:2836 -> a
+    55:56:com.android.tools.r8.graph.DexEncodedMethod lookup(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2673 -> a
+    57:58:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod):2689:2690 -> a
+    57:58:com.android.tools.r8.graph.DexEncodedMethod lookup(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2671 -> a
+    59:97:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):2764:2802 -> a
+    98:107:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):2818:2827 -> a
+    108:110:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness addEnumOrdinalMaps(java.util.Map):2905:2907 -> a
+    1:6:java.util.SortedSet toSortedDescriptorSet(java.util.Set):2561:2566 -> b
+    7:13:java.util.SortedMap rewriteKeysWhileMergingValues(java.util.Map,java.util.function.Function):2582:2588 -> b
+    14:14:java.util.Set lambda$rewriteKeysWhileMergingValues$2(com.android.tools.r8.graph.PresortedComparable):2585:2585 -> b
+    15:16:boolean isPinned(com.android.tools.r8.graph.DexReference):2624:2625 -> b
+    17:42:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2841:2866 -> b
+    43:43:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> b
+    43:43:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2865 -> b
+    44:71:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2867:2894 -> b
+    72:74:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness addSwitchMaps(java.util.Map):2898:2900 -> b
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMapFor(com.android.tools.r8.graph.DexField):2460:2461 -> c
+    3:48:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2695:2740 -> c
+    49:53:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2739:2743 -> c
+    54:54:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2726:2726 -> c
+    1:8:boolean isFieldRead(com.android.tools.r8.graph.DexField):2515:2522 -> d
+    9:10:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):2607:2608 -> d
+    1:8:boolean isFieldWritten(com.android.tools.r8.graph.DexField):2526:2533 -> e
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap getOrdinalsMapFor(com.android.tools.r8.graph.DexType):2455:2456 -> f
+    3:5:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexField):2537:2539 -> f
+    1:2:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):2509:2510 -> g
+    3:8:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexType):2482:2487 -> g
+    3:8:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):2511 -> g
+    9:9:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):2511:2511 -> g
+    10:11:boolean isLibraryField(com.android.tools.r8.graph.DexField):2543:2544 -> g
+    12:12:boolean hasLiveness():2613:2613 -> g
+    1:15:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexType):2491:2505 -> h
+    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):2654:2655 -> i
+    1:1:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness withLiveness():2619:2619 -> l
+    1:2:java.lang.Iterable getPinnedItems():2629:2630 -> p
+    1:2:java.util.Set getPrunedTypes():2659:2660 -> q
 com.android.tools.r8.shaking.Enqueuer$SetWithReason -> a.a.a.a.s.v:
     java.util.Set items -> a
     java.util.function.BiConsumer register -> b
-    1:1:void <init>(java.util.function.BiConsumer):2257:2257 -> <init>
-    2:7:void <init>(java.util.function.BiConsumer):2253:2258 -> <init>
-    1:1:java.util.Set access$3800(com.android.tools.r8.shaking.Enqueuer$SetWithReason):2251:2251 -> a
-    2:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):2262:2263 -> a
-    4:4:boolean contains(java.lang.Object):2267:2267 -> a
-    5:5:java.util.Set getItems():2271:2271 -> a
+    1:1:void <init>(java.util.function.BiConsumer):2917:2917 -> <init>
+    2:7:void <init>(java.util.function.BiConsumer):2913:2918 -> <init>
+    1:1:java.util.Set access$3900(com.android.tools.r8.shaking.Enqueuer$SetWithReason):2911:2911 -> a
+    2:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):2922:2923 -> a
+    4:4:boolean contains(java.lang.Object):2927:2927 -> a
+    5:5:java.util.Set getItems():2931:2931 -> a
 com.android.tools.r8.shaking.Enqueuer$TargetWithContext -> a.a.a.a.s.w:
     com.android.tools.r8.graph.Descriptor target -> a
     com.android.tools.r8.graph.DexEncodedMethod context -> b
-    1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod):2280:2282 -> <init>
-    1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$1):2275 -> <init>
-    1:1:com.android.tools.r8.graph.Descriptor access$000(com.android.tools.r8.shaking.Enqueuer$TargetWithContext):2275:2275 -> a
-    2:2:com.android.tools.r8.graph.DexEncodedMethod getContext():2290:2290 -> a
-    1:1:com.android.tools.r8.graph.Descriptor getTarget():2286:2286 -> b
-    1:5:boolean equals(java.lang.Object):2300:2304 -> equals
-    1:1:int hashCode():2295:2295 -> hashCode
+    1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod):2940:2942 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$1):2935 -> <init>
+    1:1:com.android.tools.r8.graph.Descriptor access$000(com.android.tools.r8.shaking.Enqueuer$TargetWithContext):2935:2935 -> a
+    2:2:com.android.tools.r8.graph.DexEncodedMethod getContext():2950:2950 -> a
+    1:1:com.android.tools.r8.graph.Descriptor getTarget():2946:2946 -> b
+    1:5:boolean equals(java.lang.Object):2960:2964 -> equals
+    1:1:int hashCode():2955:2955 -> hashCode
     2:2:int com.android.tools.r8.graph.KeyedDexItem.hashCode():20:20 -> hashCode
-    2:2:int hashCode():2295 -> hashCode
+    2:2:int hashCode():2955 -> hashCode
 com.android.tools.r8.shaking.Enqueuer$UseRegistry -> a.a.a.a.s.x:
     com.android.tools.r8.shaking.Enqueuer this$0 -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexEncodedMethod currentMethod -> c
-    1:1:void <clinit>():457:457 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexEncodedMethod):461:463 -> <init>
-    1:3:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$1):457 -> <init>
+    1:1:void <clinit>():466:466 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexEncodedMethod):470:472 -> <init>
+    1:3:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$1):466 -> <init>
     1:35:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):60:94 -> a
-    1:35:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):663 -> a
+    1:35:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):665 -> a
     36:36:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):88:88 -> a
-    36:36:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):663 -> a
+    36:36:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):665 -> a
     37:43:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):85:91 -> a
-    37:43:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):663 -> a
+    37:43:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):665 -> a
     44:46:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):80:82 -> a
-    44:46:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):663 -> a
+    44:46:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):665 -> a
     47:50:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):74:77 -> a
-    47:50:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):663 -> a
+    47:50:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):665 -> a
     51:60:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):62:71 -> a
-    51:60:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):663 -> a
-    61:64:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):670:673 -> a
+    51:60:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):665 -> a
+    61:64:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):672:675 -> a
     65:65:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.methodHandleReferencedIn(com.android.tools.r8.graph.DexEncodedMethod):90:90 -> a
-    65:65:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):673 -> a
-    66:66:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):673:673 -> a
-    67:67:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):493:493 -> a
-    68:74:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):497:503 -> a
-    75:81:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):588:594 -> a
-    82:82:boolean registerCheckCast(com.android.tools.r8.graph.DexType):652:652 -> a
-    83:145:void registerCallSite(com.android.tools.r8.graph.DexCallSite):680:742 -> a
-    146:155:void registerCallSite(com.android.tools.r8.graph.DexCallSite):730:739 -> a
-    156:156:boolean registerNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):604:604 -> a
-    156:156:void registerCallSite(com.android.tools.r8.graph.DexCallSite):739 -> a
-    157:157:void registerCallSite(com.android.tools.r8.graph.DexCallSite):733:733 -> a
-    158:201:void registerCallSite(com.android.tools.r8.graph.DexCallSite):727:770 -> a
-    202:221:void registerCallSite(com.android.tools.r8.graph.DexCallSite):769:788 -> a
-    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):544:544 -> b
-    2:8:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):548:554 -> b
-    9:16:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):575:582 -> b
-    17:17:boolean registerConstClass(com.android.tools.r8.graph.DexType):647:647 -> b
-    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):509:509 -> c
-    2:27:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):513:538 -> c
-    28:28:boolean registerNewInstance(com.android.tools.r8.graph.DexType):600:600 -> c
-    29:29:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.DexEncodedMethod):34:34 -> c
-    29:29:boolean registerNewInstance(com.android.tools.r8.graph.DexType):600 -> c
-    30:30:boolean registerNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):604:604 -> c
-    30:30:boolean registerNewInstance(com.android.tools.r8.graph.DexType):600 -> c
-    31:37:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):610:616 -> c
-    1:8:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):472:479 -> d
-    9:22:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):474:487 -> d
-    23:30:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):562:569 -> d
-    31:49:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):622:640 -> d
-    50:50:boolean registerTypeReference(com.android.tools.r8.graph.DexType):657:657 -> d
-    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):468:468 -> e
-    2:11:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):793:802 -> e
-    12:12:boolean registerTypeReference(com.android.tools.r8.graph.DexType):657:657 -> e
-    12:12:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):808 -> e
-com.android.tools.r8.shaking.EnqueuerUtils -> a.a.a.a.s.z:
-    1:1:boolean lambda$extractProgramFieldDefinitions$0(com.android.tools.r8.graph.AppInfo,java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedField):27:27 -> a
-    2:16:java.util.SortedSet extractFieldDefinitions(java.util.Set,java.util.Set,com.android.tools.r8.graph.AppInfo,java.util.function.Predicate):35:49 -> a
-    1:1:java.util.SortedSet extractProgramFieldDefinitions(java.util.Set,java.util.Set,com.android.tools.r8.graph.AppInfo,java.util.function.Predicate):23:23 -> b
-com.android.tools.r8.shaking.FilteredClassPath -> a.a.a.a.s.A:
+    65:65:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):675 -> a
+    66:66:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):675:675 -> a
+    67:67:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):499:499 -> a
+    68:74:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):503:509 -> a
+    75:81:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):590:596 -> a
+    82:82:boolean registerCheckCast(com.android.tools.r8.graph.DexType):654:654 -> a
+    83:145:void registerCallSite(com.android.tools.r8.graph.DexCallSite):682:744 -> a
+    146:155:void registerCallSite(com.android.tools.r8.graph.DexCallSite):732:741 -> a
+    156:156:boolean registerNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):606:606 -> a
+    156:156:void registerCallSite(com.android.tools.r8.graph.DexCallSite):741 -> a
+    157:157:void registerCallSite(com.android.tools.r8.graph.DexCallSite):735:735 -> a
+    158:201:void registerCallSite(com.android.tools.r8.graph.DexCallSite):729:772 -> a
+    202:221:void registerCallSite(com.android.tools.r8.graph.DexCallSite):771:790 -> a
+    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):546:546 -> b
+    2:8:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):550:556 -> b
+    9:16:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):577:584 -> b
+    17:17:boolean registerConstClass(com.android.tools.r8.graph.DexType):649:649 -> b
+    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):515:515 -> c
+    2:23:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):519:540 -> c
+    24:24:boolean registerNewInstance(com.android.tools.r8.graph.DexType):602:602 -> c
+    25:25:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.DexEncodedMethod):34:34 -> c
+    25:25:boolean registerNewInstance(com.android.tools.r8.graph.DexType):602 -> c
+    26:26:boolean registerNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):606:606 -> c
+    26:26:boolean registerNewInstance(com.android.tools.r8.graph.DexType):602 -> c
+    27:33:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):612:618 -> c
+    1:13:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):481:493 -> d
+    14:21:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):564:571 -> d
+    22:40:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):624:642 -> d
+    41:41:boolean registerTypeReference(com.android.tools.r8.graph.DexType):659:659 -> d
+    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):477:477 -> e
+    2:11:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):795:804 -> e
+    12:12:boolean registerTypeReference(com.android.tools.r8.graph.DexType):659:659 -> e
+    12:12:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):810 -> e
+com.android.tools.r8.shaking.FilteredClassPath -> a.a.a.a.s.z:
     java.nio.file.Path path -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList pattern -> b
     1:3:void <init>(java.nio.file.Path,java.util.List):25:27 -> <init>
@@ -43191,7 +42446,7 @@
     1:1:boolean isUnfiltered():119:119 -> toString
     1:1:java.lang.String toString():124 -> toString
     2:16:java.lang.String toString():125:139 -> toString
-com.android.tools.r8.shaking.InlineRule -> a.a.a.a.s.E:
+com.android.tools.r8.shaking.InlineRule -> a.a.a.a.s.D:
     com.android.tools.r8.origin.Origin checkDiscardOrigin -> p
     boolean $assertionsDisabled -> q
     com.android.tools.r8.shaking.InlineRule$Type type -> o
@@ -43219,15 +42474,15 @@
     19:20:com.android.tools.r8.shaking.ProguardCheckDiscardRule asProguardCheckDiscardRule():94:95 -> s
     1:1:com.android.tools.r8.shaking.InlineRule$Builder builder():74:74 -> t
     1:1:com.android.tools.r8.shaking.InlineRule$Type getType():78:78 -> u
-com.android.tools.r8.shaking.InlineRule$1 -> a.a.a.a.s.B:
+com.android.tools.r8.shaking.InlineRule$1 -> a.a.a.a.s.A:
     1:1:void <init>(com.android.tools.r8.origin.Origin):13:13 -> <init>
     java.lang.String part() -> a
-com.android.tools.r8.shaking.InlineRule$Builder -> a.a.a.a.s.C:
+com.android.tools.r8.shaking.InlineRule$Builder -> a.a.a.a.s.B:
     com.android.tools.r8.shaking.InlineRule$Type type -> o
     1:1:void <init>():27:27 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.InlineRule$1):24 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.InlineRule$Type -> a.a.a.a.s.D:
+com.android.tools.r8.shaking.InlineRule$Type -> a.a.a.a.s.C:
     com.android.tools.r8.shaking.InlineRule$Type[] $VALUES -> d
     com.android.tools.r8.shaking.InlineRule$Type NEVER -> c
     com.android.tools.r8.shaking.InlineRule$Type FORCE -> b
@@ -43236,7 +42491,7 @@
     2:2:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(java.lang.String,int):20:20 -> <init>
     1:1:com.android.tools.r8.shaking.InlineRule$Type[] values():20:20 -> a
-com.android.tools.r8.shaking.KeepReason -> a.a.a.a.s.W:
+com.android.tools.r8.shaking.KeepReason -> a.a.a.a.s.V:
     1:1:void <init>():15:15 -> <init>
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind() -> a
     com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer) -> a
@@ -43254,8 +42509,8 @@
     boolean isDueToReflectiveUse() -> e
     1:1:com.android.tools.r8.shaking.KeepReason invokedViaSuperFrom(com.android.tools.r8.graph.DexEncodedMethod):38:38 -> e
     1:1:com.android.tools.r8.shaking.KeepReason reflectiveUseIn(com.android.tools.r8.graph.DexEncodedMethod):86:86 -> f
-com.android.tools.r8.shaking.KeepReason$1 -> a.a.a.a.s.F:
-com.android.tools.r8.shaking.KeepReason$AnnotatedOn -> a.a.a.a.s.G:
+com.android.tools.r8.shaking.KeepReason$1 -> a.a.a.a.s.E:
+com.android.tools.r8.shaking.KeepReason$AnnotatedOn -> a.a.a.a.s.F:
     com.android.tools.r8.graph.DexDefinition holder -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():310:310 -> <clinit>
@@ -43263,12 +42518,12 @@
     1:2:void <init>(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason$1):310 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():320:320 -> a
     2:8:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):325:331 -> a
-com.android.tools.r8.shaking.KeepReason$BasedOnOtherMethod -> a.a.a.a.s.H:
+com.android.tools.r8.shaking.KeepReason$BasedOnOtherMethod -> a.a.a.a.s.G:
     com.android.tools.r8.graph.DexEncodedMethod method -> a
     1:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):142:143 -> <init>
     1:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):138 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):150:150 -> a
-com.android.tools.r8.shaking.KeepReason$DueToKeepRule -> a.a.a.a.s.I:
+com.android.tools.r8.shaking.KeepReason$DueToKeepRule -> a.a.a.a.s.H:
     com.android.tools.r8.shaking.ProguardKeepRule keepRule -> a
     1:2:void <init>(com.android.tools.r8.shaking.ProguardKeepRule):97:98 -> <init>
     1:2:void <init>(com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.KeepReason$1):93 -> <init>
@@ -43276,96 +42531,96 @@
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):118:118 -> a
     1:1:com.android.tools.r8.shaking.ProguardKeepRule getProguardKeepRule():113:113 -> b
     boolean isDueToKeepRule() -> c
-com.android.tools.r8.shaking.KeepReason$DueToProguardCompatibilityKeepRule -> a.a.a.a.s.J:
+com.android.tools.r8.shaking.KeepReason$DueToProguardCompatibilityKeepRule -> a.a.a.a.s.I:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardKeepRule):124:124 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.KeepReason$1):122 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():129:129 -> a
     boolean isDueToProguardCompatibility() -> d
-com.android.tools.r8.shaking.KeepReason$InstatiatedIn -> a.a.a.a.s.K:
+com.android.tools.r8.shaking.KeepReason$InstatiatedIn -> a.a.a.a.s.J:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):154 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():162:162 -> a
-com.android.tools.r8.shaking.KeepReason$InvokedFrom -> a.a.a.a.s.L:
+com.android.tools.r8.shaking.KeepReason$InvokedFrom -> a.a.a.a.s.K:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):208:208 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):205 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():213:213 -> a
-com.android.tools.r8.shaking.KeepReason$InvokedFromLambdaCreatedIn -> a.a.a.a.s.M:
+com.android.tools.r8.shaking.KeepReason$InvokedFromLambdaCreatedIn -> a.a.a.a.s.L:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):225:225 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):222 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():230:230 -> a
-com.android.tools.r8.shaking.KeepReason$InvokedViaSuper -> a.a.a.a.s.N:
+com.android.tools.r8.shaking.KeepReason$InvokedViaSuper -> a.a.a.a.s.M:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):174:174 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):171 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():179:179 -> a
-com.android.tools.r8.shaking.KeepReason$IsLibraryMethod -> a.a.a.a.s.O:
+com.android.tools.r8.shaking.KeepReason$IsLibraryMethod -> a.a.a.a.s.N:
     1:1:void <init>():277:277 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.KeepReason$1):275 -> <init>
     com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer) -> a
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():282:282 -> a
-com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom -> a.a.a.a.s.P:
+com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom -> a.a.a.a.s.O:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):361:361 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):358 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():366:366 -> a
-com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType -> a.a.a.a.s.Q:
+com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType -> a.a.a.a.s.P:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):260:261 -> <init>
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):256 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():266:266 -> a
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):271:271 -> a
-com.android.tools.r8.shaking.KeepReason$ReferencedFrom -> a.a.a.a.s.S:
+com.android.tools.r8.shaking.KeepReason$ReferencedFrom -> a.a.a.a.s.Q:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):242:242 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):239 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():247:247 -> a
-com.android.tools.r8.shaking.KeepReason$ReferencedInAnnotation -> a.a.a.a.s.T:
+com.android.tools.r8.shaking.KeepReason$ReferencedInAnnotation -> a.a.a.a.s.S:
     com.android.tools.r8.graph.DexItem holder -> a
     1:2:void <init>(com.android.tools.r8.graph.DexItem):295:296 -> <init>
     1:2:void <init>(com.android.tools.r8.graph.DexItem,com.android.tools.r8.shaking.KeepReason$1):291 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():301:301 -> a
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):306:306 -> a
-com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom -> a.a.a.a.s.U:
+com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom -> a.a.a.a.s.T:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):339:339 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):336 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():349:349 -> a
     boolean isDueToReflectiveUse() -> e
-com.android.tools.r8.shaking.KeepReason$TargetedBySuper -> a.a.a.a.s.V:
+com.android.tools.r8.shaking.KeepReason$TargetedBySuper -> a.a.a.a.s.U:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):191:191 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):188 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():196:196 -> a
-com.android.tools.r8.shaking.MainDexClasses -> a.a.a.a.s.Z:
+com.android.tools.r8.shaking.MainDexClasses -> a.a.a.a.s.Y:
     java.util.Set classes -> c
     boolean $assertionsDisabled -> e
     java.util.Set roots -> a
     java.util.Set dependencies -> b
     com.android.tools.r8.shaking.MainDexClasses NONE -> d
-    1:3:void <clinit>():18:20 -> <clinit>
-    1:1:void <init>(java.util.Set,java.util.Set,com.android.tools.r8.shaking.MainDexClasses$1):18:18 -> <init>
-    2:6:void <init>(java.util.Set,java.util.Set):70:74 -> <init>
-    1:1:java.util.Set getClasses():91:91 -> a
-    2:2:void collectTypesMatching(java.util.Set,java.util.function.Predicate,java.util.function.Consumer):96:96 -> a
-    3:4:void lambda$collectTypesMatching$0(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexType):98:99 -> a
-    5:9:com.android.tools.r8.shaking.MainDexClasses prunedCopy(com.android.tools.r8.shaking.AppInfoWithLiveness):105:109 -> a
-    10:10:com.android.tools.r8.shaking.MainDexClasses$Builder builder(com.android.tools.r8.graph.AppInfo):113:113 -> a
-    1:1:java.util.Set getDependencies():87:87 -> b
-    1:1:java.util.Set getRoots():83:83 -> c
-    1:2:boolean isEmpty():78:79 -> d
-com.android.tools.r8.shaking.MainDexClasses$1 -> a.a.a.a.s.X:
-com.android.tools.r8.shaking.MainDexClasses$Builder -> a.a.a.a.s.Y:
+    1:3:void <clinit>():19:21 -> <clinit>
+    1:1:void <init>(java.util.Set,java.util.Set,com.android.tools.r8.shaking.MainDexClasses$1):19:19 -> <init>
+    2:6:void <init>(java.util.Set,java.util.Set):71:75 -> <init>
+    1:1:java.util.Set getClasses():92:92 -> a
+    2:2:void collectTypesMatching(java.util.Set,java.util.function.Predicate,java.util.function.Consumer):97:97 -> a
+    3:4:void lambda$collectTypesMatching$0(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexType):99:100 -> a
+    5:9:com.android.tools.r8.shaking.MainDexClasses prunedCopy(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness):106:110 -> a
+    10:10:com.android.tools.r8.shaking.MainDexClasses$Builder builder(com.android.tools.r8.graph.AppInfo):114:114 -> a
+    1:1:java.util.Set getDependencies():88:88 -> b
+    1:1:java.util.Set getRoots():84:84 -> c
+    1:2:boolean isEmpty():79:80 -> d
+com.android.tools.r8.shaking.MainDexClasses$1 -> a.a.a.a.s.W:
+com.android.tools.r8.shaking.MainDexClasses$Builder -> a.a.a.a.s.X:
     java.util.Set dependencies -> c
     java.util.Set roots -> b
     com.android.tools.r8.graph.AppInfo appInfo -> a
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppInfo):27:27 -> <init>
-    1:1:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.shaking.MainDexClasses$1):22 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.AppInfo):24:28 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.shaking.MainDexClasses$1):22 -> <init>
-    1:2:com.android.tools.r8.shaking.MainDexClasses$Builder addRoots(java.util.Collection):38:39 -> a
-    3:4:com.android.tools.r8.shaking.MainDexClasses$Builder addDependency(com.android.tools.r8.graph.DexType):44:45 -> a
-    5:5:com.android.tools.r8.shaking.MainDexClasses build():54:54 -> a
-    1:2:com.android.tools.r8.shaking.MainDexClasses$Builder addRoot(com.android.tools.r8.graph.DexType):32:33 -> b
-    1:1:boolean contains(com.android.tools.r8.graph.DexType):50:50 -> c
-    1:2:boolean isProgramClass(com.android.tools.r8.graph.DexType):58:59 -> d
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> a.a.a.a.s.ea:
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppInfo):28:28 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.shaking.MainDexClasses$1):23 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.AppInfo):25:29 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.shaking.MainDexClasses$1):23 -> <init>
+    1:2:com.android.tools.r8.shaking.MainDexClasses$Builder addRoots(java.util.Collection):39:40 -> a
+    3:4:com.android.tools.r8.shaking.MainDexClasses$Builder addDependency(com.android.tools.r8.graph.DexType):45:46 -> a
+    5:5:com.android.tools.r8.shaking.MainDexClasses build():55:55 -> a
+    1:2:com.android.tools.r8.shaking.MainDexClasses$Builder addRoot(com.android.tools.r8.graph.DexType):33:34 -> b
+    1:1:boolean contains(com.android.tools.r8.graph.DexType):51:51 -> c
+    1:2:boolean isProgramClass(com.android.tools.r8.graph.DexType):59:60 -> d
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> a.a.a.a.s.da:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector codeDirectReferenceCollector -> b
     java.util.function.Consumer consumer -> d
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> c
@@ -43388,26 +42643,26 @@
     20:20:boolean hasReferencesOutsideFromCode(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):81:81 -> a
     21:25:void lambda$hasReferencesOutsideFromCode$2(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$BooleanBox,com.android.tools.r8.graph.DexType):71:75 -> a
     26:29:void traceMethodDirectDependencies(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):89:92 -> a
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1 -> a.a.a.a.s.aa:
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> a.a.a.a.s.ba:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1 -> a.a.a.a.s.Z:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> a.a.a.a.s.aa:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> a
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer):172:172 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):172 -> <init>
     boolean addString(com.android.tools.r8.graph.DexString) -> a
     1:1:boolean addClass(com.android.tools.r8.graph.DexProgramClass):176:176 -> a
-    2:4:boolean addProto(com.android.tools.r8.graph.DexProto):201:203 -> a
-    5:5:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):216:216 -> a
-    6:6:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):221:221 -> a
-    1:2:boolean addField(com.android.tools.r8.graph.DexField):182:183 -> b
-    3:4:boolean addMethod(com.android.tools.r8.graph.DexMethod):189:190 -> b
-    5:7:boolean addProto(com.android.tools.r8.graph.DexProto):201:203 -> b
-    5:7:boolean addMethod(com.android.tools.r8.graph.DexMethod):190 -> b
-    8:8:boolean addType(com.android.tools.r8.graph.DexType):210:210 -> b
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$BooleanBox -> a.a.a.a.s.ca:
+    2:3:boolean addField(com.android.tools.r8.graph.DexField):182:183 -> a
+    4:5:boolean addMethod(com.android.tools.r8.graph.DexMethod):189:190 -> a
+    6:8:boolean addProto(com.android.tools.r8.graph.DexProto):201:203 -> a
+    6:8:boolean addMethod(com.android.tools.r8.graph.DexMethod):190 -> a
+    9:11:boolean addProto(com.android.tools.r8.graph.DexProto):201:203 -> a
+    12:12:boolean addType(com.android.tools.r8.graph.DexType):210:210 -> a
+    13:13:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):216:216 -> a
+    14:14:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):221:221 -> a
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$BooleanBox -> a.a.a.a.s.ba:
     boolean value -> a
     1:2:void <init>():59:60 -> <init>
     1:2:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):59 -> <init>
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> a.a.a.a.s.da:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> a.a.a.a.s.ca:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> c
     1:2:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.DexItemFactory):98:99 -> <init>
     1:2:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):96 -> <init>
@@ -43424,7 +42679,7 @@
     1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):104:104 -> e
     2:3:boolean registerFieldAccess(com.android.tools.r8.graph.DexField):154:155 -> e
     1:2:boolean registerInvoke(com.android.tools.r8.graph.DexMethod):128:129 -> f
-com.android.tools.r8.shaking.MainDexListBuilder -> a.a.a.a.s.fa:
+com.android.tools.r8.shaking.MainDexListBuilder -> a.a.a.a.s.ea:
     java.util.Map annotationTypeContainEnum -> c
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> b
     boolean $assertionsDisabled -> f
@@ -43462,120 +42717,119 @@
     13:13:void addAnnotationsWithEnum(com.android.tools.r8.graph.DexProgramClass):146:146 -> c
     13:13:void traceRuntimeAnnotationsWithEnumForMainDex():73 -> c
     14:14:void traceRuntimeAnnotationsWithEnumForMainDex():78:78 -> c
-    15:37:void com.android.tools.r8.graph.DexClass.forEachAnnotation(java.util.function.Consumer):318:340 -> c
+    15:37:void com.android.tools.r8.graph.DexClass.forEachAnnotation(java.util.function.Consumer):316:338 -> c
     15:37:void traceRuntimeAnnotationsWithEnumForMainDex():78 -> c
     38:39:boolean isProgramClass(com.android.tools.r8.graph.DexType):128:129 -> c
-com.android.tools.r8.shaking.MemberValuePropagationRule -> a.a.a.a.s.ja:
+com.android.tools.r8.shaking.MemberValuePropagationRule -> a.a.a.a.s.ia:
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type type -> o
     1:4:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.MemberValuePropagationRule$Type):61:64 -> <init>
     1:4:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.shaking.MemberValuePropagationRule$1):11 -> <init>
     1:5:java.lang.String typeString():77:81 -> r
     1:1:com.android.tools.r8.shaking.MemberValuePropagationRule$Builder builder():68:68 -> s
     1:1:com.android.tools.r8.shaking.MemberValuePropagationRule$Type getType():72:72 -> t
-com.android.tools.r8.shaking.MemberValuePropagationRule$1 -> a.a.a.a.s.ga:
+com.android.tools.r8.shaking.MemberValuePropagationRule$1 -> a.a.a.a.s.fa:
     int[] $SwitchMap$com$android$tools$r8$shaking$MemberValuePropagationRule$Type -> a
     1:1:void <clinit>():77:77 -> <clinit>
-com.android.tools.r8.shaking.MemberValuePropagationRule$Builder -> a.a.a.a.s.ha:
+com.android.tools.r8.shaking.MemberValuePropagationRule$Builder -> a.a.a.a.s.ga:
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type type -> o
     1:1:void <init>():21:21 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.MemberValuePropagationRule$1):17 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.MemberValuePropagationRule$Type -> a.a.a.a.s.ia:
+com.android.tools.r8.shaking.MemberValuePropagationRule$Type -> a.a.a.a.s.ha:
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type[] $VALUES -> b
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type NEVER -> a
     1:1:void <clinit>():14:14 -> <clinit>
     2:2:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):13:13 -> <init>
     1:1:com.android.tools.r8.shaking.MemberValuePropagationRule$Type[] values():13:13 -> a
-com.android.tools.r8.shaking.ProguardAccessFlags -> a.a.a.a.s.ka:
-    java.util.List NAMES -> c
-    int PPP_MASK -> b
+com.android.tools.r8.shaking.ProguardAccessFlags -> a.a.a.a.s.ja:
+    java.util.List NAMES -> b
     int flags -> a
-    1:7:void <clinit>():15:21 -> <clinit>
-    1:6:void <init>():13:18 -> <init>
-    1:1:java.util.List getPredicates():39:39 -> A
-    1:1:boolean containsAll(com.android.tools.r8.graph.AccessFlags):69:69 -> a
-    2:2:boolean containsAll(int):57:57 -> a
-    2:2:boolean containsAll(com.android.tools.r8.graph.AccessFlags):69 -> a
-    3:8:void setVisibility(com.android.tools.r8.graph.ClassAccessFlags):108:113 -> a
-    9:9:boolean isAbstract():138:138 -> a
-    10:10:boolean isSet(int):198:198 -> a
-    1:1:boolean containsNone(com.android.tools.r8.graph.AccessFlags):73:73 -> b
-    2:2:boolean containsNone(int):65:65 -> b
-    2:2:boolean containsNone(com.android.tools.r8.graph.AccessFlags):73 -> b
-    3:3:boolean isBridge():194:194 -> b
-    4:4:void set(int):202:202 -> b
-    1:1:void setFlags(com.android.tools.r8.graph.AccessFlags):77:77 -> c
-    2:2:boolean isFinal():130:130 -> c
-    1:1:boolean isNative():170:170 -> d
-    1:1:boolean isPrivate():95:95 -> e
-    1:1:boolean isProtected():104:104 -> f
-    1:1:boolean isPublic():86:86 -> g
-    1:1:boolean isStatic():122:122 -> h
-    1:1:boolean isStrict():178:178 -> i
-    1:1:boolean isSynchronized():162:162 -> j
-    1:1:boolean isSynthetic():186:186 -> k
-    1:1:boolean isTransient():154:154 -> l
-    1:1:boolean isVolatile():146:146 -> m
-    1:1:void setAbstract():134:134 -> n
-    1:1:void setBridge():190:190 -> o
-    1:1:void setFinal():126:126 -> p
-    1:1:void setNative():166:166 -> q
-    1:1:com.android.tools.r8.shaking.ProguardAccessFlags setPrivate():90:90 -> r
-    1:1:com.android.tools.r8.shaking.ProguardAccessFlags setProtected():99:99 -> s
-    1:1:com.android.tools.r8.shaking.ProguardAccessFlags setPublic():81:81 -> t
-    1:14:java.lang.String toString():207:220 -> toString
-    1:1:void setStatic():118:118 -> u
-    1:1:void setStrict():174:174 -> v
-    1:1:void setSynchronized():158:158 -> w
-    1:1:void setSynthetic():182:182 -> x
-    1:1:void setTransient():150:150 -> y
-    1:1:void setVolatile():142:142 -> z
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule -> a.a.a.a.s.na:
+    1:1:void <clinit>():18:18 -> <clinit>
+    1:3:void <init>():13:15 -> <init>
+    1:1:java.util.List getPredicates():36:36 -> A
+    1:1:boolean containsAll(com.android.tools.r8.graph.AccessFlags):61:61 -> a
+    2:2:boolean containsAll(int):53:53 -> a
+    2:2:boolean containsAll(com.android.tools.r8.graph.AccessFlags):61 -> a
+    3:8:void setVisibility(com.android.tools.r8.graph.ClassAccessFlags):97:102 -> a
+    9:9:boolean isAbstract():127:127 -> a
+    10:10:boolean isSet(int):187:187 -> a
+    1:1:boolean containsNone(com.android.tools.r8.graph.AccessFlags):65:65 -> b
+    2:2:boolean containsNone(int):57:57 -> b
+    2:2:boolean containsNone(com.android.tools.r8.graph.AccessFlags):65 -> b
+    3:3:boolean isBridge():183:183 -> b
+    4:4:void set(int):191:191 -> b
+    1:1:void setFlags(com.android.tools.r8.graph.AccessFlags):69:69 -> c
+    2:2:boolean isFinal():119:119 -> c
+    1:1:boolean isNative():159:159 -> d
+    1:1:boolean isPrivate():85:85 -> e
+    1:1:boolean isProtected():93:93 -> f
+    1:1:boolean isPublic():77:77 -> g
+    1:1:boolean isStatic():111:111 -> h
+    1:1:boolean isStrict():167:167 -> i
+    1:1:boolean isSynchronized():151:151 -> j
+    1:1:boolean isSynthetic():175:175 -> k
+    1:1:boolean isTransient():143:143 -> l
+    1:1:boolean isVolatile():135:135 -> m
+    1:1:void setAbstract():123:123 -> n
+    1:1:void setBridge():179:179 -> o
+    1:1:void setFinal():115:115 -> p
+    1:1:void setNative():155:155 -> q
+    1:1:void setPrivate():81:81 -> r
+    1:1:void setProtected():89:89 -> s
+    1:1:void setPublic():73:73 -> t
+    1:14:java.lang.String toString():196:209 -> toString
+    1:1:void setStatic():107:107 -> u
+    1:1:void setStrict():163:163 -> v
+    1:1:void setSynchronized():147:147 -> w
+    1:1:void setSynthetic():171:171 -> x
+    1:1:void setTransient():139:139 -> y
+    1:1:void setVolatile():131:131 -> z
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule -> a.a.a.a.s.ma:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1):10 -> <init>
-    boolean applyToNonProgramClasses() -> a
+    boolean applyToLibraryClasses() -> a
     java.lang.String typeString() -> r
     1:1:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder builder():75:75 -> s
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1 -> a.a.a.a.s.la:
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder -> a.a.a.a.s.ma:
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1 -> a.a.a.a.s.ka:
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder -> a.a.a.a.s.la:
     1:1:void <init>():16:16 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1):12 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule -> a.a.a.a.s.qa:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule -> a.a.a.a.s.pa:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):46:46 -> <init>
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1):10 -> <init>
-    boolean applyToNonProgramClasses() -> a
+    boolean applyToLibraryClasses() -> a
     java.lang.String typeString() -> r
     1:1:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder builder():55:55 -> s
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1 -> a.a.a.a.s.oa:
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder -> a.a.a.a.s.pa:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1 -> a.a.a.a.s.na:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder -> a.a.a.a.s.oa:
     1:1:void <init>():16:16 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1):12 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardAssumeValuesRule -> a.a.a.a.s.ta:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule -> a.a.a.a.s.sa:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):46:46 -> <init>
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardAssumeValuesRule$1):10 -> <init>
     java.lang.String typeString() -> r
     1:1:com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder builder():55:55 -> s
-com.android.tools.r8.shaking.ProguardAssumeValuesRule$1 -> a.a.a.a.s.ra:
-com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder -> a.a.a.a.s.sa:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule$1 -> a.a.a.a.s.qa:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder -> a.a.a.a.s.ra:
     1:1:void <init>():16:16 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardAssumeValuesRule$1):12 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
     1:1:com.android.tools.r8.shaking.ProguardAssumeValuesRule build():26:26 -> c
-com.android.tools.r8.shaking.ProguardCheckDiscardRule -> a.a.a.a.s.wa:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule -> a.a.a.a.s.va:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):46:46 -> <init>
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardCheckDiscardRule$1):10 -> <init>
     java.lang.String typeString() -> r
     1:1:com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder builder():52:52 -> s
-com.android.tools.r8.shaking.ProguardCheckDiscardRule$1 -> a.a.a.a.s.ua:
-com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder -> a.a.a.a.s.va:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule$1 -> a.a.a.a.s.ta:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder -> a.a.a.a.s.ua:
     1:1:void <init>():16:16 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardCheckDiscardRule$1):12 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
     1:1:com.android.tools.r8.shaking.ProguardCheckDiscardRule build():26:26 -> c
-com.android.tools.r8.shaking.ProguardClassFilter -> a.a.a.a.s.za:
+com.android.tools.r8.shaking.ProguardClassFilter -> a.a.a.a.s.ya:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList patterns -> a
     1:2:void <clinit>():12:13 -> <clinit>
@@ -43587,8 +42841,8 @@
     4:5:void filterOutMatches(java.util.Set):59:60 -> a
     6:10:void lambda$filterOutMatches$0(java.util.Set,com.android.tools.r8.shaking.ProguardTypeMatcher):61:65 -> a
     1:1:boolean isEmpty():46:46 -> b
-com.android.tools.r8.shaking.ProguardClassFilter$1 -> a.a.a.a.s.xa:
-com.android.tools.r8.shaking.ProguardClassFilter$Builder -> a.a.a.a.s.ya:
+com.android.tools.r8.shaking.ProguardClassFilter$1 -> a.a.a.a.s.wa:
+com.android.tools.r8.shaking.ProguardClassFilter$Builder -> a.a.a.a.s.xa:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder patterns -> a
     1:1:void <init>():24:24 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardClassFilter$1):21 -> <init>
@@ -43596,7 +42850,7 @@
     2:2:void <init>(com.android.tools.r8.shaking.ProguardClassFilter$1):21 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardClassFilter$Builder addPattern(com.android.tools.r8.shaking.ProguardClassNameList):28:28 -> a
     2:2:com.android.tools.r8.shaking.ProguardClassFilter build():33:33 -> a
-com.android.tools.r8.shaking.ProguardClassNameList -> a.a.a.a.s.Fa:
+com.android.tools.r8.shaking.ProguardClassNameList -> a.a.a.a.s.Ea:
     1:1:void <init>():19:19 -> <init>
     java.util.List asSpecificDexTypes() -> a
     void forEachTypeMatcher(java.util.function.Consumer) -> a
@@ -43607,16 +42861,19 @@
     java.lang.Iterable getWildcards() -> b
     com.android.tools.r8.shaking.ProguardClassNameList materialize() -> c
     1:3:java.lang.String toString():69:71 -> toString
-com.android.tools.r8.shaking.ProguardClassNameList$1 -> a.a.a.a.s.Aa:
-com.android.tools.r8.shaking.ProguardClassNameList$Builder -> a.a.a.a.s.Ba:
+com.android.tools.r8.shaking.ProguardClassNameList$1 -> a.a.a.a.s.za:
+com.android.tools.r8.shaking.ProguardClassNameList$Builder -> a.a.a.a.s.Aa:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap matchers -> a
     1:1:void <init>():42:42 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardClassNameList$1):35 -> <init>
     2:2:void <init>():40:40 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.ProguardClassNameList$1):35 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardClassNameList$Builder addClassName(boolean,com.android.tools.r8.shaking.ProguardTypeMatcher):46:46 -> a
-    2:9:com.android.tools.r8.shaking.ProguardClassNameList build():51:58 -> a
-com.android.tools.r8.shaking.ProguardClassNameList$MixedClassNameList -> a.a.a.a.s.Ca:
+    2:7:com.android.tools.r8.shaking.ProguardClassNameList build():51:56 -> a
+    8:8:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getOnlyElement(java.lang.Iterable):266:266 -> a
+    8:8:com.android.tools.r8.shaking.ProguardClassNameList build():56 -> a
+    9:11:com.android.tools.r8.shaking.ProguardClassNameList build():56:58 -> a
+com.android.tools.r8.shaking.ProguardClassNameList$MixedClassNameList -> a.a.a.a.s.Ba:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap classNames -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):229:230 -> <init>
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.shaking.ProguardClassNameList$1):225 -> <init>
@@ -43631,7 +42888,7 @@
     1:1:com.android.tools.r8.shaking.ProguardClassNameList$Builder com.android.tools.r8.shaking.ProguardClassNameList.builder():22:22 -> c
     1:1:com.android.tools.r8.shaking.ProguardClassNameList materialize():279 -> c
     2:3:com.android.tools.r8.shaking.ProguardClassNameList materialize():280:281 -> c
-com.android.tools.r8.shaking.ProguardClassNameList$PositiveClassNameList -> a.a.a.a.s.Da:
+com.android.tools.r8.shaking.ProguardClassNameList$PositiveClassNameList -> a.a.a.a.s.Ca:
     com.android.tools.r8.com.google.common.collect.ImmutableList classNames -> a
     1:2:void <init>(java.util.Collection):170:171 -> <init>
     3:4:void <init>(java.util.Collection):170:171 -> <init>
@@ -43646,7 +42903,7 @@
     2:4:java.lang.Iterable getWildcards():207:209 -> b
     1:1:com.android.tools.r8.shaking.ProguardClassNameList materialize():166:166 -> c
     2:3:com.android.tools.r8.shaking.ProguardClassNameList$PositiveClassNameList materialize():215:216 -> c
-com.android.tools.r8.shaking.ProguardClassNameList$SingleClassNameList -> a.a.a.a.s.Ea:
+com.android.tools.r8.shaking.ProguardClassNameList$SingleClassNameList -> a.a.a.a.s.Da:
     com.android.tools.r8.shaking.ProguardTypeMatcher className -> a
     1:2:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher):125:126 -> <init>
     3:4:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher):125:126 -> <init>
@@ -43658,7 +42915,7 @@
     1:1:java.lang.Iterable getWildcards():152:152 -> b
     1:1:com.android.tools.r8.shaking.ProguardClassNameList$SingleClassNameList materialize():157:157 -> c
     1:1:com.android.tools.r8.shaking.ProguardClassNameList materialize():121 -> c
-com.android.tools.r8.shaking.ProguardClassSpecification$Builder -> a.a.a.a.s.Ga:
+com.android.tools.r8.shaking.ProguardClassSpecification$Builder -> a.a.a.a.s.Fa:
     com.android.tools.r8.shaking.ProguardClassType classType -> i
     com.android.tools.r8.shaking.ProguardTypeMatcher inheritanceAnnotation -> k
     boolean inheritanceIsExtends -> m
@@ -43689,7 +42946,7 @@
     20:20:void setClassAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher):163:163 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
     1:1:void setInheritanceAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher):113:113 -> b
-com.android.tools.r8.shaking.ProguardClassType -> a.a.a.a.s.Ma:
+com.android.tools.r8.shaking.ProguardClassType -> a.a.a.a.s.La:
     com.android.tools.r8.shaking.ProguardClassType ANNOTATION_INTERFACE -> a
     com.android.tools.r8.shaking.ProguardClassType CLASS -> b
     com.android.tools.r8.shaking.ProguardClassType UNSPECIFIED -> e
@@ -43702,107 +42959,106 @@
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.shaking.ProguardClassType$1):9 -> <init>
     boolean matches(com.android.tools.r8.graph.DexClass) -> a
     1:9:java.lang.String toString():43:51 -> toString
-com.android.tools.r8.shaking.ProguardClassType$1 -> a.a.a.a.s.Ha:
+com.android.tools.r8.shaking.ProguardClassType$1 -> a.a.a.a.s.Ga:
     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 -> a.a.a.a.s.Ia:
+com.android.tools.r8.shaking.ProguardClassType$2 -> a.a.a.a.s.Ha:
     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 -> a.a.a.a.s.Ja:
+com.android.tools.r8.shaking.ProguardClassType$3 -> a.a.a.a.s.Ia:
     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 -> a.a.a.a.s.Ka:
+com.android.tools.r8.shaking.ProguardClassType$4 -> a.a.a.a.s.Ja:
     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 -> a.a.a.a.s.La:
+com.android.tools.r8.shaking.ProguardClassType$5 -> a.a.a.a.s.Ka:
     1:1:void <init>(java.lang.String,int):34:34 -> <init>
     boolean matches(com.android.tools.r8.graph.DexClass) -> a
-com.android.tools.r8.shaking.ProguardConfiguration -> a.a.a.a.s.Pa:
+com.android.tools.r8.shaking.ProguardConfiguration -> a.a.a.a.s.Oa:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.lang.String packagePrefix -> f
     boolean optimizing -> i
+    com.android.tools.r8.com.google.common.collect.ImmutableList obfuscationDictionary -> z
     com.android.tools.r8.shaking.ProguardKeepAttributes keepAttributes -> t
     boolean shrinking -> k
-    com.android.tools.r8.shaking.ProguardClassFilter dontWarnPatterns -> v
     java.nio.file.Path printConfigurationFile -> m
     com.android.tools.r8.shaking.ProguardClassFilter adaptClassStrings -> D
+    boolean printSeeds -> w
     java.nio.file.Path printMappingFile -> q
-    com.android.tools.r8.com.google.common.collect.ImmutableList classObfuscationDictionary -> B
+    com.android.tools.r8.com.google.common.collect.ImmutableList packageObfuscationDictionary -> B
     java.nio.file.Path printUsageFile -> o
     com.android.tools.r8.com.google.common.collect.ImmutableList injars -> c
     com.android.tools.r8.shaking.ProguardPathFilter adaptResourceFilenames -> E
     java.nio.file.Path applyMappingFile -> r
+    boolean overloadAggressively -> y
     com.android.tools.r8.shaking.ProguardPathFilter keepDirectories -> G
+    java.nio.file.Path seedFile -> x
     java.lang.String parsedConfiguration -> a
     boolean ignoreWarnings -> h
-    com.android.tools.r8.com.google.common.collect.ImmutableList rules -> w
+    boolean useUniqueClassMemberNames -> C
     boolean printUsage -> n
     boolean printMapping -> p
     boolean obfuscating -> j
     boolean printConfiguration -> l
-    boolean printSeeds -> x
+    com.android.tools.r8.shaking.ProguardClassFilter dontWarnPatterns -> u
     java.lang.String renameSourceFileAttribute -> s
-    com.android.tools.r8.com.google.common.collect.ImmutableList obfuscationDictionary -> A
+    com.android.tools.r8.com.google.common.collect.ImmutableList classObfuscationDictionary -> A
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryjars -> d
-    com.android.tools.r8.com.google.common.collect.ImmutableList packageObfuscationDictionary -> C
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode packageObfuscationMode -> e
-    java.nio.file.Path seedFile -> y
-    boolean overloadAggressively -> z
     com.android.tools.r8.shaking.ProguardPathFilter adaptResourceFileContents -> F
+    com.android.tools.r8.com.google.common.collect.ImmutableList rules -> v
     boolean allowAccessModification -> g
-    com.android.tools.r8.shaking.ProguardPackageNameList keepPackageNamesPatterns -> u
-    1:37:void <init>(java.lang.String,com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.List,com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode,java.lang.String,boolean,boolean,boolean,boolean,boolean,boolean,java.nio.file.Path,boolean,java.nio.file.Path,boolean,java.nio.file.Path,java.nio.file.Path,boolean,java.lang.String,com.android.tools.r8.shaking.ProguardKeepAttributes,com.android.tools.r8.shaking.ProguardPackageNameList,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardClassFilter,java.util.Set,boolean,java.nio.file.Path,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,boolean,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter):433:469 -> <init>
-    1:37:void <init>(java.lang.String,com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.List,com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode,java.lang.String,boolean,boolean,boolean,boolean,boolean,boolean,java.nio.file.Path,boolean,java.nio.file.Path,boolean,java.nio.file.Path,java.nio.file.Path,boolean,java.lang.String,com.android.tools.r8.shaking.ProguardKeepAttributes,com.android.tools.r8.shaking.ProguardPackageNameList,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardClassFilter,java.util.Set,boolean,java.nio.file.Path,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,boolean,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardConfiguration$1):20 -> <init>
-    1:1:boolean isObfuscating():533:533 -> A
-    1:1:boolean isOptimizing():529:529 -> B
-    1:1:boolean isOverloadAggressively():585:585 -> C
-    1:1:boolean isPrintConfiguration():541:541 -> D
-    1:1:boolean isPrintMapping():509:509 -> E
-    1:1:boolean isPrintSeeds():621:621 -> F
-    1:1:boolean isPrintUsage():549:549 -> G
-    1:1:boolean isShrinking():537:537 -> H
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder builder(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):477:477 -> a
-    2:2:com.android.tools.r8.shaking.ProguardClassFilter getAdaptClassStrings():605:605 -> a
-    1:1:com.android.tools.r8.shaking.ProguardPathFilter getAdaptResourceFileContents():613:613 -> b
-    1:1:com.android.tools.r8.shaking.ProguardPathFilter getAdaptResourceFilenames():609:609 -> c
-    1:1:java.nio.file.Path getApplyMappingFile():521:521 -> d
-    1:1:java.util.List getClassObfuscationDictionary():593:593 -> e
-    1:1:com.android.tools.r8.graph.DexItemFactory getDexItemFactory():485:485 -> f
-    1:1:com.android.tools.r8.shaking.ProguardClassFilter getDontWarnPatterns():573:573 -> g
-    1:1:java.util.List getInjars():489:489 -> h
-    1:1:com.android.tools.r8.shaking.ProguardKeepAttributes getKeepAttributes():565:565 -> i
-    1:1:com.android.tools.r8.shaking.ProguardPathFilter getKeepDirectories():617:617 -> j
-    1:1:com.android.tools.r8.shaking.ProguardPackageNameList getKeepPackageNamesPatterns():569:569 -> k
-    1:1:java.util.List getLibraryjars():493:493 -> l
-    1:1:java.util.List getObfuscationDictionary():589:589 -> m
-    1:1:java.util.List getPackageObfuscationDictionary():597:597 -> n
-    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode getPackageObfuscationMode():497:497 -> o
-    1:1:java.lang.String getPackagePrefix():501:501 -> p
-    1:1:java.lang.String getParsedConfiguration():481:481 -> q
-    1:1:java.nio.file.Path getPrintConfigurationFile():545:545 -> r
-    1:1:java.nio.file.Path getPrintMappingFile():513:513 -> s
-    1:1:java.nio.file.Path getPrintUsageFile():553:553 -> t
-    1:2:java.lang.String toString():630:631 -> toString
+    1:37:void <init>(java.lang.String,com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.List,com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode,java.lang.String,boolean,boolean,boolean,boolean,boolean,boolean,java.nio.file.Path,boolean,java.nio.file.Path,boolean,java.nio.file.Path,java.nio.file.Path,boolean,java.lang.String,com.android.tools.r8.shaking.ProguardKeepAttributes,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardClassFilter,java.util.Set,boolean,java.nio.file.Path,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,boolean,boolean,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter):435:471 -> <init>
+    1:37:void <init>(java.lang.String,com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.List,com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode,java.lang.String,boolean,boolean,boolean,boolean,boolean,boolean,java.nio.file.Path,boolean,java.nio.file.Path,boolean,java.nio.file.Path,java.nio.file.Path,boolean,java.lang.String,com.android.tools.r8.shaking.ProguardKeepAttributes,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardClassFilter,java.util.Set,boolean,java.nio.file.Path,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,boolean,boolean,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardConfiguration$1):20 -> <init>
+    1:1:boolean isOptimizing():531:531 -> A
+    1:1:boolean isOverloadAggressivelyWithoutUseUniqueClassMemberNames():583:583 -> B
+    1:1:boolean isPrintConfiguration():543:543 -> C
+    1:1:boolean isPrintMapping():511:511 -> D
+    1:1:boolean isPrintSeeds():623:623 -> E
+    1:1:boolean isPrintUsage():551:551 -> F
+    1:1:boolean isShrinking():539:539 -> G
+    1:1:boolean isUseUniqueClassMemberNames():599:599 -> H
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder builder(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):479:479 -> a
+    2:2:com.android.tools.r8.shaking.ProguardClassFilter getAdaptClassStrings():607:607 -> a
+    1:1:com.android.tools.r8.shaking.ProguardPathFilter getAdaptResourceFileContents():615:615 -> b
+    1:1:com.android.tools.r8.shaking.ProguardPathFilter getAdaptResourceFilenames():611:611 -> c
+    1:1:java.nio.file.Path getApplyMappingFile():523:523 -> d
+    1:1:java.util.List getClassObfuscationDictionary():591:591 -> e
+    1:1:com.android.tools.r8.graph.DexItemFactory getDexItemFactory():487:487 -> f
+    1:1:com.android.tools.r8.shaking.ProguardClassFilter getDontWarnPatterns():571:571 -> g
+    1:1:java.util.List getInjars():491:491 -> h
+    1:1:com.android.tools.r8.shaking.ProguardKeepAttributes getKeepAttributes():567:567 -> i
+    1:1:com.android.tools.r8.shaking.ProguardPathFilter getKeepDirectories():619:619 -> j
+    1:1:java.util.List getLibraryjars():495:495 -> k
+    1:1:java.util.List getObfuscationDictionary():587:587 -> l
+    1:1:java.util.List getPackageObfuscationDictionary():595:595 -> m
+    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode getPackageObfuscationMode():499:499 -> n
+    1:1:java.lang.String getPackagePrefix():503:503 -> o
+    1:1:java.lang.String getParsedConfiguration():483:483 -> p
+    1:1:java.nio.file.Path getPrintConfigurationFile():547:547 -> q
+    1:1:java.nio.file.Path getPrintMappingFile():515:515 -> r
+    1:1:java.nio.file.Path getPrintUsageFile():555:555 -> s
+    1:1:java.lang.String getRenameSourceFileAttribute():563:563 -> t
+    1:2:java.lang.String toString():632:633 -> toString
     3:3:boolean com.android.tools.r8.shaking.ProguardKeepAttributes.isEmpty():221:221 -> toString
-    3:3:java.lang.String toString():631 -> toString
-    4:11:java.lang.String toString():632:639 -> toString
-    1:1:java.lang.String getRenameSourceFileAttribute():561:561 -> u
-    1:1:java.util.List getRules():581:581 -> v
-    1:1:java.nio.file.Path getSeedFile():625:625 -> w
-    1:1:boolean hasApplyMappingFile():517:517 -> x
-    1:1:boolean isAccessModificationAllowed():505:505 -> y
-    1:1:boolean isIgnoreWarnings():525:525 -> z
-com.android.tools.r8.shaking.ProguardConfiguration$1 -> a.a.a.a.s.Na:
-com.android.tools.r8.shaking.ProguardConfiguration$Builder -> a.a.a.a.s.Oa:
+    3:3:java.lang.String toString():633 -> toString
+    4:11:java.lang.String toString():634:641 -> toString
+    1:1:java.util.List getRules():579:579 -> u
+    1:1:java.nio.file.Path getSeedFile():627:627 -> v
+    1:1:boolean hasApplyMappingFile():519:519 -> w
+    1:1:boolean isAccessModificationAllowed():507:507 -> x
+    1:1:boolean isIgnoreWarnings():527:527 -> y
+    1:1:boolean isObfuscating():535:535 -> z
+com.android.tools.r8.shaking.ProguardConfiguration$1 -> a.a.a.a.s.Ma:
+com.android.tools.r8.shaking.ProguardConfiguration$Builder -> a.a.a.a.s.Na:
     java.lang.String packagePrefix -> f
-    java.nio.file.Path classObfuscationDictionary -> D
+    java.nio.file.Path packageObfuscationDictionary -> D
     boolean overloadAggressively -> N
-    java.util.Set rules -> y
     boolean $assertionsDisabled -> P
-    java.nio.file.Path seedFile -> B
+    java.nio.file.Path obfuscationDictionary -> B
     boolean optimizing -> i
     boolean shrinking -> k
-    com.android.tools.r8.shaking.ProguardClassFilter$Builder dontWarnPatterns -> w
+    com.android.tools.r8.shaking.ProguardClassFilter$Builder dontNotePatterns -> w
     java.nio.file.Path printConfigurationFile -> m
     com.android.tools.r8.origin.Origin keepParameterNamesOptionOrigin -> G
     com.android.tools.r8.position.Position keepParameterNamesOptionPosition -> H
@@ -43814,140 +43070,138 @@
     com.android.tools.r8.shaking.ProguardPathFilter$Builder adaptResourceFilenames -> J
     com.android.tools.r8.shaking.ProguardPathFilter$Builder keepDirectories -> L
     java.nio.file.Path applyMappingFile -> r
+    com.android.tools.r8.graph.DexItemFactory dexItemFactory -> y
+    boolean useUniqueClassMemberNames -> E
     boolean ignoreWarnings -> h
-    boolean printSeeds -> A
-    com.android.tools.r8.shaking.ProguardClassFilter$Builder dontNotePatterns -> x
-    java.nio.file.Path packageObfuscationDictionary -> E
     boolean forceProguardCompatibility -> M
     boolean printUsage -> n
-    java.nio.file.Path obfuscationDictionary -> C
+    java.util.Set rules -> x
+    java.nio.file.Path classObfuscationDictionary -> C
     boolean keepRuleSynthesisForRecompilation -> O
     boolean printMapping -> p
     boolean obfuscating -> j
     java.util.List keepAttributePatterns -> u
+    com.android.tools.r8.shaking.ProguardClassFilter$Builder dontWarnPatterns -> v
     boolean printConfiguration -> l
     com.android.tools.r8.utils.Reporter reporter -> d
-    com.android.tools.r8.graph.DexItemFactory dexItemFactory -> z
-    com.android.tools.r8.shaking.ProguardPackageNameList$Builder keepPackageNamesPatterns -> v
     java.util.List parsedConfiguration -> a
     com.android.tools.r8.shaking.ProguardClassFilter$Builder adaptClassStrings -> I
     com.android.tools.r8.shaking.ProguardPathFilter$Builder adaptResourceFileContents -> K
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode packageObfuscationMode -> e
+    boolean printSeeds -> z
     java.util.List libraryjars -> c
     boolean keepParameterNames -> F
     boolean allowAccessModification -> g
+    java.nio.file.Path seedFile -> A
     1:1:void <clinit>():22:22 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):72:72 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):71:71 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.shaking.ProguardConfiguration$1):22 -> <init>
-    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):24:44 -> <init>
-    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.shaking.ProguardConfiguration$1):22 -> <init>
-    23:23:com.android.tools.r8.shaking.ProguardPackageNameList$Builder com.android.tools.r8.shaking.ProguardPackageNameList.builder():15:15 -> <init>
-    23:23:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):46 -> <init>
-    23:23:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.shaking.ProguardConfiguration$1):22 -> <init>
-    24:52:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):46:74 -> <init>
-    24:52:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.shaking.ProguardConfiguration$1):22 -> <init>
-    1:1:void addParsedConfiguration(java.lang.String):78:78 -> a
-    2:2:void addInjars(java.util.List):82:82 -> a
-    3:3:void setAllowAccessModification(boolean):104:104 -> a
-    4:4:boolean isShrinking():130:130 -> a
-    4:4:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):346 -> a
-    5:5:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):346:346 -> a
-    6:6:boolean isOptimizing():126:126 -> a
-    6:6:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):347 -> a
-    7:7:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):347:347 -> a
-    8:8:boolean isObfuscating():122:122 -> a
-    8:8:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):348 -> a
-    9:9:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):348:348 -> a
-    10:10:void setApplyMappingFile(java.nio.file.Path):165:165 -> a
-    11:11:void addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):182:182 -> a
-    12:12:void addKeepPackageNamesPattern(boolean,com.android.tools.r8.shaking.ProguardPackageMatcher):186:186 -> a
-    13:16:void setKeepParameterNames(boolean,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):223:226 -> a
-    17:17:void addAdaptClassStringsPattern(com.android.tools.r8.shaking.ProguardClassNameList):242:242 -> a
-    18:18:void addAdaptResourceFileContents(com.android.tools.r8.shaking.ProguardPathList):250:250 -> a
-    19:19:java.lang.String[] lambda$synthesizeKeepRulesForRecompilation$0(int):287:287 -> a
-    20:20:com.android.tools.r8.shaking.ProguardConfiguration build():337:337 -> a
-    21:21:boolean isObfuscating():122:122 -> a
-    21:21:com.android.tools.r8.shaking.ProguardConfiguration build():337 -> a
-    22:22:com.android.tools.r8.shaking.ProguardConfiguration build():339:339 -> a
-    23:23:boolean isShrinking():130:130 -> a
-    23:23:com.android.tools.r8.shaking.ProguardConfiguration build():344 -> a
-    24:24:boolean isObfuscating():122:122 -> a
-    24:24:com.android.tools.r8.shaking.ProguardConfiguration build():344 -> a
-    25:25:boolean isOptimizing():126:126 -> a
-    25:25:com.android.tools.r8.shaking.ProguardConfiguration build():344 -> a
-    26:26:com.android.tools.r8.shaking.ProguardConfiguration build():345:345 -> a
-    27:29:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardKeepRule.defaultKeepAllRule(java.util.function.Consumer):111:113 -> a
-    27:29:com.android.tools.r8.shaking.ProguardConfiguration build():345 -> a
-    30:30:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:50 -> a
-    30:30:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardKeepRule.defaultKeepAllRule(java.util.function.Consumer):112 -> a
-    30:30:com.android.tools.r8.shaking.ProguardConfiguration build():345 -> a
-    31:31:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardKeepRule.defaultKeepAllRule(java.util.function.Consumer):119:119 -> a
-    31:31:com.android.tools.r8.shaking.ProguardConfiguration build():345 -> a
-    32:32:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():102:102 -> a
-    32:32:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.matchAllSpecification():167 -> a
+    2:51:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):24:73 -> <init>
+    2:51:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.shaking.ProguardConfiguration$1):22 -> <init>
+    1:1:void addParsedConfiguration(java.lang.String):77:77 -> a
+    2:2:void addInjars(java.util.List):81:81 -> a
+    3:3:void setAllowAccessModification(boolean):103:103 -> a
+    4:4:boolean isShrinking():129:129 -> a
+    4:4:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):348 -> a
+    5:5:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):348:348 -> a
+    6:6:boolean isOptimizing():125:125 -> a
+    6:6:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):349 -> a
+    7:7:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):349:349 -> a
+    8:8:boolean isObfuscating():121:121 -> a
+    8:8:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):350 -> a
+    9:9:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):350:350 -> a
+    10:10:void setApplyMappingFile(java.nio.file.Path):164:164 -> a
+    11:11:void addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):181:181 -> a
+    12:15:void setKeepParameterNames(boolean,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):226:229 -> a
+    16:16:void addAdaptClassStringsPattern(com.android.tools.r8.shaking.ProguardClassNameList):245:245 -> a
+    17:17:void addAdaptResourceFileContents(com.android.tools.r8.shaking.ProguardPathList):253:253 -> a
+    18:18:java.lang.String[] lambda$synthesizeKeepRulesForRecompilation$0(int):290:290 -> a
+    19:19:com.android.tools.r8.shaking.ProguardConfiguration build():339:339 -> a
+    20:20:boolean isObfuscating():121:121 -> a
+    20:20:com.android.tools.r8.shaking.ProguardConfiguration build():339 -> a
+    21:21:com.android.tools.r8.shaking.ProguardConfiguration build():341:341 -> a
+    22:22:boolean isShrinking():129:129 -> a
+    22:22:com.android.tools.r8.shaking.ProguardConfiguration build():346 -> a
+    23:23:boolean isObfuscating():121:121 -> a
+    23:23:com.android.tools.r8.shaking.ProguardConfiguration build():346 -> a
+    24:24:boolean isOptimizing():125:125 -> a
+    24:24:com.android.tools.r8.shaking.ProguardConfiguration build():346 -> a
+    25:25:com.android.tools.r8.shaking.ProguardConfiguration build():347:347 -> a
+    26:28:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardKeepRule.defaultKeepAllRule(java.util.function.Consumer):111:113 -> a
+    26:28:com.android.tools.r8.shaking.ProguardConfiguration build():347 -> a
+    29:29:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:50 -> a
+    29:29:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardKeepRule.defaultKeepAllRule(java.util.function.Consumer):112 -> a
+    29:29:com.android.tools.r8.shaking.ProguardConfiguration build():347 -> a
+    30:30:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardKeepRule.defaultKeepAllRule(java.util.function.Consumer):119:119 -> a
+    30:30:com.android.tools.r8.shaking.ProguardConfiguration build():347 -> a
+    31:31:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():102:102 -> a
+    31:31:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.matchAllSpecification():167 -> a
+    31:31:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardKeepRule.defaultKeepAllRule(java.util.function.Consumer):120 -> a
+    31:31:com.android.tools.r8.shaking.ProguardConfiguration build():347 -> a
+    32:32:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.matchAllSpecification():167:167 -> a
     32:32:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardKeepRule.defaultKeepAllRule(java.util.function.Consumer):120 -> a
-    32:32:com.android.tools.r8.shaking.ProguardConfiguration build():345 -> a
-    33:33:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.matchAllSpecification():167:167 -> a
+    32:32:com.android.tools.r8.shaking.ProguardConfiguration build():347 -> a
+    33:33:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassNames(com.android.tools.r8.shaking.ProguardClassNameList):121:121 -> a
+    33:33:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.matchAllSpecification():167 -> a
     33:33:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardKeepRule.defaultKeepAllRule(java.util.function.Consumer):120 -> a
-    33:33:com.android.tools.r8.shaking.ProguardConfiguration build():345 -> a
-    34:34:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassNames(com.android.tools.r8.shaking.ProguardClassNameList):121:121 -> a
-    34:34:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.matchAllSpecification():167 -> a
-    34:34:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardKeepRule.defaultKeepAllRule(java.util.function.Consumer):120 -> a
-    34:34:com.android.tools.r8.shaking.ProguardConfiguration build():345 -> a
-    35:37:com.android.tools.r8.shaking.ProguardMemberRule com.android.tools.r8.shaking.ProguardMemberRule.defaultKeepAllRule():404:406 -> a
-    35:37:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.matchAllSpecification():168 -> a
-    35:37:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardKeepRule.defaultKeepAllRule(java.util.function.Consumer):120 -> a
-    35:37:com.android.tools.r8.shaking.ProguardConfiguration build():345 -> a
-    38:38:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.matchAllSpecification():168:168 -> a
-    38:38:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardKeepRule.defaultKeepAllRule(java.util.function.Consumer):120 -> a
-    38:38:com.android.tools.r8.shaking.ProguardConfiguration build():345 -> a
-    39:39:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardKeepRule.defaultKeepAllRule(java.util.function.Consumer):121:121 -> a
-    39:39:com.android.tools.r8.shaking.ProguardConfiguration build():345 -> a
-    40:40:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
-    40:40:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardKeepRule.defaultKeepAllRule(java.util.function.Consumer):122 -> a
-    40:40:com.android.tools.r8.shaking.ProguardConfiguration build():345 -> a
-    41:42:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardKeepRule.defaultKeepAllRule(java.util.function.Consumer):122:123 -> a
-    41:42:com.android.tools.r8.shaking.ProguardConfiguration build():345 -> a
-    43:54:com.android.tools.r8.shaking.ProguardConfiguration build():345:356 -> a
-    1:2:void setFlattenPackagePrefix(java.lang.String):99:100 -> b
-    3:3:com.android.tools.r8.shaking.ProguardConfiguration$Builder addKeepAttributePatterns(java.util.List):177:177 -> b
-    4:4:void addDontNotePattern(com.android.tools.r8.shaking.ProguardClassNameList):194:194 -> b
-    5:5:void setClassObfuscationDictionary(java.nio.file.Path):210:210 -> b
-    6:6:void addAdaptResourceFilenames(com.android.tools.r8.shaking.ProguardPathList):246:246 -> b
-    7:7:void setForceProguardCompatibility(boolean):262:262 -> b
-    8:47:com.android.tools.r8.shaking.ProguardConfiguration buildRaw():292:331 -> b
-    1:1:void addLibraryJars(java.util.List):86:86 -> c
-    2:3:void setPackagePrefix(java.lang.String):94:95 -> c
-    4:4:void setIgnoreWarnings(boolean):108:108 -> c
-    5:5:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableObfuscation():117:117 -> c
-    6:6:void addDontWarnPattern(com.android.tools.r8.shaking.ProguardClassNameList):190:190 -> c
-    7:7:void setObfuscationDictionary(java.nio.file.Path):206:206 -> c
-    8:8:void addKeepDirectories(com.android.tools.r8.shaking.ProguardPathList):258:258 -> c
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableOptimization():112:112 -> d
-    2:2:void setRenameSourceFileAttribute(java.lang.String):173:173 -> d
-    3:3:void setPackageObfuscationDictionary(java.nio.file.Path):214:214 -> d
-    4:4:void setOverloadAggressively(boolean):266:266 -> d
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableShrinking():134:134 -> e
-    2:2:void setPrintConfiguration(boolean):139:139 -> e
-    3:4:void setPrintConfigurationFile(java.nio.file.Path):143:144 -> e
-    1:1:void setPrintMapping(boolean):156:156 -> f
-    2:3:void setPrintMappingFile(java.nio.file.Path):160:161 -> f
-    4:4:void enableKeepDirectories():254:254 -> f
-    1:1:void setPrintUsageFile(java.nio.file.Path):152:152 -> g
-    2:2:void setPrintSeeds(boolean):202:202 -> g
-    3:3:void enableKeepRuleSynthesisForRecompilation():270:270 -> g
-    1:1:void setPrintUsage(boolean):148:148 -> h
-    2:2:void setSeedFile(java.nio.file.Path):198:198 -> h
-    3:3:com.android.tools.r8.origin.Origin getKeepParameterNamesOptionOrigin():234:234 -> h
-    1:1:void setVerbose(boolean):169:169 -> i
-    2:2:com.android.tools.r8.position.Position getKeepParameterNamesOptionPosition():238:238 -> i
-    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode getPackageObfuscationMode():90:90 -> j
-    1:1:boolean isKeepParameterNames():230:230 -> k
-    1:1:boolean isObfuscating():122:122 -> l
-    1:10:void synthesizeKeepRulesForRecompilation():278:287 -> m
-    11:11:void synthesizeKeepRulesForRecompilation():284:284 -> m
-    12:12:void synthesizeKeepRulesForRecompilation():283:283 -> m
-com.android.tools.r8.shaking.ProguardConfigurationParser -> a.a.a.a.s.Ua:
+    33:33:com.android.tools.r8.shaking.ProguardConfiguration build():347 -> a
+    34:36:com.android.tools.r8.shaking.ProguardMemberRule com.android.tools.r8.shaking.ProguardMemberRule.defaultKeepAllRule():404:406 -> a
+    34:36:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.matchAllSpecification():168 -> a
+    34:36:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardKeepRule.defaultKeepAllRule(java.util.function.Consumer):120 -> a
+    34:36:com.android.tools.r8.shaking.ProguardConfiguration build():347 -> a
+    37:37:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.matchAllSpecification():168:168 -> a
+    37:37:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardKeepRule.defaultKeepAllRule(java.util.function.Consumer):120 -> a
+    37:37:com.android.tools.r8.shaking.ProguardConfiguration build():347 -> a
+    38:38:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardKeepRule.defaultKeepAllRule(java.util.function.Consumer):121:121 -> a
+    38:38:com.android.tools.r8.shaking.ProguardConfiguration build():347 -> a
+    39:39:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
+    39:39:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardKeepRule.defaultKeepAllRule(java.util.function.Consumer):122 -> a
+    39:39:com.android.tools.r8.shaking.ProguardConfiguration build():347 -> a
+    40:41:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardKeepRule.defaultKeepAllRule(java.util.function.Consumer):122:123 -> a
+    40:41:com.android.tools.r8.shaking.ProguardConfiguration build():347 -> a
+    42:53:com.android.tools.r8.shaking.ProguardConfiguration build():347:358 -> a
+    1:2:void setFlattenPackagePrefix(java.lang.String):98:99 -> b
+    3:3:com.android.tools.r8.shaking.ProguardConfiguration$Builder addKeepAttributePatterns(java.util.List):176:176 -> b
+    4:4:void addDontNotePattern(com.android.tools.r8.shaking.ProguardClassNameList):189:189 -> b
+    5:5:void setClassObfuscationDictionary(java.nio.file.Path):205:205 -> b
+    6:6:void addAdaptResourceFilenames(com.android.tools.r8.shaking.ProguardPathList):249:249 -> b
+    7:7:void setForceProguardCompatibility(boolean):265:265 -> b
+    8:46:com.android.tools.r8.shaking.ProguardConfiguration buildRaw():295:333 -> b
+    1:1:void addLibraryJars(java.util.List):85:85 -> c
+    2:3:void setPackagePrefix(java.lang.String):93:94 -> c
+    4:4:void setIgnoreWarnings(boolean):107:107 -> c
+    5:5:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableObfuscation():116:116 -> c
+    6:6:void addDontWarnPattern(com.android.tools.r8.shaking.ProguardClassNameList):185:185 -> c
+    7:7:void setObfuscationDictionary(java.nio.file.Path):201:201 -> c
+    8:8:void addKeepDirectories(com.android.tools.r8.shaking.ProguardPathList):261:261 -> c
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableOptimization():111:111 -> d
+    2:2:void setRenameSourceFileAttribute(java.lang.String):172:172 -> d
+    3:3:void setPackageObfuscationDictionary(java.nio.file.Path):209:209 -> d
+    4:4:void setOverloadAggressively(boolean):269:269 -> d
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableShrinking():133:133 -> e
+    2:2:void setPrintConfiguration(boolean):138:138 -> e
+    3:4:void setPrintConfigurationFile(java.nio.file.Path):142:143 -> e
+    1:1:void setPrintMapping(boolean):155:155 -> f
+    2:3:void setPrintMappingFile(java.nio.file.Path):159:160 -> f
+    4:4:void enableKeepDirectories():257:257 -> f
+    1:1:void setPrintUsageFile(java.nio.file.Path):151:151 -> g
+    2:2:void setPrintSeeds(boolean):197:197 -> g
+    3:3:void enableKeepRuleSynthesisForRecompilation():273:273 -> g
+    1:1:void setPrintUsage(boolean):147:147 -> h
+    2:2:void setSeedFile(java.nio.file.Path):193:193 -> h
+    3:3:com.android.tools.r8.origin.Origin getKeepParameterNamesOptionOrigin():237:237 -> h
+    1:1:void setUseUniqueClassMemberNames(boolean):213:213 -> i
+    2:2:com.android.tools.r8.position.Position getKeepParameterNamesOptionPosition():241:241 -> i
+    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode getPackageObfuscationMode():89:89 -> j
+    2:2:void setVerbose(boolean):168:168 -> j
+    1:1:boolean isKeepParameterNames():233:233 -> k
+    1:1:boolean isObfuscating():121:121 -> l
+    1:1:boolean isOverloadAggressively():221:221 -> m
+    1:1:boolean isUseUniqueClassMemberNames():217:217 -> n
+    1:10:void synthesizeKeepRulesForRecompilation():281:290 -> o
+    11:11:void synthesizeKeepRulesForRecompilation():287:287 -> o
+    12:12:void synthesizeKeepRulesForRecompilation():286:286 -> o
+com.android.tools.r8.shaking.ProguardConfigurationParser -> a.a.a.a.s.Ta:
     com.android.tools.r8.shaking.ProguardConfiguration$Builder configurationBuilder -> a
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.utils.Reporter reporter -> c
@@ -43961,55 +43215,53 @@
     java.util.List WARNED_CLASS_DESCRIPTOR_OPTIONS -> l
     java.util.List WARNED_FLAG_OPTIONS -> k
     boolean allowTestOptions -> d
-    1:52:void <clinit>():54:105 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean):113:118 -> <init>
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder access$000(com.android.tools.r8.shaking.ProguardConfigurationParser):45:45 -> a
-    2:2:java.util.List access$1000():45:45 -> a
-    3:3:java.lang.String access$1300(com.android.tools.r8.shaking.ProguardConfigurationParser,java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):45:45 -> a
-    4:4:void parse(com.android.tools.r8.shaking.ProguardConfigurationSource):158:158 -> a
-    5:12:void parse(java.util.List):162:169 -> a
-    13:14:void parse(java.util.List):166:167 -> a
-    15:21:void parse(java.util.List):166:172 -> a
-    22:28:java.lang.String getTextSourceSnippet(java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):1874:1880 -> a
-    1:1:boolean access$100(com.android.tools.r8.shaking.ProguardConfigurationParser):45:45 -> b
-    2:2:java.util.List access$1100():45:45 -> b
-    1:1:com.android.tools.r8.graph.DexItemFactory access$1200(com.android.tools.r8.shaking.ProguardConfigurationParser):45:45 -> c
-    2:2:java.util.List access$300():45:45 -> c
-    1:1:com.android.tools.r8.utils.Reporter access$200(com.android.tools.r8.shaking.ProguardConfigurationParser):45:45 -> d
-    2:2:java.util.List access$400():45:45 -> d
-    1:1:java.util.List access$500():45:45 -> e
-    1:1:java.util.List access$600():45:45 -> f
-    1:1:java.util.List access$700():45:45 -> g
-    1:1:java.util.List access$800():45:45 -> h
-    1:1:java.util.List access$900():45:45 -> i
-    1:7:void validate():126:132 -> j
-    1:7:com.android.tools.r8.shaking.ProguardConfiguration getConfig():140 -> j
-    8:8:void validate():129:129 -> j
-    8:8:com.android.tools.r8.shaking.ProguardConfiguration getConfig():140 -> j
-    9:9:com.android.tools.r8.shaking.ProguardConfiguration getConfig():141:141 -> j
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder getConfigurationBuilder():122:122 -> k
-com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards -> a.a.a.a.s.Qa:
+    1:51:void <clinit>():53:103 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean):111:116 -> <init>
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder access$000(com.android.tools.r8.shaking.ProguardConfigurationParser):44:44 -> a
+    2:2:java.util.List access$1000():44:44 -> a
+    3:3:java.lang.String access$1300(com.android.tools.r8.shaking.ProguardConfigurationParser,java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):44:44 -> a
+    4:4:void parse(com.android.tools.r8.shaking.ProguardConfigurationSource):163:163 -> a
+    5:12:void parse(java.util.List):167:174 -> a
+    13:14:void parse(java.util.List):171:172 -> a
+    15:21:void parse(java.util.List):171:177 -> a
+    22:28:java.lang.String getTextSourceSnippet(java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):1866:1872 -> a
+    1:1:boolean access$100(com.android.tools.r8.shaking.ProguardConfigurationParser):44:44 -> b
+    2:2:java.util.List access$1100():44:44 -> b
+    1:1:com.android.tools.r8.graph.DexItemFactory access$1200(com.android.tools.r8.shaking.ProguardConfigurationParser):44:44 -> c
+    2:2:java.util.List access$300():44:44 -> c
+    1:1:com.android.tools.r8.utils.Reporter access$200(com.android.tools.r8.shaking.ProguardConfigurationParser):44:44 -> d
+    2:2:java.util.List access$400():44:44 -> d
+    1:1:java.util.List access$500():44:44 -> e
+    1:1:java.util.List access$600():44:44 -> f
+    1:1:java.util.List access$700():44:44 -> g
+    1:1:java.util.List access$800():44:44 -> h
+    1:1:java.util.List access$900():44:44 -> i
+    1:7:void validate():124:130 -> j
+    1:7:com.android.tools.r8.shaking.ProguardConfiguration getConfig():145 -> j
+    8:15:void validate():127:134 -> j
+    8:15:com.android.tools.r8.shaking.ProguardConfiguration getConfig():145 -> j
+    16:16:com.android.tools.r8.shaking.ProguardConfiguration getConfig():146:146 -> j
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder getConfigurationBuilder():120:120 -> k
+com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards -> a.a.a.a.s.Pa:
     java.util.List wildcards -> b
     java.lang.String pattern -> a
-    1:3:void <init>(java.lang.String,java.util.List):1888:1890 -> <init>
-    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):1894:1894 -> a
-    2:16:boolean hasUnusualCharacters():1902:1916 -> a
-com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation -> a.a.a.a.s.Ra:
+    1:3:void <init>(java.lang.String,java.util.List):1880:1882 -> <init>
+    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):1886:1886 -> a
+    2:16:boolean hasUnusualCharacters():1894:1908 -> a
+com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation -> a.a.a.a.s.Qa:
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards patternWithWildcards -> a
     boolean negated -> b
-    1:3:void <init>(java.lang.String,java.util.List,boolean):1927:1929 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType -> a.a.a.a.s.Sa:
-    com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType CLASS_NAME -> b
-    com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType PACKAGE_NAME -> a
-    com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType ANY -> c
-    1:3:void <clinit>():176:178 -> <clinit>
-    4:4:void <clinit>():175:175 -> <clinit>
-    1:1:void <init>(java.lang.String,int):175:175 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser -> a.a.a.a.s.Ta:
-    java.util.function.Predicate PACKAGE_NAME_PREDICATE -> j
+    1:3:void <init>(java.lang.String,java.util.List,boolean):1919:1921 -> <init>
+com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType -> a.a.a.a.s.Ra:
+    com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType ANY -> b
+    com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType CLASS_NAME -> a
+    1:2:void <clinit>():181:182 -> <clinit>
+    3:3:void <clinit>():180:180 -> <clinit>
+    1:1:void <init>(java.lang.String,int):180:180 -> <init>
+com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser -> a.a.a.a.s.Sa:
+    boolean $assertionsDisabled -> k
     java.nio.file.Path baseDirectory -> g
-    boolean $assertionsDisabled -> l
-    com.android.tools.r8.shaking.ProguardConfigurationParser this$0 -> k
+    com.android.tools.r8.shaking.ProguardConfigurationParser this$0 -> j
     int lineStartPosition -> f
     java.lang.String name -> a
     int positionAfterInclude -> d
@@ -44018,618 +43270,624 @@
     java.lang.String contents -> b
     int position -> c
     java.util.function.Predicate CLASS_NAME_PREDICATE -> i
-    1:1:void <clinit>():181:181 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):191:191 -> <init>
-    2:1272:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):184:1454 -> <init>
-    1273:1276:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):192:195 -> <init>
-    1:4:void parse():200:203 -> a
-    5:7:void unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):420:422 -> a
-    8:8:void unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):420:420 -> a
-    9:10:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):579:580 -> a
-    11:12:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> a
-    11:12:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):581 -> a
-    13:13:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):581:581 -> a
-    14:15:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):767:768 -> a
-    14:15:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):582 -> a
-    16:16:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
-    16:16:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):769 -> a
-    16:16:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):582 -> a
-    17:24:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):769:776 -> a
-    17:24:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):582 -> a
-    25:25:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
-    25:25:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):777 -> a
-    25:25:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):582 -> a
-    26:28:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):777:779 -> a
-    26:28:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):582 -> a
-    29:29:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
-    29:29:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):780 -> a
-    29:29:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):582 -> a
-    30:48:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):780:798 -> a
-    30:48:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):582 -> a
-    49:53:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):804:808 -> a
-    49:53:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):800 -> a
-    49:53:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):582 -> a
-    54:54:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
-    54:54:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):809 -> a
-    54:54:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):800 -> a
-    54:54:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):582 -> a
-    55:56:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):809:810 -> a
-    55:56:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):800 -> a
-    55:56:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):582 -> a
-    57:57:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
-    57:57:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):811 -> a
-    57:57:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):800 -> a
-    57:57:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):582 -> a
-    58:59:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):811:812 -> a
-    58:59:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):800 -> a
-    58:59:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):582 -> a
-    60:60:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
-    60:60:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):813 -> a
-    60:60:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):800 -> a
-    60:60:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):582 -> a
-    61:63:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):813:815 -> a
-    61:63:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):800 -> a
-    61:63:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):582 -> a
-    64:64:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
-    64:64:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):816 -> a
-    64:64:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):800 -> a
-    64:64:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):582 -> a
-    65:67:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):816:818 -> a
-    65:67:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):800 -> a
-    65:67:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):582 -> a
-    68:68:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):583:583 -> a
-    69:69:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():80:80 -> a
-    69:69:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):584 -> a
-    70:75:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):584:589 -> a
-    76:79:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):588:591 -> a
-    80:80:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules() -> a
-    80:80:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):592 -> a
-    81:84:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):592:595 -> a
-    85:86:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> a
-    85:86:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):596 -> a
-    87:87:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):597:597 -> a
-    88:89:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):660:661 -> a
-    90:91:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> a
-    90:91:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):662 -> a
-    92:92:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):662:662 -> a
-    93:93:com.android.tools.r8.shaking.InlineRule$Builder com.android.tools.r8.shaking.InlineRule$Builder.setType(com.android.tools.r8.shaking.InlineRule$Type):38:38 -> a
-    93:93:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):663 -> a
-    94:96:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):664:666 -> a
-    97:98:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> a
-    97:98:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):667 -> a
-    99:99:com.android.tools.r8.shaking.InlineRule com.android.tools.r8.shaking.InlineRule$Builder.build():44:44 -> a
-    99:99:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):668 -> a
-    100:105:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):850:855 -> a
-    100:105:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):759 -> a
-    106:106:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getClassAnnotation():159:159 -> a
-    106:106:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):855 -> a
-    106:106:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):759 -> a
-    107:112:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):855:860 -> a
-    107:112:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):759 -> a
-    113:113:com.android.tools.r8.shaking.ProguardAccessFlags com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getNegatedClassAccessFlags():151:151 -> a
-    113:113:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):861 -> a
-    113:113:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):759 -> a
-    114:114:com.android.tools.r8.shaking.ProguardAccessFlags com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getClassAccessFlags():143:143 -> a
-    114:114:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):862 -> a
-    114:114:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):759 -> a
-    115:124:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):863:872 -> a
-    115:124:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):759 -> a
-    125:142:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):885:902 -> a
-    125:142:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):760 -> a
-    143:143:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):761:761 -> a
-    144:145:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):910:911 -> a
-    144:145:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):762 -> a
-    146:146:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceIsExtends(boolean):93:93 -> a
-    146:146:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):912 -> a
-    146:146:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):762 -> a
-    147:147:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):913:913 -> a
-    147:147:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):762 -> a
+    1:1:void <clinit>():185:185 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):195:195 -> <init>
+    2:1278:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):188:1464 -> <init>
+    1279:1282:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):196:199 -> <init>
+    1:5:void parse():204:208 -> a
+    6:6:void parse():207:207 -> a
+    7:9:void unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):428:430 -> a
+    10:10:void unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):428:428 -> a
+    11:12:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):587:588 -> a
+    13:14:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> a
+    13:14:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):589 -> a
+    15:15:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):589:589 -> a
+    16:17:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):786:787 -> a
+    16:17:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):590 -> a
+    18:18:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
+    18:18:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):788 -> a
+    18:18:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):590 -> a
+    19:26:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):788:795 -> a
+    19:26:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):590 -> a
+    27:27:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
+    27:27:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):796 -> a
+    27:27:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):590 -> a
+    28:30:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):796:798 -> a
+    28:30:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):590 -> a
+    31:31:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
+    31:31:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):799 -> a
+    31:31:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):590 -> a
+    32:50:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):799:817 -> a
+    32:50:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):590 -> a
+    51:55:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):823:827 -> a
+    51:55:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):819 -> a
+    51:55:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):590 -> a
+    56:56:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
+    56:56:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):828 -> a
+    56:56:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):819 -> a
+    56:56:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):590 -> a
+    57:58:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):828:829 -> a
+    57:58:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):819 -> a
+    57:58:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):590 -> a
+    59:59:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
+    59:59:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):830 -> a
+    59:59:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):819 -> a
+    59:59:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):590 -> a
+    60:61:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):830:831 -> a
+    60:61:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):819 -> a
+    60:61:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):590 -> a
+    62:62:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
+    62:62:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):832 -> a
+    62:62:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):819 -> a
+    62:62:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):590 -> a
+    63:65:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):832:834 -> a
+    63:65:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):819 -> a
+    63:65:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):590 -> a
+    66:66:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
+    66:66:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):835 -> a
+    66:66:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):819 -> a
+    66:66:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):590 -> a
+    67:69:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):835:837 -> a
+    67:69:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):819 -> a
+    67:69:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):590 -> a
+    70:70:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):591:591 -> a
+    71:71:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():80:80 -> a
+    71:71:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):592 -> a
+    72:77:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):592:597 -> a
+    78:81:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):596:599 -> a
+    82:82:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():80:80 -> a
+    82:82:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):600 -> a
+    83:86:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):600:603 -> a
+    87:88:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> a
+    87:88:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):604 -> a
+    89:89:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):605:605 -> a
+    90:91:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):679:680 -> a
+    92:93:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> a
+    92:93:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):681 -> a
+    94:94:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):681:681 -> a
+    95:95:com.android.tools.r8.shaking.InlineRule$Builder com.android.tools.r8.shaking.InlineRule$Builder.setType(com.android.tools.r8.shaking.InlineRule$Type):38:38 -> a
+    95:95:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):682 -> a
+    96:98:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):683:685 -> a
+    99:100:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> a
+    99:100:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):686 -> a
+    101:101:com.android.tools.r8.shaking.InlineRule com.android.tools.r8.shaking.InlineRule$Builder.build():44:44 -> a
+    101:101:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):687 -> a
+    102:107:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):869:874 -> a
+    102:107:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):778 -> a
+    108:108:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getClassAnnotation():159:159 -> a
+    108:108:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):874 -> a
+    108:108:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):778 -> a
+    109:114:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):874:879 -> a
+    109:114:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):778 -> a
+    115:115:com.android.tools.r8.shaking.ProguardAccessFlags com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getNegatedClassAccessFlags():151:151 -> a
+    115:115:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):880 -> a
+    115:115:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):778 -> a
+    116:116:com.android.tools.r8.shaking.ProguardAccessFlags com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getClassAccessFlags():143:143 -> a
+    116:116:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):881 -> a
+    116:116:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):778 -> a
+    117:126:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):882:891 -> a
+    117:126:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):778 -> a
+    127:144:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):905:922 -> a
+    127:144:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):779 -> a
+    145:145:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):780:780 -> a
+    146:147:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):930:931 -> a
+    146:147:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):781 -> a
     148:148:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceIsExtends(boolean):93:93 -> a
-    148:148:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):914 -> a
-    148:148:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):762 -> a
-    149:151:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):918:920 -> a
-    149:151:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):762 -> a
-    152:152:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):919:919 -> a
-    152:152:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):762 -> a
-    153:153:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceClassName(com.android.tools.r8.shaking.ProguardTypeMatcher):105:105 -> a
-    153:153:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):919 -> a
-    153:153:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):762 -> a
-    154:155:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):929:930 -> a
-    154:155:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    156:158:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):942:944 -> a
-    156:158:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    156:158:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    159:207:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):952:1000 -> a
-    159:207:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):945 -> a
-    159:207:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    159:207:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    208:225:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):988:1005 -> a
-    208:225:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):945 -> a
-    208:225:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    208:225:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    226:231:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):979:984 -> a
-    226:231:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):945 -> a
-    226:231:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    226:231:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    232:233:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):974:975 -> a
-    232:233:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):945 -> a
-    232:233:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    232:233:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    234:235:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):969:970 -> a
-    234:235:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):945 -> a
-    234:235:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    234:235:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    236:237:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):964:965 -> a
-    236:237:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):945 -> a
-    236:237:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    236:237:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    238:239:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):959:960 -> a
-    238:239:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):945 -> a
-    238:239:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    238:239:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    240:273:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1017:1050 -> a
-    240:273:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    240:273:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    240:273:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    274:288:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1049:1063 -> a
-    274:288:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    274:288:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    274:288:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    289:303:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1062:1076 -> a
-    289:303:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    289:303:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    289:303:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    304:309:java.lang.String acceptFieldNameOrIntegerForReturn():1594:1599 -> a
-    304:309:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1077 -> a
-    304:309:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    304:309:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    304:309:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    310:311:char peekCharAt(int):1392:1393 -> a
-    310:311:java.lang.String acceptFieldNameOrIntegerForReturn():1599 -> a
-    310:311:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1077 -> a
-    310:311:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    310:311:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    310:311:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    312:324:java.lang.String acceptFieldNameOrIntegerForReturn():1603:1615 -> a
-    312:324:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1077 -> a
-    312:324:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    312:324:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    312:324:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    325:326:boolean isInteger(java.lang.String):1328:1329 -> a
-    325:326:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1079 -> a
-    325:326:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    325:326:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    325:326:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    327:341:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1080:1094 -> a
-    327:341:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    327:341:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    327:341:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    342:342:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1093:1093 -> a
-    342:342:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    342:342:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    342:342:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    343:355:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1091:1103 -> a
-    343:355:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    343:355:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    343:355:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    356:356:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1102:1102 -> a
-    356:356:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    356:356:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    356:356:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    357:362:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1101:1106 -> a
-    357:362:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    357:362:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    357:362:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    363:385:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1105:1127 -> a
-    363:385:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    363:385:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    363:385:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    386:386:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):947:947 -> a
-    386:386:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    386:386:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    387:387:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():80:80 -> a
-    387:387:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):933 -> a
-    387:387:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    388:391:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):933:936 -> a
-    388:391:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    392:392:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):904:904 -> a
-    392:392:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):760 -> a
-    393:394:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):880:881 -> a
-    395:416:java.nio.file.Path parseFileName(boolean):1194:1215 -> a
-    417:417:java.nio.file.Path parseFileName(boolean):1213:1213 -> a
-    418:438:java.lang.String replaceSystemPropertyReferences(java.lang.String):1160:1180 -> a
-    418:438:java.nio.file.Path parseFileName(boolean):1218 -> a
-    439:451:java.lang.String replaceSystemPropertyReferences(java.lang.String):1178:1190 -> a
-    439:451:java.nio.file.Path parseFileName(boolean):1218 -> a
-    452:452:java.nio.file.Path parseFileName(boolean):1220:1220 -> a
-    453:453:java.nio.file.Path parseFileName(boolean):1209:1209 -> a
-    454:454:java.nio.file.Path parseFileName(boolean):1198:1198 -> a
-    455:458:boolean lambda$parseFileName$1(boolean,char,boolean,java.lang.Integer):1204:1207 -> a
-    459:459:boolean eof(int):1341:1341 -> a
-    460:461:boolean acceptChar(char):1363:1364 -> a
-    462:462:int remainingChars():1401:1401 -> a
-    462:462:boolean acceptString(java.lang.String):1411 -> a
-    463:471:boolean acceptString(java.lang.String):1411:1419 -> a
-    472:472:boolean lambda$acceptQuotedOrUnquotedString$4(char,java.lang.Integer):1429:1429 -> a
-    473:478:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1467:1472 -> a
-    479:505:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1477:1503 -> a
-    506:507:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1498:1499 -> a
-    508:518:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1498:1508 -> a
-    519:531:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1506:1518 -> a
-    532:587:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1517:1572 -> a
-    588:588:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1568:1568 -> a
-    589:589:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1562:1562 -> a
-    590:617:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1557:1584 -> a
-    618:625:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1583:1590 -> a
-    626:628:boolean lambda$acceptPattern$7(java.lang.Integer):1642:1644 -> a
-    629:643:java.lang.String acceptString(java.util.function.Predicate):1648:1662 -> a
-    644:646:void parseClassFilter(java.util.function.Consumer):1694:1696 -> a
-    647:647:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():102:102 -> a
-    647:647:void parseClassFilter(java.util.function.Consumer):1699 -> a
-    648:648:void parseClassFilter(java.util.function.Consumer):1699:1699 -> a
-    649:649:void parseClassFilter(java.util.function.Consumer):1698:1698 -> a
-    650:651:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1816:1817 -> a
-    652:653:void com.android.tools.r8.shaking.ProguardRuleParserException.<init>(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.Throwable):27:28 -> a
-    652:653:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1817 -> a
-    654:655:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1826:1827 -> a
-    656:656:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1826:1826 -> a
-    657:658:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1836:1837 -> a
-    659:659:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1836:1836 -> a
-    660:665:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1842:1847 -> a
-    666:666:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1842:1842 -> a
-    667:670:com.android.tools.r8.position.Position getPosition(com.android.tools.r8.position.TextPosition):1851:1854 -> a
-    671:672:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):1867:1868 -> a
-    1:5:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):456:460 -> b
-    6:14:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):551:559 -> b
-    6:14:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):461 -> b
-    15:16:void expectChar(char):1405:1406 -> b
-    17:17:boolean lambda$acceptString$3(java.lang.Integer):1424:1424 -> b
-    18:22:java.lang.Integer acceptInteger():1437:1441 -> b
-    23:27:void parsePathFilter(java.util.function.Consumer):1747:1751 -> b
-    28:28:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1806:1806 -> b
-    29:38:java.lang.String snippetForPosition():1782:1791 -> b
-    29:38:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1806 -> b
-    39:45:java.lang.String snippetForPosition():1787:1793 -> b
-    39:45:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1806 -> b
-    46:46:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1806:1806 -> b
-    47:48:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition):1821:1822 -> b
-    1:1:void unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):415:415 -> c
-    2:9:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):437:444 -> c
-    10:10:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):443:443 -> c
-    11:12:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1831:1832 -> c
-    11:12:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):451 -> c
-    13:13:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1831:1831 -> c
-    13:13:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):451 -> c
-    14:14:boolean skipFlag(java.lang.String):499:499 -> c
-    15:19:void expectClosingQuote(char):1376:1380 -> c
-    20:20:void expectClosingQuote(char):1378:1378 -> c
-    21:27:boolean lambda$new$5(java.lang.Integer):1446:1452 -> c
-    28:28:java.lang.String acceptPattern():1640:1640 -> c
-    1:4:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):426:429 -> d
-    5:5:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):428:428 -> d
-    6:15:boolean skipOptionWithClassSpec(java.lang.String):534:543 -> d
+    148:148:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):932 -> a
+    148:148:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):781 -> a
+    149:149:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):933:933 -> a
+    149:149:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):781 -> a
+    150:150:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceIsExtends(boolean):93:93 -> a
+    150:150:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):934 -> a
+    150:150:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):781 -> a
+    151:153:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):938:940 -> a
+    151:153:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):781 -> a
+    154:154:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):939:939 -> a
+    154:154:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):781 -> a
+    155:155:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceClassName(com.android.tools.r8.shaking.ProguardTypeMatcher):105:105 -> a
+    155:155:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):939 -> a
+    155:155:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):781 -> a
+    156:157:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):949:950 -> a
+    156:157:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    158:160:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):962:964 -> a
+    158:160:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    158:160:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    161:209:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):972:1020 -> a
+    161:209:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):965 -> a
+    161:209:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    161:209:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    210:227:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1008:1025 -> a
+    210:227:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):965 -> a
+    210:227:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    210:227:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    228:233:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):999:1004 -> a
+    228:233:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):965 -> a
+    228:233:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    228:233:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    234:235:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):994:995 -> a
+    234:235:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):965 -> a
+    234:235:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    234:235:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    236:237:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):989:990 -> a
+    236:237:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):965 -> a
+    236:237:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    236:237:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    238:239:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):984:985 -> a
+    238:239:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):965 -> a
+    238:239:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    238:239:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    240:241:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):979:980 -> a
+    240:241:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):965 -> a
+    240:241:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    240:241:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    242:275:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1037:1070 -> a
+    242:275:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    242:275:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    242:275:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    276:290:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1069:1083 -> a
+    276:290:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    276:290:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    276:290:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    291:305:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1082:1096 -> a
+    291:305:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    291:305:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    291:305:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    306:311:java.lang.String acceptFieldNameOrIntegerForReturn():1605:1610 -> a
+    306:311:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1097 -> a
+    306:311:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    306:311:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    306:311:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    312:313:char peekCharAt(int):1412:1413 -> a
+    312:313:java.lang.String acceptFieldNameOrIntegerForReturn():1610 -> a
+    312:313:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1097 -> a
+    312:313:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    312:313:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    312:313:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    314:326:java.lang.String acceptFieldNameOrIntegerForReturn():1614:1626 -> a
+    314:326:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1097 -> a
+    314:326:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    314:326:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    314:326:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    327:328:boolean isInteger(java.lang.String):1348:1349 -> a
+    327:328:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1099 -> a
+    327:328:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    327:328:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    327:328:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    329:343:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1100:1114 -> a
+    329:343:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    329:343:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    329:343:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    344:344:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1113:1113 -> a
+    344:344:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    344:344:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    344:344:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    345:357:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1111:1123 -> a
+    345:357:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    345:357:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    345:357:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    358:358:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1122:1122 -> a
+    358:358:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    358:358:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    358:358:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    359:364:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1121:1126 -> a
+    359:364:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    359:364:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    359:364:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    365:387:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1125:1147 -> a
+    365:387:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    365:387:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    365:387:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    388:388:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):967:967 -> a
+    388:388:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    388:388:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    389:389:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():80:80 -> a
+    389:389:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):953 -> a
+    389:389:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    390:393:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):953:956 -> a
+    390:393:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    394:394:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):924:924 -> a
+    394:394:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):779 -> a
+    395:396:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):899:900 -> a
+    397:418:java.nio.file.Path parseFileName(boolean):1214:1235 -> a
+    419:419:java.nio.file.Path parseFileName(boolean):1233:1233 -> a
+    420:440:java.lang.String replaceSystemPropertyReferences(java.lang.String):1180:1200 -> a
+    420:440:java.nio.file.Path parseFileName(boolean):1238 -> a
+    441:453:java.lang.String replaceSystemPropertyReferences(java.lang.String):1198:1210 -> a
+    441:453:java.nio.file.Path parseFileName(boolean):1238 -> a
+    454:454:java.nio.file.Path parseFileName(boolean):1240:1240 -> a
+    455:455:java.nio.file.Path parseFileName(boolean):1229:1229 -> a
+    456:456:java.nio.file.Path parseFileName(boolean):1218:1218 -> a
+    457:460:boolean lambda$parseFileName$1(boolean,char,boolean,java.lang.Integer):1224:1227 -> a
+    461:461:boolean eof(int):1361:1361 -> a
+    462:463:boolean acceptChar(char):1383:1384 -> a
+    464:464:int remainingChars():1421:1421 -> a
+    464:464:boolean acceptString(java.lang.String):1431 -> a
+    465:473:boolean acceptString(java.lang.String):1431:1439 -> a
+    474:474:boolean lambda$acceptQuotedOrUnquotedString$4(char,java.lang.Integer):1449:1449 -> a
+    475:480:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1480:1485 -> a
+    481:507:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1490:1516 -> a
+    508:509:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1511:1512 -> a
+    510:520:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1511:1521 -> a
+    521:533:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1519:1531 -> a
+    534:587:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1530:1583 -> a
+    588:588:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1579:1579 -> a
+    589:589:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1573:1573 -> a
+    590:615:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1570:1595 -> a
+    616:623:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1594:1601 -> a
+    624:626:boolean lambda$acceptPattern$6(java.lang.Integer):1653:1655 -> a
+    627:641:java.lang.String acceptString(java.util.function.Predicate):1659:1673 -> a
+    642:644:void parseClassFilter(java.util.function.Consumer):1686:1688 -> a
+    645:645:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():102:102 -> a
+    645:645:void parseClassFilter(java.util.function.Consumer):1691 -> a
+    646:646:void parseClassFilter(java.util.function.Consumer):1691:1691 -> a
+    647:647:void parseClassFilter(java.util.function.Consumer):1690:1690 -> a
+    648:649:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1808:1809 -> a
+    650:651:void com.android.tools.r8.shaking.ProguardRuleParserException.<init>(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.Throwable):27:28 -> a
+    650:651:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1809 -> a
+    652:653:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition):1813:1814 -> a
+    654:655:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1823:1824 -> a
+    656:656:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1823:1823 -> a
+    657:662:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1829:1834 -> a
+    663:663:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1829:1829 -> a
+    664:667:com.android.tools.r8.position.Position getPosition(com.android.tools.r8.position.TextPosition):1843:1846 -> a
+    668:669:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):1859:1860 -> a
+    1:1:void unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):423:423 -> b
+    2:6:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):464:468 -> b
+    7:15:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):559:567 -> b
+    7:15:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):469 -> b
+    16:17:void expectChar(char):1425:1426 -> b
+    18:18:boolean lambda$acceptString$3(java.lang.Integer):1444:1444 -> b
+    19:23:java.lang.Integer acceptInteger():1457:1461 -> b
+    24:28:void parsePathFilter(java.util.function.Consumer):1739:1743 -> b
+    29:29:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1798:1798 -> b
+    30:39:java.lang.String snippetForPosition():1774:1783 -> b
+    30:39:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1798 -> b
+    40:46:java.lang.String snippetForPosition():1779:1785 -> b
+    40:46:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1798 -> b
+    47:47:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1798:1798 -> b
+    1:8:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):445:452 -> c
+    9:17:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):451:459 -> c
+    18:18:boolean skipFlag(java.lang.String):507:507 -> c
+    19:23:void expectClosingQuote(char):1396:1400 -> c
+    24:24:void expectClosingQuote(char):1398:1398 -> c
+    25:31:boolean lambda$new$5(java.lang.Integer):1466:1472 -> c
+    32:32:java.lang.String acceptPattern():1651:1651 -> c
+    33:34:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1818:1819 -> c
+    35:35:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1818:1818 -> c
+    1:4:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):434:437 -> d
+    5:5:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):436:436 -> d
+    6:15:boolean skipOptionWithClassSpec(java.lang.String):542:551 -> d
     16:18:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic,java.lang.Throwable):80:82 -> d
-    16:18:boolean skipOptionWithClassSpec(java.lang.String):543 -> d
-    19:22:boolean hasNextChar(char):1345:1348 -> d
-    23:23:char acceptQuoteIfPresent():1372:1372 -> d
-    24:27:boolean hasNextChar(java.util.function.Predicate):1352:1355 -> d
-    24:27:char acceptQuoteIfPresent():1372 -> d
-    28:28:char readChar():1397:1397 -> d
-    28:28:char acceptQuoteIfPresent():1372 -> d
-    29:32:boolean lambda$new$6(java.lang.Integer):1456:1459 -> d
+    16:18:boolean skipOptionWithClassSpec(java.lang.String):551 -> d
+    19:20:boolean lambda$parseFileFilter$2(java.lang.Integer):1281:1282 -> d
+    21:24:boolean hasNextChar(char):1365:1368 -> d
+    25:25:char acceptQuoteIfPresent():1392:1392 -> d
+    26:29:boolean hasNextChar(java.util.function.Predicate):1372:1375 -> d
+    26:29:char acceptQuoteIfPresent():1392 -> d
+    30:30:char readChar():1417:1417 -> d
+    30:30:char acceptQuoteIfPresent():1392 -> d
     boolean isQuote(char) -> e
-    1:7:boolean skipOptionWithOptionalSingleArg(java.lang.String):520:526 -> e
-    8:9:boolean lambda$parseFileFilter$2(java.lang.Integer):1261:1262 -> e
-    10:13:java.lang.String acceptQuotedOrUnquotedString():1428:1431 -> e
-    14:17:java.lang.String snippetForPosition(com.android.tools.r8.position.TextPosition):1798:1801 -> e
-    1:5:boolean skipOptionWithSingleArg(java.lang.String):509:513 -> f
-    6:6:boolean lambda$skipOptimizationName$0(java.lang.Integer):567:567 -> f
-    7:7:java.lang.String acceptString():1424:1424 -> f
-    1:1:boolean eof():1337:1337 -> g
-    2:5:void unacceptString(java.lang.String):1666:1669 -> g
-    6:6:boolean pathFilterMatcher(java.lang.Integer):1742:1742 -> g
-    1:1:com.android.tools.r8.position.TextPosition getPosition():1859:1859 -> h
-    2:2:int getColumn():1863:1863 -> h
-    2:2:com.android.tools.r8.position.TextPosition getPosition():1859 -> h
-    3:3:com.android.tools.r8.position.TextPosition getPosition():1859:1859 -> h
-    1:1:boolean isOptionalArgumentGiven():1359:1359 -> i
-    1:13:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():825:837 -> j
-    14:14:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():836:836 -> j
-    1:12:java.util.List parseArgumentList():1132:1143 -> k
-    13:22:java.util.List parseArgumentList():1140:1149 -> k
-    23:25:java.util.List parseArgumentList():1148:1150 -> k
-    26:33:java.util.List parseArgumentList():1147:1154 -> k
-    1:2:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1733:1734 -> l
-    1:2:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1726 -> l
-    3:4:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1727:1728 -> l
-    5:5:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1736:1736 -> l
-    5:5:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1726 -> l
+    1:7:boolean skipOptionWithOptionalSingleArg(java.lang.String):528:534 -> e
+    8:8:boolean lambda$skipOptimizationName$0(java.lang.Integer):575:575 -> e
+    9:12:java.lang.String acceptQuotedOrUnquotedString():1448:1451 -> e
+    13:16:java.lang.String snippetForPosition(com.android.tools.r8.position.TextPosition):1790:1793 -> e
+    1:5:boolean skipOptionWithSingleArg(java.lang.String):517:521 -> f
+    6:6:java.lang.String acceptString():1444:1444 -> f
+    7:7:boolean pathFilterMatcher(java.lang.Integer):1734:1734 -> f
+    1:1:boolean eof():1357:1357 -> g
+    2:5:void unacceptString(java.lang.String):1677:1680 -> g
+    1:1:com.android.tools.r8.position.TextPosition getPosition():1851:1851 -> h
+    2:2:int getColumn():1855:1855 -> h
+    2:2:com.android.tools.r8.position.TextPosition getPosition():1851 -> h
+    3:3:com.android.tools.r8.position.TextPosition getPosition():1851:1851 -> h
+    1:1:boolean isOptionalArgumentGiven():1379:1379 -> i
+    1:13:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():844:856 -> j
+    14:14:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():855:855 -> j
+    1:12:java.util.List parseArgumentList():1152:1163 -> k
+    13:22:java.util.List parseArgumentList():1160:1169 -> k
+    23:25:java.util.List parseArgumentList():1168:1170 -> k
+    26:33:java.util.List parseArgumentList():1167:1174 -> k
+    1:2:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1725:1726 -> l
+    1:2:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1718 -> l
+    3:4:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1719:1720 -> l
+    5:5:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1728:1728 -> l
+    5:5:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1718 -> l
     1:1:com.android.tools.r8.shaking.ProguardClassNameList$Builder com.android.tools.r8.shaking.ProguardClassNameList.builder():22:22 -> m
-    1:1:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1713 -> m
-    2:3:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1733:1734 -> m
-    2:3:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1705 -> m
-    2:3:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1715 -> m
-    4:6:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1706:1708 -> m
-    4:6:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1715 -> m
-    7:10:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1706:1709 -> m
-    7:10:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1715 -> m
-    11:12:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1716:1717 -> m
-    13:13:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1736:1736 -> m
-    13:13:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1705 -> m
-    13:13:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1715 -> m
-    1:9:java.util.List parseClassPath():1224:1232 -> n
-    1:14:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1238:1251 -> o
-    15:20:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1248:1253 -> o
-    1:7:java.lang.String parseFileFilter():1258:1264 -> p
-    1:10:void parseInclude():465:474 -> q
-    11:11:void parseInclude():471:471 -> q
-    1:2:boolean parseNegation():843:844 -> r
-    1:1:boolean parseOption():208:208 -> s
-    2:8:boolean acceptArobaseInclude():480:486 -> s
-    2:8:boolean parseOption():211 -> s
-    9:22:boolean parseOption():214:227 -> s
-    23:34:java.util.List acceptPatternList():1619:1630 -> s
-    23:34:void parseKeepAttributes():491 -> s
-    23:34:boolean parseOption():228 -> s
-    35:38:void parseKeepAttributes():492:495 -> s
-    35:38:boolean parseOption():228 -> s
-    39:39:void parseKeepAttributes():493:493 -> s
-    39:39:boolean parseOption():228 -> s
-    40:41:boolean parseOption():229:230 -> s
-    42:51:void parsePackageFilter(java.util.function.BiConsumer):1675:1684 -> s
-    42:51:boolean parseOption():230 -> s
-    52:55:void parsePackageFilter(java.util.function.BiConsumer):1683:1686 -> s
-    52:55:boolean parseOption():230 -> s
-    56:63:void parsePackageFilter(java.util.function.BiConsumer):1681:1688 -> s
-    56:63:boolean parseOption():230 -> s
-    64:66:boolean parseOption():231:233 -> s
-    67:68:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):614:615 -> s
-    67:68:boolean parseOption():234 -> s
-    69:70:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
-    69:70:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):616 -> s
-    69:70:boolean parseOption():234 -> s
-    71:74:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):616:619 -> s
-    71:74:boolean parseOption():234 -> s
-    75:76:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
-    75:76:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):620 -> s
-    75:76:boolean parseOption():234 -> s
-    77:77:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):621:621 -> s
-    77:77:boolean parseOption():234 -> s
-    78:82:boolean parseOption():235:239 -> s
-    83:83:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):711:711 -> s
-    83:83:boolean parseOption():240 -> s
-    84:85:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
-    84:85:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):711 -> s
-    84:85:boolean parseOption():240 -> s
-    86:89:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):711:714 -> s
-    86:89:boolean parseOption():240 -> s
-    90:91:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
-    90:91:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):715 -> s
-    90:91:boolean parseOption():240 -> s
-    92:94:com.android.tools.r8.shaking.ConstantArgumentRule com.android.tools.r8.shaking.ConstantArgumentRule$Builder.build():26:28 -> s
-    92:94:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):716 -> s
-    92:94:boolean parseOption():240 -> s
-    95:95:boolean parseOption():241:241 -> s
-    96:96:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):182:182 -> s
-    96:96:boolean parseOption():241 -> s
-    97:97:boolean parseOption():242:242 -> s
-    98:98:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):722:722 -> s
-    98:98:boolean parseOption():243 -> s
-    99:100:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
-    99:100:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):722 -> s
-    99:100:boolean parseOption():243 -> s
-    101:104:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):722:725 -> s
-    101:104:boolean parseOption():243 -> s
-    105:106:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
-    105:106:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):726 -> s
-    105:106:boolean parseOption():243 -> s
-    107:109:com.android.tools.r8.shaking.UnusedArgumentRule com.android.tools.r8.shaking.UnusedArgumentRule$Builder.build():26:28 -> s
-    107:109:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):727 -> s
-    107:109:boolean parseOption():243 -> s
-    110:110:boolean parseOption():244:244 -> s
-    111:111:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):182:182 -> s
-    111:111:boolean parseOption():244 -> s
-    112:115:boolean parseOption():245:248 -> s
-    116:117:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):602:603 -> s
-    116:117:boolean parseOption():249 -> s
-    118:119:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
-    118:119:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):604 -> s
-    118:119:boolean parseOption():249 -> s
-    120:123:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):604:607 -> s
-    120:123:boolean parseOption():249 -> s
-    124:125:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
-    124:125:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):608 -> s
-    124:125:boolean parseOption():249 -> s
-    126:126:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder.build():26:26 -> s
-    126:126:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):609 -> s
-    126:126:boolean parseOption():249 -> s
-    127:127:boolean parseOption():250:250 -> s
-    128:128:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):182:182 -> s
-    128:128:boolean parseOption():250 -> s
-    129:138:boolean parseOption():251:260 -> s
-    139:140:boolean parseOption():257:258 -> s
-    141:218:boolean parseOption():257:334 -> s
-    219:220:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1271:1272 -> s
-    219:220:boolean parseOption():335 -> s
-    221:222:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
-    221:222:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1273 -> s
-    221:222:boolean parseOption():335 -> s
-    223:226:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1273:1276 -> s
-    223:226:boolean parseOption():335 -> s
-    227:228:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
-    227:228:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1277 -> s
-    227:228:boolean parseOption():335 -> s
-    229:229:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder.build():26:26 -> s
-    229:229:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1278 -> s
-    229:229:boolean parseOption():335 -> s
-    230:230:boolean parseOption():336:336 -> s
-    231:231:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):182:182 -> s
-    231:231:boolean parseOption():336 -> s
-    232:232:boolean parseOption():337:337 -> s
-    233:234:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1294:1295 -> s
-    233:234:boolean parseOption():338 -> s
-    235:236:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
-    235:236:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1296 -> s
-    235:236:boolean parseOption():338 -> s
-    237:240:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1296:1299 -> s
-    237:240:boolean parseOption():338 -> s
-    241:242:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
-    241:242:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1300 -> s
-    241:242:boolean parseOption():338 -> s
-    243:243:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1301:1301 -> s
-    243:243:boolean parseOption():338 -> s
-    244:248:boolean parseOption():339:343 -> s
-    249:276:boolean parseOption():342:369 -> s
-    277:277:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1284:1284 -> s
-    277:277:boolean parseOption():370 -> s
-    278:279:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
-    278:279:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1284 -> s
-    278:279:boolean parseOption():370 -> s
-    280:283:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1284:1287 -> s
-    280:283:boolean parseOption():370 -> s
-    284:285:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
-    284:285:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1288 -> s
-    284:285:boolean parseOption():370 -> s
-    286:288:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder.build():26:28 -> s
-    286:288:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1289 -> s
-    286:288:boolean parseOption():370 -> s
-    289:289:boolean parseOption():371:371 -> s
-    290:290:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):182:182 -> s
-    290:290:boolean parseOption():371 -> s
-    291:301:boolean parseOption():372:382 -> s
-    302:302:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):627:627 -> s
-    302:302:boolean parseOption():382 -> s
-    303:304:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
-    303:304:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):627 -> s
-    303:304:boolean parseOption():382 -> s
-    305:305:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):627:627 -> s
-    305:305:boolean parseOption():382 -> s
-    306:306:com.android.tools.r8.shaking.ClassInlineRule$Builder com.android.tools.r8.shaking.ClassInlineRule$Builder.setType(com.android.tools.r8.shaking.ClassInlineRule$Type):31:31 -> s
-    306:306:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):627 -> s
-    306:306:boolean parseOption():382 -> s
-    307:309:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):628:630 -> s
-    307:309:boolean parseOption():382 -> s
-    310:311:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
-    310:311:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):631 -> s
-    310:311:boolean parseOption():382 -> s
-    312:314:com.android.tools.r8.shaking.ClassInlineRule com.android.tools.r8.shaking.ClassInlineRule$Builder.build():37:39 -> s
-    312:314:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):632 -> s
-    312:314:boolean parseOption():382 -> s
-    315:315:boolean parseOption():383:383 -> s
-    316:316:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):182:182 -> s
-    316:316:boolean parseOption():383 -> s
-    317:318:boolean parseOption():384:385 -> s
-    319:319:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):638:638 -> s
-    319:319:boolean parseOption():385 -> s
-    320:321:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
-    320:321:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):638 -> s
-    320:321:boolean parseOption():385 -> s
-    322:322:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):638:638 -> s
-    322:322:boolean parseOption():385 -> s
-    323:323:com.android.tools.r8.shaking.ClassMergingRule$Builder com.android.tools.r8.shaking.ClassMergingRule$Builder.setType(com.android.tools.r8.shaking.ClassMergingRule$Type):31:31 -> s
-    323:323:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):638 -> s
-    323:323:boolean parseOption():385 -> s
-    324:326:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):639:641 -> s
-    324:326:boolean parseOption():385 -> s
-    327:328:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
-    327:328:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):642 -> s
-    327:328:boolean parseOption():385 -> s
-    329:329:com.android.tools.r8.shaking.ClassMergingRule com.android.tools.r8.shaking.ClassMergingRule$Builder.build():37:37 -> s
-    329:329:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):643 -> s
-    329:329:boolean parseOption():385 -> s
-    330:330:boolean parseOption():386:386 -> s
-    331:331:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):182:182 -> s
-    331:331:boolean parseOption():386 -> s
-    332:333:boolean parseOption():387:388 -> s
-    334:334:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):650:650 -> s
-    334:334:boolean parseOption():389 -> s
-    335:336:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
-    335:336:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):650 -> s
-    335:336:boolean parseOption():389 -> s
-    337:337:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):650:650 -> s
-    337:337:boolean parseOption():389 -> s
-    338:338:com.android.tools.r8.shaking.MemberValuePropagationRule$Builder com.android.tools.r8.shaking.MemberValuePropagationRule$Builder.setType(com.android.tools.r8.shaking.MemberValuePropagationRule$Type):32:32 -> s
-    338:338:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):650 -> s
-    338:338:boolean parseOption():389 -> s
-    339:341:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):651:653 -> s
-    339:341:boolean parseOption():389 -> s
-    342:343:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
-    342:343:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):654 -> s
-    342:343:boolean parseOption():389 -> s
-    344:344:com.android.tools.r8.shaking.MemberValuePropagationRule com.android.tools.r8.shaking.MemberValuePropagationRule$Builder.build():38:38 -> s
-    344:344:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):655 -> s
-    344:344:boolean parseOption():389 -> s
-    345:345:boolean parseOption():390:390 -> s
-    346:346:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):182:182 -> s
-    346:346:boolean parseOption():390 -> s
-    347:354:boolean parseOption():391:398 -> s
-    355:356:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):674:675 -> s
-    355:356:boolean parseOption():398 -> s
-    357:358:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
-    357:358:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):676 -> s
-    357:358:boolean parseOption():398 -> s
-    359:362:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):676:679 -> s
-    359:362:boolean parseOption():398 -> s
-    363:364:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
-    363:364:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):680 -> s
-    363:364:boolean parseOption():398 -> s
-    365:365:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder.build():25:25 -> s
-    365:365:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):681 -> s
-    365:365:boolean parseOption():398 -> s
-    366:366:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):182:182 -> s
-    366:366:boolean parseOption():398 -> s
-    367:368:boolean parseOption():399:400 -> s
-    369:370:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):686:687 -> s
-    369:370:boolean parseOption():400 -> s
-    371:372:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
-    371:372:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):688 -> s
-    371:372:boolean parseOption():400 -> s
-    373:380:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):688:695 -> s
-    373:380:boolean parseOption():400 -> s
-    381:381:void com.android.tools.r8.shaking.ProguardIfRule$Builder.setSubsequentRule(com.android.tools.r8.shaking.ProguardKeepRule):39:39 -> s
-    381:381:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):696 -> s
-    381:381:boolean parseOption():400 -> s
-    382:383:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):697:698 -> s
-    382:383:boolean parseOption():400 -> s
-    384:385:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
-    384:385:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):699 -> s
-    384:385:boolean parseOption():400 -> s
-    386:387:com.android.tools.r8.shaking.ProguardIfRule com.android.tools.r8.shaking.ProguardIfRule$Builder.build():44:45 -> s
-    386:387:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):700 -> s
-    386:387:boolean parseOption():400 -> s
-    388:388:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):701:701 -> s
-    388:388:boolean parseOption():400 -> s
-    389:401:void verifyAndLinkBackReferences(java.lang.Iterable):731:743 -> s
-    389:401:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):701 -> s
-    389:401:boolean parseOption():400 -> s
-    402:405:void verifyAndLinkBackReferences(java.lang.Iterable):738:741 -> s
-    402:405:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):701 -> s
-    402:405:boolean parseOption():400 -> s
-    406:415:void verifyAndLinkBackReferences(java.lang.Iterable):738:747 -> s
-    406:415:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):701 -> s
-    406:415:boolean parseOption():400 -> s
-    416:416:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):182:182 -> s
-    416:416:boolean parseOption():400 -> s
-    417:418:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):704:705 -> s
-    417:418:boolean parseOption():400 -> s
-    419:419:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):704:704 -> s
-    419:419:boolean parseOption():400 -> s
-    420:427:boolean parseOption():402:409 -> s
-    1:1:java.lang.String acceptClassName():1462:1462 -> t
-    1:1:java.lang.String parsePackageNameOrEmptyString():1721 -> t
-    1:20:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1756:1775 -> u
-    21:26:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1772:1777 -> u
-    27:27:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1762:1762 -> u
-    1:1:char peekChar():1388:1388 -> v
-    1:1:int remainingChars():1401:1401 -> w
-    1:4:void skipOptimizationName():564:567 -> x
-    1:2:void skipSingleArgument():571:572 -> y
-    3:3:char readChar():1397:1397 -> y
-    3:3:void skipSingleArgument():573 -> y
-    1:6:void skipWhitespace():1305:1310 -> z
-    7:14:void skipComment():1316:1323 -> z
-    7:14:void skipWhitespace():1312 -> z
-com.android.tools.r8.shaking.ProguardConfigurationRule -> a.a.a.a.s.Va:
+    1:1:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1705 -> m
+    2:3:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1725:1726 -> m
+    2:3:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1697 -> m
+    2:3:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1707 -> m
+    4:6:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1698:1700 -> m
+    4:6:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1707 -> m
+    7:10:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1698:1701 -> m
+    7:10:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1707 -> m
+    11:12:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1708:1709 -> m
+    13:13:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1728:1728 -> m
+    13:13:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1697 -> m
+    13:13:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1707 -> m
+    1:9:java.util.List parseClassPath():1244:1252 -> n
+    1:14:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1258:1271 -> o
+    15:20:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1268:1273 -> o
+    1:7:java.lang.String parseFileFilter():1278:1284 -> p
+    1:10:void parseInclude():473:482 -> q
+    11:11:void parseInclude():479:479 -> q
+    1:2:boolean parseNegation():862:863 -> r
+    1:1:boolean parseOption():213:213 -> s
+    2:8:boolean acceptArobaseInclude():488:494 -> s
+    2:8:boolean parseOption():216 -> s
+    9:22:boolean parseOption():219:232 -> s
+    23:34:java.util.List acceptPatternList():1630:1641 -> s
+    23:34:void parseKeepAttributes():499 -> s
+    23:34:boolean parseOption():233 -> s
+    35:38:void parseKeepAttributes():500:503 -> s
+    35:38:boolean parseOption():233 -> s
+    39:39:void parseKeepAttributes():501:501 -> s
+    39:39:boolean parseOption():233 -> s
+    40:40:boolean parseOption():234:234 -> s
+    41:41:com.android.tools.r8.shaking.ProguardKeepPackageNamesRule parseKeepPackageNamesRule(com.android.tools.r8.position.Position):623:623 -> s
+    41:41:boolean parseOption():235 -> s
+    42:43:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
+    42:43:com.android.tools.r8.shaking.ProguardKeepPackageNamesRule parseKeepPackageNamesRule(com.android.tools.r8.position.Position):623 -> s
+    42:43:boolean parseOption():235 -> s
+    44:47:com.android.tools.r8.shaking.ProguardKeepPackageNamesRule parseKeepPackageNamesRule(com.android.tools.r8.position.Position):623:626 -> s
+    44:47:boolean parseOption():235 -> s
+    48:49:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
+    48:49:com.android.tools.r8.shaking.ProguardKeepPackageNamesRule parseKeepPackageNamesRule(com.android.tools.r8.position.Position):627 -> s
+    48:49:boolean parseOption():235 -> s
+    50:50:com.android.tools.r8.shaking.ProguardKeepPackageNamesRule com.android.tools.r8.shaking.ProguardKeepPackageNamesRule$Builder.build():26:26 -> s
+    50:50:com.android.tools.r8.shaking.ProguardKeepPackageNamesRule parseKeepPackageNamesRule(com.android.tools.r8.position.Position):628 -> s
+    50:50:boolean parseOption():235 -> s
+    51:51:boolean parseOption():236:236 -> s
+    52:52:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):181:181 -> s
+    52:52:boolean parseOption():236 -> s
+    53:55:boolean parseOption():237:239 -> s
+    56:57:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):633:634 -> s
+    56:57:boolean parseOption():240 -> s
+    58:59:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
+    58:59:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):635 -> s
+    58:59:boolean parseOption():240 -> s
+    60:63:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):635:638 -> s
+    60:63:boolean parseOption():240 -> s
+    64:65:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
+    64:65:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):639 -> s
+    64:65:boolean parseOption():240 -> s
+    66:66:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):640:640 -> s
+    66:66:boolean parseOption():240 -> s
+    67:71:boolean parseOption():241:245 -> s
+    72:72:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):730:730 -> s
+    72:72:boolean parseOption():246 -> s
+    73:74:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
+    73:74:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):730 -> s
+    73:74:boolean parseOption():246 -> s
+    75:78:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):730:733 -> s
+    75:78:boolean parseOption():246 -> s
+    79:80:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
+    79:80:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):734 -> s
+    79:80:boolean parseOption():246 -> s
+    81:83:com.android.tools.r8.shaking.ConstantArgumentRule com.android.tools.r8.shaking.ConstantArgumentRule$Builder.build():26:28 -> s
+    81:83:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):735 -> s
+    81:83:boolean parseOption():246 -> s
+    84:84:boolean parseOption():247:247 -> s
+    85:85:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):181:181 -> s
+    85:85:boolean parseOption():247 -> s
+    86:86:boolean parseOption():248:248 -> s
+    87:87:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):741:741 -> s
+    87:87:boolean parseOption():249 -> s
+    88:89:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
+    88:89:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):741 -> s
+    88:89:boolean parseOption():249 -> s
+    90:93:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):741:744 -> s
+    90:93:boolean parseOption():249 -> s
+    94:95:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
+    94:95:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):745 -> s
+    94:95:boolean parseOption():249 -> s
+    96:98:com.android.tools.r8.shaking.UnusedArgumentRule com.android.tools.r8.shaking.UnusedArgumentRule$Builder.build():26:28 -> s
+    96:98:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):746 -> s
+    96:98:boolean parseOption():249 -> s
+    99:99:boolean parseOption():250:250 -> s
+    100:100:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):181:181 -> s
+    100:100:boolean parseOption():250 -> s
+    101:104:boolean parseOption():251:254 -> s
+    105:106:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):610:611 -> s
+    105:106:boolean parseOption():255 -> s
+    107:108:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
+    107:108:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):612 -> s
+    107:108:boolean parseOption():255 -> s
+    109:112:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):612:615 -> s
+    109:112:boolean parseOption():255 -> s
+    113:114:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
+    113:114:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):616 -> s
+    113:114:boolean parseOption():255 -> s
+    115:115:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder.build():26:26 -> s
+    115:115:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):617 -> s
+    115:115:boolean parseOption():255 -> s
+    116:116:boolean parseOption():256:256 -> s
+    117:117:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):181:181 -> s
+    117:117:boolean parseOption():256 -> s
+    118:127:boolean parseOption():257:266 -> s
+    128:129:boolean parseOption():263:264 -> s
+    130:207:boolean parseOption():263:340 -> s
+    208:209:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1291:1292 -> s
+    208:209:boolean parseOption():341 -> s
+    210:211:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
+    210:211:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1293 -> s
+    210:211:boolean parseOption():341 -> s
+    212:215:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1293:1296 -> s
+    212:215:boolean parseOption():341 -> s
+    216:217:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
+    216:217:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1297 -> s
+    216:217:boolean parseOption():341 -> s
+    218:218:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder.build():26:26 -> s
+    218:218:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1298 -> s
+    218:218:boolean parseOption():341 -> s
+    219:219:boolean parseOption():342:342 -> s
+    220:220:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):181:181 -> s
+    220:220:boolean parseOption():342 -> s
+    221:221:boolean parseOption():343:343 -> s
+    222:223:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1314:1315 -> s
+    222:223:boolean parseOption():344 -> s
+    224:225:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
+    224:225:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1316 -> s
+    224:225:boolean parseOption():344 -> s
+    226:229:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1316:1319 -> s
+    226:229:boolean parseOption():344 -> s
+    230:231:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
+    230:231:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1320 -> s
+    230:231:boolean parseOption():344 -> s
+    232:232:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1321:1321 -> s
+    232:232:boolean parseOption():344 -> s
+    233:237:boolean parseOption():345:349 -> s
+    238:265:boolean parseOption():348:375 -> s
+    266:266:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1304:1304 -> s
+    266:266:boolean parseOption():376 -> s
+    267:268:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
+    267:268:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1304 -> s
+    267:268:boolean parseOption():376 -> s
+    269:272:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1304:1307 -> s
+    269:272:boolean parseOption():376 -> s
+    273:274:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
+    273:274:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1308 -> s
+    273:274:boolean parseOption():376 -> s
+    275:277:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder.build():26:28 -> s
+    275:277:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1309 -> s
+    275:277:boolean parseOption():376 -> s
+    278:278:boolean parseOption():377:377 -> s
+    279:279:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):181:181 -> s
+    279:279:boolean parseOption():377 -> s
+    280:290:boolean parseOption():378:388 -> s
+    291:291:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):646:646 -> s
+    291:291:boolean parseOption():388 -> s
+    292:293:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
+    292:293:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):646 -> s
+    292:293:boolean parseOption():388 -> s
+    294:294:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):646:646 -> s
+    294:294:boolean parseOption():388 -> s
+    295:295:com.android.tools.r8.shaking.ClassInlineRule$Builder com.android.tools.r8.shaking.ClassInlineRule$Builder.setType(com.android.tools.r8.shaking.ClassInlineRule$Type):31:31 -> s
+    295:295:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):646 -> s
+    295:295:boolean parseOption():388 -> s
+    296:298:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):647:649 -> s
+    296:298:boolean parseOption():388 -> s
+    299:300:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
+    299:300:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):650 -> s
+    299:300:boolean parseOption():388 -> s
+    301:303:com.android.tools.r8.shaking.ClassInlineRule com.android.tools.r8.shaking.ClassInlineRule$Builder.build():37:39 -> s
+    301:303:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):651 -> s
+    301:303:boolean parseOption():388 -> s
+    304:304:boolean parseOption():389:389 -> s
+    305:305:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):181:181 -> s
+    305:305:boolean parseOption():389 -> s
+    306:307:boolean parseOption():390:391 -> s
+    308:308:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):657:657 -> s
+    308:308:boolean parseOption():391 -> s
+    309:310:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
+    309:310:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):657 -> s
+    309:310:boolean parseOption():391 -> s
+    311:311:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):657:657 -> s
+    311:311:boolean parseOption():391 -> s
+    312:312:com.android.tools.r8.shaking.ClassMergingRule$Builder com.android.tools.r8.shaking.ClassMergingRule$Builder.setType(com.android.tools.r8.shaking.ClassMergingRule$Type):31:31 -> s
+    312:312:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):657 -> s
+    312:312:boolean parseOption():391 -> s
+    313:315:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):658:660 -> s
+    313:315:boolean parseOption():391 -> s
+    316:317:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
+    316:317:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):661 -> s
+    316:317:boolean parseOption():391 -> s
+    318:318:com.android.tools.r8.shaking.ClassMergingRule com.android.tools.r8.shaking.ClassMergingRule$Builder.build():37:37 -> s
+    318:318:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):662 -> s
+    318:318:boolean parseOption():391 -> s
+    319:319:boolean parseOption():392:392 -> s
+    320:320:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):181:181 -> s
+    320:320:boolean parseOption():392 -> s
+    321:322:boolean parseOption():393:394 -> s
+    323:323:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):669:669 -> s
+    323:323:boolean parseOption():395 -> s
+    324:325:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
+    324:325:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):669 -> s
+    324:325:boolean parseOption():395 -> s
+    326:326:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):669:669 -> s
+    326:326:boolean parseOption():395 -> s
+    327:327:com.android.tools.r8.shaking.MemberValuePropagationRule$Builder com.android.tools.r8.shaking.MemberValuePropagationRule$Builder.setType(com.android.tools.r8.shaking.MemberValuePropagationRule$Type):32:32 -> s
+    327:327:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):669 -> s
+    327:327:boolean parseOption():395 -> s
+    328:330:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):670:672 -> s
+    328:330:boolean parseOption():395 -> s
+    331:332:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
+    331:332:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):673 -> s
+    331:332:boolean parseOption():395 -> s
+    333:333:com.android.tools.r8.shaking.MemberValuePropagationRule com.android.tools.r8.shaking.MemberValuePropagationRule$Builder.build():38:38 -> s
+    333:333:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):674 -> s
+    333:333:boolean parseOption():395 -> s
+    334:334:boolean parseOption():396:396 -> s
+    335:335:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):181:181 -> s
+    335:335:boolean parseOption():396 -> s
+    336:345:boolean parseOption():397:406 -> s
+    346:347:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):693:694 -> s
+    346:347:boolean parseOption():406 -> s
+    348:349:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
+    348:349:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):695 -> s
+    348:349:boolean parseOption():406 -> s
+    350:353:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):695:698 -> s
+    350:353:boolean parseOption():406 -> s
+    354:355:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
+    354:355:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):699 -> s
+    354:355:boolean parseOption():406 -> s
+    356:356:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder.build():25:25 -> s
+    356:356:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):700 -> s
+    356:356:boolean parseOption():406 -> s
+    357:357:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):181:181 -> s
+    357:357:boolean parseOption():406 -> s
+    358:359:boolean parseOption():407:408 -> s
+    360:361:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):705:706 -> s
+    360:361:boolean parseOption():408 -> s
+    362:363:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> s
+    362:363:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):707 -> s
+    362:363:boolean parseOption():408 -> s
+    364:371:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):707:714 -> s
+    364:371:boolean parseOption():408 -> s
+    372:372:void com.android.tools.r8.shaking.ProguardIfRule$Builder.setSubsequentRule(com.android.tools.r8.shaking.ProguardKeepRule):39:39 -> s
+    372:372:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):715 -> s
+    372:372:boolean parseOption():408 -> s
+    373:374:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):716:717 -> s
+    373:374:boolean parseOption():408 -> s
+    375:376:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:61 -> s
+    375:376:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):718 -> s
+    375:376:boolean parseOption():408 -> s
+    377:378:com.android.tools.r8.shaking.ProguardIfRule com.android.tools.r8.shaking.ProguardIfRule$Builder.build():44:45 -> s
+    377:378:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):719 -> s
+    377:378:boolean parseOption():408 -> s
+    379:379:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):720:720 -> s
+    379:379:boolean parseOption():408 -> s
+    380:392:void verifyAndLinkBackReferences(java.lang.Iterable):750:762 -> s
+    380:392:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):720 -> s
+    380:392:boolean parseOption():408 -> s
+    393:396:void verifyAndLinkBackReferences(java.lang.Iterable):757:760 -> s
+    393:396:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):720 -> s
+    393:396:boolean parseOption():408 -> s
+    397:406:void verifyAndLinkBackReferences(java.lang.Iterable):757:766 -> s
+    397:406:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):720 -> s
+    397:406:boolean parseOption():408 -> s
+    407:407:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):181:181 -> s
+    407:407:boolean parseOption():408 -> s
+    408:409:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):723:724 -> s
+    408:409:boolean parseOption():408 -> s
+    410:410:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):723:723 -> s
+    410:410:boolean parseOption():408 -> s
+    411:418:boolean parseOption():410:417 -> s
+    1:1:java.lang.String acceptClassName():1475:1475 -> t
+    1:1:java.lang.String parsePackageNameOrEmptyString():1713 -> t
+    1:20:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1748:1767 -> u
+    21:26:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1764:1769 -> u
+    27:27:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1754:1754 -> u
+    1:1:char peekChar():1408:1408 -> v
+    1:1:int remainingChars():1421:1421 -> w
+    1:4:void skipOptimizationName():572:575 -> x
+    1:2:void skipSingleArgument():579:580 -> y
+    3:3:char readChar():1417:1417 -> y
+    3:3:void skipSingleArgument():581 -> y
+    1:6:void skipWhitespace():1325:1330 -> z
+    7:14:void skipComment():1336:1343 -> z
+    7:14:void skipWhitespace():1332 -> z
+com.android.tools.r8.shaking.ProguardConfigurationRule -> a.a.a.a.s.Ua:
     com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardClassSpecification.inheritanceClassName -> k
     boolean com.android.tools.r8.shaking.ProguardClassSpecification.$assertionsDisabled -> n
     com.android.tools.r8.shaking.ProguardClassType com.android.tools.r8.shaking.ProguardClassSpecification.classType -> h
@@ -44647,7 +43905,7 @@
     1:1:void com.android.tools.r8.shaking.ProguardClassSpecification.<clinit>():16:16 -> <clinit>
     1:18:void com.android.tools.r8.shaking.ProguardClassSpecification.<init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):199:216 -> <init>
     1:18:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):29 -> <init>
-    boolean applyToNonProgramClasses() -> a
+    boolean applyToLibraryClasses() -> a
     1:1:java.util.stream.Stream lambda$getWildcards$0(java.lang.Iterable):54:54 -> a
     2:6:java.lang.StringBuilder append(java.lang.StringBuilder,boolean):76:80 -> a
     7:9:void com.android.tools.r8.shaking.ProguardClassSpecification.lambda$append$0(java.lang.StringBuilder,com.android.tools.r8.shaking.ProguardMemberRule):356:358 -> a
@@ -44712,37 +43970,35 @@
     java.lang.String typeString() -> r
     1:1:java.lang.String com.android.tools.r8.shaking.ProguardClassSpecification.toString():374:374 -> toString
     1:1:java.lang.String com.android.tools.r8.shaking.ProguardClassSpecification.toString():0 -> toString
-com.android.tools.r8.shaking.ProguardConfigurationSource -> a.a.a.a.s.Wa:
+com.android.tools.r8.shaking.ProguardConfigurationSource -> a.a.a.a.s.Va:
     com.android.tools.r8.origin.Origin getOrigin() -> a
-    java.lang.String getName() -> b
-    java.nio.file.Path getBaseDirectory() -> c
-com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> a.a.a.a.s.Xa:
+    java.nio.file.Path getBaseDirectory() -> b
+com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> a.a.a.a.s.Wa:
     byte[] bytes -> a
     com.android.tools.r8.origin.Origin origin -> b
     1:1:void <init>(java.io.InputStream,com.android.tools.r8.origin.Origin):24:24 -> <init>
     2:4:void <init>(byte[],com.android.tools.r8.origin.Origin):18:20 -> <init>
     2:4:void <init>(java.io.InputStream,com.android.tools.r8.origin.Origin):24 -> <init>
     1:1:com.android.tools.r8.origin.Origin getOrigin():45:45 -> a
-    1:1:java.lang.String getName():40:40 -> b
-    java.nio.file.Path getBaseDirectory() -> c
+    java.nio.file.Path getBaseDirectory() -> b
     1:1:java.lang.String get():29:29 -> get
-com.android.tools.r8.shaking.ProguardConfigurationSourceFile -> a.a.a.a.s.Ya:
+    1:1:java.lang.String getName():40:40 -> getName
+com.android.tools.r8.shaking.ProguardConfigurationSourceFile -> a.a.a.a.s.Xa:
     java.nio.file.Path path -> a
     1:2:void <init>(java.nio.file.Path):18:19 -> <init>
     1:1:com.android.tools.r8.origin.Origin getOrigin():45:45 -> a
-    1:1:java.lang.String getName():40:40 -> b
-    1:5:java.nio.file.Path getBaseDirectory():29:33 -> c
+    1:5:java.nio.file.Path getBaseDirectory():29:33 -> b
     1:1:java.lang.String get():24:24 -> get
-com.android.tools.r8.shaking.ProguardConfigurationSourceStrings -> a.a.a.a.s.Za:
+    1:1:java.lang.String getName():40:40 -> getName
+com.android.tools.r8.shaking.ProguardConfigurationSourceStrings -> a.a.a.a.s.Ya:
     java.util.List config -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.nio.file.Path basePath -> a
     1:4:void <init>(java.util.List,java.nio.file.Path,com.android.tools.r8.origin.Origin):24:27 -> <init>
     1:1:com.android.tools.r8.origin.Origin getOrigin():57:57 -> a
-    java.lang.String getName() -> b
-    1:1:java.nio.file.Path getBaseDirectory():47:47 -> c
+    1:1:java.nio.file.Path getBaseDirectory():47:47 -> b
     1:1:java.lang.String get():42:42 -> get
-com.android.tools.r8.shaking.ProguardConfigurationUtils -> a.a.a.a.s.cb:
+com.android.tools.r8.shaking.ProguardConfigurationUtils -> a.a.a.a.s.bb:
     com.android.tools.r8.origin.Origin proguardCompatOrigin -> a
     com.android.tools.r8.origin.Origin synthesizedRecompilationOrigin -> b
     boolean $assertionsDisabled -> c
@@ -44780,7 +44036,7 @@
     73:74:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> a
     73:74:com.android.tools.r8.shaking.ProguardAssumeValuesRule buildAssumeValuesForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):105 -> a
     75:76:com.android.tools.r8.shaking.ProguardAssumeValuesRule buildAssumeValuesForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):105:106 -> a
-    77:77:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> a
+    77:77:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> a
     77:77:com.android.tools.r8.shaking.ProguardAssumeValuesRule buildAssumeValuesForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):109 -> a
     78:78:com.android.tools.r8.shaking.ProguardAssumeValuesRule buildAssumeValuesForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):109:109 -> a
     79:79:com.android.tools.r8.shaking.ProguardAssumeValuesRule buildAssumeValuesForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):108:108 -> a
@@ -44788,7 +44044,7 @@
     92:95:com.android.tools.r8.shaking.ProguardAssumeValuesRule buildAssumeValuesForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):116:119 -> a
     96:107:com.android.tools.r8.shaking.ProguardAssumeValuesRule buildAssumeValuesForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):110:121 -> a
     108:119:boolean hasExplicitAssumeValuesRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):131:142 -> a
-    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):996:996 -> a
+    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):895:895 -> a
     120:120:boolean hasExplicitAssumeValuesRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):142 -> a
     121:147:boolean hasExplicitAssumeValuesRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):142:168 -> a
     148:157:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):179:188 -> a
@@ -44797,27 +44053,27 @@
     163:164:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):189 -> a
     165:166:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):189:190 -> a
     167:167:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):181:181 -> a
-com.android.tools.r8.shaking.ProguardConfigurationUtils$1 -> a.a.a.a.s._a:
+com.android.tools.r8.shaking.ProguardConfigurationUtils$1 -> a.a.a.a.s.Za:
     1:1:void <init>(com.android.tools.r8.origin.Origin):22:22 -> <init>
     java.lang.String part() -> a
-com.android.tools.r8.shaking.ProguardConfigurationUtils$2 -> a.a.a.a.s.ab:
+com.android.tools.r8.shaking.ProguardConfigurationUtils$2 -> a.a.a.a.s._a:
     1:1:void <init>(com.android.tools.r8.origin.Origin):30:30 -> <init>
     java.lang.String part() -> a
-com.android.tools.r8.shaking.ProguardConfigurationUtils$3 -> a.a.a.a.s.bb:
+com.android.tools.r8.shaking.ProguardConfigurationUtils$3 -> a.a.a.a.s.ab:
     com.android.tools.r8.utils.AndroidApiLevel val$apiLevel -> e
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.AndroidApiLevel):91:91 -> <init>
     1:1:java.lang.String part():94:94 -> a
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule -> a.a.a.a.s.fb:
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule -> a.a.a.a.s.eb:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):45:45 -> <init>
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1):10 -> <init>
     java.lang.String typeString() -> r
     1:1:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder builder():51:51 -> s
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1 -> a.a.a.a.s.db:
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder -> a.a.a.a.s.eb:
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1 -> a.a.a.a.s.cb:
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder -> a.a.a.a.s.db:
     1:1:void <init>():15:15 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1):12 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardIfRule -> a.a.a.a.s.ib:
+com.android.tools.r8.shaking.ProguardIfRule -> a.a.a.a.s.hb:
     com.android.tools.r8.origin.Origin neverInlineOrigin -> r
     com.android.tools.r8.shaking.ProguardKeepRule subsequentRule -> q
     1:2:void <clinit>():15:16 -> <clinit>
@@ -44840,17 +44096,17 @@
     1:19:com.android.tools.r8.shaking.ProguardIfRule materialize():80:98 -> v
     1:14:com.android.tools.r8.shaking.ClassInlineRule neverClassInlineRuleForCondition():102:115 -> w
     1:20:com.android.tools.r8.shaking.InlineRule neverInlineRuleForCondition():142:161 -> x
-com.android.tools.r8.shaking.ProguardIfRule$1 -> a.a.a.a.s.gb:
+com.android.tools.r8.shaking.ProguardIfRule$1 -> a.a.a.a.s.fb:
     1:1:void <init>(com.android.tools.r8.origin.Origin):16:16 -> <init>
     java.lang.String part() -> a
-com.android.tools.r8.shaking.ProguardIfRule$Builder -> a.a.a.a.s.hb:
+com.android.tools.r8.shaking.ProguardIfRule$Builder -> a.a.a.a.s.gb:
     com.android.tools.r8.shaking.ProguardKeepRule subsequentRule -> q
     boolean $assertionsDisabled -> r
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>():30:30 -> <init>
     2:2:void <init>():27:27 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardKeepAttributes -> a.a.a.a.s.jb:
+com.android.tools.r8.shaking.ProguardKeepAttributes -> a.a.a.a.s.ib:
     boolean runtimeVisibleParameterAnnotations -> m
     boolean runtimeInvisibleParameterAnnotations -> n
     boolean runtimeVisibleTypeAnnotations -> o
@@ -44882,20 +44138,30 @@
     1:5:boolean equals(java.lang.Object):180:184 -> equals
     1:15:int hashCode():203:217 -> hashCode
     1:1:java.lang.String toString():296:296 -> toString
-com.android.tools.r8.shaking.ProguardKeepRule -> a.a.a.a.s.mb:
+com.android.tools.r8.shaking.ProguardKeepPackageNamesRule -> a.a.a.a.s.lb:
+    1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):46:46 -> <init>
+    1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardKeepPackageNamesRule$1):10 -> <init>
+    java.lang.String typeString() -> r
+    1:1:com.android.tools.r8.shaking.ProguardKeepPackageNamesRule$Builder builder():52:52 -> s
+com.android.tools.r8.shaking.ProguardKeepPackageNamesRule$1 -> a.a.a.a.s.jb:
+com.android.tools.r8.shaking.ProguardKeepPackageNamesRule$Builder -> a.a.a.a.s.kb:
+    1:1:void <init>():16:16 -> <init>
+    1:1:void <init>(com.android.tools.r8.shaking.ProguardKeepPackageNamesRule$1):12 -> <init>
+    com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
+com.android.tools.r8.shaking.ProguardKeepRule -> a.a.a.a.s.ob:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardKeepRuleType,com.android.tools.r8.shaking.ProguardKeepRuleModifiers):49:49 -> <init>
     1:8:void appendNonEmpty(java.lang.StringBuilder,java.lang.String,java.lang.Object,java.lang.String):97:104 -> a
     1:5:boolean equals(java.lang.Object):86:90 -> equals
     1:1:com.android.tools.r8.shaking.ProguardKeepRule$Builder builder():58:58 -> u
     1:20:com.android.tools.r8.shaking.ProguardKeepRule materialize():62:81 -> v
-com.android.tools.r8.shaking.ProguardKeepRule$1 -> a.a.a.a.s.kb:
+com.android.tools.r8.shaking.ProguardKeepRule$1 -> a.a.a.a.s.mb:
     1:1:void <init>(com.android.tools.r8.origin.Origin):113:113 -> <init>
     java.lang.String part() -> a
-com.android.tools.r8.shaking.ProguardKeepRule$Builder -> a.a.a.a.s.lb:
+com.android.tools.r8.shaking.ProguardKeepRule$Builder -> a.a.a.a.s.nb:
     1:1:void <init>():17:17 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
     1:3:com.android.tools.r8.shaking.ProguardKeepRule build():27:29 -> c
-com.android.tools.r8.shaking.ProguardKeepRuleBase -> a.a.a.a.s.ob:
+com.android.tools.r8.shaking.ProguardKeepRuleBase -> a.a.a.a.s.qb:
     com.android.tools.r8.shaking.ProguardKeepRuleModifiers modifiers -> p
     com.android.tools.r8.shaking.ProguardKeepRuleType type -> o
     1:5:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardKeepRuleType,com.android.tools.r8.shaking.ProguardKeepRuleModifiers):58:62 -> <init>
@@ -44910,7 +44176,7 @@
     2:12:java.lang.String typeString():116 -> r
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleModifiers getModifiers():70:70 -> s
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleType getType():66:66 -> t
-com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder -> a.a.a.a.s.nb:
+com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder -> a.a.a.a.s.pb:
     com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder modifiersBuilder -> p
     com.android.tools.r8.shaking.ProguardKeepRuleType type -> o
     1:1:void <init>():21:21 -> <init>
@@ -44918,7 +44184,7 @@
     2:2:void <init>():18 -> <init>
     3:3:void <init>():18:18 -> <init>
     1:2:com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder setType(com.android.tools.r8.shaking.ProguardKeepRuleType):25:26 -> a
-com.android.tools.r8.shaking.ProguardKeepRuleModifiers -> a.a.a.a.s.rb:
+com.android.tools.r8.shaking.ProguardKeepRuleModifiers -> a.a.a.a.s.tb:
     boolean allowsShrinking -> a
     boolean allowsOptimization -> b
     boolean allowsObfuscation -> c
@@ -44929,8 +44195,8 @@
     1:6:boolean equals(java.lang.Object):63:68 -> equals
     1:4:int hashCode():76:79 -> hashCode
     1:6:java.lang.String toString():84:89 -> toString
-com.android.tools.r8.shaking.ProguardKeepRuleModifiers$1 -> a.a.a.a.s.pb:
-com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder -> a.a.a.a.s.qb:
+com.android.tools.r8.shaking.ProguardKeepRuleModifiers$1 -> a.a.a.a.s.rb:
+com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder -> a.a.a.a.s.sb:
     boolean allowsShrinking -> a
     boolean allowsOptimization -> b
     boolean allowsObfuscation -> c
@@ -44944,7 +44210,7 @@
     1:1:void setAllowsOptimization(boolean):21:21 -> b
     1:1:void setAllowsShrinking(boolean):17:17 -> c
     1:1:void setIncludeDescriptorClasses(boolean):30:30 -> d
-com.android.tools.r8.shaking.ProguardKeepRuleType -> a.a.a.a.s.sb:
+com.android.tools.r8.shaking.ProguardKeepRuleType -> a.a.a.a.s.ub:
     com.android.tools.r8.shaking.ProguardKeepRuleType[] $VALUES -> e
     com.android.tools.r8.shaking.ProguardKeepRuleType KEEP_CLASS_MEMBERS -> b
     com.android.tools.r8.shaking.ProguardKeepRuleType KEEP_CLASSES_WITH_MEMBERS -> c
@@ -44955,7 +44221,7 @@
     1:1:void <init>(java.lang.String,int):8:8 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleType[] values():8:8 -> a
     1:11:java.lang.String toString():16:26 -> toString
-com.android.tools.r8.shaking.ProguardMemberRule -> a.a.a.a.s.vb:
+com.android.tools.r8.shaking.ProguardMemberRule -> a.a.a.a.s.xb:
     com.android.tools.r8.shaking.ProguardNameMatcher name -> f
     com.android.tools.r8.shaking.ProguardMemberType ruleType -> d
     com.android.tools.r8.shaking.ProguardTypeMatcher type -> e
@@ -45076,10 +44342,10 @@
     51:51:java.lang.String toString():387 -> toString
     52:52:java.lang.String toString():387:387 -> toString
     53:86:java.lang.String toString():367:400 -> toString
-com.android.tools.r8.shaking.ProguardMemberRule$1 -> a.a.a.a.s.tb:
+com.android.tools.r8.shaking.ProguardMemberRule$1 -> a.a.a.a.s.vb:
     int[] $SwitchMap$com$android$tools$r8$shaking$ProguardMemberType -> a
     1:1:void <clinit>():175:175 -> <clinit>
-com.android.tools.r8.shaking.ProguardMemberRule$Builder -> a.a.a.a.s.ub:
+com.android.tools.r8.shaking.ProguardMemberRule$Builder -> a.a.a.a.s.wb:
     com.android.tools.r8.shaking.ProguardNameMatcher name -> f
     boolean $assertionsDisabled -> i
     com.android.tools.r8.shaking.ProguardMemberType ruleType -> d
@@ -45106,7 +44372,7 @@
     1:1:com.android.tools.r8.shaking.ProguardAccessFlags getNegatedAccessFlags():51:51 -> c
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher getTypeMatcher():64:64 -> d
     1:1:boolean isValid():87:87 -> e
-com.android.tools.r8.shaking.ProguardMemberRuleReturnValue -> a.a.a.a.s.xb:
+com.android.tools.r8.shaking.ProguardMemberRuleReturnValue -> a.a.a.a.s.zb:
     com.android.tools.r8.utils.LongInterval longInterval -> c
     boolean $assertionsDisabled -> e
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type type -> a
@@ -45126,7 +44392,7 @@
     1:1:boolean isSingleValue():78:78 -> g
     1:1:boolean isValueRange():56:56 -> h
     1:17:java.lang.String toString():111:127 -> toString
-com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type -> a.a.a.a.s.wb:
+com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type -> a.a.a.a.s.yb:
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type BOOLEAN -> a
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type FIELD -> c
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type VALUE_RANGE -> b
@@ -45134,7 +44400,7 @@
     1:4:void <clinit>():12:15 -> <clinit>
     5:5:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(java.lang.String,int):11:11 -> <init>
-com.android.tools.r8.shaking.ProguardMemberType -> a.a.a.a.s.yb:
+com.android.tools.r8.shaking.ProguardMemberType -> a.a.a.a.s.Ab:
     com.android.tools.r8.shaking.ProguardMemberType METHOD -> g
     com.android.tools.r8.shaking.ProguardMemberType CONSTRUCTOR -> f
     com.android.tools.r8.shaking.ProguardMemberType INIT -> e
@@ -45147,7 +44413,7 @@
     8:8:void <clinit>():6:6 -> <clinit>
     1:1:void <init>(java.lang.String,int):6:6 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardMemberType[] values():6:6 -> a
-com.android.tools.r8.shaking.ProguardNameMatcher -> a.a.a.a.s.Db:
+com.android.tools.r8.shaking.ProguardNameMatcher -> a.a.a.a.s.Fb:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.shaking.ProguardNameMatcher MATCH_ALL_NAMES -> a
     1:3:void <clinit>():14:16 -> <clinit>
@@ -45157,7 +44423,7 @@
     1:1:boolean access$100(java.lang.String,int,java.lang.String,int,java.util.List,int):14:14 -> a
     2:2:java.lang.Iterable getWildcards():93:93 -> a
     3:3:java.lang.Iterable getWildcardsOrEmpty(com.android.tools.r8.shaking.ProguardNameMatcher):97:97 -> a
-    4:4:boolean com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards.isMatchAllNames():1898:1898 -> a
+    4:4:boolean com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards.isMatchAllNames():1890:1890 -> a
     4:4:com.android.tools.r8.shaking.ProguardNameMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):23 -> a
     5:9:com.android.tools.r8.shaking.ProguardNameMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):24:28 -> a
     com.android.tools.r8.shaking.ProguardNameMatcher materialize() -> b
@@ -45167,8 +44433,8 @@
     58:58:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):70 -> b
     59:65:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):72:78 -> b
     66:110:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):43:87 -> b
-com.android.tools.r8.shaking.ProguardNameMatcher$1 -> a.a.a.a.s.zb:
-com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames -> a.a.a.a.s.Ab:
+com.android.tools.r8.shaking.ProguardNameMatcher$1 -> a.a.a.a.s.Bb:
+com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames -> a.a.a.a.s.Cb:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> c
     1:1:void <init>():108:108 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.ProguardWildcard):111:112 -> <init>
@@ -45178,7 +44444,7 @@
     2:2:java.lang.Iterable getWildcards():123:123 -> a
     1:1:com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames materialize():128:128 -> b
     1:1:com.android.tools.r8.shaking.ProguardNameMatcher materialize():104 -> b
-com.android.tools.r8.shaking.ProguardNameMatcher$MatchNamePattern -> a.a.a.a.s.Bb:
+com.android.tools.r8.shaking.ProguardNameMatcher$MatchNamePattern -> a.a.a.a.s.Db:
     java.util.List wildcards -> d
     java.lang.String pattern -> c
     1:3:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):142:144 -> <init>
@@ -45189,42 +44455,14 @@
     1:1:boolean equals(java.lang.Object):180:180 -> equals
     1:1:int hashCode():185:185 -> hashCode
     1:1:java.lang.String toString():172:172 -> toString
-com.android.tools.r8.shaking.ProguardNameMatcher$MatchSpecificName -> a.a.a.a.s.Cb:
+com.android.tools.r8.shaking.ProguardNameMatcher$MatchSpecificName -> a.a.a.a.s.Eb:
     java.lang.String name -> c
     1:2:void <init>(java.lang.String):193:194 -> <init>
     1:1:boolean matches(java.lang.String):199:199 -> a
     1:1:boolean equals(java.lang.Object):209:209 -> equals
     1:1:int hashCode():214:214 -> hashCode
     1:1:java.lang.String toString():204:204 -> toString
-com.android.tools.r8.shaking.ProguardPackageMatcher -> a.a.a.a.s.Eb:
-    java.lang.String pattern -> a
-    1:2:void <init>(java.lang.String):12:13 -> <init>
-    1:1:boolean matches(com.android.tools.r8.graph.DexType):17:17 -> a
-    2:47:boolean matchPackageNameImpl(java.lang.String,int,java.lang.String,int):22:67 -> a
-    48:48:boolean matchPackageNameImpl(java.lang.String,int,java.lang.String,int):60:60 -> a
-    49:55:boolean matchPackageNameImpl(java.lang.String,int,java.lang.String,int):29:35 -> a
-    56:56:boolean containsSeparatorsStartingAt(java.lang.String,int):77:77 -> a
-    56:56:boolean matchPackageNameImpl(java.lang.String,int,java.lang.String,int):39 -> a
-    57:86:boolean matchPackageNameImpl(java.lang.String,int,java.lang.String,int):44:73 -> a
-    1:5:boolean equals(java.lang.Object):85:89 -> equals
-    1:1:int hashCode():94:94 -> hashCode
-com.android.tools.r8.shaking.ProguardPackageNameList -> a.a.a.a.s.Hb:
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap packageNames -> a
-    1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):39:40 -> <init>
-    1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.shaking.ProguardPackageNameList$1):12 -> <init>
-    1:4:boolean matches(com.android.tools.r8.graph.DexType):60:63 -> a
-    1:15:boolean equals(java.lang.Object):74:88 -> equals
-    1:6:int hashCode():98:103 -> hashCode
-com.android.tools.r8.shaking.ProguardPackageNameList$1 -> a.a.a.a.s.Fb:
-com.android.tools.r8.shaking.ProguardPackageNameList$Builder -> a.a.a.a.s.Gb:
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap matchers -> a
-    1:1:void <init>():24:24 -> <init>
-    1:1:void <init>(com.android.tools.r8.shaking.ProguardPackageNameList$1):18 -> <init>
-    2:2:void <init>():21:21 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.ProguardPackageNameList$1):18 -> <init>
-    1:1:com.android.tools.r8.shaking.ProguardPackageNameList$Builder addPackageName(boolean,com.android.tools.r8.shaking.ProguardPackageMatcher):28:28 -> a
-    2:2:com.android.tools.r8.shaking.ProguardPackageNameList build():33:33 -> a
-com.android.tools.r8.shaking.ProguardPathFilter -> a.a.a.a.s.Kb:
+com.android.tools.r8.shaking.ProguardPathFilter -> a.a.a.a.s.Ib:
     boolean enabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList patterns -> b
     boolean $assertionsDisabled -> c
@@ -45234,8 +44472,8 @@
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder builder():14:14 -> a
     2:4:boolean matches(java.lang.String):59:61 -> a
     1:1:boolean isEnabled():55:55 -> b
-com.android.tools.r8.shaking.ProguardPathFilter$1 -> a.a.a.a.s.Ib:
-com.android.tools.r8.shaking.ProguardPathFilter$Builder -> a.a.a.a.s.Jb:
+com.android.tools.r8.shaking.ProguardPathFilter$1 -> a.a.a.a.s.Gb:
+com.android.tools.r8.shaking.ProguardPathFilter$Builder -> a.a.a.a.s.Hb:
     boolean enabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder patterns -> b
     1:1:void <init>():21:21 -> <init>
@@ -45246,13 +44484,13 @@
     2:2:com.android.tools.r8.shaking.ProguardPathFilter build():40:40 -> a
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder disable():30:30 -> b
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder enable():35:35 -> c
-com.android.tools.r8.shaking.ProguardPathList -> a.a.a.a.s.Qb:
+com.android.tools.r8.shaking.ProguardPathList -> a.a.a.a.s.Ob:
     1:1:void <init>():10:10 -> <init>
     boolean matches(java.lang.String) -> a
     1:1:com.android.tools.r8.shaking.ProguardPathList$Builder builder():13:13 -> a
     1:1:com.android.tools.r8.shaking.ProguardPathList emptyList():17:17 -> b
-com.android.tools.r8.shaking.ProguardPathList$1 -> a.a.a.a.s.Lb:
-com.android.tools.r8.shaking.ProguardPathList$Builder -> a.a.a.a.s.Mb:
+com.android.tools.r8.shaking.ProguardPathList$1 -> a.a.a.a.s.Jb:
+com.android.tools.r8.shaking.ProguardPathList$Builder -> a.a.a.a.s.Kb:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder matchers -> a
     1:1:void <init>():26:26 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathList$1):22 -> <init>
@@ -45262,11 +44500,11 @@
     1:1:com.android.tools.r8.shaking.ProguardPathList$Builder addFileName(java.lang.String):30 -> a
     2:2:com.android.tools.r8.shaking.ProguardPathList$Builder addFileName(java.lang.String,boolean):34:34 -> a
     3:7:com.android.tools.r8.shaking.ProguardPathList build():39:43 -> a
-com.android.tools.r8.shaking.ProguardPathList$EmptyPathList -> a.a.a.a.s.Nb:
+com.android.tools.r8.shaking.ProguardPathList$EmptyPathList -> a.a.a.a.s.Lb:
     1:1:void <init>():124:124 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathList$1):122 -> <init>
     boolean matches(java.lang.String) -> a
-com.android.tools.r8.shaking.ProguardPathList$FileNameMatcher -> a.a.a.a.s.Ob:
+com.android.tools.r8.shaking.ProguardPathList$FileNameMatcher -> a.a.a.a.s.Mb:
     boolean negated -> a
     java.lang.String pattern -> b
     1:3:void <init>(boolean,java.lang.String):52:54 -> <init>
@@ -45278,12 +44516,12 @@
     34:34:boolean containsSeparatorsStartingAt(java.lang.String,int):98:98 -> a
     34:34:boolean matchImpl(java.lang.String,int,java.lang.String,int):70 -> a
     35:56:boolean matchImpl(java.lang.String,int,java.lang.String,int):73:94 -> a
-com.android.tools.r8.shaking.ProguardPathList$PathList -> a.a.a.a.s.Pb:
+com.android.tools.r8.shaking.ProguardPathList$PathList -> a.a.a.a.s.Nb:
     java.util.List matchers -> a
     1:2:void <init>(java.util.List):106:107 -> <init>
     1:2:void <init>(java.util.List,com.android.tools.r8.shaking.ProguardPathList$1):103 -> <init>
     1:4:boolean matches(java.lang.String):112:115 -> a
-com.android.tools.r8.shaking.ProguardRuleParserException -> a.a.a.a.s.Rb:
+com.android.tools.r8.shaking.ProguardRuleParserException -> a.a.a.a.s.Pb:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     java.lang.String message -> a
@@ -45291,9 +44529,9 @@
     1:5:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):18:22 -> <init>
     1:1:com.android.tools.r8.origin.Origin getOrigin():33:33 -> a
     1:1:java.lang.String getDiagnosticMessage():43:43 -> b
-    1:1:com.android.tools.r8.position.Position getPosition():38:38 -> c
     1:1:java.lang.String getMessage():48:48 -> getMessage
-com.android.tools.r8.shaking.ProguardTypeMatcher -> a.a.a.a.s._b:
+    1:1:com.android.tools.r8.position.Position getPosition():38:38 -> getPosition
+com.android.tools.r8.shaking.ProguardTypeMatcher -> a.a.a.a.s.Yb:
     1:1:void <init>():28:28 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher$1):20 -> <init>
     com.android.tools.r8.graph.DexType getSpecificType() -> a
@@ -45311,14 +44549,14 @@
     1:1:java.lang.Iterable getWildcards():52:52 -> b
     boolean isTripleDotPattern() -> c
     com.android.tools.r8.shaking.ProguardTypeMatcher materialize() -> d
-com.android.tools.r8.shaking.ProguardTypeMatcher$1 -> a.a.a.a.s.Sb:
-com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType -> a.a.a.a.s.Tb:
+com.android.tools.r8.shaking.ProguardTypeMatcher$1 -> a.a.a.a.s.Qb:
+com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType -> a.a.a.a.s.Rb:
     com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType CLASS -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType TYPE -> b
     1:2:void <clinit>():32:33 -> <clinit>
     3:3:void <clinit>():31:31 -> <clinit>
     1:1:void <init>(java.lang.String,int):31:31 -> <init>
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAllTypes -> a.a.a.a.s.Ub:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAllTypes -> a.a.a.a.s.Sb:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_ALL_TYPES -> b
     1:1:void <clinit>():121:121 -> <clinit>
@@ -45333,7 +44571,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$000():119:119 -> e
     1:1:boolean equals(java.lang.Object):156:156 -> equals
     1:1:int hashCode():161:161 -> hashCode
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAnyArgSequence -> a.a.a.a.s.Vb:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAnyArgSequence -> a.a.a.a.s.Tb:
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_ANY_ARG_SEQUENCE -> a
     1:1:void <clinit>():167:167 -> <clinit>
     1:1:void <init>():165:165 -> <init>
@@ -45342,7 +44580,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$100():165:165 -> e
     1:1:boolean equals(java.lang.Object):186:186 -> equals
     1:1:int hashCode():191:191 -> hashCode
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchBasicTypes -> a.a.a.a.s.Wb:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchBasicTypes -> a.a.a.a.s.Ub:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_BASIC_TYPES -> b
     1:1:void <clinit>():252:252 -> <clinit>
@@ -45357,7 +44595,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$400():250:250 -> e
     1:1:boolean equals(java.lang.Object):290:290 -> equals
     1:1:int hashCode():295:295 -> hashCode
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchClassTypes -> a.a.a.a.s.Xb:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchClassTypes -> a.a.a.a.s.Vb:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> b
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_CLASS_TYPES -> c
     boolean $assertionsDisabled -> e
@@ -45380,7 +44618,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$300():195:195 -> f
     1:1:int hashCode():246:246 -> hashCode
     1:1:java.lang.String toString():236:236 -> toString
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchSpecificType -> a.a.a.a.s.Yb:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchSpecificType -> a.a.a.a.s.Wb:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):303:304 -> <init>
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardTypeMatcher$1):299 -> <init>
@@ -45389,7 +44627,7 @@
     1:2:boolean equals(java.lang.Object):319:320 -> equals
     1:1:int hashCode():327:327 -> hashCode
     1:1:java.lang.String toString():314:314 -> toString
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchTypePattern -> a.a.a.a.s.Zb:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchTypePattern -> a.a.a.a.s.Xb:
     java.util.List wildcards -> b
     java.lang.String pattern -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType kind -> c
@@ -45415,17 +44653,17 @@
     1:3:boolean equals(java.lang.Object):501:503 -> equals
     1:1:int hashCode():510:510 -> hashCode
     1:1:java.lang.String toString():496:496 -> toString
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule -> a.a.a.a.s.cc:
+com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule -> a.a.a.a.s.ac:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):46:46 -> <init>
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1):10 -> <init>
     java.lang.String typeString() -> r
     1:1:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder builder():52:52 -> s
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1 -> a.a.a.a.s.ac:
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder -> a.a.a.a.s.bc:
+com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1 -> a.a.a.a.s.Zb:
+com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder -> a.a.a.a.s._b:
     1:1:void <init>():16:16 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1):12 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardWildcard -> a.a.a.a.s.fc:
+com.android.tools.r8.shaking.ProguardWildcard -> a.a.a.a.s.dc:
     1:1:void <init>():8:8 -> <init>
     com.android.tools.r8.shaking.ProguardWildcard$BackReference asBackReference() -> a
     void setCaptured(java.lang.String) -> a
@@ -45434,7 +44672,7 @@
     boolean isBackReference() -> d
     boolean isPattern() -> e
     com.android.tools.r8.shaking.ProguardWildcard materialize() -> f
-com.android.tools.r8.shaking.ProguardWildcard$BackReference -> a.a.a.a.s.dc:
+com.android.tools.r8.shaking.ProguardWildcard$BackReference -> a.a.a.a.s.bc:
     int referenceIndex -> b
     com.android.tools.r8.shaking.ProguardWildcard$Pattern reference -> a
     1:2:void <init>(int):85:86 -> <init>
@@ -45446,7 +44684,7 @@
     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():130:130 -> toString
-com.android.tools.r8.shaking.ProguardWildcard$Pattern -> a.a.a.a.s.ec:
+com.android.tools.r8.shaking.ProguardWildcard$Pattern -> a.a.a.a.s.cc:
     java.lang.String pattern -> a
     java.lang.String captured -> b
     1:1:void <init>(java.lang.String):35:35 -> <init>
@@ -45459,173 +44697,173 @@
     2:6:com.android.tools.r8.shaking.ProguardWildcard$Pattern materialize():56:60 -> f
     1:1:java.lang.String getCaptured():51:51 -> g
     1:1:java.lang.String toString():76:76 -> toString
-com.android.tools.r8.shaking.RootSetBuilder -> a.a.a.a.s.kc:
-    java.util.Map mayHaveSideEffects -> s
-    java.util.Set ifRules -> y
+com.android.tools.r8.shaking.RootSetBuilder -> a.a.a.a.s.ic:
+    java.util.Set identifierNameStrings -> w
+    java.util.Map dependentNoShrinking -> s
     com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.shaking.DexStringCache dexStringCache -> y
     java.lang.Iterable rules -> c
     java.util.LinkedHashMap reasonAsked -> g
-    java.util.Map assumedValues -> u
+    java.util.Map noSideEffects -> u
     com.android.tools.r8.graph.DirectMappedDexApplication application -> b
-    java.util.Set checkDiscarded -> i
+    java.util.Set rulesThatUseExtendsOrImplementsWrong -> i
     java.util.Set noOptimization -> e
-    java.util.Set neverClassInline -> o
-    java.util.Set neverPropagateValue -> q
-    com.android.tools.r8.utils.InternalOptions options -> w
-    java.util.Set forceInline -> k
-    java.util.Set keepParametersWithConstantValue -> m
-    java.util.Map dependentNoShrinking -> r
-    java.util.Map noSideEffects -> t
-    java.util.Set identifierNameStrings -> v
-    com.android.tools.r8.shaking.DexStringCache dexStringCache -> x
-    java.util.Set rulesThatUseExtendsOrImplementsWrong -> h
+    java.util.Set keepUnusedArguments -> o
+    java.util.Set neverMerge -> q
+    boolean $assertionsDisabled -> A
+    java.util.Set alwaysInline -> k
+    java.util.Set neverInline -> m
+    java.util.Map mayHaveSideEffects -> t
+    java.util.Set ifRules -> z
+    java.util.Map assumedValues -> v
+    java.util.Set keepPackageName -> h
     java.util.Map noShrinking -> d
-    java.util.Set alwaysInline -> j
-    boolean $assertionsDisabled -> z
+    java.util.Set checkDiscarded -> j
     java.util.Set noObfuscation -> f
-    java.util.Set neverMerge -> p
-    java.util.Set neverInline -> l
-    java.util.Set keepUnusedArguments -> n
-    1:1:void <clinit>():61:61 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,java.lang.Iterable):95:95 -> <init>
-    2:35:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,java.lang.Iterable):66:99 -> <init>
+    java.util.Set neverClassInline -> p
+    java.util.Set neverPropagateValue -> r
+    com.android.tools.r8.utils.InternalOptions options -> x
+    java.util.Set forceInline -> l
+    java.util.Set keepParametersWithConstantValue -> n
+    1:1:void <clinit>():62:62 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,java.lang.Iterable):97:97 -> <init>
+    2:36:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,java.lang.Iterable):67:101 -> <init>
     boolean lambda$process$0(com.android.tools.r8.graph.DexDefinition) -> a
-    1:1:com.android.tools.r8.graph.DirectMappedDexApplication access$100(com.android.tools.r8.shaking.RootSetBuilder):61:61 -> a
-    2:2:boolean access$1200(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):61:61 -> a
-    3:3:boolean access$1300(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):61:61 -> a
-    4:4:boolean access$1500(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):61:61 -> a
-    5:5:void access$1600(com.android.tools.r8.shaking.RootSetBuilder,java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):61:61 -> a
-    6:6:boolean access$1700(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):61:61 -> a
-    7:10:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):111:114 -> a
-    11:11:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):624:624 -> a
-    11:11:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):117 -> a
-    12:52:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):125:165 -> a
-    53:53:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):144:144 -> a
-    54:56:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):139:141 -> a
-    57:57:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):853:853 -> a
-    57:57:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):149 -> a
-    58:78:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):150:170 -> a
-    79:79:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):853:853 -> a
-    79:79:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):171 -> a
-    80:84:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):173:177 -> a
-    85:85:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):853:853 -> a
-    85:85:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):178 -> a
-    86:93:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):179:186 -> a
-    94:94:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):853:853 -> a
-    94:94:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):187 -> a
-    95:100:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):189:194 -> a
-    101:101:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):853:853 -> a
-    101:101:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):195 -> a
-    102:111:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):197:206 -> a
-    112:112:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):192:192 -> a
-    113:114:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):183:184 -> a
-    115:115:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):168:168 -> a
-    116:129:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):216:229 -> a
-    130:130:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):228:228 -> a
-    131:136:void lambda$runPerRule$4(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):231:236 -> a
-    137:159:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):244:266 -> a
-    160:160:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):260:260 -> a
-    161:170:com.android.tools.r8.graph.DexDefinition testAndGetPrecondition(com.android.tools.r8.graph.DexDefinition,java.util.Map):471:480 -> a
-    171:172:void lambda$markMatchingVisibleMethods$5(java.util.Map,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexEncodedMethod):503:504 -> a
-    173:174:void lambda$markMatchingMethods$7(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexEncodedMethod):525:526 -> a
-    175:183:void markMatchingVisibleFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean):537:545 -> a
-    184:184:void markMatchingFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map):554:554 -> a
-    185:186:void lambda$markMatchingFields$9(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexEncodedField):556:557 -> a
-    187:198:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):564:575 -> a
-    199:199:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    199:199:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):577 -> a
-    200:200:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):577:577 -> a
-    201:226:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):572:597 -> a
-    227:227:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    227:227:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):597 -> a
-    228:228:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):597:597 -> a
-    229:244:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):596:611 -> a
-    245:270:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):700:725 -> a
-    271:276:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):732:737 -> a
-    277:277:boolean lambda$anySourceMatchesInheritanceRuleDirectly$10(boolean,com.android.tools.r8.graph.DexType):736:736 -> a
-    278:278:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):742:742 -> a
-    279:282:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):755:758 -> a
-    279:282:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):743 -> a
-    283:283:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):778:778 -> a
-    284:284:boolean com.android.tools.r8.shaking.ProguardMemberType.includesFields():17:17 -> a
-    284:284:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):778 -> a
-    285:286:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):779:780 -> a
-    287:291:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):797:801 -> a
-    292:305:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition):815:828 -> a
-    306:312:void markField(com.android.tools.r8.graph.DexEncodedField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition):838:844 -> a
-    313:332:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRule):857:876 -> a
-    333:352:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition):899:918 -> a
-    353:381:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition):915:943 -> a
-    382:392:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRule):880:890 -> a
-    382:392:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition):944 -> a
-    393:416:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition):946:969 -> a
-    417:417:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition):963:963 -> a
-    418:482:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition):960:1024 -> a
-    483:483:java.util.Map lambda$addItemToSets$13(com.android.tools.r8.graph.DexReference):930:930 -> a
-    1:1:java.util.Map access$1000(com.android.tools.r8.shaking.RootSetBuilder):61:61 -> b
-    2:2:boolean access$1800(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):61:61 -> b
-    3:3:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):155:155 -> b
-    4:27:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean):491:514 -> b
-    28:29:void lambda$markMatchingVisibleMethods$6(java.util.Map,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexEncodedMethod):511:512 -> b
-    30:30:void markMatchingMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map):523:523 -> b
-    31:32:void lambda$markMatchingVisibleFields$8(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexEncodedField):542:543 -> b
-    33:33:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):624:624 -> b
-    33:33:boolean access$1400(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):61 -> b
-    34:34:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):658:658 -> b
-    34:34:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):628 -> b
-    35:47:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):668:680 -> b
-    35:47:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):658 -> b
-    35:47:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):628 -> b
-    48:48:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):663:663 -> b
-    48:48:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):628 -> b
-    49:54:boolean satisfyImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):686:691 -> b
-    49:54:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):631 -> b
-    55:55:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):637:637 -> b
+    1:1:com.android.tools.r8.graph.DirectMappedDexApplication access$100(com.android.tools.r8.shaking.RootSetBuilder):62:62 -> a
+    2:2:boolean access$1200(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):62:62 -> a
+    3:3:boolean access$1300(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):62:62 -> a
+    4:4:boolean access$1500(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):62:62 -> a
+    5:5:void access$1600(com.android.tools.r8.shaking.RootSetBuilder,java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):62:62 -> a
+    6:6:boolean access$1700(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):62:62 -> a
+    7:10:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):113:116 -> a
+    11:11:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):626:626 -> a
+    11:11:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):119 -> a
+    12:52:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):127:167 -> a
+    53:53:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):146:146 -> a
+    54:56:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):141:143 -> a
+    57:57:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):855:855 -> a
+    57:57:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):151 -> a
+    58:78:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):152:172 -> a
+    79:79:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):855:855 -> a
+    79:79:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):173 -> a
+    80:94:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):175:189 -> a
+    95:95:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):855:855 -> a
+    95:95:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):190 -> a
+    96:101:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):192:197 -> a
+    102:102:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):855:855 -> a
+    102:102:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):198 -> a
+    103:112:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):200:209 -> a
+    113:113:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):195:195 -> a
+    114:115:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):186:187 -> a
+    116:116:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):855:855 -> a
+    116:116:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):181 -> a
+    117:118:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):182:183 -> a
+    119:119:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):170:170 -> a
+    120:132:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):219:231 -> a
+    133:138:void lambda$runPerRule$4(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):232:237 -> a
+    139:161:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):245:267 -> a
+    162:162:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):261:261 -> a
+    163:172:com.android.tools.r8.graph.DexDefinition testAndGetPrecondition(com.android.tools.r8.graph.DexDefinition,java.util.Map):473:482 -> a
+    173:174:void lambda$markMatchingVisibleMethods$5(java.util.Map,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexEncodedMethod):505:506 -> a
+    175:176:void lambda$markMatchingMethods$7(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexEncodedMethod):527:528 -> a
+    177:185:void markMatchingVisibleFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean):539:547 -> a
+    186:186:void markMatchingFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map):556:556 -> a
+    187:188:void lambda$markMatchingFields$9(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexEncodedField):558:559 -> a
+    189:200:void writeSeeds(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):566:577 -> a
+    201:201:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
+    201:201:void writeSeeds(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):579 -> a
+    202:202:void writeSeeds(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):579:579 -> a
+    203:228:void writeSeeds(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):574:599 -> a
+    229:229:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
+    229:229:void writeSeeds(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):599 -> a
+    230:230:void writeSeeds(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):599:599 -> a
+    231:246:void writeSeeds(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):598:613 -> a
+    247:272:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):702:727 -> a
+    273:278:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):734:739 -> a
+    279:279:boolean lambda$anySourceMatchesInheritanceRuleDirectly$10(boolean,com.android.tools.r8.graph.DexType):738:738 -> a
+    280:280:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):744:744 -> a
+    281:284:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):757:760 -> a
+    281:284:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):745 -> a
+    285:285:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):780:780 -> a
+    286:286:boolean com.android.tools.r8.shaking.ProguardMemberType.includesFields():17:17 -> a
+    286:286:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):780 -> a
+    287:288:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):781:782 -> a
+    289:293:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):799:803 -> a
+    294:307:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition):817:830 -> a
+    308:314:void markField(com.android.tools.r8.graph.DexEncodedField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition):840:846 -> a
+    315:334:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRule):859:878 -> a
+    335:354:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition):901:920 -> a
+    355:383:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition):917:945 -> a
+    384:394:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRule):882:892 -> a
+    384:394:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition):946 -> a
+    395:420:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition):948:973 -> a
+    421:421:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition):967:967 -> a
+    422:478:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition):964:1020 -> a
+    479:479:java.util.Map lambda$addItemToSets$13(com.android.tools.r8.graph.DexReference):932:932 -> a
+    1:1:java.util.Map access$1000(com.android.tools.r8.shaking.RootSetBuilder):62:62 -> b
+    2:2:boolean access$1800(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):62:62 -> b
+    3:3:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):157:157 -> b
+    4:27:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean):493:516 -> b
+    28:29:void lambda$markMatchingVisibleMethods$6(java.util.Map,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexEncodedMethod):513:514 -> b
+    30:30:void markMatchingMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map):525:525 -> b
+    31:32:void lambda$markMatchingVisibleFields$8(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexEncodedField):544:545 -> b
+    33:33:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):626:626 -> b
+    33:33:boolean access$1400(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):62 -> b
+    34:34:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):660:660 -> b
+    34:34:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):630 -> b
+    35:47:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):670:682 -> b
+    35:47:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):660 -> b
+    35:47:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):630 -> b
+    48:48:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):665:665 -> b
+    48:48:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):630 -> b
+    49:54:boolean satisfyImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):688:693 -> b
+    49:54:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):633 -> b
+    55:55:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):639:639 -> b
     56:56:boolean com.android.tools.r8.shaking.ProguardTypeMatcher.matchesSpecificType():116:116 -> b
-    56:56:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):637 -> b
-    57:66:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):638:647 -> b
-    67:67:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):763:763 -> b
+    56:56:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):639 -> b
+    57:66:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):640:649 -> b
+    67:67:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):765:765 -> b
     68:68:boolean com.android.tools.r8.shaking.ProguardMemberType.includesMethods():21:21 -> b
-    68:68:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):763 -> b
-    69:70:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):764:765 -> b
-    71:71:java.util.Set lambda$addItemToSets$14(com.android.tools.r8.graph.DexReference):931:931 -> b
+    68:68:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):765 -> b
+    69:70:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):766:767 -> b
+    71:71:java.util.Set lambda$addItemToSets$14(com.android.tools.r8.graph.DexReference):933:933 -> b
     boolean lambda$process$2(com.android.tools.r8.graph.DexDefinition) -> c
-    1:1:java.lang.Iterable access$200(com.android.tools.r8.shaking.RootSetBuilder):61:61 -> c
-    2:3:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):619:620 -> c
-    4:4:java.util.Set lambda$addItemToSets$15(com.android.tools.r8.graph.DexReference):934:934 -> c
+    1:1:java.lang.Iterable access$200(com.android.tools.r8.shaking.RootSetBuilder):62:62 -> c
+    2:3:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):621:622 -> c
+    4:4:java.util.Set lambda$addItemToSets$15(com.android.tools.r8.graph.DexReference):936:936 -> c
     com.android.tools.r8.graph.DexReference lambda$addItemToSets$16(com.android.tools.r8.graph.DexReference) -> d
     boolean lambda$process$3(com.android.tools.r8.graph.DexDefinition) -> d
-    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.RootSetBuilder):61:61 -> d
-    2:2:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):615:615 -> d
-    1:1:com.android.tools.r8.utils.InternalOptions access$400(com.android.tools.r8.shaking.RootSetBuilder):61:61 -> e
-    2:2:java.util.Map lambda$includeDescriptor$11(com.android.tools.r8.graph.DexReference):872:872 -> e
-    1:1:java.util.Set access$500(com.android.tools.r8.shaking.RootSetBuilder):61:61 -> f
-    2:2:java.util.Set lambda$includeDescriptor$12(com.android.tools.r8.graph.DexReference):873:873 -> f
-    1:1:java.util.Set access$600(com.android.tools.r8.shaking.RootSetBuilder):61:61 -> g
-    1:1:java.util.Map access$700(com.android.tools.r8.shaking.RootSetBuilder):61:61 -> h
-    1:1:java.util.Set access$800(com.android.tools.r8.shaking.RootSetBuilder):61:61 -> i
-    1:1:java.util.Set access$900(com.android.tools.r8.shaking.RootSetBuilder):61:61 -> j
-com.android.tools.r8.shaking.RootSetBuilder$1 -> a.a.a.a.s.gc:
+    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.RootSetBuilder):62:62 -> d
+    2:2:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):617:617 -> d
+    1:1:com.android.tools.r8.utils.InternalOptions access$400(com.android.tools.r8.shaking.RootSetBuilder):62:62 -> e
+    2:2:java.util.Map lambda$includeDescriptor$11(com.android.tools.r8.graph.DexReference):874:874 -> e
+    1:1:java.util.Set access$500(com.android.tools.r8.shaking.RootSetBuilder):62:62 -> f
+    2:2:java.util.Set lambda$includeDescriptor$12(com.android.tools.r8.graph.DexReference):875:875 -> f
+    1:1:java.util.Set access$600(com.android.tools.r8.shaking.RootSetBuilder):62:62 -> g
+    1:1:java.util.Map access$700(com.android.tools.r8.shaking.RootSetBuilder):62:62 -> h
+    1:1:java.util.Set access$800(com.android.tools.r8.shaking.RootSetBuilder):62:62 -> i
+    1:1:java.util.Set access$900(com.android.tools.r8.shaking.RootSetBuilder):62:62 -> j
+com.android.tools.r8.shaking.RootSetBuilder$1 -> a.a.a.a.s.ec:
     int[] $SwitchMap$com$android$tools$r8$shaking$InlineRule$Type -> b
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassInlineRule$Type -> c
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassMergingRule$Type -> d
     int[] $SwitchMap$com$android$tools$r8$shaking$MemberValuePropagationRule$Type -> e
     int[] $SwitchMap$com$android$tools$r8$shaking$ProguardKeepRuleType -> a
-    1:1:void <clinit>():993:993 -> <clinit>
-    2:2:void <clinit>():983:983 -> <clinit>
-    3:3:void <clinit>():973:973 -> <clinit>
-    4:4:void <clinit>():958:958 -> <clinit>
-    5:5:void <clinit>():136:136 -> <clinit>
-com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet -> a.a.a.a.s.hc:
+    1:1:void <clinit>():997:997 -> <clinit>
+    2:2:void <clinit>():987:987 -> <clinit>
+    3:3:void <clinit>():977:977 -> <clinit>
+    4:4:void <clinit>():962:962 -> <clinit>
+    5:5:void <clinit>():138:138 -> <clinit>
+com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet -> a.a.a.a.s.fc:
     java.util.Map noShrinking -> c
     java.util.Set noOptimization -> d
     java.util.Set noObfuscation -> e
     java.util.Set neverInline -> a
     java.util.Set neverClassInline -> b
     java.util.Map dependentNoShrinking -> f
-    1:7:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map):1372:1378 -> <init>
-    1:7:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,com.android.tools.r8.shaking.RootSetBuilder$1):1358 -> <init>
-com.android.tools.r8.shaking.RootSetBuilder$IfRuleEvaluator -> a.a.a.a.s.ic:
+    1:7:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map):1376:1382 -> <init>
+    1:7:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,com.android.tools.r8.shaking.RootSetBuilder$1):1362 -> <init>
+com.android.tools.r8.shaking.RootSetBuilder$IfRuleEvaluator -> a.a.a.a.s.gc:
     java.util.concurrent.ExecutorService executorService -> d
     java.util.Set targetedMethods -> c
     java.util.List futures -> e
@@ -45633,58 +44871,59 @@
     java.util.Set liveFields -> a
     java.util.Set liveMethods -> b
     com.android.tools.r8.shaking.RootSetBuilder this$0 -> f
-    1:1:void <clinit>():292:292 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.RootSetBuilder,java.util.Set,java.util.Set,java.util.Set,java.util.concurrent.ExecutorService):306:306 -> <init>
-    2:12:void <init>(com.android.tools.r8.shaking.RootSetBuilder,java.util.Set,java.util.Set,java.util.Set,java.util.concurrent.ExecutorService):300:310 -> <init>
-    1:44:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run(java.util.Set):314:357 -> a
-    45:45:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run(java.util.Set):349:349 -> a
-    46:75:void evaluateIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):366:395 -> a
-    76:85:void evaluateIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):393:402 -> a
-    86:104:void evaluateIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):400:418 -> a
-    105:106:boolean lambda$evaluateIfRule$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):397:398 -> a
-    107:108:boolean lambda$evaluateIfRule$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):404:405 -> a
-    109:123:void lambda$evaluateIfRule$3(java.util.Collection,com.android.tools.r8.shaking.ProguardIfRule,java.util.Set):421:435 -> a
-    124:125:boolean lambda$evaluateIfRule$2(java.util.Collection,java.util.Collection,com.android.tools.r8.shaking.ProguardMemberRule):432:433 -> a
-    126:145:void materializeIfRule(com.android.tools.r8.shaking.ProguardIfRule):441:460 -> a
-com.android.tools.r8.shaking.RootSetBuilder$RootSet -> a.a.a.a.s.jc:
-    java.util.Map dependentNoShrinking -> q
-    java.util.Set ifRules -> s
-    java.util.Map mayHaveSideEffects -> n
-    java.util.Map noSideEffects -> o
-    java.util.Map assumedValues -> p
+    1:1:void <clinit>():294:294 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.RootSetBuilder,java.util.Set,java.util.Set,java.util.Set,java.util.concurrent.ExecutorService):308:308 -> <init>
+    2:12:void <init>(com.android.tools.r8.shaking.RootSetBuilder,java.util.Set,java.util.Set,java.util.Set,java.util.concurrent.ExecutorService):302:312 -> <init>
+    1:44:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run(java.util.Set):316:359 -> a
+    45:45:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run(java.util.Set):351:351 -> a
+    46:75:void evaluateIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):368:397 -> a
+    76:85:void evaluateIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):395:404 -> a
+    86:104:void evaluateIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):402:420 -> a
+    105:106:boolean lambda$evaluateIfRule$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):399:400 -> a
+    107:108:boolean lambda$evaluateIfRule$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):406:407 -> a
+    109:123:void lambda$evaluateIfRule$3(java.util.Collection,com.android.tools.r8.shaking.ProguardIfRule,java.util.Set):423:437 -> a
+    124:125:boolean lambda$evaluateIfRule$2(java.util.Collection,java.util.Collection,com.android.tools.r8.shaking.ProguardMemberRule):434:435 -> a
+    126:145:void materializeIfRule(com.android.tools.r8.shaking.ProguardIfRule):443:462 -> a
+com.android.tools.r8.shaking.RootSetBuilder$RootSet -> a.a.a.a.s.hc:
+    java.util.Map assumedValues -> q
+    java.util.Map dependentNoShrinking -> r
+    java.util.Set identifierNameStrings -> s
+    java.util.Set ifRules -> t
+    java.util.Map mayHaveSideEffects -> o
+    java.util.Map noSideEffects -> p
+    boolean $assertionsDisabled -> u
     java.util.Set noOptimization -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList reasonAsked -> d
-    boolean $assertionsDisabled -> t
     java.util.Map noShrinking -> a
-    java.util.Set forceInline -> g
-    java.util.Set neverInline -> h
-    java.util.Set keepConstantArguments -> i
-    java.util.Set keepUnusedArguments -> j
+    java.util.Set alwaysInline -> g
+    java.util.Set forceInline -> h
+    java.util.Set neverInline -> i
+    java.util.Set keepConstantArguments -> j
     java.util.Set noObfuscation -> c
-    java.util.Set checkDiscarded -> e
-    java.util.Set alwaysInline -> f
-    java.util.Set identifierNameStrings -> r
-    java.util.Set neverClassInline -> k
-    java.util.Set neverMerge -> l
-    java.util.Set neverPropagateValue -> m
-    1:1:void <clinit>():1029:1029 -> <clinit>
-    1:20:void <init>(java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set):1071:1090 -> <init>
-    1:20:void <init>(java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.shaking.RootSetBuilder$1):1029 -> <init>
+    java.util.Set keepPackageName -> e
+    java.util.Set checkDiscarded -> f
+    java.util.Set keepUnusedArguments -> k
+    java.util.Set neverClassInline -> l
+    java.util.Set neverMerge -> m
+    java.util.Set neverPropagateValue -> n
+    1:1:void <clinit>():1025:1025 -> <clinit>
+    1:21:void <init>(java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set):1069:1089 -> <init>
+    1:21:void <init>(java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.shaking.RootSetBuilder$1):1025 -> <init>
     1:5:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet):1137:1141 -> a
     6:6:void addDependentItems(java.util.Map):1147:1147 -> a
     7:7:java.util.Map lambda$addDependentItems$0(com.android.tools.r8.graph.DexReference):1150:1150 -> a
     8:9:void lambda$addDependentItems$1(com.android.tools.r8.graph.DexReference,java.util.Map):1150:1151 -> a
     10:11:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1155:1156 -> a
     12:12:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1155:1155 -> a
-    13:22:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1191:1200 -> a
-    23:31:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):1238:1246 -> a
-    32:104:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1253:1325 -> a
-    105:105:java.util.Set lambda$verifyKeptItemsAreKept$2(com.android.tools.r8.graph.DexType):1271:1271 -> a
-    106:106:void lambda$toString$3(java.lang.StringBuilder,com.android.tools.r8.graph.DexReference):1351:1351 -> a
-    1:11:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1208:1218 -> b
-    1:5:boolean verifyKeptTypesAreLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1227:1231 -> c
-    1:21:java.lang.String toString():1333:1353 -> toString
-com.android.tools.r8.shaking.ScopedDexMethodSet -> a.a.a.a.s.lc:
+    13:25:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness):1191:1203 -> a
+    26:34:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness):1241:1249 -> a
+    35:107:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1256:1328 -> a
+    108:108:java.util.Set lambda$verifyKeptItemsAreKept$2(com.android.tools.r8.graph.DexType):1274:1274 -> a
+    109:109:void lambda$toString$3(java.lang.StringBuilder,com.android.tools.r8.graph.DexReference):1355:1355 -> a
+    1:11:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness):1211:1221 -> b
+    1:5:boolean verifyKeptTypesAreLive(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness):1230:1234 -> c
+    1:22:java.lang.String toString():1336:1357 -> toString
+com.android.tools.r8.shaking.ScopedDexMethodSet -> a.a.a.a.s.jc:
     java.util.Map items -> b
     com.android.tools.r8.com.google.common.base.Equivalence METHOD_EQUIVALENCE -> c
     com.android.tools.r8.shaking.ScopedDexMethodSet parent -> a
@@ -45703,7 +44942,7 @@
     6:6:com.android.tools.r8.shaking.ScopedDexMethodSet getParent():62:62 -> a
     1:1:com.android.tools.r8.shaking.ScopedDexMethodSet newNestedScope():30:30 -> b
     2:5:boolean addMethodIfMoreVisible(com.android.tools.r8.graph.DexEncodedMethod):52:55 -> b
-com.android.tools.r8.shaking.StaticClassMerger -> a.a.a.a.s.pc:
+com.android.tools.r8.shaking.StaticClassMerger -> a.a.a.a.s.nc:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
     com.android.tools.r8.com.google.common.base.Equivalence fieldEquivalence -> c
@@ -45713,62 +44952,62 @@
     com.android.tools.r8.com.google.common.base.Equivalence methodEquivalence -> d
     com.android.tools.r8.shaking.MainDexClasses mainDexClasses -> b
     java.util.Map representatives -> e
-    1:1:void <clinit>():59:59 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses):210:210 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses):200:219 -> <init>
-    1:1:com.android.tools.r8.com.google.common.base.Equivalence access$000(com.android.tools.r8.shaking.StaticClassMerger):59:59 -> a
-    2:4:com.android.tools.r8.graph.GraphLense run():223:225 -> a
-    5:9:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):313:317 -> a
-    5:9:com.android.tools.r8.graph.GraphLense run():226 -> a
-    10:39:boolean mergeGlobally(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):323:352 -> a
-    10:39:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):318 -> a
-    10:39:com.android.tools.r8.graph.GraphLense run():226 -> a
-    40:72:boolean mergeInsidePackage(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):359:391 -> a
-    40:72:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):319 -> a
-    40:72:com.android.tools.r8.graph.GraphLense run():226 -> a
-    73:85:com.android.tools.r8.graph.GraphLense buildGraphLense():240:252 -> a
-    73:85:com.android.tools.r8.graph.GraphLense run():236 -> a
-    86:95:com.android.tools.r8.graph.GraphLense buildGraphLense():241:250 -> a
-    86:95:com.android.tools.r8.graph.GraphLense run():236 -> a
-    96:96:boolean isValidRepresentative(com.android.tools.r8.graph.DexProgramClass):309:309 -> a
-    97:105:com.android.tools.r8.shaking.StaticClassMerger$Representative getOrCreateRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.graph.DexProgramClass):397:405 -> a
-    106:123:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.shaking.StaticClassMerger$Representative):409:426 -> a
-    124:124:void clearRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key):438:438 -> a
-    125:125:boolean lambda$mayMergeAcrossPackageBoundaries$2(com.android.tools.r8.graph.DexEncodedMethod):449:449 -> a
-    126:126:boolean lambda$mayMergeAcrossPackageBoundaries$3(com.android.tools.r8.graph.DexEncodedField):453:453 -> a
-    127:135:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):485:493 -> a
-    136:139:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):492:495 -> a
-    140:143:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):494:497 -> a
-    144:150:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):496:502 -> a
-    151:151:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper lambda$mergeMethods$5(com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexEncodedMethod):513:513 -> a
-    152:152:boolean lambda$mergeMethods$6(java.util.Set,com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexMethod):517:517 -> a
-    153:171:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):538:556 -> a
-    172:178:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):596:602 -> a
-    172:178:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):558 -> a
+    1:1:void <clinit>():60:60 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses):211:211 -> <init>
+    2:22:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses):201:221 -> <init>
+    1:1:com.android.tools.r8.com.google.common.base.Equivalence access$000(com.android.tools.r8.shaking.StaticClassMerger):60:60 -> a
+    2:4:com.android.tools.r8.graph.GraphLense run():225:227 -> a
+    5:9:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):315:319 -> a
+    5:9:com.android.tools.r8.graph.GraphLense run():228 -> a
+    10:39:boolean mergeGlobally(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):325:354 -> a
+    10:39:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):320 -> a
+    10:39:com.android.tools.r8.graph.GraphLense run():228 -> a
+    40:72:boolean mergeInsidePackage(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):361:393 -> a
+    40:72:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):321 -> a
+    40:72:com.android.tools.r8.graph.GraphLense run():228 -> a
+    73:85:com.android.tools.r8.graph.GraphLense buildGraphLense():242:254 -> a
+    73:85:com.android.tools.r8.graph.GraphLense run():238 -> a
+    86:95:com.android.tools.r8.graph.GraphLense buildGraphLense():243:252 -> a
+    86:95:com.android.tools.r8.graph.GraphLense run():238 -> a
+    96:96:boolean isValidRepresentative(com.android.tools.r8.graph.DexProgramClass):311:311 -> a
+    97:105:com.android.tools.r8.shaking.StaticClassMerger$Representative getOrCreateRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.graph.DexProgramClass):399:407 -> a
+    106:123:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.shaking.StaticClassMerger$Representative):411:428 -> a
+    124:124:void clearRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key):440:440 -> a
+    125:125:boolean lambda$mayMergeAcrossPackageBoundaries$2(com.android.tools.r8.graph.DexEncodedMethod):451:451 -> a
+    126:126:boolean lambda$mayMergeAcrossPackageBoundaries$3(com.android.tools.r8.graph.DexEncodedField):455:455 -> a
+    127:135:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):487:495 -> a
+    136:139:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):494:497 -> a
+    140:143:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):496:499 -> a
+    144:150:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):498:504 -> a
+    151:151:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper lambda$mergeMethods$5(com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexEncodedMethod):515:515 -> a
+    152:152:boolean lambda$mergeMethods$6(java.util.Set,com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexMethod):519:519 -> a
+    153:171:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):540:558 -> a
+    172:178:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):598:604 -> a
+    172:178:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):560 -> a
     179:179:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    179:179:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):602 -> a
-    179:179:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    180:186:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):602:608 -> a
-    180:186:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    187:196:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):559:568 -> a
-    197:197:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper lambda$mergeFields$7(com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexEncodedField):550:550 -> a
-    198:198:boolean lambda$mergeFields$8(java.util.Set,com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexField):554:554 -> a
-    1:1:com.android.tools.r8.com.google.common.base.Equivalence access$100(com.android.tools.r8.shaking.StaticClassMerger):59:59 -> b
-    2:2:boolean lambda$satisfiesMergeCriteria$0(com.android.tools.r8.graph.DexEncodedField):267:267 -> b
-    3:27:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):444:468 -> b
-    28:28:boolean lambda$mayMergeAcrossPackageBoundaries$4(com.android.tools.r8.graph.DexEncodedMethod):461:461 -> b
-    29:39:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):510:520 -> b
-    40:47:com.android.tools.r8.graph.DexEncodedMethod renameMethodIfNeeded(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):576:583 -> b
-    40:47:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):522 -> b
+    179:179:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):604 -> a
+    179:179:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):560 -> a
+    180:186:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):604:610 -> a
+    180:186:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):560 -> a
+    187:196:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):561:570 -> a
+    197:197:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper lambda$mergeFields$7(com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexEncodedField):552:552 -> a
+    198:198:boolean lambda$mergeFields$8(java.util.Set,com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexField):556:556 -> a
+    1:1:com.android.tools.r8.com.google.common.base.Equivalence access$100(com.android.tools.r8.shaking.StaticClassMerger):60:60 -> b
+    2:2:boolean lambda$satisfiesMergeCriteria$0(com.android.tools.r8.graph.DexEncodedField):269:269 -> b
+    3:27:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):446:470 -> b
+    28:28:boolean lambda$mayMergeAcrossPackageBoundaries$4(com.android.tools.r8.graph.DexEncodedMethod):463:463 -> b
+    29:39:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):512:522 -> b
+    40:47:com.android.tools.r8.graph.DexEncodedMethod renameMethodIfNeeded(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):578:585 -> b
+    40:47:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):524 -> b
     48:48:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> b
-    48:48:com.android.tools.r8.graph.DexEncodedMethod renameMethodIfNeeded(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):583 -> b
-    48:48:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):522 -> b
-    49:55:com.android.tools.r8.graph.DexEncodedMethod renameMethodIfNeeded(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):583:589 -> b
-    49:55:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):522 -> b
-    56:62:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):523:529 -> b
-    1:49:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):256:304 -> c
-    50:55:boolean lambda$satisfiesMergeCriteria$1(com.android.tools.r8.graph.DexEncodedMethod):279:284 -> c
-com.android.tools.r8.shaking.StaticClassMerger$MergeGroup -> a.a.a.a.s.nc:
+    48:48:com.android.tools.r8.graph.DexEncodedMethod renameMethodIfNeeded(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):585 -> b
+    48:48:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):524 -> b
+    49:55:com.android.tools.r8.graph.DexEncodedMethod renameMethodIfNeeded(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):585:591 -> b
+    49:55:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):524 -> b
+    56:62:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):525:531 -> b
+    1:49:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):258:306 -> c
+    50:55:boolean lambda$satisfiesMergeCriteria$1(com.android.tools.r8.graph.DexEncodedMethod):281:286 -> c
+com.android.tools.r8.shaking.StaticClassMerger$MergeGroup -> a.a.a.a.s.lc:
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup DONT_MERGE -> d
     boolean $assertionsDisabled -> i
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key mainDexDependenciesGlobalKey -> f
@@ -45778,75 +45017,72 @@
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup NOT_MAIN_DEX -> c
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup MAIN_DEX_DEPENDENCIES -> b
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup MAIN_DEX_ROOTS -> a
-    1:5:void <clinit>():61:65 -> <clinit>
-    6:16:void <clinit>():61:71 -> <clinit>
-    1:1:void <init>(java.lang.String,int):61:61 -> <init>
-    1:9:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():113:121 -> a
-    10:10:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():119:119 -> a
-    11:11:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():117:117 -> a
-    12:13:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key key(java.lang.String):126:127 -> a
-    1:9:java.lang.String toString():132:140 -> toString
-com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key -> a.a.a.a.s.mc:
+    1:5:void <clinit>():62:66 -> <clinit>
+    6:16:void <clinit>():62:72 -> <clinit>
+    1:1:void <init>(java.lang.String,int):62:62 -> <init>
+    1:9:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():114:122 -> a
+    10:10:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():120:120 -> a
+    11:11:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():118:118 -> a
+    12:13:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key key(java.lang.String):127:128 -> a
+    1:9:java.lang.String toString():133:141 -> toString
+com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key -> a.a.a.a.s.kc:
     java.lang.String packageOrGlobal -> b
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup mergeGroup -> a
-    1:3:void <init>(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup,java.lang.String):77:79 -> <init>
-    1:1:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup getMergeGroup():83:83 -> a
-    1:5:boolean equals(java.lang.Object):104:108 -> equals
-    1:1:int hashCode():96:96 -> hashCode
-com.android.tools.r8.shaking.StaticClassMerger$Representative -> a.a.a.a.s.oc:
+    1:3:void <init>(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup,java.lang.String):78:80 -> <init>
+    1:1:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup getMergeGroup():84:84 -> a
+    1:5:boolean equals(java.lang.Object):105:109 -> equals
+    1:1:int hashCode():97:97 -> hashCode
+com.android.tools.r8.shaking.StaticClassMerger$Representative -> a.a.a.a.s.mc:
     com.android.tools.r8.shaking.StaticClassMerger this$0 -> d
     com.android.tools.r8.graph.DexProgramClass clazz -> a
     com.android.tools.r8.com.google.common.collect.HashMultiset methodBuckets -> c
     com.android.tools.r8.com.google.common.collect.HashMultiset fieldBuckets -> b
-    1:1:void <init>(com.android.tools.r8.shaking.StaticClassMerger,com.android.tools.r8.graph.DexProgramClass):160:160 -> <init>
-    2:7:void <init>(com.android.tools.r8.shaking.StaticClassMerger,com.android.tools.r8.graph.DexProgramClass):157:162 -> <init>
-    1:1:com.android.tools.r8.graph.DexProgramClass access$200(com.android.tools.r8.shaking.StaticClassMerger$Representative):151:151 -> a
-    2:8:void include(com.android.tools.r8.graph.DexProgramClass):167:173 -> a
-    9:13:boolean isFull():183:187 -> a
-com.android.tools.r8.shaking.TreePruner -> a.a.a.a.s.qc:
+    1:1:void <init>(com.android.tools.r8.shaking.StaticClassMerger,com.android.tools.r8.graph.DexProgramClass):161:161 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.StaticClassMerger,com.android.tools.r8.graph.DexProgramClass):158:163 -> <init>
+    1:1:com.android.tools.r8.graph.DexProgramClass access$200(com.android.tools.r8.shaking.StaticClassMerger$Representative):152:152 -> a
+    2:8:void include(com.android.tools.r8.graph.DexProgramClass):168:174 -> a
+    9:13:boolean isFull():184:188 -> a
+com.android.tools.r8.shaking.TreePruner -> a.a.a.a.s.oc:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set prunedTypes -> d
-    boolean $assertionsDisabled -> e
     com.android.tools.r8.shaking.UsagePrinter usagePrinter -> c
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):37:37 -> <init>
-    2:12:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):35:45 -> <init>
-    boolean lambda$getNewProgramClasses$0(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.InnerClassAttribute) -> a
-    1:63:java.util.List getNewProgramClasses(java.util.List):73:135 -> a
-    64:69:boolean isAttributeReferencingPrunedItem(com.android.tools.r8.graph.EnclosingMethodAttribute):142:147 -> a
-    70:75:boolean isAttributeReferencingPrunedType(com.android.tools.r8.graph.InnerClassAttribute):151:156 -> a
-    76:77:int firstUnreachableIndex(java.util.List,java.util.function.Predicate):161:162 -> a
-    78:91:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):175:188 -> a
-    92:92:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():754:754 -> a
-    92:92:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):188 -> a
-    93:95:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):188:190 -> a
-    96:97:boolean isDefaultConstructor(com.android.tools.r8.graph.DexEncodedMethod):170:171 -> a
-    96:97:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):190 -> a
-    98:100:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):193:195 -> a
-    101:105:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):192:196 -> a
-    106:106:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():754:754 -> a
-    106:106:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):196 -> a
-    107:133:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):196:222 -> a
-    134:149:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):217:232 -> a
-    150:150:boolean lambda$reachableFields$1(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexField):238:238 -> a
-    151:151:java.util.Collection getRemovedClasses():269:269 -> a
-    1:12:com.android.tools.r8.graph.DexApplication run():49:60 -> b
-    13:14:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):68:69 -> b
-    13:14:com.android.tools.r8.graph.DexApplication run():60 -> b
-    15:17:com.android.tools.r8.graph.DexApplication run():60:62 -> b
-    18:47:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):236:265 -> b
-com.android.tools.r8.shaking.UnusedArgumentRule -> a.a.a.a.s.tc:
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):38:38 -> <init>
+    2:12:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):36:46 -> <init>
+    1:51:java.util.List getNewProgramClasses(java.util.List):74:124 -> a
+    52:57:boolean isAttributeReferencingPrunedItem(com.android.tools.r8.graph.EnclosingMethodAttribute):131:136 -> a
+    58:80:boolean isAttributeReferencingPrunedType(com.android.tools.r8.graph.InnerClassAttribute):140:162 -> a
+    81:82:int firstUnreachableIndex(java.util.List,java.util.function.Predicate):167:168 -> a
+    83:96:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):181:194 -> a
+    97:97:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():725:725 -> a
+    97:97:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):194 -> a
+    98:100:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):194:196 -> a
+    101:102:boolean isDefaultConstructor(com.android.tools.r8.graph.DexEncodedMethod):176:177 -> a
+    101:102:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):196 -> a
+    103:105:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):199:201 -> a
+    106:110:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):198:202 -> a
+    111:111:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():725:725 -> a
+    111:111:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):202 -> a
+    112:138:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):202:228 -> a
+    139:154:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):223:238 -> a
+    155:157:boolean lambda$reachableFields$0(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexField):245:247 -> a
+    158:158:java.util.Collection getRemovedClasses():278:278 -> a
+    1:12:com.android.tools.r8.graph.DexApplication run():50:61 -> b
+    13:14:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):69:70 -> b
+    13:14:com.android.tools.r8.graph.DexApplication run():61 -> b
+    15:17:com.android.tools.r8.graph.DexApplication run():61:63 -> b
+    18:50:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):242:274 -> b
+com.android.tools.r8.shaking.UnusedArgumentRule -> a.a.a.a.s.rc:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.UnusedArgumentRule$1):10 -> <init>
     java.lang.String typeString() -> r
     1:1:com.android.tools.r8.shaking.UnusedArgumentRule$Builder builder():74:74 -> s
-com.android.tools.r8.shaking.UnusedArgumentRule$1 -> a.a.a.a.s.rc:
-com.android.tools.r8.shaking.UnusedArgumentRule$Builder -> a.a.a.a.s.sc:
+com.android.tools.r8.shaking.UnusedArgumentRule$1 -> a.a.a.a.s.pc:
+com.android.tools.r8.shaking.UnusedArgumentRule$Builder -> a.a.a.a.s.qc:
     1:1:void <init>():16:16 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.UnusedArgumentRule$1):12 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.UsagePrinter -> a.a.a.a.s.wc:
+com.android.tools.r8.shaking.UsagePrinter -> a.a.a.a.s.uc:
     com.android.tools.r8.graph.DexProgramClass enclosingClazz -> b
     boolean $assertionsDisabled -> e
     java.lang.StringBuilder writer -> a
@@ -45868,8 +45104,8 @@
     1:2:void visiting(com.android.tools.r8.graph.DexProgramClass):39:40 -> b
     3:4:void visited():45:46 -> b
     1:5:void printClazzPrefixIfNecessary():50:54 -> c
-com.android.tools.r8.shaking.UsagePrinter$1 -> a.a.a.a.s.uc:
-com.android.tools.r8.shaking.UsagePrinter$NoOpUsagePrinter -> a.a.a.a.s.vc:
+com.android.tools.r8.shaking.UsagePrinter$1 -> a.a.a.a.s.sc:
+com.android.tools.r8.shaking.UsagePrinter$NoOpUsagePrinter -> a.a.a.a.s.tc:
     1:1:void <init>():91:91 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.UsagePrinter$1):91 -> <init>
     void printUnusedClass(com.android.tools.r8.graph.DexProgramClass) -> a
@@ -45877,11 +45113,11 @@
     void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void visited() -> b
     void visiting(com.android.tools.r8.graph.DexProgramClass) -> b
-com.android.tools.r8.shaking.VerticalClassMerger -> a.a.a.a.s.Ic:
-    com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> b
+com.android.tools.r8.shaking.VerticalClassMerger -> a.a.a.a.s.Gc:
     boolean $assertionsDisabled -> o
     com.android.tools.r8.graph.AppView appView -> c
     com.android.tools.r8.shaking.MainDexClasses mainDexClasses -> n
+    com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness appInfo -> b
     java.util.Collection invokes -> g
     java.util.Set mergeCandidates -> h
     com.android.tools.r8.graph.DexApplication application -> a
@@ -45893,63 +45129,63 @@
     com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder renamedMembersLense -> l
     java.util.Set pinnedTypes -> k
     java.util.List synthesizedBridges -> m
-    1:1:void <clinit>():91:91 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):232:232 -> <init>
-    2:36:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):208:242 -> <init>
-    37:75:void initializePinnedTypes(java.lang.Iterable):264:302 -> <init>
-    37:75:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):243 -> <init>
-    76:78:void initializeMergeCandidates(java.lang.Iterable):252:254 -> <init>
-    76:78:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):244 -> <init>
-    1:1:java.util.Set access$100(com.android.tools.r8.shaking.VerticalClassMerger):91:91 -> a
-    2:2:com.android.tools.r8.graph.DexProto access$1200(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):91:91 -> a
-    3:3:com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses getMergedClasses():248:248 -> a
-    4:21:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):307:324 -> a
-    22:31:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):331:340 -> a
-    32:48:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):353:369 -> a
-    49:49:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.isSerializable(com.android.tools.r8.graph.DexType):597:597 -> a
-    49:49:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):369 -> a
-    50:68:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):369:387 -> a
-    69:78:boolean disallowInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):1621:1630 -> a
-    69:78:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):387 -> a
-    79:79:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):395:395 -> a
-    80:98:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):409:427 -> a
-    99:136:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):458:495 -> a
-    99:136:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):434 -> a
-    137:179:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):690:732 -> a
-    137:179:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):440 -> a
-    180:197:boolean fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):821:838 -> a
-    180:197:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):448 -> a
-    198:198:boolean lambda$isStillMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):420:420 -> a
-    199:254:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):618:673 -> a
-    255:258:void makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1400:1403 -> a
-    255:258:void access$1300(com.android.tools.r8.graph.DexEncodedMethod):91 -> a
-    259:262:com.android.tools.r8.graph.DexProto getStaticProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1407:1410 -> a
-    1:1:com.android.tools.r8.utils.Timing access$1000(com.android.tools.r8.shaking.VerticalClassMerger):91:91 -> b
-    2:59:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):744:801 -> b
-    60:60:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):796:796 -> b
-    61:61:java.util.Collection getRemovedClasses():1934:1934 -> b
-    1:1:com.android.tools.r8.ir.optimize.MethodPoolCollection access$1100(com.android.tools.r8.shaking.VerticalClassMerger):91:91 -> c
-    2:12:com.android.tools.r8.graph.GraphLense run():602:612 -> c
-    13:18:com.android.tools.r8.graph.GraphLense run():608:613 -> c
-    1:1:com.android.tools.r8.graph.DexApplication access$1400(com.android.tools.r8.shaking.VerticalClassMerger):91:91 -> d
-    2:7:com.android.tools.r8.graph.GraphLense mergeClasses():681:686 -> d
-    1:1:java.util.Map access$1500(com.android.tools.r8.shaking.VerticalClassMerger):91:91 -> e
-    1:1:java.util.Map access$1600(com.android.tools.r8.shaking.VerticalClassMerger):91:91 -> f
-    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder access$1700(com.android.tools.r8.shaking.VerticalClassMerger):91:91 -> g
-    1:1:java.util.List access$1800(com.android.tools.r8.shaking.VerticalClassMerger):91:91 -> h
-    1:4:java.util.Collection getInvokes():504:507 -> i
-    1:4:java.util.Collection access$1900(com.android.tools.r8.shaking.VerticalClassMerger):91 -> i
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness access$200(com.android.tools.r8.shaking.VerticalClassMerger):91:91 -> j
-    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):91:91 -> k
-    1:1:java.util.concurrent.ExecutorService access$900(com.android.tools.r8.shaking.VerticalClassMerger):91:91 -> l
-com.android.tools.r8.shaking.VerticalClassMerger$1 -> a.a.a.a.s.xc:
+    1:1:void <clinit>():92:92 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):233:233 -> <init>
+    2:36:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):209:243 -> <init>
+    37:75:void initializePinnedTypes(java.lang.Iterable):265:303 -> <init>
+    37:75:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):244 -> <init>
+    76:78:void initializeMergeCandidates(java.lang.Iterable):253:255 -> <init>
+    76:78:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):245 -> <init>
+    1:1:java.util.Set access$100(com.android.tools.r8.shaking.VerticalClassMerger):92:92 -> a
+    2:2:com.android.tools.r8.graph.DexProto access$1200(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):92:92 -> a
+    3:3:com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses getMergedClasses():249:249 -> a
+    4:21:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):308:325 -> a
+    22:31:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):332:341 -> a
+    32:48:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):354:370 -> a
+    49:50:boolean com.android.tools.r8.graph.DexType.isSerializable(com.android.tools.r8.graph.DexDefinitionSupplier):125:126 -> a
+    49:50:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):370 -> a
+    51:69:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):370:388 -> a
+    70:79:boolean disallowInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):1618:1627 -> a
+    70:79:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):388 -> a
+    80:80:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):396:396 -> a
+    81:99:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):410:428 -> a
+    100:137:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):459:496 -> a
+    100:137:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):435 -> a
+    138:180:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):687:729 -> a
+    138:180:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):441 -> a
+    181:198:boolean fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):818:835 -> a
+    181:198:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):449 -> a
+    199:199:boolean lambda$isStillMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):421:421 -> a
+    200:255:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):616:671 -> a
+    256:259:void makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1397:1400 -> a
+    256:259:void access$1300(com.android.tools.r8.graph.DexEncodedMethod):92 -> a
+    260:263:com.android.tools.r8.graph.DexProto getStaticProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1404:1407 -> a
+    1:1:com.android.tools.r8.utils.Timing access$1000(com.android.tools.r8.shaking.VerticalClassMerger):92:92 -> b
+    2:59:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):741:798 -> b
+    60:60:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):793:793 -> b
+    61:61:java.util.Collection getRemovedClasses():1931:1931 -> b
+    1:1:com.android.tools.r8.ir.optimize.MethodPoolCollection access$1100(com.android.tools.r8.shaking.VerticalClassMerger):92:92 -> c
+    2:12:com.android.tools.r8.graph.GraphLense run():600:610 -> c
+    13:18:com.android.tools.r8.graph.GraphLense run():606:611 -> c
+    1:1:com.android.tools.r8.graph.DexApplication access$1400(com.android.tools.r8.shaking.VerticalClassMerger):92:92 -> d
+    2:6:com.android.tools.r8.graph.GraphLense mergeClasses():679:683 -> d
+    1:1:java.util.Map access$1500(com.android.tools.r8.shaking.VerticalClassMerger):92:92 -> e
+    1:1:java.util.Map access$1600(com.android.tools.r8.shaking.VerticalClassMerger):92:92 -> f
+    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder access$1700(com.android.tools.r8.shaking.VerticalClassMerger):92:92 -> g
+    1:1:java.util.List access$1800(com.android.tools.r8.shaking.VerticalClassMerger):92:92 -> h
+    1:4:java.util.Collection getInvokes():505:508 -> i
+    1:4:java.util.Collection access$1900(com.android.tools.r8.shaking.VerticalClassMerger):92 -> i
+    1:1:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness access$200(com.android.tools.r8.shaking.VerticalClassMerger):92:92 -> j
+    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):92:92 -> k
+    1:1:java.util.concurrent.ExecutorService access$900(com.android.tools.r8.shaking.VerticalClassMerger):92:92 -> l
+com.android.tools.r8.shaking.VerticalClassMerger$1 -> a.a.a.a.s.vc:
     int[] $SwitchMap$com$android$tools$r8$shaking$VerticalClassMerger$Rename -> b
     int[] $SwitchMap$com$android$tools$r8$ir$code$Invoke$Type -> c
     int[] $SwitchMap$com$android$tools$r8$shaking$VerticalClassMerger$AbortReason -> a
-    1:1:void <clinit>():1917:1917 -> <clinit>
-    2:2:void <clinit>():1334:1334 -> <clinit>
-    3:3:void <clinit>():143:143 -> <clinit>
-com.android.tools.r8.shaking.VerticalClassMerger$AbortReason -> a.a.a.a.s.yc:
+    1:1:void <clinit>():1914:1914 -> <clinit>
+    2:2:void <clinit>():1331:1331 -> <clinit>
+    3:3:void <clinit>():144:144 -> <clinit>
+com.android.tools.r8.shaking.VerticalClassMerger$AbortReason -> a.a.a.a.s.wc:
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason RESOLUTION_FOR_FIELDS_MAY_CHANGE -> h
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason PINNED_SOURCE -> g
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason NO_SIDE_EFFECTS -> f
@@ -45965,11 +45201,11 @@
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason STATIC_INITIALIZERS -> j
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason RESOLUTION_FOR_METHODS_MAY_CHANGE -> i
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason[] $VALUES -> o
-    1:15:void <clinit>():121:135 -> <clinit>
-    16:16:void <clinit>():121:121 -> <clinit>
-    1:1:void <init>(java.lang.String,int):121:121 -> <init>
-    1:1:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason[] values():121:121 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> a.a.a.a.s.zc:
+    1:15:void <clinit>():122:136 -> <clinit>
+    16:16:void <clinit>():122:122 -> <clinit>
+    1:1:void <init>(java.lang.String,int):122:122 -> <init>
+    1:1:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason[] values():122:122 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> a.a.a.a.s.xc:
     com.android.tools.r8.graph.DexClass source -> a
     com.android.tools.r8.graph.DexClass target -> b
     com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder deferredRenamings -> c
@@ -45977,78 +45213,78 @@
     boolean abortMerge -> e
     boolean $assertionsDisabled -> g
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> f
-    1:1:void <clinit>():849:849 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):861:861 -> <init>
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.VerticalClassMerger$1):849 -> <init>
-    2:10:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):855:863 -> <init>
-    2:10:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.VerticalClassMerger$1):849 -> <init>
-    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):878:881 -> a
-    5:7:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):949:951 -> a
-    8:8:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):950:950 -> a
-    9:9:boolean lambda$merge$2(java.util.Set,com.android.tools.r8.graph.DexField):1010:1010 -> a
-    10:10:java.util.Set lambda$merge$3(com.android.tools.r8.graph.DexType):1054:1054 -> a
-    11:27:boolean restoreDebuggingState(java.util.stream.Stream):1060:1076 -> a
-    28:28:boolean restoreDebuggingState(java.util.stream.Stream):1075:1075 -> a
-    29:31:void lambda$restoreDebuggingState$4(com.android.tools.r8.graph.DexEncodedMethod):1062:1064 -> a
-    32:32:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder getRenamings():1084:1084 -> a
-    33:33:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1242:1242 -> a
-    34:37:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1264:1267 -> a
-    38:43:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1365:1370 -> a
-    38:43:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1268 -> a
+    1:1:void <clinit>():846:846 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):858:858 -> <init>
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.VerticalClassMerger$1):846 -> <init>
+    2:10:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):852:860 -> <init>
+    2:10:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.VerticalClassMerger$1):846 -> <init>
+    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):875:878 -> a
+    5:7:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):946:948 -> a
+    8:8:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):947:947 -> a
+    9:9:boolean lambda$merge$2(java.util.Set,com.android.tools.r8.graph.DexField):1007:1007 -> a
+    10:10:java.util.Set lambda$merge$3(com.android.tools.r8.graph.DexType):1051:1051 -> a
+    11:27:boolean restoreDebuggingState(java.util.stream.Stream):1057:1073 -> a
+    28:28:boolean restoreDebuggingState(java.util.stream.Stream):1072:1072 -> a
+    29:31:void lambda$restoreDebuggingState$4(com.android.tools.r8.graph.DexEncodedMethod):1059:1061 -> a
+    32:32:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder getRenamings():1081:1081 -> a
+    33:33:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1239:1239 -> a
+    34:37:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1261:1264 -> a
+    38:43:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1362:1367 -> a
+    38:43:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1265 -> a
     44:44:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    44:44:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1373 -> a
-    44:44:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1268 -> a
-    45:52:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1373:1380 -> a
-    45:52:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1268 -> a
-    53:54:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1269:1270 -> a
+    44:44:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1370 -> a
+    44:44:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1265 -> a
+    45:52:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1370:1377 -> a
+    45:52:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1265 -> a
+    53:54:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1266:1267 -> a
     55:55:void com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):262:262 -> a
-    55:55:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1270 -> a
-    56:61:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1271:1276 -> a
-    62:66:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1285:1289 -> a
-    67:67:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1319:1319 -> a
-    68:96: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):1329:1357 -> a
-    97:98: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):1336:1337 -> a
+    55:55:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1267 -> a
+    56:61:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1268:1273 -> a
+    62:66:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1282:1286 -> a
+    67:67:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1316:1316 -> a
+    68:96: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):1326:1354 -> a
+    97:98: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):1333:1334 -> a
     99:99:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    99:99: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):1345 -> a
-    100:115: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):1345:1360 -> a
-    1:5:void lambda$restoreDebuggingState$5(com.android.tools.r8.graph.DexEncodedMethod):1068:1072 -> b
-    6:6:java.util.List getSynthesizedBridges():1088:1088 -> b
-    1:2:boolean merge():870:871 -> c
-    3:4:void addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1247:1248 -> c
-    3:4:boolean merge():871 -> c
-    5:17:boolean merge():873:885 -> c
-    18:37:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1294:1313 -> c
-    18:37:boolean merge():888 -> c
-    38:38:boolean merge():889:889 -> c
-    39:48:boolean merge():886:895 -> c
-    49:58:boolean merge():892:901 -> c
-    59:59:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1168:1168 -> c
-    59:59:boolean merge():901 -> c
-    60:60:boolean merge():906:906 -> c
-    61:69:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1213:1221 -> c
-    61:69:boolean merge():907 -> c
-    70:79:boolean merge():909:918 -> c
-    80:116:boolean merge():917:953 -> c
-    117:117:boolean merge():946:946 -> c
-    118:128:void makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1384:1394 -> c
-    118:128:boolean merge():954 -> c
-    129:143:boolean merge():957:971 -> c
-    144:198:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1092:1146 -> c
-    144:198:boolean merge():971 -> c
-    199:199:boolean merge():972:972 -> c
-    200:200:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1168:1168 -> c
-    200:200:boolean merge():972 -> c
-    201:234:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1173:1206 -> c
-    201:234:boolean merge():980 -> c
-    235:245:boolean merge():981:991 -> c
-    246:271:boolean merge():990:1015 -> c
-    272:281:boolean merge():1013:1022 -> c
-    282:289:boolean merge():1020:1027 -> c
-    290:292:java.util.Set mergeArrays(java.lang.Object[],java.lang.Object[]):1253:1255 -> c
-    290:292:boolean merge():1027 -> c
-    293:318:boolean merge():1030:1055 -> c
-    319:320:boolean lambda$restoreDebuggingState$6(com.android.tools.r8.graph.DexEncodedMethod):1078:1079 -> c
-com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> a.a.a.a.s.Ac:
+    99:99: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):1342 -> a
+    100:115: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):1342:1357 -> a
+    1:5:void lambda$restoreDebuggingState$5(com.android.tools.r8.graph.DexEncodedMethod):1065:1069 -> b
+    6:6:java.util.List getSynthesizedBridges():1085:1085 -> b
+    1:2:boolean merge():867:868 -> c
+    3:4:void addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1244:1245 -> c
+    3:4:boolean merge():868 -> c
+    5:17:boolean merge():870:882 -> c
+    18:37:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1291:1310 -> c
+    18:37:boolean merge():885 -> c
+    38:38:boolean merge():886:886 -> c
+    39:48:boolean merge():883:892 -> c
+    49:58:boolean merge():889:898 -> c
+    59:59:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1165:1165 -> c
+    59:59:boolean merge():898 -> c
+    60:60:boolean merge():903:903 -> c
+    61:69:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1210:1218 -> c
+    61:69:boolean merge():904 -> c
+    70:79:boolean merge():906:915 -> c
+    80:116:boolean merge():914:950 -> c
+    117:117:boolean merge():943:943 -> c
+    118:128:void makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1381:1391 -> c
+    118:128:boolean merge():951 -> c
+    129:143:boolean merge():954:968 -> c
+    144:198:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1089:1143 -> c
+    144:198:boolean merge():968 -> c
+    199:199:boolean merge():969:969 -> c
+    200:200:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1165:1165 -> c
+    200:200:boolean merge():969 -> c
+    201:234:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1170:1203 -> c
+    201:234:boolean merge():977 -> c
+    235:245:boolean merge():978:988 -> c
+    246:271:boolean merge():987:1012 -> c
+    272:281:boolean merge():1010:1019 -> c
+    282:289:boolean merge():1017:1024 -> c
+    290:292:java.util.Set mergeArrays(java.lang.Object[],java.lang.Object[]):1250:1252 -> c
+    290:292:boolean merge():1024 -> c
+    293:318:boolean merge():1027:1052 -> c
+    319:320:boolean lambda$restoreDebuggingState$6(com.android.tools.r8.graph.DexEncodedMethod):1075:1076 -> c
+com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> a.a.a.a.s.yc:
     java.util.Map seenPositions -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap sourceProtoCache -> c
     java.util.Collection invokes -> f
@@ -46057,127 +45293,127 @@
     boolean $assertionsDisabled -> h
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> g
     com.android.tools.r8.graph.DexType target -> e
-    1:1:void <clinit>():1510:1510 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1521:1521 -> <init>
-    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):1510 -> <init>
-    2:14:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1515:1527 -> <init>
-    2:14: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):1510 -> <init>
-    1:22:boolean mayCollide():1531:1552 -> a
-    23:24:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1564:1565 -> a
-    25:56:int computePositionsFor(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1584:1615 -> a
-    1:18:void fillSeenPositions():1557:1574 -> b
-com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> a.a.a.a.s.Bc:
+    1:1:void <clinit>():1507:1507 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1518:1518 -> <init>
+    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):1507 -> <init>
+    2:14:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1512:1524 -> <init>
+    2:14: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):1507 -> <init>
+    1:22:boolean mayCollide():1528:1549 -> a
+    23:24:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1561:1562 -> a
+    25:56:int computePositionsFor(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1581:1612 -> a
+    1:18:void fillSeenPositions():1554:1571 -> b
+com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> a.a.a.a.s.zc:
     com.android.tools.r8.graph.AppView appView -> e
     boolean $assertionsDisabled -> g
     com.android.tools.r8.graph.DexMethod context -> d
     com.android.tools.r8.graph.DexClass source -> f
     boolean foundIllegalAccess -> c
-    1:1:void <clinit>():1720:1720 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1729:1729 -> <init>
-    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1722:1731 -> <init>
-    1:1:boolean foundIllegalAccess():1735:1735 -> a
-    2:2:void setContext(com.android.tools.r8.graph.DexEncodedMethod):1739:1739 -> a
-    3:6:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):1802:1805 -> a
-    7:7:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):1839:1839 -> a
-    1:4:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):1818:1821 -> b
-    5:5:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):1834:1834 -> b
-    1:4:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):1810:1813 -> c
-    5:5:boolean registerNewInstance(com.android.tools.r8.graph.DexType):1844:1844 -> c
-    6:6:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):1849:1849 -> c
-    1:4:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):1826:1829 -> d
-    5:5:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):1854:1854 -> d
-    6:6:boolean registerTypeReference(com.android.tools.r8.graph.DexType):1859:1859 -> d
-    1:10:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1743:1752 -> e
-    11:17:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1779:1785 -> e
-    18:21:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):1794:1797 -> e
-    1:12:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1760:1771 -> f
-com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> a.a.a.a.s.Cc:
+    1:1:void <clinit>():1717:1717 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1726:1726 -> <init>
+    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1719:1728 -> <init>
+    1:1:boolean foundIllegalAccess():1732:1732 -> a
+    2:2:void setContext(com.android.tools.r8.graph.DexEncodedMethod):1736:1736 -> a
+    3:6:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):1799:1802 -> a
+    7:7:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):1836:1836 -> a
+    1:4:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):1815:1818 -> b
+    5:5:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):1831:1831 -> b
+    1:4:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):1807:1810 -> c
+    5:5:boolean registerNewInstance(com.android.tools.r8.graph.DexType):1841:1841 -> c
+    6:6:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):1846:1846 -> c
+    1:4:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):1823:1826 -> d
+    5:5:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):1851:1851 -> d
+    6:6:boolean registerTypeReference(com.android.tools.r8.graph.DexType):1856:1856 -> d
+    1:10:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1740:1749 -> e
+    11:17:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1776:1782 -> e
+    18:21:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):1791:1794 -> e
+    1:12:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1757:1768 -> f
+com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> a.a.a.a.s.Ac:
     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):518:518 -> <init>
-    2:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):513:520 -> <init>
-    1:11:java.util.Collection get():525:535 -> a
-    12:26:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):567:581 -> a
-    12:26:java.util.Collection get():536 -> a
-    27:49:java.util.Collection get():537:559 -> a
-    50:50:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):543:543 -> a
-    51:58:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):587:594 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$Rename -> a.a.a.a.s.Dc:
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):519:519 -> <init>
+    2:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):514:521 -> <init>
+    1:9:java.util.Collection get():526:534 -> a
+    10:24:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):565:579 -> a
+    10:24:java.util.Collection get():535 -> a
+    25:46:java.util.Collection get():536:557 -> a
+    47:47:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):542:542 -> a
+    48:55:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):585:592 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$Rename -> a.a.a.a.s.Bc:
     com.android.tools.r8.shaking.VerticalClassMerger$Rename[] $VALUES -> d
     com.android.tools.r8.shaking.VerticalClassMerger$Rename IF_NEEDED -> b
     com.android.tools.r8.shaking.VerticalClassMerger$Rename ALWAYS -> a
     com.android.tools.r8.shaking.VerticalClassMerger$Rename NEVER -> c
-    1:3:void <clinit>():194:196 -> <clinit>
-    4:4:void <clinit>():193:193 -> <clinit>
-    1:1:void <init>(java.lang.String,int):193:193 -> <init>
-    1:1:com.android.tools.r8.shaking.VerticalClassMerger$Rename[] values():193:193 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLense -> a.a.a.a.s.Ec:
+    1:3:void <clinit>():195:197 -> <clinit>
+    4:4:void <clinit>():194:194 -> <clinit>
+    1:1:void <init>(java.lang.String,int):194:194 -> <init>
+    1:1:com.android.tools.r8.shaking.VerticalClassMerger$Rename[] values():194:194 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLense -> a.a.a.a.s.Cc:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> d
     com.android.tools.r8.graph.DexType target -> c
     com.android.tools.r8.graph.DexType source -> b
-    1:1:void <clinit>():1638:1638 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1643:1645 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1650:1650 -> a
-    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1655:1655 -> a
-    3:3:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1660:1660 -> a
-    4:21:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1682:1699 -> a
-    1:1:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1665:1665 -> b
-    2:2:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):1670:1670 -> b
-    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):1675:1675 -> b
+    1:1:void <clinit>():1635:1635 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1640:1642 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1647:1647 -> a
+    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1652:1652 -> a
+    3:3:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1657:1657 -> a
+    4:21:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1679:1696 -> a
+    1:1:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1662:1662 -> b
+    2:2:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):1667:1667 -> b
+    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):1672:1672 -> b
     boolean isContextFreeForMethods() -> c
-    1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1709:1709 -> c
-    1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):1704:1704 -> f
-com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> a.a.a.a.s.Fc:
+    1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1706:1706 -> c
+    1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):1701:1701 -> f
+com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> a.a.a.a.s.Dc:
     com.android.tools.r8.ir.code.Invoke$Type type -> g
     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: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):1876:1881 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethod access$600(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):1863:1863 -> a
-    2:3:void updateMethodSignatures(java.util.function.Function):1896:1897 -> a
-    4:8:com.android.tools.r8.ir.conversion.SourceCode lambda$getSourceCodeProvider$0(com.android.tools.r8.ir.code.Position):1903:1907 -> a
-    1:11:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):1917:1927 -> b
-    12:12:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):1919:1919 -> b
-    1:1:java.util.function.Consumer getRegistryCallback():1916:1916 -> s
-    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1902:1902 -> t
-com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer -> a.a.a.a.s.Gc:
+    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):1873:1878 -> <init>
+    1:1:com.android.tools.r8.graph.DexMethod access$600(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):1860:1860 -> a
+    2:3:void updateMethodSignatures(java.util.function.Function):1893:1894 -> a
+    4:8:com.android.tools.r8.ir.conversion.SourceCode lambda$getSourceCodeProvider$0(com.android.tools.r8.ir.code.Position):1900:1904 -> a
+    1:11:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):1914:1924 -> b
+    12:12:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):1916:1916 -> b
+    1:1:java.util.function.Consumer getRegistryCallback():1913:1913 -> s
+    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1899:1899 -> t
+com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer -> a.a.a.a.s.Ec:
     java.util.Map protoFixupCache -> b
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> c
     com.android.tools.r8.graph.GraphLense$Builder lense -> a
-    1:4:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1413:1416 -> <init>
-    1:4:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.shaking.VerticalClassMerger$1):1413 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLense access$500(com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer,com.android.tools.r8.graph.GraphLense):1413:1413 -> a
-    2:15:com.android.tools.r8.graph.GraphLense fixupTypeReferences(com.android.tools.r8.graph.GraphLense):1420:1433 -> a
-    16:22:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1440:1446 -> a
-    23:31:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1455:1463 -> a
-    32:33:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1469:1470 -> a
-    34:37:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1474:1477 -> a
-    34:37:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1470 -> a
-    38:40:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):1502:1504 -> a
-    38:40:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1477 -> a
-    38:40:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1470 -> a
-    41:42:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1478:1479 -> a
-    41:42:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1470 -> a
-    43:43:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1470:1470 -> a
-    44:44:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1469:1469 -> a
-    45:55:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):1485:1495 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses -> a.a.a.a.s.Hc:
+    1:4:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1410:1413 -> <init>
+    1:4:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.shaking.VerticalClassMerger$1):1410 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLense access$500(com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer,com.android.tools.r8.graph.GraphLense):1410:1410 -> a
+    2:15:com.android.tools.r8.graph.GraphLense fixupTypeReferences(com.android.tools.r8.graph.GraphLense):1417:1430 -> a
+    16:22:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1437:1443 -> a
+    23:31:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1452:1460 -> a
+    32:33:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1466:1467 -> a
+    34:37:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1471:1474 -> a
+    34:37:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1467 -> a
+    38:40:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):1499:1501 -> a
+    38:40:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1474 -> a
+    38:40:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1467 -> a
+    41:42:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1475:1476 -> a
+    41:42:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1467 -> a
+    43:43:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1467:1467 -> a
+    44:44:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1466:1466 -> a
+    45:55:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):1482:1492 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses -> a.a.a.a.s.Fc:
     java.util.Map mergedClasses -> a
     java.util.Map sources -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():93:93 -> <clinit>
-    1:1:void <init>(java.util.Map,com.android.tools.r8.shaking.VerticalClassMerger$1):93:93 -> <init>
-    2:8:void <init>(java.util.Map):98:104 -> <init>
-    1:1:void lambda$new$1(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):102:102 -> a
-    2:2:java.util.List getSourcesFor(com.android.tools.r8.graph.DexType):108:108 -> a
-    1:2:com.android.tools.r8.graph.DexType getTargetFor(com.android.tools.r8.graph.DexType):112:113 -> b
-    1:1:boolean hasBeenMergedIntoSubtype(com.android.tools.r8.graph.DexType):117:117 -> c
-    1:1:java.util.List lambda$new$0(com.android.tools.r8.graph.DexType):102:102 -> d
-com.android.tools.r8.shaking.VerticalClassMergerGraphLense -> a.a.a.a.s.Kc:
+    1:1:void <clinit>():94:94 -> <clinit>
+    1:1:void <init>(java.util.Map,com.android.tools.r8.shaking.VerticalClassMerger$1):94:94 -> <init>
+    2:8:void <init>(java.util.Map):99:105 -> <init>
+    1:1:void lambda$new$1(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):103:103 -> a
+    2:2:java.util.List getSourcesFor(com.android.tools.r8.graph.DexType):109:109 -> a
+    1:2:com.android.tools.r8.graph.DexType getTargetFor(com.android.tools.r8.graph.DexType):113:114 -> b
+    1:1:boolean hasBeenMergedIntoSubtype(com.android.tools.r8.graph.DexType):118:118 -> c
+    1:1:java.util.List lambda$new$0(com.android.tools.r8.graph.DexType):103:103 -> d
+com.android.tools.r8.shaking.VerticalClassMergerGraphLense -> a.a.a.a.s.Ic:
     boolean $assertionsDisabled -> o
     java.util.Map originalMethodSignaturesForBridges -> n
     java.util.Map contextualVirtualToDirectMethodMaps -> l
@@ -46197,7 +45433,7 @@
     1:1:boolean isContextFreeForMethods():146:146 -> c
     2:8:boolean isContextFreeForMethod(com.android.tools.r8.graph.DexMethod):151:157 -> c
     1:12:java.util.Set lookupMethodInAllContexts(com.android.tools.r8.graph.DexMethod):130:141 -> e
-com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder -> a.a.a.a.s.Jc:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder -> a.a.a.a.s.Hc:
     java.util.Map methodMap -> b
     com.android.tools.r8.com.google.common.collect.BiMap fieldMap -> a
     java.util.Map contextualVirtualToDirectMethodMaps -> d
@@ -46224,7 +45460,7 @@
     54:67:void merge(com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder):285:298 -> a
     1:1:void recordCreationOfBridgeMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):274:274 -> b
     1:1:void recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):270:270 -> c
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> a.a.a.a.s.Nc:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> a.a.a.a.s.Lc:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():43:43 -> <clinit>
     1:1:void <init>(com.android.tools.r8.experimental.graphinfo.GraphConsumer):58:58 -> <init>
@@ -46252,7 +45488,7 @@
     34:38:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):230 -> d
     39:45:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):230:236 -> d
     46:46:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):235:235 -> d
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter -> a.a.a.a.s.Lc:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter -> a.a.a.a.s.Jc:
     java.io.PrintStream output -> a
     int indentation -> b
     1:1:void <init>(java.io.PrintStream):257:257 -> <init>
@@ -46262,7 +45498,7 @@
     1:2:void indent():268:269 -> b
     3:5:void addReason(java.lang.String):274:276 -> b
     1:3:void startItem(java.lang.String):262:264 -> c
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> a.a.a.a.s.Mc:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> a.a.a.a.s.Kc:
     com.android.tools.r8.experimental.graphinfo.GraphNode node -> a
     com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath path -> b
     boolean $assertionsDisabled -> c
@@ -46272,7 +45508,6 @@
     1:1:void <init>():12:12 -> <init>
     2:2:void <init>(java.lang.String):17:17 -> <init>
 com.android.tools.r8.utils.Action -> a.a.a.a.t.b:
-    void execute() -> a
 com.android.tools.r8.utils.AndroidApiLevel -> a.a.a.a.t.c:
     com.android.tools.r8.utils.AndroidApiLevel F -> w
     com.android.tools.r8.utils.AndroidApiLevel G_MR1 -> u
@@ -46310,37 +45545,37 @@
     30:61:void <clinit>():11:42 -> <clinit>
     1:2:void <init>(java.lang.String,int,int):46:47 -> <init>
     1:1:int getLevel():51:51 -> a
-    1:1:java.lang.String getName():55:55 -> b
-    1:1:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):143:143 -> c
-    2:2:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):141:141 -> c
-    3:3:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):139:139 -> c
-    4:4:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):137:137 -> c
-    5:5:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):135:135 -> c
-    6:6:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):133:133 -> c
-    7:7:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):131:131 -> c
-    8:8:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):129:129 -> c
-    9:9:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):127:127 -> c
-    10:10:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):125:125 -> c
-    11:11:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):123:123 -> c
-    12:12:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):121:121 -> c
-    13:13:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):119:119 -> c
-    14:14:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):117:117 -> c
-    15:15:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):115:115 -> c
-    16:16:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):113:113 -> c
-    17:17:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):111:111 -> c
-    18:18:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):109:109 -> c
-    19:19:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):107:107 -> c
-    20:20:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):105:105 -> c
-    21:21:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):103:103 -> c
-    22:22:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):101:101 -> c
-    23:23:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):99:99 -> c
-    24:24:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):97:97 -> c
-    25:25:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):95:95 -> c
-    26:26:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):93:93 -> c
-    27:27:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):91:91 -> c
-    28:28:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):89:89 -> c
-    29:29:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):87:87 -> c
-    30:30:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):85:85 -> c
+    1:1:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):143:143 -> b
+    2:2:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):141:141 -> b
+    3:3:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):139:139 -> b
+    4:4:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):137:137 -> b
+    5:5:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):135:135 -> b
+    6:6:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):133:133 -> b
+    7:7:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):131:131 -> b
+    8:8:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):129:129 -> b
+    9:9:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):127:127 -> b
+    10:10:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):125:125 -> b
+    11:11:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):123:123 -> b
+    12:12:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):121:121 -> b
+    13:13:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):119:119 -> b
+    14:14:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):117:117 -> b
+    15:15:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):115:115 -> b
+    16:16:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):113:113 -> b
+    17:17:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):111:111 -> b
+    18:18:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):109:109 -> b
+    19:19:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):107:107 -> b
+    20:20:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):105:105 -> b
+    21:21:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):103:103 -> b
+    22:22:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):101:101 -> b
+    23:23:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):99:99 -> b
+    24:24:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):97:97 -> b
+    25:25:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):95:95 -> b
+    26:26:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):93:93 -> b
+    27:27:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):91:91 -> b
+    28:28:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):89:89 -> b
+    29:29:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):87:87 -> b
+    30:30:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):85:85 -> b
+    1:1:java.lang.String getName():55:55 -> getName
 com.android.tools.r8.utils.AndroidApp -> a.a.a.a.t.h:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.StringResource proguardMapOutputData -> f
@@ -46410,8 +45645,8 @@
     java.util.List val$finalDataResources -> b
     java.util.List val$finalProgramResources -> a
     1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder,java.util.List,java.util.List):664:664 -> <init>
-    1:1:java.util.Collection getProgramResources():667:667 -> a
-    1:2:com.android.tools.r8.DataResourceProvider getDataResourceProvider():672:673 -> b
+    1:2:com.android.tools.r8.DataResourceProvider getDataResourceProvider():672:673 -> a
+    1:1:java.util.Collection getProgramResources():667:667 -> b
 com.android.tools.r8.utils.AndroidApp$Builder$1$1 -> a.a.a.a.t.e:
     com.android.tools.r8.utils.AndroidApp$Builder$1 this$1 -> a
     boolean $assertionsDisabled -> b
@@ -46431,28 +45666,28 @@
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>(java.nio.file.Path):38:38 -> <init>
     2:11:void <init>(java.nio.file.Path):31:40 -> <init>
-    1:2:void open():45:46 -> a
-    3:5:void close(com.android.tools.r8.DiagnosticsHandler):51:53 -> a
-    6:13:void writeDelayed(com.android.tools.r8.DiagnosticsHandler):67:74 -> a
-    6:13:void close(com.android.tools.r8.DiagnosticsHandler):54 -> a
-    14:19:void close(com.android.tools.r8.DiagnosticsHandler):55:60 -> a
-    20:25:void handleIOException(java.io.IOException,com.android.tools.r8.DiagnosticsHandler):100:105 -> a
-    26:26:void addDirectory(java.lang.String,com.android.tools.r8.DiagnosticsHandler):111:111 -> a
-    27:32:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):133:138 -> a
-    33:33:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):137:137 -> a
-    34:43:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):133:142 -> a
-    44:44:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):141:141 -> a
-    45:45:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):139:139 -> a
-    46:46:void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):148:148 -> a
-    47:50:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):171:174 -> a
-    51:55:void writeNextIfAvailable(com.android.tools.r8.DiagnosticsHandler):160:164 -> a
-    51:55:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):175 -> a
-    56:57:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:179 -> a
-    58:58:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:178 -> a
-    1:6:java.util.zip.ZipOutputStream getStreamRaw():80:85 -> b
-    7:13:java.util.zip.ZipOutputStream getStream(com.android.tools.r8.DiagnosticsHandler):90:96 -> b
-    14:27:void writeDirectoryNow(java.lang.String,com.android.tools.r8.DiagnosticsHandler):115:128 -> b
-    28:30:void writeFileNow(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):153:155 -> b
+    1:3:void close(com.android.tools.r8.DiagnosticsHandler):51:53 -> a
+    4:11:void writeDelayed(com.android.tools.r8.DiagnosticsHandler):67:74 -> a
+    4:11:void close(com.android.tools.r8.DiagnosticsHandler):54 -> a
+    12:17:void close(com.android.tools.r8.DiagnosticsHandler):55:60 -> a
+    18:23:java.util.zip.ZipOutputStream getStreamRaw():80:85 -> a
+    24:29:void handleIOException(java.io.IOException,com.android.tools.r8.DiagnosticsHandler):100:105 -> a
+    30:30:void addDirectory(java.lang.String,com.android.tools.r8.DiagnosticsHandler):111:111 -> a
+    31:36:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):133:138 -> a
+    37:37:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):137:137 -> a
+    38:47:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):133:142 -> a
+    48:48:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):141:141 -> a
+    49:49:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):139:139 -> a
+    50:50:void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):148:148 -> a
+    51:54:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):171:174 -> a
+    55:59:void writeNextIfAvailable(com.android.tools.r8.DiagnosticsHandler):160:164 -> a
+    55:59:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):175 -> a
+    60:61:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:179 -> a
+    62:62:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:178 -> a
+    1:7:java.util.zip.ZipOutputStream getStream(com.android.tools.r8.DiagnosticsHandler):90:96 -> b
+    8:21:void writeDirectoryNow(java.lang.String,com.android.tools.r8.DiagnosticsHandler):115:128 -> b
+    22:24:void writeFileNow(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):153:155 -> b
+    1:2:void open():45:46 -> open
 com.android.tools.r8.utils.ArchiveBuilder$1 -> a.a.a.a.t.i:
 com.android.tools.r8.utils.ArchiveBuilder$DelayedData -> a.a.a.a.t.j:
     com.android.tools.r8.ByteDataView content -> b
@@ -46472,15 +45707,15 @@
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():35:35 -> <clinit>
     1:5:void <init>(com.android.tools.r8.shaking.FilteredClassPath,boolean):46:50 -> <init>
+    com.android.tools.r8.DataResourceProvider getDataResourceProvider() -> a
     1:1:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):84:84 -> a
-    2:4:java.util.Collection getProgramResources():99:101 -> a
-    5:10:void accept(com.android.tools.r8.DataResourceProvider$Visitor):112:117 -> a
-    11:11:boolean isProgramResourceName(java.lang.String):135:135 -> a
-    11:11:void accept(com.android.tools.r8.DataResourceProvider$Visitor):117 -> a
-    12:19:void accept(com.android.tools.r8.DataResourceProvider$Visitor):118:125 -> a
-    20:38:void accept(com.android.tools.r8.DataResourceProvider$Visitor):112:130 -> a
-    39:40:void accept(com.android.tools.r8.DataResourceProvider$Visitor):126:127 -> a
-    com.android.tools.r8.DataResourceProvider getDataResourceProvider() -> b
+    2:7:void accept(com.android.tools.r8.DataResourceProvider$Visitor):112:117 -> a
+    8:8:boolean isProgramResourceName(java.lang.String):135:135 -> a
+    8:8:void accept(com.android.tools.r8.DataResourceProvider$Visitor):117 -> a
+    9:16:void accept(com.android.tools.r8.DataResourceProvider$Visitor):118:125 -> a
+    17:35:void accept(com.android.tools.r8.DataResourceProvider$Visitor):112:130 -> a
+    36:37:void accept(com.android.tools.r8.DataResourceProvider$Visitor):126:127 -> a
+    1:3:java.util.Collection getProgramResources():99:101 -> b
     1:10:java.util.List readArchive():54:63 -> c
     11:12:boolean com.android.tools.r8.utils.ZipUtils.isDexFile(java.lang.String):99:100 -> c
     11:12:java.util.List readArchive():64 -> c
@@ -46601,33 +45836,29 @@
 com.android.tools.r8.utils.DescriptorUtils -> a.a.a.a.t.w:
     java.util.Map typeNameToLetterMap -> a
     boolean $assertionsDisabled -> b
-    1:17:void <clinit>():18:34 -> <clinit>
-    1:12:java.lang.String internalToDescriptor(java.lang.String,boolean,boolean):40:51 -> a
-    13:17:java.lang.String internalToDescriptor(java.lang.String,boolean,boolean):50:54 -> a
-    18:24:java.lang.String descriptorToInternalName(java.lang.String):149:155 -> a
-    25:25:java.lang.String descriptorToInternalName(java.lang.String):153:153 -> a
-    26:26:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):168:168 -> a
-    27:27:java.lang.String primitiveDescriptorToJavaType(char):206:206 -> a
-    27:27:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):181 -> a
-    28:28:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):178:178 -> a
-    29:33:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):171:175 -> a
-    34:42:java.lang.String computeInnerClassSeparator(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.InternalOptions):314:322 -> a
-    43:49:java.lang.String computeInnerClassSeparator(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.InternalOptions):321:327 -> a
-    1:1:java.lang.String descriptorToJavaType(java.lang.String):139:139 -> b
-    1:3:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):259:261 -> c
-    1:2:java.lang.String getDescriptorFromClassBinaryName(java.lang.String):292:293 -> d
-    1:1:java.lang.String getPackageBinaryNameFromJavaType(java.lang.String):271:271 -> e
-    1:3:java.lang.String getPackageNameFromBinaryName(java.lang.String):378:380 -> f
-    1:1:java.lang.String getUnqualifiedClassNameFromDescriptor(java.lang.String):217:217 -> g
-    2:3:java.lang.String getUnqualifiedClassNameFromBinaryName(java.lang.String):308:309 -> g
-    2:3:java.lang.String getUnqualifiedClassNameFromDescriptor(java.lang.String):217 -> g
-    1:8:java.lang.String guessTypeDescriptor(java.lang.String):416:423 -> h
-    9:9:java.lang.String guessTypeDescriptor(java.lang.String):421:421 -> h
-    1:26:boolean isClassDescriptor(java.lang.String):335:360 -> i
-    1:6:boolean isValidJavaType(java.lang.String):103:108 -> j
-    1:2:java.lang.String javaTypeToDescriptor(java.lang.String):64:65 -> k
-    1:2:java.lang.String javaTypeToDescriptorIfValidJavaType(java.lang.String):90:91 -> l
-    1:2:java.lang.String javaTypeToDescriptorIgnorePrimitives(java.lang.String):79:80 -> m
+    1:17:void <clinit>():17:33 -> <clinit>
+    1:12:java.lang.String internalToDescriptor(java.lang.String,boolean,boolean):39:50 -> a
+    13:17:java.lang.String internalToDescriptor(java.lang.String,boolean,boolean):49:53 -> a
+    18:24:java.lang.String descriptorToInternalName(java.lang.String):148:154 -> a
+    25:25:java.lang.String descriptorToInternalName(java.lang.String):152:152 -> a
+    26:26:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):167:167 -> a
+    27:27:java.lang.String primitiveDescriptorToJavaType(char):205:205 -> a
+    27:27:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):180 -> a
+    28:28:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):177:177 -> a
+    29:33:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):170:174 -> a
+    1:1:java.lang.String descriptorToJavaType(java.lang.String):138:138 -> b
+    1:3:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):258:260 -> c
+    1:2:java.lang.String getDescriptorFromClassBinaryName(java.lang.String):291:292 -> d
+    1:1:java.lang.String getPackageBinaryNameFromJavaType(java.lang.String):270:270 -> e
+    1:1:java.lang.String getSimpleClassNameFromDescriptor(java.lang.String):216:216 -> f
+    2:6:java.lang.String getSimpleClassNameFromBinaryName(java.lang.String):302:306 -> f
+    2:6:java.lang.String getSimpleClassNameFromDescriptor(java.lang.String):216 -> f
+    1:8:java.lang.String guessTypeDescriptor(java.lang.String):391:398 -> g
+    9:9:java.lang.String guessTypeDescriptor(java.lang.String):396:396 -> g
+    1:26:boolean isClassDescriptor(java.lang.String):310:335 -> h
+    1:6:boolean isValidJavaType(java.lang.String):102:107 -> i
+    1:2:java.lang.String javaTypeToDescriptor(java.lang.String):63:64 -> j
+    1:2:java.lang.String javaTypeToDescriptorIgnorePrimitives(java.lang.String):78:79 -> k
 com.android.tools.r8.utils.DexVersion -> a.a.a.a.t.x:
     byte[] dexVersionBytes -> b
     com.android.tools.r8.utils.DexVersion[] $VALUES -> g
@@ -46647,16 +45878,15 @@
     40:40:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):41:41 -> a
     1:1:int getIntValue():27:27 -> b
     2:2:boolean matchesApiLevel(com.android.tools.r8.utils.AndroidApiLevel):35:35 -> b
-    1:1:com.android.tools.r8.utils.DexVersion getDexVersion(int):88:88 -> c
-    2:2:com.android.tools.r8.utils.DexVersion getDexVersion(int):86:86 -> c
-    3:3:com.android.tools.r8.utils.DexVersion getDexVersion(int):84:84 -> c
-    4:4:com.android.tools.r8.utils.DexVersion getDexVersion(int):82:82 -> c
-    5:5:com.android.tools.r8.utils.DexVersion getDexVersion(int):80:80 -> c
+    3:3:com.android.tools.r8.utils.DexVersion getDexVersion(int):88:88 -> b
+    4:4:com.android.tools.r8.utils.DexVersion getDexVersion(int):86:86 -> b
+    5:5:com.android.tools.r8.utils.DexVersion getDexVersion(int):84:84 -> b
+    6:6:com.android.tools.r8.utils.DexVersion getDexVersion(int):82:82 -> b
+    7:7:com.android.tools.r8.utils.DexVersion getDexVersion(int):80:80 -> b
 com.android.tools.r8.utils.DirectoryBuilder -> a.a.a.a.t.y:
     java.nio.file.Path root -> a
     1:3:void <init>(java.nio.file.Path):24:26 -> <init>
     void close(com.android.tools.r8.DiagnosticsHandler) -> a
-    void open() -> a
     1:5:void addDirectory(java.lang.String,com.android.tools.r8.DiagnosticsHandler):39:43 -> a
     6:8:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):49:51 -> a
     9:15:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):49:55 -> a
@@ -46699,7 +45929,7 @@
     17:17:java.lang.String com.android.tools.r8.utils.StringUtils.joinLines(java.lang.String[]):167 -> b
     17:17:java.lang.String getDiagnosticMessage():55 -> b
     18:18:java.lang.String getDiagnosticMessage():45:45 -> b
-    1:1:com.android.tools.r8.position.Position getPosition():38:38 -> c
+    1:1:com.android.tools.r8.position.Position getPosition():38:38 -> getPosition
 com.android.tools.r8.utils.ExceptionUtils -> a.a.a.a.t.C:
     boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierPart(int) -> a
     1:14:void com.android.tools.r8.utils.ThreadUtils.awaitFutures(java.lang.Iterable):18:31 -> a
@@ -46722,8 +45952,8 @@
     6:6:int doHash(java.lang.Object):14:14 -> a
     7:10:int doHash(com.android.tools.r8.graph.DexField):45:48 -> a
     7:10:int doHash(java.lang.Object):14 -> a
-    1:1:com.android.tools.r8.utils.FieldSignatureEquivalence get():28:28 -> c
-    1:1:com.android.tools.r8.utils.FieldSignatureEquivalence getEquivalenceIgnoreName():32:32 -> d
+    1:1:com.android.tools.r8.utils.FieldSignatureEquivalence getEquivalenceIgnoreName():32:32 -> c
+    1:1:com.android.tools.r8.utils.FieldSignatureEquivalence get():28:28 -> get
 com.android.tools.r8.utils.FileUtils -> a.a.a.a.t.E:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
@@ -46792,157 +46022,149 @@
 com.android.tools.r8.utils.InternalOptions -> a.a.a.a.t.Q:
     com.android.tools.r8.DataResourceConsumer dataResourceConsumer -> e
     boolean enableNonNullTracking -> m
-    java.util.List logArgumentsFilter -> O
-    boolean enableLambdaMerging -> P
+    boolean $assertionsDisabled -> xa
+    boolean enableDesugaring -> P
+    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> fa
     boolean enableVerticalClassMerging -> i
-    java.util.Map warningInvalidParameterAnnotations -> ma
-    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> z
-    java.nio.file.Path proguardCompatibilityRulesOutput -> wa
-    boolean printCfg -> X
-    boolean enableInitializedClassesAnalysis -> q
-    boolean enableInheritanceClassInDexDistributor -> ja
-    int numberOfThreads -> C
+    java.util.Map warningInvalidDebugInfo -> ma
+    boolean skipReadingDexCode -> na
+    boolean ignoreMissingClasses -> X
+    java.util.Map missingEnclosingMembers -> ka
+    boolean enableSideEffectAnalysis -> q
+    com.android.tools.r8.StringConsumer mainDexListConsumer -> oa
     com.android.tools.r8.utils.Reporter reporter -> c
-    boolean processCovariantReturnTypeAnnotations -> T
-    boolean debug -> fa
-    java.lang.String printCfgFile -> Y
-    java.util.Set extensiveLoggingFilter -> J
-    boolean enableSwitchMapRemoval -> y
-    boolean disableAssertions -> ba
-    boolean enableCfFrontend -> da
-    boolean ignoreMainDexMissingClasses -> G
+    boolean enableMainDexListCheck -> T
+    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> J
+    boolean minimalMainDex -> ha
+    boolean enableValuePropagation -> y
+    boolean debugKeepRules -> ba
+    boolean skipIR -> da
     boolean enableHorizontalClassMerging -> h
-    int classInliningInstructionLimit -> u
+    int inliningInstructionAllowance -> u
+    boolean quiet -> C
+    java.util.List methodsFilter -> K
+    boolean intermediate -> M
     boolean enableInlining -> n
+    int minApiLevel -> L
     boolean enableArgumentRemoval -> j
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> va
-    boolean enableMainDexListCheck -> U
-    com.android.tools.r8.dex.Marker marker -> I
-    boolean enableDesugaring -> Q
-    boolean enableSideEffectAnalysis -> r
-    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> ka
-    com.android.tools.r8.StringConsumer usageInformationConsumer -> sa
-    com.android.tools.r8.StringConsumer proguardMapConsumer -> qa
-    int inliningInstructionLimit -> v
-    boolean hasMarker -> H
-    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> K
-    java.util.function.Consumer syntheticProguardRulesConsumer -> xa
-    boolean verbose -> D
-    boolean intermediate -> N
+    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> Q
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> ta
+    boolean enableTreeShaking -> U
+    java.util.List mainDexKeepRules -> ga
+    boolean enableNameReflectionOptimization -> r
+    com.android.tools.r8.StringConsumer configurationConsumer -> sa
+    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> qa
+    boolean forceProguardCompatibility -> Y
+    boolean enableUninstantiatedTypeOptimization -> z
+    int inliningControlFlowResolutionBlocksThreshold -> v
+    java.util.List logArgumentsFilter -> N
+    boolean invalidDebugInfoFatal -> D
     boolean enableClassInlining -> o
-    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> ga
-    int minApiLevel -> M
-    java.util.Map warningInvalidDebugInfo -> na
-    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> R
+    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> R
     boolean enableUnusedArgumentRemoval -> k
-    boolean enableTreeShaking -> V
-    java.util.Map missingEnclosingMembers -> la
-    boolean skipReadingDexCode -> oa
-    com.android.tools.r8.StringConsumer mainDexListConsumer -> pa
-    boolean minimalMainDex -> ia
-    boolean enableServiceLoaderRewriting -> s
-    boolean skipIR -> ea
-    boolean forceProguardCompatibility -> aa
-    boolean ignoreMissingClasses -> Z
-    boolean debugKeepRules -> ca
-    boolean quiet -> E
+    boolean printCfg -> V
+    boolean enableSwitchMapRemoval -> w
+    java.util.Map warningInvalidParameterAnnotations -> la
+    java.nio.file.Path proguardCompatibilityRulesOutput -> va
+    com.android.tools.r8.StringConsumer proguardMapConsumer -> pa
+    boolean enableInheritanceClassInDexDistributor -> ia
+    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> x
+    int numberOfThreads -> A
+    java.lang.String printCfgFile -> W
+    boolean debug -> ea
+    java.util.Set extensiveLoggingFilter -> H
+    boolean disableAssertions -> aa
+    boolean enableMinification -> Z
+    boolean enableCfFrontend -> ca
+    boolean ignoreMainDexMissingClasses -> E
     boolean printTimes -> f
-    int inliningInstructionAllowance -> w
     com.android.tools.r8.ProgramConsumer programConsumer -> d
-    boolean enableValuePropagation -> A
+    int classInliningInstructionLimit -> s
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> b
+    boolean enableLambdaMerging -> O
     boolean enableClassStaticizer -> p
-    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> S
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> ua
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> ua
     boolean enableDevirtualization -> l
-    java.util.List mainDexKeepRules -> ha
-    boolean enableMinification -> W
+    com.android.tools.r8.dex.Marker marker -> G
+    boolean processCovariantReturnTypeAnnotations -> S
     com.android.tools.r8.graph.DexItemFactory itemFactory -> a
-    boolean enableNameReflectionOptimization -> t
-    com.android.tools.r8.StringConsumer configurationConsumer -> ta
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> ra
-    int inliningControlFlowResolutionBlocksThreshold -> x
-    boolean invalidDebugInfoFatal -> F
+    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> ja
+    java.util.Set extensiveFieldMinifierLoggingFilter -> I
+    com.android.tools.r8.StringConsumer usageInformationConsumer -> ra
+    boolean hasMarker -> F
     boolean passthroughDexCode -> g
-    boolean $assertionsDisabled -> ya
-    boolean enableUninstantiatedTypeOptimization -> B
-    java.util.List methodsFilter -> L
+    int inliningInstructionLimit -> t
+    boolean verbose -> B
+    java.util.function.Consumer syntheticProguardRulesConsumer -> wa
     1:1:void <clinit>():43:43 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):91:91 -> <init>
-    2:116:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):64:178 -> <init>
-    117:125:java.util.Set getExtensiveLoggingFilter():324:332 -> <init>
-    117:125:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):248 -> <init>
-    126:126:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):248:248 -> <init>
-    127:135:java.util.Set getExtensiveFieldMinifierLoggingFilter():337:345 -> <init>
-    127:135:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):249 -> <init>
-    136:144:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():350:358 -> <init>
-    136:144:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):251 -> <init>
-    145:147:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):251:253 -> <init>
-    148:148:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():59:59 -> <init>
-    148:148:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):254 -> <init>
-    149:324:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):254:429 -> <init>
-    325:333:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):92:100 -> <init>
-    334:347:void disableGlobalOptimizations():111:124 -> <init>
-    334:347:void disableAllOptimizations():106 -> <init>
-    334:347:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):101 -> <init>
-    348:348:void disableAllOptimizations():107:107 -> <init>
-    348:348:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):101 -> <init>
-    1:1:boolean hasMarker():182:182 -> A
-    1:1:boolean hasMethodsFilter():541:541 -> B
-    1:1:boolean isGeneratingClassFiles():224:224 -> C
-    1:1:boolean isGeneratingDexIndexed():216:216 -> D
-    1:1:boolean isGeneratingDex():212 -> D
-    2:2:boolean isGeneratingDex():212:212 -> D
-    1:1:boolean isGeneratingDexFilePerClassFile():220:220 -> E
-    1:6:boolean isInterfaceMethodDesugaringEnabled():672:677 -> F
-    1:1:boolean isMinifying():287:287 -> G
-    1:1:boolean isShrinking():283:283 -> H
-    1:32:boolean printWarnings():467:498 -> I
-    33:71:boolean printWarnings():494:532 -> I
-    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():320:320 -> J
-    1:4:void signalFinishedToConsumers():240:243 -> K
-    1:1:boolean assertionsEnabled():433:433 -> a
-    2:5:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):438:441 -> a
-    6:10:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):446:450 -> a
-    11:17:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):455:461 -> a
-    18:18:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):456:456 -> a
-    19:19:java.util.List lambda$warningInvalidDebugInfo$2(com.android.tools.r8.origin.Origin):460:460 -> a
-    20:21:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):626:627 -> a
-    1:1:java.util.List lambda$warningInvalidParameterAnnotations$1(com.android.tools.r8.origin.Origin):449:449 -> b
-    2:3:boolean canHaveArtInstanceOfVerifierBug():953:954 -> b
-    1:1:java.util.List lambda$warningMissingEnclosingMember$0(com.android.tools.r8.origin.Origin):440:440 -> c
-    2:2:boolean canHaveCmpLongBug():803:803 -> c
-    boolean canHaveIncorrectJoinForArrayOfInterfacesBug() -> d
-    1:1:boolean canLeaveStaticInterfaceMethodInvokes():655:655 -> e
-    1:1:boolean canUseConstantMethodHandle():639:639 -> f
-    1:1:boolean canUseConstantMethodType():643:643 -> g
-    1:1:boolean canUseDefaultAndStaticInterfaceMethods():651:651 -> h
-    1:2:boolean canUseFilledNewArrayOfObjects():712:713 -> i
-    1:1:boolean canUseInvokeCustom():647:647 -> j
-    1:1:boolean canUseInvokePolymorphic():635:635 -> k
-    1:1:boolean canUseInvokePolymorphicOnVarHandle():631:631 -> l
-    1:1:boolean canUseJava8Methods():663:663 -> m
-    1:1:boolean canUseLongCompareAndObjectsNonNull():686:686 -> n
-    1:2:boolean canUseMultidex():681:682 -> o
-    1:1:boolean canUseNotInstruction():748:748 -> p
-    1:4:boolean canUseParameterNameAnnotations():697:700 -> q
-    1:1:boolean canUsePrivateInterfaceMethods():667:667 -> r
-    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():721:722 -> s
-    1:1:boolean canUseSuppressedExceptions():690:690 -> t
-    1:1:boolean canUseTwrCloseResourceMethod():659:659 -> u
-    1:1:com.android.tools.r8.DexFilePerClassFileConsumer getDexFilePerClassFileConsumer():232:232 -> v
-    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():200:200 -> w
-    2:2:boolean isGeneratingDexIndexed():216:216 -> w
-    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():201 -> w
-    3:9:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():202:208 -> w
-    1:2:com.android.tools.r8.dex.Marker getMarker():191:192 -> x
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():57:57 -> y
-    1:1:boolean hasConsumer():196:196 -> z
+    1:1:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):86:86 -> <init>
+    2:97:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):64:159 -> <init>
+    98:106:java.util.Set getExtensiveLoggingFilter():297:305 -> <init>
+    98:106:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):229 -> <init>
+    107:107:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):229:229 -> <init>
+    108:116:java.util.Set getExtensiveFieldMinifierLoggingFilter():310:318 -> <init>
+    108:116:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):230 -> <init>
+    117:117:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):230:230 -> <init>
+    118:126:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():323:331 -> <init>
+    118:126:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):232 -> <init>
+    127:129:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):232:234 -> <init>
+    130:130:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():59:59 -> <init>
+    130:130:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):235 -> <init>
+    131:298:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):235:402 -> <init>
+    299:318:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):87:106 -> <init>
+    1:1:boolean hasMethodsFilter():514:514 -> A
+    1:1:boolean isGeneratingClassFiles():205:205 -> B
+    1:1:boolean isGeneratingDexIndexed():197:197 -> C
+    1:1:boolean isGeneratingDex():193 -> C
+    2:2:boolean isGeneratingDex():193:193 -> C
+    1:1:boolean isGeneratingDexFilePerClassFile():201:201 -> D
+    1:6:boolean isInterfaceMethodDesugaringEnabled():643:648 -> E
+    1:32:boolean printWarnings():440:471 -> F
+    33:71:boolean printWarnings():467:505 -> F
+    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():293:293 -> G
+    1:4:void signalFinishedToConsumers():221:224 -> H
+    1:1:boolean assertionsEnabled():406:406 -> a
+    2:5:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):411:414 -> a
+    6:10:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):419:423 -> a
+    11:17:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):428:434 -> a
+    18:18:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):429:429 -> a
+    19:19:java.util.List lambda$warningInvalidDebugInfo$2(com.android.tools.r8.origin.Origin):433:433 -> a
+    20:21:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):597:598 -> a
+    1:1:java.util.List lambda$warningInvalidParameterAnnotations$1(com.android.tools.r8.origin.Origin):422:422 -> b
+    2:3:boolean canHaveArtInstanceOfVerifierBug():923:924 -> b
+    1:1:java.util.List lambda$warningMissingEnclosingMember$0(com.android.tools.r8.origin.Origin):413:413 -> c
+    2:2:boolean canHaveCmpLongBug():774:774 -> c
+    1:1:boolean canLeaveStaticInterfaceMethodInvokes():626:626 -> d
+    1:1:boolean canUseConstantMethodHandle():610:610 -> e
+    1:1:boolean canUseConstantMethodType():614:614 -> f
+    1:1:boolean canUseDefaultAndStaticInterfaceMethods():622:622 -> g
+    1:2:boolean canUseFilledNewArrayOfObjects():683:684 -> h
+    1:1:boolean canUseInvokeCustom():618:618 -> i
+    1:1:boolean canUseInvokePolymorphic():606:606 -> j
+    1:1:boolean canUseInvokePolymorphicOnVarHandle():602:602 -> k
+    1:1:boolean canUseJava8Methods():634:634 -> l
+    1:1:boolean canUseLongCompareAndObjectsNonNull():657:657 -> m
+    1:2:boolean canUseMultidex():652:653 -> n
+    1:1:boolean canUseNotInstruction():719:719 -> o
+    1:4:boolean canUseParameterNameAnnotations():668:671 -> p
+    1:1:boolean canUsePrivateInterfaceMethods():638:638 -> q
+    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():692:693 -> r
+    1:1:boolean canUseSuppressedExceptions():661:661 -> s
+    1:1:boolean canUseTwrCloseResourceMethod():630:630 -> t
+    1:1:com.android.tools.r8.DexFilePerClassFileConsumer getDexFilePerClassFileConsumer():213:213 -> u
+    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():181:181 -> v
+    2:2:boolean isGeneratingDexIndexed():197:197 -> v
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():182 -> v
+    3:9:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():183:189 -> v
+    1:2:com.android.tools.r8.dex.Marker getMarker():172:173 -> w
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():57:57 -> x
+    1:1:boolean hasConsumer():177:177 -> y
+    1:1:boolean hasMarker():163:163 -> z
 com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> a.a.a.a.t.J:
     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):368:371 -> <init>
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):341:344 -> <init>
 com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> a.a.a.a.t.K:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> a
@@ -46954,22 +46176,22 @@
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
-    1:9:void <init>():573:581 -> <init>
+    1:9:void <init>():546:554 -> <init>
 com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> a.a.a.a.t.M:
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] $VALUES -> d
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode FLATTEN -> c
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode REPACKAGE -> b
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode NONE -> a
-    1:5:void <clinit>():566:570 -> <clinit>
-    6:6:void <clinit>():564:564 -> <clinit>
-    1:1:void <init>(java.lang.String,int):564:564 -> <init>
-    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] values():564:564 -> a
+    1:5:void <clinit>():539:543 -> <clinit>
+    6:6:void <clinit>():537:537 -> <clinit>
+    1:1:void <init>(java.lang.String,int):537:537 -> <init>
+    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] values():537:537 -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions -> a.a.a.a.t.O:
-    boolean enableStatefulLambdaCreateInstanceMethod -> n
-    java.util.function.Consumer irModifier -> m
-    boolean noLocalsTableOnInput -> j
-    boolean forceNameReflectionOptimization -> k
-    boolean disallowLoadStoreOptimization -> l
+    boolean disallowLoadStoreOptimization -> m
+    java.util.function.Consumer irModifier -> n
+    boolean allowFailureOnInnerClassErrors -> j
+    boolean noLocalsTableOnInput -> k
+    boolean forceNameReflectionOptimization -> l
     com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions minifier -> o
     com.android.tools.r8.utils.IROrdering irOrdering -> a
     java.util.Set validInliningReasons -> i
@@ -46980,16 +46202,16 @@
     boolean allowProguardRulesThatUseExtendsOrImplementsWrong -> b
     boolean allowTypeErrors -> c
     boolean alwaysUsePessimisticRegisterAllocation -> d
-    1:26:void <init>():584:609 -> <init>
+    1:24:void <init>():557:580 -> <init>
 com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> a.a.a.a.t.N:
     java.util.Comparator interfaceMethodOrdering -> a
-    1:3:void <init>():611:613 -> <init>
-    1:4:java.util.Comparator createInterfaceMethodOrdering(com.android.tools.r8.naming.InterfaceMethodNameMinifier):617:620 -> a
-    5:5:int lambda$createInterfaceMethodOrdering$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):618:618 -> a
+    1:3:void <init>():582:584 -> <init>
+    1:4:java.util.Comparator createInterfaceMethodOrdering(com.android.tools.r8.naming.InterfaceMethodNameMinifier):588:591 -> a
+    5:5:int lambda$createInterfaceMethodOrdering$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):589:589 -> a
 com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> a.a.a.a.t.P:
     com.android.tools.r8.graph.DexType type -> b
     int version -> a
-    1:3:void <init>(int,com.android.tools.r8.graph.DexType):380:382 -> <init>
+    1:3:void <init>(int,com.android.tools.r8.graph.DexType):353:355 -> <init>
 com.android.tools.r8.utils.InternalOutputMode -> a.a.a.a.t.S:
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> a
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> b
@@ -47039,7 +46261,7 @@
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():54:54 -> <clinit>
     1:10:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):167:176 -> a
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():632:632 -> a
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():628:628 -> a
     11:11:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):177 -> a
     12:14:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):177:179 -> a
     15:17:void addClassToClassNaming(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.function.Supplier):343:345 -> a
@@ -47062,39 +46284,34 @@
     270:270: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):181:181 -> a
     271:272:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$2(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):247:248 -> a
     273:273:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):251:251 -> a
-    274:274:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():632:632 -> a
+    274:274:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():628:628 -> a
     274:274:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):252 -> a
     275:275:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):251:251 -> a
     276:289:int getMethodStartLine(com.android.tools.r8.graph.DexEncodedMethod):305:318 -> a
     290:290:void sortMethods(java.util.List):327:327 -> a
     291:292:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):329:330 -> a
-    293:293:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):791:791 -> a
+    293:293:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):762:762 -> a
     293:293:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):333 -> a
     294:294:void addFieldsToClassNaming(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):354:354 -> a
     295:299:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):356:360 -> a
-    300:300:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):152:152 -> a
-    300:300:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):361 -> a
-    301:301:java.lang.String com.android.tools.r8.graph.DexField.qualifiedName():126:126 -> a
-    301:301:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):153 -> a
-    301:301:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):361 -> a
-    302:302:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):153:153 -> a
+    300:301:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):152:153 -> a
+    300:301:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):361 -> a
+    302:302:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
+    302:302:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):153 -> a
     302:302:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):361 -> a
-    303:303:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    303:303:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):153 -> a
-    303:303:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):361 -> a
-    304:305:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):153:154 -> a
-    304:305:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):361 -> a
-    306:306:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):362:362 -> a
-    307:307:void com.android.tools.r8.naming.MemberNaming.<init>(com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String):60:60 -> a
-    307:307:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):362 -> a
-    308:308:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):363:363 -> a
-    309:314:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):370:375 -> a
-    315:322:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):383:390 -> a
-    315:322:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):375 -> a
-    323:323:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):376:376 -> a
-    324:324:java.util.List lambda$groupMethodsByRenamedName$5(com.android.tools.r8.graph.DexString):376:376 -> a
-    325:330:boolean doesContainPositions(com.android.tools.r8.graph.DexCode):396:401 -> a
-    331:333:boolean doesContainPositions(com.android.tools.r8.graph.CfCode):409:411 -> a
+    303:304:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):153:154 -> a
+    303:304:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):361 -> a
+    305:305:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):362:362 -> a
+    306:306:void com.android.tools.r8.naming.MemberNaming.<init>(com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String):60:60 -> a
+    306:306:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):362 -> a
+    307:307:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):363:363 -> a
+    308:313:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):370:375 -> a
+    314:321:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):383:390 -> a
+    314:321:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):375 -> a
+    322:322:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):376:376 -> a
+    323:323:java.util.List lambda$groupMethodsByRenamedName$5(com.android.tools.r8.graph.DexString):376:376 -> a
+    324:329:boolean doesContainPositions(com.android.tools.r8.graph.DexCode):396:401 -> a
+    330:332:boolean doesContainPositions(com.android.tools.r8.graph.CfCode):409:411 -> a
 com.android.tools.r8.utils.LineNumberOptimizer$1 -> a.a.a.a.t.Y:
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> i
     com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter val$positionEventEmitter -> h
@@ -47188,8 +46405,8 @@
     6:6:int doHash(java.lang.Object):15:15 -> a
     7:10:int doHash(com.android.tools.r8.graph.DexMethod):47:50 -> a
     7:10:int doHash(java.lang.Object):15 -> a
-    1:1:com.android.tools.r8.utils.MethodJavaSignatureEquivalence get():30:30 -> c
-    1:1:com.android.tools.r8.utils.MethodJavaSignatureEquivalence getEquivalenceIgnoreName():34:34 -> d
+    1:1:com.android.tools.r8.utils.MethodJavaSignatureEquivalence getEquivalenceIgnoreName():34:34 -> c
+    1:1:com.android.tools.r8.utils.MethodJavaSignatureEquivalence get():30:30 -> get
 com.android.tools.r8.utils.MethodSignatureEquivalence -> a.a.a.a.t.ha:
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE -> b
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE_IGNORE_NAME -> c
@@ -47202,8 +46419,8 @@
     6:6:int doHash(java.lang.Object):14:14 -> a
     7:10:int doHash(com.android.tools.r8.graph.DexMethod):45:48 -> a
     7:10:int doHash(java.lang.Object):14 -> a
-    1:1:com.android.tools.r8.utils.MethodSignatureEquivalence get():28:28 -> c
-    1:1:com.android.tools.r8.utils.MethodSignatureEquivalence getEquivalenceIgnoreName():32:32 -> d
+    1:1:com.android.tools.r8.utils.MethodSignatureEquivalence getEquivalenceIgnoreName():32:32 -> c
+    1:1:com.android.tools.r8.utils.MethodSignatureEquivalence get():28:28 -> get
 com.android.tools.r8.utils.OffOrAuto -> a.a.a.a.t.ia:
     com.android.tools.r8.utils.OffOrAuto Auto -> b
     com.android.tools.r8.utils.OffOrAuto Off -> a
@@ -47221,9 +46438,9 @@
     1:6:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.ProgramResource$Kind,byte[],java.util.Set):26:31 -> <init>
     1:1:com.android.tools.r8.ProgramResource create(com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,byte[],java.util.Set):22:22 -> a
     2:2:com.android.tools.r8.origin.Origin getOrigin():36:36 -> a
-    1:3:java.io.InputStream getByteStream():46:48 -> c
-    1:1:com.android.tools.r8.ProgramResource$Kind getKind():41:41 -> d
-    1:1:java.util.Set getClassDescriptors():54:54 -> e
+    1:1:java.util.Set getClassDescriptors():54:54 -> b
+    1:3:java.io.InputStream getByteStream():46:48 -> getByteStream
+    1:1:com.android.tools.r8.ProgramResource$Kind getKind():41:41 -> getKind
 com.android.tools.r8.utils.OrderedMergingIterator -> a.a.a.a.t.ka:
     java.util.List other -> b
     java.util.List one -> a
@@ -47253,7 +46470,6 @@
     void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler) -> a
     void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler) -> a
     void close(com.android.tools.r8.DiagnosticsHandler) -> a
-    void open() -> a
 com.android.tools.r8.utils.Pair -> a.a.a.a.t.ma:
     java.lang.Object second -> b
     java.lang.Object first -> a
@@ -47312,7 +46528,7 @@
     3:6:void <init>(java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):35:38 -> <init>
     1:1:com.android.tools.r8.origin.Origin getOrigin():43:43 -> a
     1:1:java.lang.String getDiagnosticMessage():53:53 -> b
-    1:1:com.android.tools.r8.position.Position getPosition():48:48 -> c
+    1:1:com.android.tools.r8.position.Position getPosition():48:48 -> getPosition
 com.android.tools.r8.utils.StringUtils -> a.a.a.a.t.ta:
     char[] IDENTIFIER_LETTERS -> c
     boolean $assertionsDisabled -> e
@@ -47342,7 +46558,7 @@
     73:81:java.lang.String hexString(int,int,boolean):217:225 -> a
     82:90:java.lang.String hexString(long,int,boolean):234:242 -> a
     82:90:java.lang.String hexString(long,int):230 -> a
-    91:110:java.lang.String numberToIdentifier(char[],int,boolean):267:286 -> a
+    91:110:java.lang.String numberToIdentifier(char[],int,boolean):263:282 -> a
     1:9:java.lang.String toASCIIString(java.lang.String):51:59 -> b
     10:12:java.lang.StringBuilder appendRightPadded(java.lang.StringBuilder,java.lang.String,int):98:100 -> b
 com.android.tools.r8.utils.StringUtils$BraceType -> a.a.a.a.t.sa:

r8-master.jar

diff --git a/r8-master.jar b/r8-master.jar
index b066572..b15e487 100644
--- a/r8-master.jar
+++ b/r8-master.jar
Binary files differ

r8-master.jar.map

diff --git a/r8-master.jar.map b/r8-master.jar.map
index d2263bb..d59f71e 100644
--- a/r8-master.jar.map
+++ b/r8-master.jar.map
@@ -1,9 +1,8 @@
 # compiler: R8
-# compiler_version: 1.5.18-dev
+# compiler_version: 1.5.13-dev
 # compiler_hash: engineering
-# pg_map_id: c0aa128
+# pg_map_id: a8e25a0
 com.android.tools.r8.ApiLevelException -> com.android.tools.r8.ApiLevelException:
-    boolean $assertionsDisabled -> c
     1:1:void <clinit>():10:10 -> <clinit>
     1:8:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):21:28 -> <init>
     1:8:void <init>(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):14 -> <init>
@@ -80,55 +79,47 @@
     2:2:void <init>(com.android.tools.r8.DiagnosticsHandler):119:119 -> <init>
     3:3:void <init>(com.android.tools.r8.utils.AndroidApp$Builder):122:122 -> <init>
     4:20:void <init>(com.android.tools.r8.utils.AndroidApp$Builder):108:124 -> <init>
-    1:1:com.android.tools.r8.utils.Reporter getReporter():162:162 -> a
-    2:2:void lambda$addClasspathFiles$5(java.nio.file.Path[]):218:218 -> a
-    3:3:void lambda$addClasspathFiles$6(java.util.Collection):224:224 -> a
-    4:4:void addClasspathFile(java.nio.file.Path):229:229 -> a
-    5:5:void lambda$addClasspathResourceProvider$8(com.android.tools.r8.ClassFileResourceProvider):234:234 -> a
-    6:6:void lambda$addClassProgramData$9(byte[],com.android.tools.r8.origin.Origin):240:240 -> a
-    7:7:void lambda$addMainDexClasses$13(java.lang.String[]):297:297 -> a
-    8:8:void setIgnoreDexInArchive(boolean):352:352 -> a
-    9:9:void error(com.android.tools.r8.origin.Origin,java.lang.Throwable):360:360 -> a
-    10:12:void guard(java.lang.Runnable):366:368 -> a
-    1:2:com.android.tools.r8.BaseCommand$Builder addClassProgramData(byte[],com.android.tools.r8.origin.Origin):240:241 -> addClassProgramData
-    1:2:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.nio.file.Path[]):218:219 -> addClasspathFiles
-    3:4:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.util.Collection):224:225 -> addClasspathFiles
-    1:2:com.android.tools.r8.BaseCommand$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):234:235 -> addClasspathResourceProvider
-    1:2:com.android.tools.r8.BaseCommand$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):246:247 -> addDexProgramData
+    com.android.tools.r8.BaseCommand makeCommand() -> a
+    1:1:void lambda$addLibraryResourceProvider$2(com.android.tools.r8.ClassFileResourceProvider):190:190 -> a
+    2:2:void lambda$addLibraryFiles$4(java.util.Collection):204:204 -> a
+    3:5:void lambda$addLibraryFiles$3(java.nio.file.Path):207:209 -> a
+    6:6:void lambda$addClassProgramData$5(byte[],com.android.tools.r8.origin.Origin):218:218 -> a
+    7:10:void lambda$addMainDexListFiles$7(java.nio.file.Path[]):240:243 -> a
+    11:11:void lambda$addMainDexListFiles$7(java.nio.file.Path[]):242:242 -> a
+    12:12:void lambda$addMainDexClasses$9(java.lang.String[]):275:275 -> a
+    13:13:void setIgnoreDexInArchive(boolean):330:330 -> a
+    14:14:void error(com.android.tools.r8.origin.Origin,java.lang.Throwable):338:338 -> a
+    15:17:void guard(java.lang.Runnable):344:346 -> a
+    1:2:com.android.tools.r8.BaseCommand$Builder addClassProgramData(byte[],com.android.tools.r8.origin.Origin):218:219 -> addClassProgramData
+    1:2:com.android.tools.r8.BaseCommand$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):224:225 -> addDexProgramData
     1:2:com.android.tools.r8.BaseCommand$Builder addLibraryFiles(java.nio.file.Path[]):196:197 -> addLibraryFiles
     3:14:com.android.tools.r8.BaseCommand$Builder addLibraryFiles(java.util.Collection):202:213 -> addLibraryFiles
     1:2:com.android.tools.r8.BaseCommand$Builder addLibraryResourceProvider(com.android.tools.r8.ClassFileResourceProvider):190:191 -> addLibraryResourceProvider
-    1:2:com.android.tools.r8.BaseCommand$Builder addMainDexClasses(java.lang.String[]):297:298 -> addMainDexClasses
-    3:4:com.android.tools.r8.BaseCommand$Builder addMainDexClasses(java.util.Collection):310:311 -> addMainDexClasses
-    1:9:com.android.tools.r8.BaseCommand$Builder addMainDexListFiles(java.nio.file.Path[]):260:268 -> addMainDexListFiles
-    10:18:com.android.tools.r8.BaseCommand$Builder addMainDexListFiles(java.util.Collection):277:285 -> addMainDexListFiles
+    1:2:com.android.tools.r8.BaseCommand$Builder addMainDexClasses(java.lang.String[]):275:276 -> addMainDexClasses
+    3:4:com.android.tools.r8.BaseCommand$Builder addMainDexClasses(java.util.Collection):288:289 -> addMainDexClasses
+    1:9:com.android.tools.r8.BaseCommand$Builder addMainDexListFiles(java.nio.file.Path[]):238:246 -> addMainDexListFiles
+    10:18:com.android.tools.r8.BaseCommand$Builder addMainDexListFiles(java.util.Collection):255:263 -> addMainDexListFiles
     1:2:com.android.tools.r8.BaseCommand$Builder addProgramFiles(java.nio.file.Path[]):157:158 -> addProgramFiles
     3:15:com.android.tools.r8.BaseCommand$Builder addProgramFiles(java.util.Collection):167:179 -> addProgramFiles
     1:2:com.android.tools.r8.BaseCommand$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):184:185 -> addProgramResourceProvider
-    com.android.tools.r8.BaseCommand makeCommand() -> b
-    1:1:void lambda$addLibraryResourceProvider$2(com.android.tools.r8.ClassFileResourceProvider):190:190 -> b
-    2:2:void lambda$addLibraryFiles$4(java.util.Collection):204:204 -> b
-    3:3:void lambda$addClasspathFile$7(java.nio.file.Path):229:229 -> b
-    4:4:void lambda$addDexProgramData$10(byte[],com.android.tools.r8.origin.Origin):246:246 -> b
-    5:8:void lambda$addMainDexListFiles$11(java.nio.file.Path[]):262:265 -> b
-    9:9:void lambda$addMainDexListFiles$11(java.nio.file.Path[]):264:264 -> b
-    10:10:void lambda$setIgnoreDexInArchive$15(boolean):352:352 -> b
+    com.android.tools.r8.BaseCommand$Builder self() -> b
+    1:4:void lambda$addProgramFiles$0(java.nio.file.Path):172:175 -> b
+    5:5:void lambda$addDexProgramData$6(byte[],com.android.tools.r8.origin.Origin):224:224 -> b
+    6:6:void lambda$addMainDexClasses$10(java.util.Collection):288:288 -> b
+    7:7:void lambda$setIgnoreDexInArchive$11(boolean):330:330 -> b
     1:6:com.android.tools.r8.BaseCommand build():138:143 -> build
-    com.android.tools.r8.BaseCommand$Builder self() -> c
-    1:3:void lambda$addLibraryFiles$3(java.nio.file.Path):207:209 -> c
-    4:4:void lambda$addMainDexClasses$14(java.util.Collection):310:310 -> c
-    void validate() -> d
-    1:4:void lambda$addProgramFiles$0(java.nio.file.Path):172:175 -> d
-    5:8:void lambda$addMainDexListFiles$12(java.util.Collection):279:282 -> d
-    9:9:void lambda$addMainDexListFiles$12(java.util.Collection):281:281 -> d
-    1:1:void lambda$addProgramFiles$1(java.util.Collection):169:169 -> e
-    1:1:void error(com.android.tools.r8.Diagnostic):338:338 -> error
-    1:1:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):347:347 -> fatalError
+    void validate() -> c
+    1:4:void lambda$addMainDexListFiles$8(java.util.Collection):257:260 -> c
+    5:5:void lambda$addMainDexListFiles$8(java.util.Collection):259:259 -> c
+    1:1:void lambda$addProgramFiles$1(java.util.Collection):169:169 -> d
+    1:1:void error(com.android.tools.r8.Diagnostic):316:316 -> error
+    1:1:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):325:325 -> fatalError
     1:1:com.android.tools.r8.utils.AndroidApp$Builder getAppBuilder():152:152 -> getAppBuilder
-    1:1:boolean isPrintHelp():316:316 -> isPrintHelp
-    1:1:boolean isPrintVersion():327:327 -> isPrintVersion
-    1:2:com.android.tools.r8.BaseCommand$Builder setPrintHelp(boolean):321:322 -> setPrintHelp
-    1:2:com.android.tools.r8.BaseCommand$Builder setPrintVersion(boolean):332:333 -> setPrintVersion
+    1:1:com.android.tools.r8.utils.Reporter getReporter():162:162 -> getReporter
+    1:1:boolean isPrintHelp():294:294 -> isPrintHelp
+    1:1:boolean isPrintVersion():305:305 -> isPrintVersion
+    1:2:com.android.tools.r8.BaseCommand$Builder setPrintHelp(boolean):299:300 -> setPrintHelp
+    1:2:com.android.tools.r8.BaseCommand$Builder setPrintVersion(boolean):310:311 -> setPrintVersion
 com.android.tools.r8.BaseCommand$InputFileOrigin -> com.android.tools.r8.BaseCommand$a:
     java.lang.String inputType -> g
     1:2:void <init>(java.lang.String,java.nio.file.Path):73:74 -> <init>
@@ -190,10 +181,10 @@
     35:35:void com.android.tools.r8.ClassFileConsumer$DirectoryConsumer.<init>(java.nio.file.Path,boolean):189:189 -> a
     35:35:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):330 -> a
     36:36:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):332:332 -> a
-    1:29:void validate():383:411 -> d
-    com.android.tools.r8.CompilationMode defaultCompilationMode() -> e
-    1:1:boolean isMinApiLevelSet():341:341 -> f
-    1:1:boolean isOptimizeMultidexForLinearAlloc():225:225 -> g
+    1:29:void validate():383:411 -> c
+    com.android.tools.r8.CompilationMode defaultCompilationMode() -> d
+    1:1:boolean isMinApiLevelSet():341:341 -> e
+    1:1:boolean isOptimizeMultidexForLinearAlloc():225:225 -> f
     1:1:boolean getDisableDesugaring():378:378 -> getDisableDesugaring
     1:1:com.android.tools.r8.StringConsumer getMainDexListConsumer():207:207 -> getMainDexListConsumer
     1:1:int getMinApiLevel():337:337 -> getMinApiLevel
@@ -217,12 +208,12 @@
     1:1:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):283:283 -> setOutput
     2:7:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):288:293 -> setOutput
     1:4:com.android.tools.r8.BaseCompilerCommand$Builder setProgramConsumer(com.android.tools.r8.ProgramConsumer):239:242 -> setProgramConsumer
-com.android.tools.r8.BaseCompilerCommand$Builder$1 -> com.android.tools.r8.BaseCompilerCommand$Builder$1:
+com.android.tools.r8.BaseCompilerCommand$Builder$1 -> com.android.tools.r8.a:
     1:1:void com.android.tools.r8.DexFilePerClassFileConsumer$ArchiveConsumer.<init>(java.nio.file.Path,boolean):156:156 -> <init>
     1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):307 -> <init>
-com.android.tools.r8.BaseCompilerCommand$Builder$2 -> com.android.tools.r8.BaseCompilerCommand$Builder$2:
+com.android.tools.r8.BaseCompilerCommand$Builder$2 -> com.android.tools.r8.b:
     1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):314:314 -> <init>
-com.android.tools.r8.BaseCompilerCommandParser -> com.android.tools.r8.a:
+com.android.tools.r8.BaseCompilerCommandParser -> com.android.tools.r8.c:
     1:1:void <init>():9:9 -> <init>
     1:10:void parseMinApi(com.android.tools.r8.BaseCompilerCommand$Builder,java.lang.String,com.android.tools.r8.origin.Origin):14:23 -> a
     11:11:void parseMinApi(com.android.tools.r8.BaseCompilerCommand$Builder,java.lang.String,com.android.tools.r8.origin.Origin):16:16 -> a
@@ -286,7 +277,7 @@
     1:2:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):75:76 -> accept
     1:2:void finished(com.android.tools.r8.DiagnosticsHandler):82:83 -> finished
     1:1:com.android.tools.r8.DataResourceConsumer getDataResourceConsumer():70:70 -> getDataResourceConsumer
-com.android.tools.r8.CompatDxHelper -> com.android.tools.r8.b:
+com.android.tools.r8.CompatDxHelper -> com.android.tools.r8.d:
     1:12:void run(com.android.tools.r8.D8Command,java.lang.Boolean):13:24 -> a
     13:13:void ignoreDexInArchive(com.android.tools.r8.BaseCommand$Builder):28:28 -> a
 com.android.tools.r8.CompatProguardCommandBuilder -> com.android.tools.r8.CompatProguardCommandBuilder:
@@ -313,20 +304,20 @@
     4:15:void run(java.lang.String[]):102:113 -> a
     4:15:void lambda$main$2(java.lang.String[]):126 -> a
     16:27:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.utils.InternalOptions):145:156 -> a
-    28:28:void lambda$run$4(java.lang.String):178:178 -> a
-    29:31:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):226:228 -> a
-    32:32:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):257:257 -> a
-    32:32:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):228 -> a
-    33:43:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):229:239 -> a
-    44:48:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):235:239 -> a
-    49:49:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):233:233 -> a
+    28:28:void lambda$run$4(java.lang.String):187:187 -> a
+    29:31:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):235:237 -> a
+    32:32:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):260:260 -> a
+    32:32:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):237 -> a
+    33:43:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):238:248 -> a
+    44:48:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):244:248 -> a
+    49:49:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):242:242 -> a
     1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):97:97 -> b
     1:3:void lambda$runForTesting$3(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):136:138 -> c
-    1:41:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):163:203 -> d
-    42:42:void com.android.tools.r8.dex.ApplicationWriter.<init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,java.lang.String,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,java.lang.String,com.android.tools.r8.naming.ProguardMapSupplier):141:141 -> d
-    42:42:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):203 -> d
-    43:51:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):206:214 -> d
-    52:57:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):209:214 -> d
+    1:50:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):163:212 -> d
+    51:51:void com.android.tools.r8.dex.ApplicationWriter.<init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,java.lang.String,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,java.lang.String,com.android.tools.r8.naming.ProguardMapSupplier):141:141 -> d
+    51:51:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):212 -> d
+    52:60:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):215:223 -> d
+    61:66:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):218:223 -> d
     1:5:void main(java.lang.String[]):122:126 -> main
     1:5:void run(com.android.tools.r8.D8Command):70:74 -> run
     6:6:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):43:43 -> run
@@ -343,58 +334,61 @@
     boolean intermediate -> m
     boolean $assertionsDisabled -> o
     java.lang.String USAGE_MESSAGE -> n
-    1:143:void <clinit>():30:172 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean):226:226 -> <init>
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean,com.android.tools.r8.D8Command$1):31 -> <init>
-    2:63:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean):174:235 -> <init>
-    2:63:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean,com.android.tools.r8.D8Command$1):31 -> <init>
-    64:64:void <init>(boolean,boolean):239:239 -> <init>
-    64:64:void <init>(boolean,boolean,com.android.tools.r8.D8Command$1):31 -> <init>
-    65:65:void <init>(boolean,boolean):174:174 -> <init>
-    65:65:void <init>(boolean,boolean,com.android.tools.r8.D8Command$1):31 -> <init>
-    1:1:com.android.tools.r8.D8Command$Builder builder():177:177 -> builder
-    2:2:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):181:181 -> builder
-    3:3:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):186:186 -> builder
-    1:27:com.android.tools.r8.utils.InternalOptions getInternalOptions():244:270 -> getInternalOptions
-    1:1:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):199:199 -> parse
-    2:2:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):213:213 -> parse
+    1:147:void <clinit>():31:177 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean):231:231 -> <init>
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean,com.android.tools.r8.D8Command$1):32 -> <init>
+    2:63:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean):179:240 -> <init>
+    2:63:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean,com.android.tools.r8.D8Command$1):32 -> <init>
+    64:64:void <init>(boolean,boolean):244:244 -> <init>
+    64:64:void <init>(boolean,boolean,com.android.tools.r8.D8Command$1):32 -> <init>
+    65:65:void <init>(boolean,boolean):179:179 -> <init>
+    65:65:void <init>(boolean,boolean,com.android.tools.r8.D8Command$1):32 -> <init>
+    1:1:com.android.tools.r8.D8Command$Builder builder():182:182 -> builder
+    2:2:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):186:186 -> builder
+    3:3:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):191:191 -> builder
+    1:37:com.android.tools.r8.utils.InternalOptions getInternalOptions():249:285 -> getInternalOptions
+    1:1:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):204:204 -> parse
+    2:2:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):218:218 -> parse
+com.android.tools.r8.D8Command$1 -> com.android.tools.r8.e:
 com.android.tools.r8.D8Command$Builder -> com.android.tools.r8.D8Command$Builder:
     boolean intermediate -> o
-    1:1:void <init>():68:68 -> <init>
-    1:1:void <init>(com.android.tools.r8.D8Command$1):63 -> <init>
-    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler):72:72 -> <init>
-    3:3:void <init>(com.android.tools.r8.DiagnosticsHandler):65:65 -> <init>
-    10:10:void <init>(com.android.tools.r8.DiagnosticsHandler):72:72 -> <init>
-    10:10:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.D8Command$1):63 -> <init>
-    11:11:void <init>(com.android.tools.r8.DiagnosticsHandler):65:65 -> <init>
-    11:11:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.D8Command$1):63 -> <init>
-    12:12:void <init>(com.android.tools.r8.utils.AndroidApp):76:76 -> <init>
-    12:12:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.D8Command$1):63 -> <init>
-    13:13:void <init>(com.android.tools.r8.utils.AndroidApp):65:65 -> <init>
-    13:13:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.D8Command$1):63 -> <init>
-    1:1:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.util.Collection):62:62 -> addClasspathFiles
-    2:2:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.nio.file.Path[]):62:62 -> addClasspathFiles
-    3:3:com.android.tools.r8.D8Command$Builder addClasspathFiles(java.nio.file.Path[]):89:89 -> addClasspathFiles
-    4:4:com.android.tools.r8.D8Command$Builder addClasspathFiles(java.util.Collection):95:95 -> addClasspathFiles
-    1:1:com.android.tools.r8.BaseCommand$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):62:62 -> addClasspathResourceProvider
-    2:2:com.android.tools.r8.D8Command$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):101:101 -> addClasspathResourceProvider
-    1:1:com.android.tools.r8.BaseCommand$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):62:62 -> addDexProgramData
-    2:3:com.android.tools.r8.D8Command$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):82:83 -> addDexProgramData
-    1:1:com.android.tools.r8.BaseCommand makeCommand():62:62 -> b
-    2:17:com.android.tools.r8.D8Command makeCommand():153:168 -> b
-    18:18:com.android.tools.r8.D8Command makeCommand():154:154 -> b
-    com.android.tools.r8.D8Command$Builder self() -> c
-    1:1:com.android.tools.r8.BaseCommand$Builder self():62:62 -> c
-    2:2:void lambda$addDexProgramData$0(byte[],com.android.tools.r8.origin.Origin):82:82 -> c
-    1:19:void validate():126:144 -> d
-    20:26:void validate():142:148 -> d
-    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():121:121 -> e
-    1:2:com.android.tools.r8.D8Command$Builder setIntermediate(boolean):110:111 -> setIntermediate
+    1:1:void <init>():69:69 -> <init>
+    1:1:void <init>(com.android.tools.r8.D8Command$1):64 -> <init>
+    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler):73:73 -> <init>
+    3:3:void <init>(com.android.tools.r8.DiagnosticsHandler):66:66 -> <init>
+    10:10:void <init>(com.android.tools.r8.DiagnosticsHandler):73:73 -> <init>
+    10:10:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.D8Command$1):64 -> <init>
+    11:11:void <init>(com.android.tools.r8.DiagnosticsHandler):66:66 -> <init>
+    11:11:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.D8Command$1):64 -> <init>
+    12:12:void <init>(com.android.tools.r8.utils.AndroidApp):77:77 -> <init>
+    12:12:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.D8Command$1):64 -> <init>
+    13:13:void <init>(com.android.tools.r8.utils.AndroidApp):66:66 -> <init>
+    13:13:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.D8Command$1):64 -> <init>
+    1:1:com.android.tools.r8.BaseCommand makeCommand():63:63 -> a
+    2:17:com.android.tools.r8.D8Command makeCommand():158:173 -> a
+    18:18:com.android.tools.r8.D8Command makeCommand():159:159 -> a
+    1:2:com.android.tools.r8.D8Command$Builder addClasspathFiles(java.nio.file.Path[]):89:90 -> addClasspathFiles
+    3:4:com.android.tools.r8.D8Command$Builder addClasspathFiles(java.util.Collection):95:96 -> addClasspathFiles
+    1:2:com.android.tools.r8.D8Command$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):105:106 -> addClasspathResourceProvider
+    1:1:com.android.tools.r8.BaseCommand$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):63:63 -> addDexProgramData
+    2:3:com.android.tools.r8.D8Command$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):83:84 -> addDexProgramData
+    com.android.tools.r8.D8Command$Builder self() -> b
+    1:1:com.android.tools.r8.BaseCommand$Builder self():63:63 -> b
+    2:2:void lambda$addClasspathFiles$1(java.nio.file.Path[]):89:89 -> b
+    3:3:void lambda$addClasspathResourceProvider$4(com.android.tools.r8.ClassFileResourceProvider):105:105 -> b
+    1:1:void lambda$addDexProgramData$0(byte[],com.android.tools.r8.origin.Origin):83:83 -> c
+    2:2:void addClasspathFile(java.nio.file.Path):100:100 -> c
+    3:21:void validate():131:149 -> c
+    22:28:void validate():147:153 -> c
+    1:1:void lambda$addClasspathFile$3(java.nio.file.Path):100:100 -> d
+    2:2:com.android.tools.r8.CompilationMode defaultCompilationMode():126:126 -> d
+    1:1:void lambda$addClasspathFiles$2(java.util.Collection):95:95 -> e
+    1:2:com.android.tools.r8.D8Command$Builder setIntermediate(boolean):115:116 -> setIntermediate
 com.android.tools.r8.D8Command$DefaultD8DiagnosticsHandler -> com.android.tools.r8.D8Command$a:
-    1:1:void <init>():40:40 -> <init>
-    1:1:void <init>(com.android.tools.r8.D8Command$1):40 -> <init>
-    1:6:void error(com.android.tools.r8.Diagnostic):44:49 -> error
-    7:13:void error(com.android.tools.r8.Diagnostic):47:53 -> error
+    1:1:void <init>():41:41 -> <init>
+    1:1:void <init>(com.android.tools.r8.D8Command$1):41 -> <init>
+    1:6:void error(com.android.tools.r8.Diagnostic):45:50 -> error
+    7:13:void error(com.android.tools.r8.Diagnostic):48:54 -> error
 com.android.tools.r8.D8CommandParser -> com.android.tools.r8.D8CommandParser:
     java.util.Set OPTIONS_WITH_PARAMETER -> a
     java.lang.String USAGE_MESSAGE -> b
@@ -413,6 +407,7 @@
     61:64:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):220:223 -> a
     65:68:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):222:225 -> a
     69:120:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):217:268 -> a
+com.android.tools.r8.D8CommandParser$1 -> com.android.tools.r8.f:
 com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider -> com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider:
     java.util.Set descriptors -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.D8CommandParser$1):46:46 -> <init>
@@ -433,6 +428,7 @@
     1:2:com.android.tools.r8.DataDirectoryResource fromFile(java.nio.file.Path,java.nio.file.Path):23:24 -> fromFile
     1:1:com.android.tools.r8.DataDirectoryResource fromName(java.lang.String,com.android.tools.r8.origin.Origin):19:19 -> fromName
     1:1:com.android.tools.r8.DataDirectoryResource fromZip(java.util.zip.ZipFile,java.util.zip.ZipEntry):28:28 -> fromZip
+com.android.tools.r8.DataDirectoryResource$1 -> com.android.tools.r8.g:
 com.android.tools.r8.DataDirectoryResource$LocalDataDirectoryResource -> com.android.tools.r8.DataDirectoryResource$a:
     java.io.File file -> a
     java.lang.String relativePath -> b
@@ -465,6 +461,7 @@
     1:2:com.android.tools.r8.DataEntryResource fromFile(java.nio.file.Path,java.nio.file.Path):30:31 -> fromFile
     1:1:com.android.tools.r8.DataEntryResource fromZip(java.util.zip.ZipFile,java.util.zip.ZipEntry):35:35 -> fromZip
     1:1:com.android.tools.r8.DataEntryResource withName(java.lang.String):39:39 -> withName
+com.android.tools.r8.DataEntryResource$1 -> com.android.tools.r8.h:
 com.android.tools.r8.DataEntryResource$ByteDataEntryResource -> com.android.tools.r8.DataEntryResource$a:
     byte[] bytes -> a
     com.android.tools.r8.origin.Origin origin -> c
@@ -675,6 +672,7 @@
     1:1:java.nio.file.Path getRoot():73:73 -> getRoot
 com.android.tools.r8.Disassemble -> com.android.tools.r8.Disassemble:
     1:18:void disassemble(com.android.tools.r8.Disassemble$DisassembleCommand):220:237 -> disassemble
+com.android.tools.r8.Disassemble$1 -> com.android.tools.r8.i:
 com.android.tools.r8.Disassemble$DisassembleCommand -> com.android.tools.r8.Disassemble$DisassembleCommand:
     java.nio.file.Path outputPath -> e
     boolean useIr -> i
@@ -699,11 +697,11 @@
     java.nio.file.Path outputPath -> f
     boolean useSmali -> h
     1:6:void <init>():31:36 -> <init>
-    1:1:com.android.tools.r8.BaseCommand makeCommand():31:31 -> b
-    2:8:com.android.tools.r8.Disassemble$DisassembleCommand makeCommand():76:82 -> b
-    9:9:com.android.tools.r8.Disassemble$DisassembleCommand makeCommand():77:77 -> b
-    com.android.tools.r8.Disassemble$DisassembleCommand$Builder self() -> c
-    1:1:com.android.tools.r8.BaseCommand$Builder self():31:31 -> c
+    1:1:com.android.tools.r8.BaseCommand makeCommand():31:31 -> a
+    2:8:com.android.tools.r8.Disassemble$DisassembleCommand makeCommand():76:82 -> a
+    9:9:com.android.tools.r8.Disassemble$DisassembleCommand makeCommand():77:77 -> a
+    com.android.tools.r8.Disassemble$DisassembleCommand$Builder self() -> b
+    1:1:com.android.tools.r8.BaseCommand$Builder self():31:31 -> b
     1:1:java.nio.file.Path getOutputPath():50:50 -> getOutputPath
     1:1:com.android.tools.r8.Disassemble$DisassembleCommand$Builder setOutputPath(java.nio.file.Path):54:54 -> setOutputPath
     1:1:com.android.tools.r8.Disassemble$DisassembleCommand$Builder setProguardMapFile(java.nio.file.Path):45:45 -> setProguardMapFile
@@ -726,7 +724,7 @@
     int index -> e
     1:2:void <init>(com.android.tools.r8.origin.Origin,int):36:37 -> <init>
     1:1:java.lang.String part():42:42 -> part
-com.android.tools.r8.ExtractMarkerCommand -> com.android.tools.r8.d:
+com.android.tools.r8.ExtractMarkerCommand -> com.android.tools.r8.l:
     java.lang.String USAGE_MESSAGE -> g
     java.util.List programFiles -> f
     boolean csv -> e
@@ -751,8 +749,8 @@
     1:1:boolean getSummary():153:153 -> d
     1:1:boolean getVerbose():149:149 -> e
     1:1:boolean isPrintHelp():137:137 -> f
-com.android.tools.r8.ExtractMarkerCommand$1 -> com.android.tools.r8.c:
-com.android.tools.r8.ExtractMarkerCommand$Builder -> com.android.tools.r8.d$a:
+com.android.tools.r8.ExtractMarkerCommand$1 -> com.android.tools.r8.j:
+com.android.tools.r8.ExtractMarkerCommand$Builder -> com.android.tools.r8.k:
     java.util.List programFiles -> f
     boolean csv -> e
     boolean printHelp -> a
@@ -775,7 +773,7 @@
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):38:38 -> <init>
     2:6:void <init>(com.android.tools.r8.utils.InternalOptions):35:39 -> <init>
     1:17:java.util.List run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):45:61 -> a
-    18:18:void com.android.tools.r8.shaking.Enqueuer.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer):279:279 -> a
+    18:18:void com.android.tools.r8.shaking.Enqueuer.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer):288:288 -> a
     18:18:java.util.List run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):61 -> a
     19:40:java.util.List run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):62:83 -> a
     41:48:java.util.List run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):82:89 -> a
@@ -787,6 +785,7 @@
     12:12:void com.android.tools.r8.utils.ExceptionUtils.withMainDexListHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):53:53 -> run
     12:12:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand,java.util.concurrent.ExecutorService):134 -> run
     13:13:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand,java.util.concurrent.ExecutorService):143:143 -> run
+com.android.tools.r8.GenerateMainDexList$1 -> com.android.tools.r8.m:
 com.android.tools.r8.GenerateMainDexList$ResultBox -> com.android.tools.r8.GenerateMainDexList$a:
     java.util.List content -> a
     1:1:void <init>():146:146 -> <init>
@@ -811,6 +810,7 @@
     1:1:com.android.tools.r8.GenerateMainDexListCommand$Builder parse(java.lang.String[]):159:159 -> parse
     2:23:void parse(java.lang.String[],com.android.tools.r8.GenerateMainDexListCommand$Builder):173:194 -> parse
     2:23:com.android.tools.r8.GenerateMainDexListCommand$Builder parse(java.lang.String[]):160 -> parse
+com.android.tools.r8.GenerateMainDexListCommand$1 -> com.android.tools.r8.n:
 com.android.tools.r8.GenerateMainDexListCommand$Builder -> com.android.tools.r8.GenerateMainDexListCommand$Builder:
     com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> i
     com.android.tools.r8.graph.DexItemFactory factory -> f
@@ -824,60 +824,40 @@
     6:6:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.GenerateMainDexListCommand$1):35 -> <init>
     7:10:void <init>(com.android.tools.r8.DiagnosticsHandler):37:40 -> <init>
     7:10:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.GenerateMainDexListCommand$1):35 -> <init>
-    1:2:void lambda$addMainDexRulesFiles$1(java.util.List):72:73 -> a
-    3:4:void lambda$addMainDexRules$2(java.util.List,com.android.tools.r8.origin.Origin):83:84 -> a
-    5:5:void lambda$addMainDexRules$2(java.util.List,com.android.tools.r8.origin.Origin):83:83 -> a
+    1:1:com.android.tools.r8.BaseCommand makeCommand():34:34 -> a
+    2:3:void lambda$addMainDexRulesFiles$1(java.util.List):72:73 -> a
+    4:5:void lambda$addMainDexRules$2(java.util.List,com.android.tools.r8.origin.Origin):83:84 -> a
+    6:6:void lambda$addMainDexRules$2(java.util.List,com.android.tools.r8.origin.Origin):83:83 -> a
+    7:27:com.android.tools.r8.GenerateMainDexListCommand makeCommand():107:127 -> a
+    28:28:com.android.tools.r8.GenerateMainDexListCommand makeCommand():108:108 -> a
     1:3:com.android.tools.r8.GenerateMainDexListCommand$Builder addMainDexRules(java.util.List,com.android.tools.r8.origin.Origin):83:85 -> addMainDexRules
     1:6:com.android.tools.r8.GenerateMainDexListCommand$Builder addMainDexRulesFiles(java.nio.file.Path[]):59:64 -> addMainDexRulesFiles
     7:12:com.android.tools.r8.GenerateMainDexListCommand$Builder addMainDexRulesFiles(java.util.List):71:76 -> addMainDexRulesFiles
-    1:1:com.android.tools.r8.BaseCommand makeCommand():34:34 -> b
-    2:22:com.android.tools.r8.GenerateMainDexListCommand makeCommand():107:127 -> b
-    23:23:com.android.tools.r8.GenerateMainDexListCommand makeCommand():108:108 -> b
-    com.android.tools.r8.GenerateMainDexListCommand$Builder self() -> c
-    1:1:com.android.tools.r8.BaseCommand$Builder self():34:34 -> c
-    2:3:void lambda$addMainDexRulesFiles$0(java.nio.file.Path[]):60:61 -> c
+    com.android.tools.r8.GenerateMainDexListCommand$Builder self() -> b
+    1:1:com.android.tools.r8.BaseCommand$Builder self():34:34 -> b
+    2:3:void lambda$addMainDexRulesFiles$0(java.nio.file.Path[]):60:61 -> b
     1:2:com.android.tools.r8.GenerateMainDexListCommand$Builder setMainDexKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):132:133 -> setMainDexKeptGraphConsumer
     1:2:com.android.tools.r8.GenerateMainDexListCommand$Builder setMainDexListConsumer(com.android.tools.r8.StringConsumer):100:101 -> setMainDexListConsumer
     1:1:com.android.tools.r8.GenerateMainDexListCommand$Builder setMainDexListOutputPath(java.nio.file.Path):94:94 -> setMainDexListOutputPath
     2:2:void com.android.tools.r8.StringConsumer$FileConsumer.<init>(java.nio.file.Path):76:76 -> setMainDexListOutputPath
     2:2:com.android.tools.r8.GenerateMainDexListCommand$Builder setMainDexListOutputPath(java.nio.file.Path):94 -> setMainDexListOutputPath
     3:4:com.android.tools.r8.GenerateMainDexListCommand$Builder setMainDexListOutputPath(java.nio.file.Path):94:95 -> setMainDexListOutputPath
-com.android.tools.r8.GeneratedOutlineSupport -> com.android.tools.r8.e:
+com.android.tools.r8.GeneratedOutlineSupport -> com.android.tools.r8.o:
     long outline0(long,long,long) -> a
     com.android.tools.r8.ir.code.BasicBlock outline1(com.android.tools.r8.ir.code.BasicBlock) -> a
-    java.lang.String outline10(java.lang.StringBuilder,int,java.lang.String) -> a
-    java.lang.String outline11(java.lang.StringBuilder,java.lang.Object,java.lang.String) -> a
-    java.lang.String outline12(java.lang.StringBuilder,java.lang.String,java.lang.String) -> a
+    java.lang.String outline10(java.lang.StringBuilder,java.lang.Object,java.lang.String) -> a
+    java.lang.String outline11(java.lang.StringBuilder,java.lang.String,java.lang.String) -> a
+    java.lang.StringBuilder outline12(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String) -> a
     java.lang.StringBuilder outline13(java.lang.String) -> a
     java.lang.StringBuilder outline14(java.lang.String,int,java.lang.String) -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type outline2(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type) -> a
-    java.lang.String outline3(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String) -> a
     java.lang.String outline4(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.lang.StringBuilder) -> a
     java.lang.String outline5(java.lang.String,int) -> a
-    java.lang.String outline6(java.lang.String,int,int) -> a
-    java.lang.String outline7(java.lang.String,java.lang.Object) -> a
-    java.lang.String outline8(java.lang.String,java.lang.Object,java.lang.String) -> a
-    java.lang.String outline9(java.lang.String,java.lang.String) -> a
-com.android.tools.r8.OptionalBool -> com.android.tools.r8.i:
-    com.android.tools.r8.OptionalBool TRUE -> a
-    com.android.tools.r8.OptionalBool FALSE -> b
-    com.android.tools.r8.OptionalBool UNKNOWN -> c
-    1:27:void <clinit>():9:35 -> <clinit>
-    1:1:void <init>():56:56 -> <init>
-    1:1:void <init>(com.android.tools.r8.OptionalBool$1):7 -> <init>
-    boolean isFalse() -> a
-    1:1:com.android.tools.r8.OptionalBool of(boolean):49:49 -> a
-    1:1:boolean isPossiblyTrue():71:71 -> b
-    boolean isTrue() -> c
-    1:1:com.android.tools.r8.OptionalBool unknown():53:53 -> d
-com.android.tools.r8.OptionalBool$1 -> com.android.tools.r8.f:
-    1:1:void <init>():10:10 -> <init>
-    boolean isTrue() -> c
-com.android.tools.r8.OptionalBool$2 -> com.android.tools.r8.g:
-    1:1:void <init>():23:23 -> <init>
-    boolean isFalse() -> a
-com.android.tools.r8.OptionalBool$3 -> com.android.tools.r8.h:
-    1:1:void <init>():36:36 -> <init>
+    java.lang.String outline6(java.lang.String,java.lang.Object) -> a
+    java.lang.String outline7(java.lang.String,java.lang.Object,java.lang.String) -> a
+    java.lang.String outline8(java.lang.String,java.lang.String) -> a
+    java.lang.String outline9(java.lang.StringBuilder,int,java.lang.String) -> a
+    java.lang.String outline3(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String) -> b
 com.android.tools.r8.OutputMode -> com.android.tools.r8.OutputMode:
     com.android.tools.r8.OutputMode[] $VALUES -> a
     1:16:void <clinit>():11:26 -> <clinit>
@@ -888,6 +868,7 @@
 com.android.tools.r8.ProgramResource -> com.android.tools.r8.ProgramResource:
     1:1:com.android.tools.r8.ProgramResource fromBytes(com.android.tools.r8.origin.Origin,com.android.tools.r8.ProgramResource$Kind,byte[],java.util.Set):52:52 -> fromBytes
     1:1:com.android.tools.r8.ProgramResource fromFile(com.android.tools.r8.ProgramResource$Kind,java.nio.file.Path):41:41 -> fromFile
+com.android.tools.r8.ProgramResource$1 -> com.android.tools.r8.p:
 com.android.tools.r8.ProgramResource$ByteResource -> com.android.tools.r8.ProgramResource$ByteResource:
     com.android.tools.r8.origin.Origin origin -> a
     java.util.Set classDescriptors -> d
@@ -929,66 +910,68 @@
     1:1:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):166:166 -> a
     2:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.utils.InternalOptions):172:183 -> a
     14:15:java.util.Set filterMissingClasses(java.util.Set,com.android.tools.r8.shaking.ProguardClassFilter):234:235 -> a
-    16:38:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):259:281 -> a
-    39:64:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):280:305 -> a
-    65:71:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):303:309 -> a
-    72:72:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):307:307 -> a
-    73:85:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):306:318 -> a
-    86:88:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):317:319 -> a
-    89:102:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):313:326 -> a
-    103:103:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):324:324 -> a
-    104:130:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):323:349 -> a
-    131:159:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):345:373 -> a
-    160:205:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):363:408 -> a
-    206:228:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):407:429 -> a
-    229:249:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):426:446 -> a
-    250:265:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):442:457 -> a
-    266:275:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):454:463 -> a
-    276:288:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):460:472 -> a
-    289:297:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):470:478 -> a
-    298:345:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):475:522 -> a
-    346:350:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):518:522 -> a
-    351:393:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):516:558 -> a
-    394:421:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):557:584 -> a
-    422:422:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):582:582 -> a
-    423:438:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):581:596 -> a
-    439:439:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):594:594 -> a
-    440:451:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):591:602 -> a
-    452:485:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):601:634 -> a
-    486:558:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):633:705 -> a
-    559:567:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):670:678 -> a
-    568:568:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):674:674 -> a
-    569:589:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):672:692 -> a
-    590:608:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):687:705 -> a
-    609:609:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):615:615 -> a
-    610:610:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):501:501 -> a
-    611:940:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):376:705 -> a
-    941:942:void lambda$run$2(com.android.tools.r8.graph.DexType):285:286 -> a
-    943:943:void lambda$run$2(com.android.tools.r8.graph.DexType):285:285 -> a
-    944:944:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):373:373 -> a
-    945:945:void lambda$run$4(java.lang.String):665:665 -> a
-    946:949:void computeKotlinInfoForProgramClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):712:715 -> a
-    950:959:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):720:729 -> a
-    960:961:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):723:724 -> a
-    962:962:void lambda$run$5(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):748:748 -> a
-    963:963:void lambda$main$6(java.lang.String[]):764:764 -> a
+    16:39:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):259:282 -> a
+    40:65:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):281:306 -> a
+    66:72:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):304:310 -> a
+    73:73:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):308:308 -> a
+    74:86:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):307:319 -> a
+    87:95:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):318:326 -> a
+    96:96:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):324:324 -> a
+    97:123:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):323:349 -> a
+    124:134:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):345:355 -> a
+    135:155:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):354:374 -> a
+    156:177:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):364:385 -> a
+    178:217:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):384:423 -> a
+    218:240:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):420:442 -> a
+    241:251:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):438:448 -> a
+    252:259:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):447:454 -> a
+    260:269:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):451:460 -> a
+    270:278:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):458:466 -> a
+    279:319:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):463:503 -> a
+    320:324:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):499:503 -> a
+    325:367:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):497:539 -> a
+    368:396:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):538:566 -> a
+    397:397:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):564:564 -> a
+    398:414:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):563:579 -> a
+    415:415:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):577:577 -> a
+    416:427:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):574:585 -> a
+    428:461:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):584:617 -> a
+    462:534:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):616:688 -> a
+    535:543:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):653:661 -> a
+    544:544:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):657:657 -> a
+    545:565:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):655:675 -> a
+    566:584:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):670:688 -> a
+    585:585:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):598:598 -> a
+    586:586:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):485:485 -> a
+    587:898:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):377:688 -> a
+    899:900:void lambda$run$2(com.android.tools.r8.graph.DexType):286:287 -> a
+    901:901:void lambda$run$2(com.android.tools.r8.graph.DexType):286:286 -> a
+    902:902:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):374:374 -> a
+    903:903:void lambda$run$4(java.lang.String):648:648 -> a
+    904:907:void computeKotlinInfoForProgramClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):695:698 -> a
+    908:917:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):703:712 -> a
+    918:919:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):706:707 -> a
+    920:920:void lambda$run$5(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):731:731 -> a
+    921:921:void lambda$main$6(java.lang.String[]):747:747 -> a
     boolean lambda$run$3(com.android.tools.r8.graph.DexType) -> b
     1:3:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):246:248 -> b
-    4:5:void run(java.lang.String[]):734:735 -> b
+    4:5:void run(java.lang.String[]):717:718 -> b
     6:6:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> b
-    6:6:void run(java.lang.String[]):736 -> b
-    7:7:void run(java.lang.String[]):737:737 -> b
-    8:8:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> b
-    8:8:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> b
-    8:8:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> b
-    8:8:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> b
-    8:8:void run(java.lang.String[]):736 -> b
-    9:16:void run(java.lang.String[]):740:747 -> b
-    17:17:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):48:48 -> b
-    17:17:void run(java.lang.String[]):747 -> b
-    18:18:void run(java.lang.String[]):750:750 -> b
+    6:6:void run(java.lang.String[]):719 -> b
+    7:7:void run(java.lang.String[]):720:720 -> b
+    8:8:void com.android.tools.r8.utils.SelfRetraceTest.test():26:26 -> b
+    8:8:void run(java.lang.String[]):719 -> b
+    9:9:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> b
+    9:9:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> b
+    9:9:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> b
+    9:9:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> b
+    9:9:void run(java.lang.String[]):719 -> b
+    10:17:void run(java.lang.String[]):723:730 -> b
+    18:18:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):48:48 -> b
+    18:18:void run(java.lang.String[]):730 -> b
+    19:19:void run(java.lang.String[]):733:733 -> b
     1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):255:255 -> c
-    1:5:void main(java.lang.String[]):760:764 -> main
+    1:5:void main(java.lang.String[]):743:747 -> main
     1:3:void run(com.android.tools.r8.R8Command):145:147 -> run
     4:7:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):161:164 -> run
     8:8:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):48:48 -> run
@@ -1029,9 +1012,10 @@
     5:5:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):556:556 -> builder
     1:1:boolean getEnableMinification():645:645 -> getEnableMinification
     1:1:boolean getEnableTreeShaking():640:640 -> getEnableTreeShaking
-    1:107:com.android.tools.r8.utils.InternalOptions getInternalOptions():650:756 -> getInternalOptions
+    1:109:com.android.tools.r8.utils.InternalOptions getInternalOptions():650:758 -> getInternalOptions
     1:1:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):569:569 -> parse
     2:2:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):583:583 -> parse
+com.android.tools.r8.R8Command$1 -> com.android.tools.r8.q:
 com.android.tools.r8.R8Command$Builder -> com.android.tools.r8.R8Command$Builder:
     java.util.function.Consumer proguardConfigurationConsumer -> p
     java.util.List proguardConfigs -> r
@@ -1044,8 +1028,9 @@
     boolean disableMinification -> t
     com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> x
     com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> y
-    boolean allowTestProguardOptions -> z
-    boolean $assertionsDisabled -> A
+    java.nio.file.Path proguardCompatibilityRulesOutput -> z
+    boolean allowTestProguardOptions -> A
+    boolean $assertionsDisabled -> B
     1:1:void <clinit>():59:59 -> <clinit>
     1:1:void <init>(com.android.tools.r8.DiagnosticsHandler):104:104 -> <init>
     2:18:void <init>(com.android.tools.r8.DiagnosticsHandler):80:96 -> <init>
@@ -1057,38 +1042,41 @@
     37:37:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.R8Command$1):60 -> <init>
     38:54:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):80:96 -> <init>
     38:54:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.R8Command$1):60 -> <init>
-    1:2:void lambda$addMainDexRules$2(java.util.List,com.android.tools.r8.origin.Origin):179:180 -> a
-    3:3:void lambda$addMainDexRules$2(java.util.List,com.android.tools.r8.origin.Origin):179:179 -> a
-    4:5:void lambda$addProguardConfigurationFiles$4(java.util.List):197:198 -> a
-    6:8:com.android.tools.r8.InternalProgramOutputPathConsumer com.android.tools.r8.BaseCompilerCommand$Builder.createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):300:302 -> a
-    6:8:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):311 -> a
-    9:9:void com.android.tools.r8.DexIndexedConsumer$ArchiveConsumer.<init>(java.nio.file.Path,boolean):133:133 -> a
-    9:9:com.android.tools.r8.InternalProgramOutputPathConsumer com.android.tools.r8.BaseCompilerCommand$Builder.createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):302 -> a
-    9:9:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):311 -> a
-    10:10:com.android.tools.r8.InternalProgramOutputPathConsumer com.android.tools.r8.BaseCompilerCommand$Builder.createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):303:303 -> a
+    1:1:com.android.tools.r8.BaseCommand makeCommand():59:59 -> a
+    2:3:void lambda$addMainDexRules$2(java.util.List,com.android.tools.r8.origin.Origin):179:180 -> a
+    4:4:void lambda$addMainDexRules$2(java.util.List,com.android.tools.r8.origin.Origin):179:179 -> a
+    5:6:void lambda$addProguardConfigurationFiles$4(java.util.List):197:198 -> a
+    7:9:com.android.tools.r8.InternalProgramOutputPathConsumer com.android.tools.r8.BaseCompilerCommand$Builder.createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):300:302 -> a
+    7:9:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):311 -> a
+    10:10:void com.android.tools.r8.DexIndexedConsumer$ArchiveConsumer.<init>(java.nio.file.Path,boolean):133:133 -> a
+    10:10:com.android.tools.r8.InternalProgramOutputPathConsumer com.android.tools.r8.BaseCompilerCommand$Builder.createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):302 -> a
     10:10:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):311 -> a
-    11:11:void com.android.tools.r8.DexIndexedConsumer$DirectoryConsumer.<init>(java.nio.file.Path,boolean):223:223 -> a
-    11:11:com.android.tools.r8.InternalProgramOutputPathConsumer com.android.tools.r8.BaseCompilerCommand$Builder.createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):303 -> a
+    11:11:com.android.tools.r8.InternalProgramOutputPathConsumer com.android.tools.r8.BaseCompilerCommand$Builder.createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):303:303 -> a
     11:11:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):311 -> a
-    12:31:com.android.tools.r8.InternalProgramOutputPathConsumer com.android.tools.r8.BaseCompilerCommand$Builder.createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):305:324 -> a
-    12:31:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):311 -> a
-    32:32:void com.android.tools.r8.DexFilePerClassFileConsumer$ArchiveConsumer.<init>(java.nio.file.Path,boolean):156:156 -> a
-    32:32:com.android.tools.r8.InternalProgramOutputPathConsumer com.android.tools.r8.BaseCompilerCommand$Builder.createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):324 -> a
-    32:32:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):311 -> a
-    33:37:com.android.tools.r8.InternalProgramOutputPathConsumer com.android.tools.r8.BaseCompilerCommand$Builder.createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):325:329 -> a
-    33:37:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):311 -> a
-    38:38:void com.android.tools.r8.ClassFileConsumer$ArchiveConsumer.<init>(java.nio.file.Path,boolean):100:100 -> a
-    38:38:com.android.tools.r8.InternalProgramOutputPathConsumer com.android.tools.r8.BaseCompilerCommand$Builder.createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):329 -> a
-    38:38:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):311 -> a
-    39:39:com.android.tools.r8.InternalProgramOutputPathConsumer com.android.tools.r8.BaseCompilerCommand$Builder.createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):330:330 -> a
+    12:12:void com.android.tools.r8.DexIndexedConsumer$DirectoryConsumer.<init>(java.nio.file.Path,boolean):223:223 -> a
+    12:12:com.android.tools.r8.InternalProgramOutputPathConsumer com.android.tools.r8.BaseCompilerCommand$Builder.createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):303 -> a
+    12:12:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):311 -> a
+    13:32:com.android.tools.r8.InternalProgramOutputPathConsumer com.android.tools.r8.BaseCompilerCommand$Builder.createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):305:324 -> a
+    13:32:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):311 -> a
+    33:33:void com.android.tools.r8.DexFilePerClassFileConsumer$ArchiveConsumer.<init>(java.nio.file.Path,boolean):156:156 -> a
+    33:33:com.android.tools.r8.InternalProgramOutputPathConsumer com.android.tools.r8.BaseCompilerCommand$Builder.createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):324 -> a
+    33:33:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):311 -> a
+    34:38:com.android.tools.r8.InternalProgramOutputPathConsumer com.android.tools.r8.BaseCompilerCommand$Builder.createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):325:329 -> a
+    34:38:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):311 -> a
+    39:39:void com.android.tools.r8.ClassFileConsumer$ArchiveConsumer.<init>(java.nio.file.Path,boolean):100:100 -> a
+    39:39:com.android.tools.r8.InternalProgramOutputPathConsumer com.android.tools.r8.BaseCompilerCommand$Builder.createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):329 -> a
     39:39:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):311 -> a
-    40:40:void com.android.tools.r8.ClassFileConsumer$DirectoryConsumer.<init>(java.nio.file.Path,boolean):189:189 -> a
-    40:40:com.android.tools.r8.InternalProgramOutputPathConsumer com.android.tools.r8.BaseCompilerCommand$Builder.createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):330 -> a
+    40:40:com.android.tools.r8.InternalProgramOutputPathConsumer com.android.tools.r8.BaseCompilerCommand$Builder.createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):330:330 -> a
     40:40:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):311 -> a
-    41:41:com.android.tools.r8.InternalProgramOutputPathConsumer com.android.tools.r8.BaseCompilerCommand$Builder.createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):332:332 -> a
+    41:41:void com.android.tools.r8.ClassFileConsumer$DirectoryConsumer.<init>(java.nio.file.Path,boolean):189:189 -> a
+    41:41:com.android.tools.r8.InternalProgramOutputPathConsumer com.android.tools.r8.BaseCompilerCommand$Builder.createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):330 -> a
     41:41:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):311 -> a
-    42:44:void lambda$makeR8Command$6(com.android.tools.r8.DataResourceProvider$Visitor,com.android.tools.r8.utils.Reporter,com.android.tools.r8.DataResourceProvider):417:419 -> a
-    45:47:void lambda$addProguardConfigurationConsumerForTesting$7(java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):472:474 -> a
+    42:42:com.android.tools.r8.InternalProgramOutputPathConsumer com.android.tools.r8.BaseCompilerCommand$Builder.createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):332:332 -> a
+    42:42:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):311 -> a
+    43:46:com.android.tools.r8.R8Command makeCommand():352:355 -> a
+    47:47:com.android.tools.r8.R8Command makeCommand():353:353 -> a
+    48:50:void lambda$makeR8Command$6(com.android.tools.r8.DataResourceProvider$Visitor,com.android.tools.r8.utils.Reporter,com.android.tools.r8.DataResourceProvider):417:419 -> a
+    51:53:void lambda$addProguardConfigurationConsumerForTesting$7(java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):472:474 -> a
     1:3:com.android.tools.r8.R8Command$Builder addMainDexRules(java.util.List,com.android.tools.r8.origin.Origin):179:181 -> addMainDexRules
     1:6:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.nio.file.Path[]):159:164 -> addMainDexRulesFiles
     7:12:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.util.Collection):169:174 -> addMainDexRulesFiles
@@ -1100,25 +1088,22 @@
     7:12:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.util.List):196:201 -> addProguardConfigurationFiles
     1:3:void addSyntheticProguardRulesConsumerForTesting(java.util.function.Consumer):481:483 -> addSyntheticProguardRulesConsumerForTesting
     1:1:void allowTestProguardOptions():494:494 -> allowTestProguardOptions
-    1:1:com.android.tools.r8.BaseCommand makeCommand():59:59 -> b
+    com.android.tools.r8.R8Command$Builder self() -> b
+    1:1:com.android.tools.r8.BaseCommand$Builder self():59:59 -> b
     2:2:void setDisableVerticalClassMerging(boolean):122:122 -> b
-    3:4:void lambda$addProguardConfiguration$5(java.util.List,com.android.tools.r8.origin.Origin):206:207 -> b
-    5:5:void lambda$addProguardConfiguration$5(java.util.List,com.android.tools.r8.origin.Origin):206:206 -> b
-    6:9:com.android.tools.r8.R8Command makeCommand():352:355 -> b
-    10:10:com.android.tools.r8.R8Command makeCommand():353:353 -> b
-    com.android.tools.r8.R8Command$Builder self() -> c
-    1:1:com.android.tools.r8.BaseCommand$Builder self():59:59 -> c
-    2:3:void lambda$addMainDexRulesFiles$0(java.nio.file.Path[]):160:161 -> c
-    1:2:void lambda$addProguardConfigurationFiles$3(java.nio.file.Path[]):187:188 -> d
-    3:20:void validate():316:333 -> d
-    21:36:void validate():331:346 -> d
-    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():132:132 -> e
-    1:2:void lambda$addMainDexRulesFiles$1(java.util.Collection):170:171 -> f
-    1:1:void internalForceProguardCompatibility():118:118 -> h
-    1:7:com.android.tools.r8.R8Command makeR8Command():359:365 -> i
-    8:8:void com.android.tools.r8.shaking.ProguardConfigurationParser.<init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):109:109 -> i
-    8:8:com.android.tools.r8.R8Command makeR8Command():365 -> i
-    9:103:com.android.tools.r8.R8Command makeR8Command():367:461 -> i
+    3:4:void lambda$addMainDexRulesFiles$0(java.nio.file.Path[]):160:161 -> b
+    5:6:void lambda$addProguardConfiguration$5(java.util.List,com.android.tools.r8.origin.Origin):206:207 -> b
+    7:7:void lambda$addProguardConfiguration$5(java.util.List,com.android.tools.r8.origin.Origin):206:206 -> b
+    1:2:void lambda$addProguardConfigurationFiles$3(java.nio.file.Path[]):187:188 -> c
+    3:20:void validate():316:333 -> c
+    21:36:void validate():331:346 -> c
+    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():132:132 -> d
+    1:2:void lambda$addMainDexRulesFiles$1(java.util.Collection):170:171 -> e
+    1:1:void internalForceProguardCompatibility():118:118 -> g
+    1:7:com.android.tools.r8.R8Command makeR8Command():359:365 -> h
+    8:8:void com.android.tools.r8.shaking.ProguardConfigurationParser.<init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):107:107 -> h
+    8:8:com.android.tools.r8.R8Command makeR8Command():365 -> h
+    9:103:com.android.tools.r8.R8Command makeR8Command():367:461 -> h
     1:2:com.android.tools.r8.R8Command$Builder setDisableMinification(boolean):153:154 -> setDisableMinification
     1:2:com.android.tools.r8.R8Command$Builder setDisableTreeShaking(boolean):142:143 -> setDisableTreeShaking
     1:2:com.android.tools.r8.R8Command$Builder setKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):245:246 -> setKeptGraphConsumer
@@ -1132,7 +1117,7 @@
     3:3:void com.android.tools.r8.StringConsumer$FileConsumer.<init>(java.nio.file.Path):76:76 -> setProguardMapOutputPath
     3:3:com.android.tools.r8.R8Command$Builder setProguardMapOutputPath(java.nio.file.Path):222 -> setProguardMapOutputPath
     4:5:com.android.tools.r8.R8Command$Builder setProguardMapOutputPath(java.nio.file.Path):222:223 -> setProguardMapOutputPath
-com.android.tools.r8.R8Command$Builder$1 -> com.android.tools.r8.R8Command$Builder$1:
+com.android.tools.r8.R8Command$Builder$1 -> com.android.tools.r8.r:
     com.android.tools.r8.shaking.ProguardConfigurationParser val$parser -> a
     com.android.tools.r8.utils.Reporter val$reporter -> b
     1:1:void <init>(com.android.tools.r8.R8Command$Builder,com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.utils.Reporter):388:388 -> <init>
@@ -1150,35 +1135,35 @@
     1:2:void <init>(com.android.tools.r8.ProgramResourceProvider):503:504 -> <init>
     1:1:com.android.tools.r8.DataResourceProvider getDataResourceProvider():521:521 -> getDataResourceProvider
     1:4:java.util.Collection getProgramResources():509:512 -> getProgramResources
-com.android.tools.r8.R8CommandParser -> com.android.tools.r8.l:
+com.android.tools.r8.R8CommandParser -> com.android.tools.r8.u:
     java.util.Set OPTIONS_WITH_PARAMETER -> a
     java.lang.String USAGE_MESSAGE -> b
-    1:31:void <clinit>():18:48 -> <clinit>
-    32:32:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():59:59 -> <clinit>
-    32:32:void <clinit>():64 -> <clinit>
-    33:33:void <clinit>():64:64 -> <clinit>
-    34:34:void <clinit>():51:51 -> <clinit>
-    35:35:void <clinit>():49:49 -> <clinit>
+    1:30:void <clinit>():18:47 -> <clinit>
+    31:31:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():59:59 -> <clinit>
+    31:31:void <clinit>():63 -> <clinit>
+    32:32:void <clinit>():63:63 -> <clinit>
+    33:33:void <clinit>():50:50 -> <clinit>
+    34:34:void <clinit>():48:48 -> <clinit>
     1:1:void <init>():16:16 -> <init>
-    1:1:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):89:89 -> a
-    2:2:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):103:103 -> a
-    3:3:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder):107:107 -> a
-    4:57:void parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder,com.android.tools.r8.R8CommandParser$ParseState):120:173 -> a
-    4:57:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder):108 -> a
-    58:103:void parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder,com.android.tools.r8.R8CommandParser$ParseState):170:215 -> a
-    58:103:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder):108 -> a
-    104:109:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder):109:114 -> a
-com.android.tools.r8.R8CommandParser$1 -> com.android.tools.r8.j:
-com.android.tools.r8.R8CommandParser$ParseState -> com.android.tools.r8.k:
+    1:1:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):88:88 -> a
+    2:2:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):102:102 -> a
+    3:3:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder):106:106 -> a
+    4:57:void parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder,com.android.tools.r8.R8CommandParser$ParseState):119:172 -> a
+    4:57:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder):107 -> a
+    58:101:void parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder,com.android.tools.r8.R8CommandParser$ParseState):169:212 -> a
+    58:101:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder):107 -> a
+    102:107:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder):108:113 -> a
+com.android.tools.r8.R8CommandParser$1 -> com.android.tools.r8.s:
+com.android.tools.r8.R8CommandParser$ParseState -> com.android.tools.r8.t:
     java.nio.file.Path outputPath -> c
     com.android.tools.r8.OutputMode outputMode -> b
     boolean includeDataResources -> e
     com.android.tools.r8.CompilationMode mode -> a
     boolean hasDefinedApiLevel -> d
-    1:6:void <init>():40:45 -> <init>
-    1:6:void <init>(com.android.tools.r8.R8CommandParser$1):40 -> <init>
-    1:1:boolean access$100(com.android.tools.r8.R8CommandParser$ParseState):40:40 -> a
-    2:2:boolean access$102(com.android.tools.r8.R8CommandParser$ParseState,boolean):40:40 -> a
+    1:6:void <init>():39:44 -> <init>
+    1:6:void <init>(com.android.tools.r8.R8CommandParser$1):39 -> <init>
+    1:1:boolean access$100(com.android.tools.r8.R8CommandParser$ParseState):39:39 -> a
+    2:2:boolean access$102(com.android.tools.r8.R8CommandParser$ParseState,boolean):39:39 -> a
 com.android.tools.r8.ResourceException -> com.android.tools.r8.ResourceException:
     com.android.tools.r8.origin.Origin origin -> a
     1:2:void <init>(com.android.tools.r8.origin.Origin,java.lang.String):20:21 -> <init>
@@ -1190,10 +1175,10 @@
     1:6:void run(com.android.tools.r8.ResourceShrinker$Command,com.android.tools.r8.ResourceShrinker$ReferenceChecker):462:467 -> run
 com.android.tools.r8.ResourceShrinker$Builder -> com.android.tools.r8.ResourceShrinker$Builder:
     1:1:void <init>():111:111 -> <init>
-    1:1:com.android.tools.r8.BaseCommand makeCommand():110:110 -> b
-    2:2:com.android.tools.r8.ResourceShrinker$Command makeCommand():120:120 -> b
-    com.android.tools.r8.ResourceShrinker$Builder self() -> c
-    1:1:com.android.tools.r8.BaseCommand$Builder self():110:110 -> c
+    1:1:com.android.tools.r8.BaseCommand makeCommand():110:110 -> a
+    2:2:com.android.tools.r8.ResourceShrinker$Command makeCommand():120:120 -> a
+    com.android.tools.r8.ResourceShrinker$Builder self() -> b
+    1:1:com.android.tools.r8.BaseCommand$Builder self():110:110 -> b
 com.android.tools.r8.ResourceShrinker$Command -> com.android.tools.r8.ResourceShrinker$Command:
     1:1:void <init>(com.android.tools.r8.utils.AndroidApp):101:101 -> <init>
     1:1:com.android.tools.r8.utils.InternalOptions getInternalOptions():106:106 -> getInternalOptions
@@ -1317,6 +1302,7 @@
     1:1:com.android.tools.r8.StringResource fromFile(java.nio.file.Path,java.nio.charset.Charset):49:49 -> a
     1:1:com.android.tools.r8.StringResource fromFile(java.nio.file.Path):37:37 -> fromFile
     1:1:com.android.tools.r8.StringResource fromString(java.lang.String,com.android.tools.r8.origin.Origin):26:26 -> fromString
+com.android.tools.r8.StringResource$1 -> com.android.tools.r8.v:
 com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.StringResource$a:
     java.nio.charset.Charset charset -> b
     com.android.tools.r8.origin.Origin origin -> c
@@ -1447,110 +1433,110 @@
     24:24:int lambda$computeLocalsAtLabels$1(com.android.tools.r8.graph.CfCode$LocalVariableInfo,com.android.tools.r8.graph.CfCode$LocalVariableInfo):207:207 -> a
     25:26:java.util.List getSortedLocalVariables(com.android.tools.r8.graph.CfCode):214:215 -> a
     27:28:void print(java.lang.String):236:237 -> a
-    27:28:void print(com.android.tools.r8.cf.code.CfNop):241 -> a
-    29:58:void print(com.android.tools.r8.cf.code.CfStackInstruction):245:274 -> a
-    59:60:void print(java.lang.String):236:237 -> a
-    59:60:void print(com.android.tools.r8.cf.code.CfStackInstruction):271 -> a
-    61:62:void print(java.lang.String):236:237 -> a
-    61:62:void print(com.android.tools.r8.cf.code.CfStackInstruction):268 -> a
-    63:64:void print(java.lang.String):236:237 -> a
-    63:64:void print(com.android.tools.r8.cf.code.CfStackInstruction):265 -> a
-    65:66:void print(java.lang.String):236:237 -> a
-    65:66:void print(com.android.tools.r8.cf.code.CfStackInstruction):262 -> a
+    27:28:void print(com.android.tools.r8.cf.code.CfArrayLength):479 -> a
+    29:30:void print(java.lang.String):236:237 -> a
+    29:30:void print(com.android.tools.r8.cf.code.CfConstNull):283 -> a
+    31:32:void print(java.lang.String):236:237 -> a
+    31:32:void print(com.android.tools.r8.cf.code.CfNop):241 -> a
+    33:34:void print(java.lang.String):236:237 -> a
+    33:34:void print(com.android.tools.r8.cf.code.CfReturnVoid):314 -> a
+    35:36:void print(java.lang.String):236:237 -> a
+    35:36:void print(com.android.tools.r8.cf.code.CfThrow):279 -> a
+    37:66:void print(com.android.tools.r8.cf.code.CfStackInstruction):245:274 -> a
     67:68:void print(java.lang.String):236:237 -> a
-    67:68:void print(com.android.tools.r8.cf.code.CfStackInstruction):259 -> a
+    67:68:void print(com.android.tools.r8.cf.code.CfStackInstruction):271 -> a
     69:70:void print(java.lang.String):236:237 -> a
-    69:70:void print(com.android.tools.r8.cf.code.CfStackInstruction):256 -> a
+    69:70:void print(com.android.tools.r8.cf.code.CfStackInstruction):268 -> a
     71:72:void print(java.lang.String):236:237 -> a
-    71:72:void print(com.android.tools.r8.cf.code.CfStackInstruction):253 -> a
+    71:72:void print(com.android.tools.r8.cf.code.CfStackInstruction):265 -> a
     73:74:void print(java.lang.String):236:237 -> a
-    73:74:void print(com.android.tools.r8.cf.code.CfStackInstruction):250 -> a
+    73:74:void print(com.android.tools.r8.cf.code.CfStackInstruction):262 -> a
     75:76:void print(java.lang.String):236:237 -> a
-    75:76:void print(com.android.tools.r8.cf.code.CfStackInstruction):247 -> a
-    77:93:void print(com.android.tools.r8.cf.code.CfConstNumber):287:303 -> a
-    94:94:void print(com.android.tools.r8.cf.code.CfConstNumber):300:300 -> a
-    95:95:void print(com.android.tools.r8.cf.code.CfConstNumber):297:297 -> a
-    96:96:void print(com.android.tools.r8.cf.code.CfConstNumber):294:294 -> a
-    97:97:void print(com.android.tools.r8.cf.code.CfConstNumber):291:291 -> a
-    98:100:void print(com.android.tools.r8.cf.code.CfConstClass):308:310 -> a
-    101:101:void print(com.android.tools.r8.cf.code.CfReturn):318:318 -> a
-    102:102:void print(com.android.tools.r8.cf.code.CfMonitor):322:322 -> a
-    103:104:void print(java.lang.String):236:237 -> a
-    103:104:void print(com.android.tools.r8.cf.code.CfMonitor):322 -> a
-    105:105:void print(com.android.tools.r8.cf.code.CfArithmeticBinop):326:326 -> a
-    106:106:void print(com.android.tools.r8.cf.code.CfCmp):330:330 -> a
-    107:107:void print(com.android.tools.r8.cf.code.CfLogicalBinop):334:334 -> a
-    108:108:void print(com.android.tools.r8.cf.code.CfNeg):338:338 -> a
-    109:109:void print(com.android.tools.r8.cf.code.CfNumberConversion):342:342 -> a
-    110:111:void print(com.android.tools.r8.cf.code.CfConstString):346:347 -> a
-    112:113:void print(com.android.tools.r8.cf.code.CfDexItemBasedConstString):351:352 -> a
-    114:115:void print(com.android.tools.r8.cf.code.CfArrayLoad):356:357 -> a
-    116:117:void print(com.android.tools.r8.cf.code.CfArrayStore):361:362 -> a
-    118:120:void print(com.android.tools.r8.cf.code.CfInvoke):366:368 -> a
-    121:124:void print(com.android.tools.r8.cf.code.CfInvokeDynamic):372:375 -> a
-    125:144:void print(com.android.tools.r8.cf.code.CfFrame):379:398 -> a
-    145:148:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):402:405 -> a
-    149:152:void appendType(com.android.tools.r8.graph.DexType):688:691 -> a
-    149:152:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):405 -> a
-    153:153:void appendType(com.android.tools.r8.graph.DexType):689:689 -> a
-    153:153:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):405 -> a
-    154:154:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):407:407 -> a
-    155:157:void print(com.android.tools.r8.cf.code.CfInstanceOf):412:414 -> a
-    158:160:void print(com.android.tools.r8.cf.code.CfCheckCast):418:420 -> a
-    161:176:void print(com.android.tools.r8.cf.code.CfFieldInstruction):424:439 -> a
-    177:177:void print(com.android.tools.r8.cf.code.CfFieldInstruction):430:430 -> a
-    178:187:void print(com.android.tools.r8.cf.code.CfFieldInstruction):427:436 -> a
-    188:196:void print(com.android.tools.r8.cf.code.CfFieldInstruction):433:441 -> a
-    197:202:void appendField(com.android.tools.r8.graph.DexField):709:714 -> a
-    197:202:void print(com.android.tools.r8.cf.code.CfFieldInstruction):441 -> a
-    203:204:void print(com.android.tools.r8.cf.code.CfFieldInstruction):442:443 -> a
-    205:209:void appendDescriptor(com.android.tools.r8.graph.DexType):680:684 -> a
-    205:209:void print(com.android.tools.r8.cf.code.CfFieldInstruction):443 -> a
-    210:212:void print(com.android.tools.r8.cf.code.CfNew):447:449 -> a
-    213:226:void print(com.android.tools.r8.cf.code.CfNewArray):453:466 -> a
-    227:230:void print(com.android.tools.r8.cf.code.CfMultiANewArray):472:475 -> a
-    231:241:void print(com.android.tools.r8.cf.code.CfLabel):483:493 -> a
-    242:242:void print(com.android.tools.r8.cf.code.CfLabel):491:491 -> a
-    243:243:void print(com.android.tools.r8.cf.code.CfLabel):489:489 -> a
-    244:248:void print(com.android.tools.r8.cf.code.CfPosition):498:502 -> a
-    249:250:void print(com.android.tools.r8.cf.code.CfGoto):507:508 -> a
-    251:255:void print(com.android.tools.r8.cf.code.CfIf):516:520 -> a
-    256:256:java.lang.String ifPostfix(com.android.tools.r8.ir.code.If$Type):512:512 -> a
-    256:256:void print(com.android.tools.r8.cf.code.CfIf):520 -> a
-    257:259:void print(com.android.tools.r8.cf.code.CfIf):520:522 -> a
-    260:263:void print(com.android.tools.r8.cf.code.CfIfCmp):526:529 -> a
+    75:76:void print(com.android.tools.r8.cf.code.CfStackInstruction):259 -> a
+    77:78:void print(java.lang.String):236:237 -> a
+    77:78:void print(com.android.tools.r8.cf.code.CfStackInstruction):256 -> a
+    79:80:void print(java.lang.String):236:237 -> a
+    79:80:void print(com.android.tools.r8.cf.code.CfStackInstruction):253 -> a
+    81:82:void print(java.lang.String):236:237 -> a
+    81:82:void print(com.android.tools.r8.cf.code.CfStackInstruction):250 -> a
+    83:84:void print(java.lang.String):236:237 -> a
+    83:84:void print(com.android.tools.r8.cf.code.CfStackInstruction):247 -> a
+    85:101:void print(com.android.tools.r8.cf.code.CfConstNumber):287:303 -> a
+    102:102:void print(com.android.tools.r8.cf.code.CfConstNumber):300:300 -> a
+    103:103:void print(com.android.tools.r8.cf.code.CfConstNumber):297:297 -> a
+    104:104:void print(com.android.tools.r8.cf.code.CfConstNumber):294:294 -> a
+    105:105:void print(com.android.tools.r8.cf.code.CfConstNumber):291:291 -> a
+    106:108:void print(com.android.tools.r8.cf.code.CfConstClass):308:310 -> a
+    109:109:void print(com.android.tools.r8.cf.code.CfReturn):318:318 -> a
+    110:110:void print(com.android.tools.r8.cf.code.CfMonitor):322:322 -> a
+    111:112:void print(java.lang.String):236:237 -> a
+    111:112:void print(com.android.tools.r8.cf.code.CfMonitor):322 -> a
+    113:113:void print(com.android.tools.r8.cf.code.CfArithmeticBinop):326:326 -> a
+    114:114:void print(com.android.tools.r8.cf.code.CfCmp):330:330 -> a
+    115:115:void print(com.android.tools.r8.cf.code.CfLogicalBinop):334:334 -> a
+    116:116:void print(com.android.tools.r8.cf.code.CfNeg):338:338 -> a
+    117:117:void print(com.android.tools.r8.cf.code.CfNumberConversion):342:342 -> a
+    118:119:void print(com.android.tools.r8.cf.code.CfConstString):346:347 -> a
+    120:121:void print(com.android.tools.r8.cf.code.CfDexItemBasedConstString):351:352 -> a
+    122:123:void print(com.android.tools.r8.cf.code.CfArrayLoad):356:357 -> a
+    124:125:void print(com.android.tools.r8.cf.code.CfArrayStore):361:362 -> a
+    126:128:void print(com.android.tools.r8.cf.code.CfInvoke):366:368 -> a
+    129:132:void print(com.android.tools.r8.cf.code.CfInvokeDynamic):372:375 -> a
+    133:152:void print(com.android.tools.r8.cf.code.CfFrame):379:398 -> a
+    153:156:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):402:405 -> a
+    157:160:void appendType(com.android.tools.r8.graph.DexType):688:691 -> a
+    157:160:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):405 -> a
+    161:161:void appendType(com.android.tools.r8.graph.DexType):689:689 -> a
+    161:161:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):405 -> a
+    162:162:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):407:407 -> a
+    163:165:void print(com.android.tools.r8.cf.code.CfInstanceOf):412:414 -> a
+    166:168:void print(com.android.tools.r8.cf.code.CfCheckCast):418:420 -> a
+    169:184:void print(com.android.tools.r8.cf.code.CfFieldInstruction):424:439 -> a
+    185:185:void print(com.android.tools.r8.cf.code.CfFieldInstruction):430:430 -> a
+    186:195:void print(com.android.tools.r8.cf.code.CfFieldInstruction):427:436 -> a
+    196:204:void print(com.android.tools.r8.cf.code.CfFieldInstruction):433:441 -> a
+    205:210:void appendField(com.android.tools.r8.graph.DexField):709:714 -> a
+    205:210:void print(com.android.tools.r8.cf.code.CfFieldInstruction):441 -> a
+    211:212:void print(com.android.tools.r8.cf.code.CfFieldInstruction):442:443 -> a
+    213:217:void appendDescriptor(com.android.tools.r8.graph.DexType):680:684 -> a
+    213:217:void print(com.android.tools.r8.cf.code.CfFieldInstruction):443 -> a
+    218:220:void print(com.android.tools.r8.cf.code.CfNew):447:449 -> a
+    221:234:void print(com.android.tools.r8.cf.code.CfNewArray):453:466 -> a
+    235:238:void print(com.android.tools.r8.cf.code.CfMultiANewArray):472:475 -> a
+    239:249:void print(com.android.tools.r8.cf.code.CfLabel):483:493 -> a
+    250:250:void print(com.android.tools.r8.cf.code.CfLabel):491:491 -> a
+    251:251:void print(com.android.tools.r8.cf.code.CfLabel):489:489 -> a
+    252:256:void print(com.android.tools.r8.cf.code.CfPosition):498:502 -> a
+    257:258:void print(com.android.tools.r8.cf.code.CfGoto):507:508 -> a
+    259:263:void print(com.android.tools.r8.cf.code.CfIf):516:520 -> a
     264:264:java.lang.String ifPostfix(com.android.tools.r8.ir.code.If$Type):512:512 -> a
-    264:264:void print(com.android.tools.r8.cf.code.CfIfCmp):529 -> a
-    265:267:void print(com.android.tools.r8.cf.code.CfIfCmp):529:531 -> a
-    268:285:void print(com.android.tools.r8.cf.code.CfSwitch):535:552 -> a
-    286:286:void print(com.android.tools.r8.cf.code.CfLoad):556:556 -> a
-    287:287:void print(com.android.tools.r8.cf.code.CfStore):560:560 -> a
-    288:293:void print(com.android.tools.r8.cf.code.CfIinc):564:569 -> a
-    294:295:void printPrefixed(com.android.tools.r8.ir.code.ValueType,java.lang.String,int):573:574 -> a
-    296:308:char typePrefix(com.android.tools.r8.ir.code.ValueType):578:590 -> a
-    309:328:char typePrefix(com.android.tools.r8.ir.code.MemberType):595:614 -> a
-    329:331:void print(com.android.tools.r8.cf.code.CfConstMethodHandle):637:639 -> a
-    332:334:void print(com.android.tools.r8.cf.code.CfConstMethodType):643:645 -> a
-    335:335:void appendComment(java.lang.String):676:676 -> a
-    336:344:void appendClass(com.android.tools.r8.graph.DexType):696:704 -> a
-    345:345:void appendClass(com.android.tools.r8.graph.DexType):703:703 -> a
-    346:346:void appendClass(com.android.tools.r8.graph.DexType):702:702 -> a
-    347:354:void appendMethod(com.android.tools.r8.graph.DexMethod):718:725 -> a
-    355:355:java.lang.String opcodeName(int):729:729 -> a
+    264:264:void print(com.android.tools.r8.cf.code.CfIf):520 -> a
+    265:267:void print(com.android.tools.r8.cf.code.CfIf):520:522 -> a
+    268:271:void print(com.android.tools.r8.cf.code.CfIfCmp):526:529 -> a
+    272:272:java.lang.String ifPostfix(com.android.tools.r8.ir.code.If$Type):512:512 -> a
+    272:272:void print(com.android.tools.r8.cf.code.CfIfCmp):529 -> a
+    273:275:void print(com.android.tools.r8.cf.code.CfIfCmp):529:531 -> a
+    276:293:void print(com.android.tools.r8.cf.code.CfSwitch):535:552 -> a
+    294:294:void print(com.android.tools.r8.cf.code.CfLoad):556:556 -> a
+    295:295:void print(com.android.tools.r8.cf.code.CfStore):560:560 -> a
+    296:301:void print(com.android.tools.r8.cf.code.CfIinc):564:569 -> a
+    302:303:void printPrefixed(com.android.tools.r8.ir.code.ValueType,java.lang.String,int):573:574 -> a
+    304:316:char typePrefix(com.android.tools.r8.ir.code.ValueType):578:590 -> a
+    317:336:char typePrefix(com.android.tools.r8.ir.code.MemberType):595:614 -> a
+    337:339:void print(com.android.tools.r8.cf.code.CfConstMethodHandle):637:639 -> a
+    340:342:void print(com.android.tools.r8.cf.code.CfConstMethodType):643:645 -> a
+    343:345:void indent():665:667 -> a
+    346:346:void appendComment(java.lang.String):676:676 -> a
+    347:355:void appendClass(com.android.tools.r8.graph.DexType):696:704 -> a
+    356:356:void appendClass(com.android.tools.r8.graph.DexType):703:703 -> a
+    357:357:void appendClass(com.android.tools.r8.graph.DexType):702:702 -> a
+    358:365:void appendMethod(com.android.tools.r8.graph.DexMethod):718:725 -> a
+    366:366:java.lang.String opcodeName(int):729:729 -> a
     1:13:int lambda$getSortedLocalVariables$2(com.android.tools.r8.graph.CfCode$LocalVariableInfo,com.android.tools.r8.graph.CfCode$LocalVariableInfo):218:230 -> b
     14:15:void print(java.lang.String):236:237 -> b
-    16:17:void print(java.lang.String):236:237 -> b
-    16:17:void print(com.android.tools.r8.cf.code.CfThrow):279 -> b
-    18:18:java.lang.String getLabel(com.android.tools.r8.cf.code.CfLabel):649:649 -> b
-    1:2:void print(java.lang.String):236:237 -> c
-    1:2:void print(com.android.tools.r8.cf.code.CfConstNull):283 -> c
-    1:2:void print(java.lang.String):236:237 -> d
-    1:2:void print(com.android.tools.r8.cf.code.CfReturnVoid):314 -> d
-    1:2:void print(java.lang.String):236:237 -> e
-    1:2:void print(com.android.tools.r8.cf.code.CfArrayLength):479 -> e
-    1:3:void indent():665:667 -> f
-    1:2:void instructionIndex():659:660 -> g
-    1:2:void newline():653:654 -> h
+    16:16:java.lang.String getLabel(com.android.tools.r8.cf.code.CfLabel):649:649 -> b
+    17:18:void instructionIndex():659:660 -> b
+    1:2:void newline():653:654 -> c
     1:1:java.lang.String toString():734:734 -> toString
 com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.cf.b:
     boolean $assertionsDisabled -> n
@@ -2008,7 +1994,7 @@
     1:1:com.android.tools.r8.graph.DexField getField():33:33 -> getField
     1:1:int getOpcode():37:37 -> getOpcode
     1:1:void print(com.android.tools.r8.cf.CfPrinter):50:50 -> print
-com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.cf.code.h:
+com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.cf.code.m:
     java.util.List stack -> b
     boolean $assertionsDisabled -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap locals -> a
@@ -2030,7 +2016,7 @@
     1:1:void print(com.android.tools.r8.cf.CfPrinter):277:277 -> print
     1:1:java.lang.String toString():272:272 -> toString
 com.android.tools.r8.cf.code.CfFrame$1 -> com.android.tools.r8.cf.code.g:
-com.android.tools.r8.cf.code.CfFrame$FrameType -> com.android.tools.r8.cf.code.h$a:
+com.android.tools.r8.cf.code.CfFrame$FrameType -> com.android.tools.r8.cf.code.h:
     1:1:void <init>():72:72 -> <init>
     1:1:void <init>(com.android.tools.r8.cf.code.CfFrame$1):24 -> <init>
     com.android.tools.r8.graph.DexType getInitializedType() -> a
@@ -2114,7 +2100,7 @@
     17:17:int getOpcode():46:46 -> getOpcode
     1:1:com.android.tools.r8.ir.code.ValueType getType():35:35 -> getType
     1:1:void print(com.android.tools.r8.cf.CfPrinter):64:64 -> print
-com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.cf.code.m:
+com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.cf.code.n:
     int increment -> b
     int var -> a
     1:3:void <init>(int,int):19:21 -> <init>
@@ -2207,7 +2193,7 @@
     1:1:com.android.tools.r8.ir.code.ValueType getType():55:55 -> getType
     1:1:int getLocalIndex():59:59 -> j
     1:1:void print(com.android.tools.r8.cf.CfPrinter):51:51 -> print
-com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.cf.code.o:
+com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.cf.code.p:
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode opcode -> a
     com.android.tools.r8.ir.code.NumericType type -> b
     boolean $assertionsDisabled -> c
@@ -2242,7 +2228,7 @@
     20:20:int getAsmOpcode():75:75 -> getAsmOpcode
     21:21:int getAsmOpcode():73:73 -> getAsmOpcode
     1:1:void print(com.android.tools.r8.cf.CfPrinter):91:91 -> print
-com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.cf.code.n:
+com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.cf.code.o:
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode Shl -> a
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode[] $VALUES -> g
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode And -> d
@@ -2261,7 +2247,7 @@
     boolean canThrow() -> c
     1:1:com.android.tools.r8.ir.code.Monitor$Type getType():25:25 -> getType
     1:1:void print(com.android.tools.r8.cf.CfPrinter):35:35 -> print
-com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.cf.code.p:
+com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.cf.code.q:
     com.android.tools.r8.graph.DexType type -> a
     int dimensions -> b
     1:3:void <init>(com.android.tools.r8.graph.DexType,int):22:24 -> <init>
@@ -2273,7 +2259,7 @@
     1:1:com.android.tools.r8.graph.DexType getType():28:28 -> getType
     1:1:int getDimensions():32:32 -> j
     1:1:void print(com.android.tools.r8.cf.CfPrinter):42:42 -> print
-com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.cf.code.q:
+com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.cf.code.r:
     com.android.tools.r8.ir.code.NumericType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType):21:22 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):27:27 -> a
@@ -2312,7 +2298,7 @@
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):18:18 -> a
     boolean emitsIR() -> d
     1:1:void print(com.android.tools.r8.cf.CfPrinter):23:23 -> print
-com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.cf.code.r:
+com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.cf.code.s:
     com.android.tools.r8.ir.code.NumericType to -> b
     com.android.tools.r8.ir.code.NumericType from -> a
     boolean $assertionsDisabled -> c
@@ -2413,7 +2399,7 @@
     10:10:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(java.lang.String,int,int):33:34 -> <init>
     1:1:int access$000(com.android.tools.r8.cf.code.CfStackInstruction$Opcode):20:20 -> a
-com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.cf.code.s:
+com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.cf.code.t:
     com.android.tools.r8.ir.code.ValueType type -> b
     int var -> a
     1:3:void <init>(com.android.tools.r8.ir.code.ValueType,int):22:24 -> <init>
@@ -2696,7 +2682,7 @@
     boolean canThrow() -> d
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.AputBoolean -> com.android.tools.r8.code.AputBoolean:
+com.android.tools.r8.code.AputBoolean -> com.android.tools.r8.code.u:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -2707,7 +2693,7 @@
     boolean canThrow() -> d
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.AputByte -> com.android.tools.r8.code.AputByte:
+com.android.tools.r8.code.AputByte -> com.android.tools.r8.code.v:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -2718,7 +2704,7 @@
     boolean canThrow() -> d
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.AputChar -> com.android.tools.r8.code.AputChar:
+com.android.tools.r8.code.AputChar -> com.android.tools.r8.code.w:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -2740,7 +2726,7 @@
     boolean canThrow() -> d
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.AputShort -> com.android.tools.r8.code.AputShort:
+com.android.tools.r8.code.AputShort -> com.android.tools.r8.code.x:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -2751,7 +2737,7 @@
     boolean canThrow() -> d
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.AputWide -> com.android.tools.r8.code.AputWide:
+com.android.tools.r8.code.AputWide -> com.android.tools.r8.code.y:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -2762,7 +2748,7 @@
     boolean canThrow() -> d
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.ArrayLength -> com.android.tools.r8.code.u:
+com.android.tools.r8.code.ArrayLength -> com.android.tools.r8.code.z:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -2774,24 +2760,24 @@
     boolean canThrow() -> d
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.Base1Format -> com.android.tools.r8.code.v:
+com.android.tools.r8.code.Base1Format -> com.android.tools.r8.code.A:
     1:1:void <init>(com.android.tools.r8.code.BytecodeStream):11:11 -> <init>
     2:2:void <init>():14:14 -> <init>
-com.android.tools.r8.code.Base2Format -> com.android.tools.r8.code.w:
+com.android.tools.r8.code.Base2Format -> com.android.tools.r8.code.B:
     1:1:void <init>():10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.code.BytecodeStream):13:13 -> <init>
-com.android.tools.r8.code.Base3Format -> com.android.tools.r8.code.x:
+com.android.tools.r8.code.Base3Format -> com.android.tools.r8.code.C:
     1:1:void <init>():10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.code.BytecodeStream):13:13 -> <init>
-com.android.tools.r8.code.Base4Format -> com.android.tools.r8.code.y:
+com.android.tools.r8.code.Base4Format -> com.android.tools.r8.code.D:
     1:1:void <init>():10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.code.BytecodeStream):13:13 -> <init>
-com.android.tools.r8.code.Base5Format -> com.android.tools.r8.code.z:
+com.android.tools.r8.code.Base5Format -> com.android.tools.r8.code.E:
     1:1:void <init>():10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.code.BytecodeStream):13:13 -> <init>
-com.android.tools.r8.code.BaseInstructionFactory -> com.android.tools.r8.code.A:
+com.android.tools.r8.code.BaseInstructionFactory -> com.android.tools.r8.code.F:
     1:1:void <init>():8:8 -> <init>
-com.android.tools.r8.code.BytecodeStream -> com.android.tools.r8.code.B:
+com.android.tools.r8.code.BytecodeStream -> com.android.tools.r8.code.G:
 com.android.tools.r8.code.CheckCast -> com.android.tools.r8.code.CheckCast:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexType):22:22 -> <init>
@@ -2807,7 +2793,7 @@
     java.lang.String getName() -> e
     1:1:com.android.tools.r8.graph.DexType getType():51:51 -> getType
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.CmpLong -> com.android.tools.r8.code.C:
+com.android.tools.r8.code.CmpLong -> com.android.tools.r8.code.H:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):17:17 -> <init>
     2:2:void <init>(int,int,int):21:21 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -2817,7 +2803,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):10:10 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.CmpgDouble -> com.android.tools.r8.code.D:
+com.android.tools.r8.code.CmpgDouble -> com.android.tools.r8.code.I:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):17:17 -> <init>
     2:2:void <init>(int,int,int):21:21 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -2837,7 +2823,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):10:10 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.CmplDouble -> com.android.tools.r8.code.E:
+com.android.tools.r8.code.CmplDouble -> com.android.tools.r8.code.J:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):17:17 -> <init>
     2:2:void <init>(int,int,int):21:21 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -2847,7 +2833,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):10:10 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.CmplFloat -> com.android.tools.r8.code.F:
+com.android.tools.r8.code.CmplFloat -> com.android.tools.r8.code.K:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):17:17 -> <init>
     2:2:void <init>(int,int,int):21:21 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -2928,7 +2914,7 @@
     1:1:int decodedValue():43:43 -> decodedValue
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.ConstMethodHandle -> com.android.tools.r8.code.G:
+com.android.tools.r8.code.ConstMethodHandle -> com.android.tools.r8.code.L:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):23:23 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexMethodHandle):27:27 -> <init>
     1:1:com.android.tools.r8.graph.DexMethodHandle getMethodHandle():31:31 -> a
@@ -2947,7 +2933,7 @@
     boolean canThrow() -> d
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.ConstMethodType -> com.android.tools.r8.code.H:
+com.android.tools.r8.code.ConstMethodType -> com.android.tools.r8.code.M:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):22:22 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexProto):26:26 -> <init>
     1:1:com.android.tools.r8.graph.DexProto getMethodType():30:30 -> a
@@ -3067,8 +3053,8 @@
     1:1:long decodedValue():43:43 -> decodedValue
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.DexItemBasedConstString -> com.android.tools.r8.code.I:
-    com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo classNameComputationInfo -> g
+com.android.tools.r8.code.DexItemBasedConstString -> com.android.tools.r8.code.N:
+    com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo classNameComputationInfo -> c
     1:2:void <init>(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo):24:25 -> <init>
     1:1:void com.android.tools.r8.code.Format21c.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):15 -> a
@@ -3085,7 +3071,7 @@
     boolean isDexItemBasedConstString() -> k
     1:1:com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo getClassNameComputationInfo():33:33 -> o
     1:1:com.android.tools.r8.graph.DexReference getItem():29:29 -> p
-com.android.tools.r8.code.DivDouble -> com.android.tools.r8.code.K:
+com.android.tools.r8.code.DivDouble -> com.android.tools.r8.code.P:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3095,7 +3081,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.DivDouble2Addr -> com.android.tools.r8.code.J:
+com.android.tools.r8.code.DivDouble2Addr -> com.android.tools.r8.code.O:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3106,7 +3092,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.DivFloat -> com.android.tools.r8.code.M:
+com.android.tools.r8.code.DivFloat -> com.android.tools.r8.code.S:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3116,7 +3102,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.DivFloat2Addr -> com.android.tools.r8.code.L:
+com.android.tools.r8.code.DivFloat2Addr -> com.android.tools.r8.code.Q:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3150,7 +3136,7 @@
     boolean canThrow() -> d
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.DivIntLit16 -> com.android.tools.r8.code.N:
+com.android.tools.r8.code.DivIntLit16 -> com.android.tools.r8.code.T:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
@@ -3164,7 +3150,7 @@
     boolean canThrow() -> d
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.DivLong -> com.android.tools.r8.code.P:
+com.android.tools.r8.code.DivLong -> com.android.tools.r8.code.V:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3175,7 +3161,7 @@
     boolean canThrow() -> d
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.DivLong2Addr -> com.android.tools.r8.code.O:
+com.android.tools.r8.code.DivLong2Addr -> com.android.tools.r8.code.U:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3187,7 +3173,7 @@
     boolean canThrow() -> d
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.DoubleToFloat -> com.android.tools.r8.code.Q:
+com.android.tools.r8.code.DoubleToFloat -> com.android.tools.r8.code.W:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3198,7 +3184,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.DoubleToInt -> com.android.tools.r8.code.S:
+com.android.tools.r8.code.DoubleToInt -> com.android.tools.r8.code.X:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3209,7 +3195,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.DoubleToLong -> com.android.tools.r8.code.T:
+com.android.tools.r8.code.DoubleToLong -> com.android.tools.r8.code.Y:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3220,7 +3206,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.FillArrayData -> com.android.tools.r8.code.U:
+com.android.tools.r8.code.FillArrayData -> com.android.tools.r8.code.Z:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
@@ -3228,11 +3214,11 @@
     boolean canThrow() -> d
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.FillArrayDataPayload -> com.android.tools.r8.code.V:
-    short[] data -> g
-    long size -> f
-    boolean $assertionsDisabled -> h
-    int element_width -> e
+com.android.tools.r8.code.FillArrayDataPayload -> com.android.tools.r8.code.aa:
+    long size -> b
+    short[] data -> c
+    boolean $assertionsDisabled -> d
+    int element_width -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:10:void <init>(int,com.android.tools.r8.code.BytecodeStream):20:29 -> <init>
     11:14:void <init>(int,long,short[]):33:36 -> <init>
@@ -3244,7 +3230,7 @@
     1:1:int getSize():75:75 -> getSize
     1:4:int hashCode():66:69 -> hashCode
     boolean isPayload() -> l
-com.android.tools.r8.code.FilledNewArray -> com.android.tools.r8.code.W:
+com.android.tools.r8.code.FilledNewArray -> com.android.tools.r8.code.ba:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):17:17 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexType,int,int,int,int,int):21:21 -> <init>
     1:1:com.android.tools.r8.graph.DexType getType():40:40 -> a
@@ -3253,7 +3239,7 @@
     boolean canThrow() -> d
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.FilledNewArrayRange -> com.android.tools.r8.code.X:
+com.android.tools.r8.code.FilledNewArrayRange -> com.android.tools.r8.code.ca:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):17:17 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexType):21:21 -> <init>
     1:1:com.android.tools.r8.graph.DexType getType():40:40 -> a
@@ -3262,7 +3248,7 @@
     boolean canThrow() -> d
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.FloatToDouble -> com.android.tools.r8.code.Y:
+com.android.tools.r8.code.FloatToDouble -> com.android.tools.r8.code.da:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3273,7 +3259,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.FloatToInt -> com.android.tools.r8.code.Z:
+com.android.tools.r8.code.FloatToInt -> com.android.tools.r8.code.ea:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3284,7 +3270,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.FloatToLong -> com.android.tools.r8.code.aa:
+com.android.tools.r8.code.FloatToLong -> com.android.tools.r8.code.fa:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -3295,11 +3281,11 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.Format10x -> com.android.tools.r8.code.ba:
+com.android.tools.r8.code.Format10x -> com.android.tools.r8.code.ga:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):17:17 -> <init>
     2:2:void <init>():20:20 -> <init>
 com.android.tools.r8.code.Format11n -> com.android.tools.r8.code.Format11n:
-    boolean $assertionsDisabled -> e
+    boolean $assertionsDisabled -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:8:void <init>(int,com.android.tools.r8.code.BytecodeStream):19:26 -> <init>
     9:13:void <init>(int,int):30:34 -> <init>
@@ -3308,9 +3294,9 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):58:58 -> b
     1:5:boolean equals(java.lang.Object):49:53 -> equals
     1:1:int hashCode():44:44 -> hashCode
-com.android.tools.r8.code.Format11x -> com.android.tools.r8.code.ca:
-    short AA -> e
-    boolean $assertionsDisabled -> f
+com.android.tools.r8.code.Format11x -> com.android.tools.r8.code.ha:
+    boolean $assertionsDisabled -> b
+    short AA -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:2:void <init>(int,com.android.tools.r8.code.BytecodeStream):19:20 -> <init>
     3:5:void <init>(int):23:25 -> <init>
@@ -3319,7 +3305,7 @@
     1:4:boolean equals(java.lang.Object):40:43 -> equals
     1:1:int hashCode():35:35 -> hashCode
 com.android.tools.r8.code.Format12x -> com.android.tools.r8.code.Format12x:
-    boolean $assertionsDisabled -> e
+    boolean $assertionsDisabled -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:3:void <init>(int,com.android.tools.r8.code.BytecodeStream):19:21 -> <init>
     4:8:void <init>(int,int):24:28 -> <init>
@@ -3330,8 +3316,8 @@
     1:5:boolean equals(java.lang.Object):43:47 -> equals
     1:1:int hashCode():38:38 -> hashCode
 com.android.tools.r8.code.Format21c -> com.android.tools.r8.code.Format21c:
-    short AA -> e
-    boolean $assertionsDisabled -> f
+    boolean $assertionsDisabled -> b
+    short AA -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:3:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.IndexedDexItem[]):22:24 -> <init>
     4:7:void <init>(int,com.android.tools.r8.graph.IndexedDexItem):27:30 -> <init>
@@ -3342,18 +3328,18 @@
     3:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):55:55 -> b
     1:5:boolean equals(java.lang.Object):46:50 -> equals
     1:1:int hashCode():41:41 -> hashCode
-com.android.tools.r8.code.Format21h -> com.android.tools.r8.code.da:
-    short AA -> e
-    boolean $assertionsDisabled -> g
-    char BBBB -> f
+com.android.tools.r8.code.Format21h -> com.android.tools.r8.code.ia:
+    char BBBB -> b
+    boolean $assertionsDisabled -> c
+    short AA -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:3:void <init>(int,com.android.tools.r8.code.BytecodeStream):19:21 -> <init>
     4:8:void <init>(int,int):24:28 -> <init>
     1:5:boolean equals(java.lang.Object):44:48 -> equals
     1:1:int hashCode():39:39 -> hashCode
 com.android.tools.r8.code.Format21s -> com.android.tools.r8.code.Format21s:
-    short AA -> e
-    boolean $assertionsDisabled -> f
+    boolean $assertionsDisabled -> b
+    short AA -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:3:void <init>(int,com.android.tools.r8.code.BytecodeStream):21:23 -> <init>
     4:8:void <init>(int,int):26:30 -> <init>
@@ -3364,8 +3350,8 @@
     1:5:boolean equals(java.lang.Object):46:50 -> equals
     1:1:int hashCode():41:41 -> hashCode
 com.android.tools.r8.code.Format21t -> com.android.tools.r8.code.Format21t:
-    short AA -> e
-    boolean $assertionsDisabled -> f
+    boolean $assertionsDisabled -> b
+    short AA -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:3:void <init>(int,com.android.tools.r8.code.BytecodeStream):23:25 -> <init>
     4:8:void <init>(int,int):28:32 -> <init>
@@ -3379,8 +3365,8 @@
     1:1:int hashCode():43:43 -> hashCode
     com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint() -> o
 com.android.tools.r8.code.Format22b -> com.android.tools.r8.code.Format22b:
-    short BB -> e
-    boolean $assertionsDisabled -> f
+    boolean $assertionsDisabled -> b
+    short BB -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:2:void <init>(int,com.android.tools.r8.code.BytecodeStream):22:23 -> <init>
     3:3:byte com.android.tools.r8.code.Instruction.readSigned8BitValue(com.android.tools.r8.code.BytecodeStream):39:39 -> <init>
@@ -3394,11 +3380,11 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):59:59 -> b
     1:5:boolean equals(java.lang.Object):50:54 -> equals
     1:1:int hashCode():45:45 -> hashCode
-com.android.tools.r8.code.Format22c -> com.android.tools.r8.code.ea:
-    com.android.tools.r8.graph.IndexedDexItem CCCC -> g
-    boolean $assertionsDisabled -> h
-    byte B -> f
-    byte A -> e
+com.android.tools.r8.code.Format22c -> com.android.tools.r8.code.ja:
+    byte B -> b
+    byte A -> a
+    com.android.tools.r8.graph.IndexedDexItem CCCC -> c
+    boolean $assertionsDisabled -> d
     1:1:void <clinit>():15:15 -> <clinit>
     1:4:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.IndexedDexItem[]):23:26 -> <init>
     5:10:void <init>(int,int,com.android.tools.r8.graph.IndexedDexItem):29:34 -> <init>
@@ -3410,9 +3396,9 @@
     1:5:boolean equals(java.lang.Object):50:54 -> equals
     1:1:int hashCode():45:45 -> hashCode
 com.android.tools.r8.code.Format22s -> com.android.tools.r8.code.Format22s:
-    boolean $assertionsDisabled -> g
-    byte B -> f
-    byte A -> e
+    byte B -> b
+    byte A -> a
+    boolean $assertionsDisabled -> c
     1:1:void <clinit>():14:14 -> <clinit>
     1:4:void <init>(int,com.android.tools.r8.code.BytecodeStream):22:25 -> <init>
     5:11:void <init>(int,int,int):28:34 -> <init>
@@ -3424,9 +3410,9 @@
     1:5:boolean equals(java.lang.Object):50:54 -> equals
     1:1:int hashCode():45:45 -> hashCode
 com.android.tools.r8.code.Format22t -> com.android.tools.r8.code.Format22t:
-    boolean $assertionsDisabled -> g
-    byte B -> f
-    byte A -> e
+    byte B -> b
+    byte A -> a
+    boolean $assertionsDisabled -> c
     1:1:void <clinit>():16:16 -> <clinit>
     1:4:void <init>(int,com.android.tools.r8.code.BytecodeStream):24:27 -> <init>
     5:11:void <init>(int,int,int):30:36 -> <init>
@@ -3439,10 +3425,10 @@
     1:1:int[] getTargets():65:65 -> getTargets
     1:1:int hashCode():47:47 -> hashCode
     com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint() -> o
-com.android.tools.r8.code.Format22x -> com.android.tools.r8.code.fa:
-    short AA -> e
-    boolean $assertionsDisabled -> g
-    char BBBB -> f
+com.android.tools.r8.code.Format22x -> com.android.tools.r8.code.ka:
+    char BBBB -> b
+    boolean $assertionsDisabled -> c
+    short AA -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:3:void <init>(int,com.android.tools.r8.code.BytecodeStream):20:22 -> <init>
     4:8:void <init>(int,int):25:29 -> <init>
@@ -3450,11 +3436,11 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> b
     1:5:boolean equals(java.lang.Object):45:49 -> equals
     1:1:int hashCode():40:40 -> hashCode
-com.android.tools.r8.code.Format23x -> com.android.tools.r8.code.ga:
-    short CC -> g
-    short AA -> e
-    short BB -> f
-    boolean $assertionsDisabled -> h
+com.android.tools.r8.code.Format23x -> com.android.tools.r8.code.la:
+    short CC -> c
+    short AA -> a
+    boolean $assertionsDisabled -> d
+    short BB -> b
     1:1:void <clinit>():13:13 -> <clinit>
     1:4:void <init>(int,com.android.tools.r8.code.BytecodeStream):21:24 -> <init>
     5:11:void <init>(int,int,int):27:33 -> <init>
@@ -3473,8 +3459,8 @@
     1:4:boolean equals(java.lang.Object):39:42 -> equals
     1:1:int hashCode():34:34 -> hashCode
 com.android.tools.r8.code.Format31c -> com.android.tools.r8.code.Format31c:
-    short AA -> e
-    boolean $assertionsDisabled -> f
+    boolean $assertionsDisabled -> b
+    short AA -> a
     1:1:void <clinit>():17:17 -> <clinit>
     1:3:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.DexString[]):24:26 -> <init>
     4:7:void <init>(int,com.android.tools.r8.graph.DexString):29:32 -> <init>
@@ -3484,19 +3470,19 @@
     3:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):57:57 -> b
     1:5:boolean equals(java.lang.Object):48:52 -> equals
     1:1:int hashCode():43:43 -> hashCode
-com.android.tools.r8.code.Format31i -> com.android.tools.r8.code.ha:
-    short AA -> e
-    int BBBBBBBB -> f
-    boolean $assertionsDisabled -> g
+com.android.tools.r8.code.Format31i -> com.android.tools.r8.code.ma:
+    int BBBBBBBB -> b
+    boolean $assertionsDisabled -> c
+    short AA -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:3:void <init>(int,com.android.tools.r8.code.BytecodeStream):20:22 -> <init>
     4:7:void <init>(int,int):25:28 -> <init>
     1:5:boolean equals(java.lang.Object):44:48 -> equals
     1:1:int hashCode():39:39 -> hashCode
-com.android.tools.r8.code.Format31t -> com.android.tools.r8.code.ia:
-    short AA -> e
-    int BBBBBBBB -> f
-    boolean $assertionsDisabled -> g
+com.android.tools.r8.code.Format31t -> com.android.tools.r8.code.na:
+    int BBBBBBBB -> b
+    boolean $assertionsDisabled -> c
+    short AA -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:3:void <init>(int,com.android.tools.r8.code.BytecodeStream):20:22 -> <init>
     4:7:void <init>(int,int):25:28 -> <init>
@@ -3508,10 +3494,10 @@
     1:1:int getPayloadOffset():45:45 -> f
     1:1:int hashCode():54:54 -> hashCode
     boolean hasPayload() -> i
-com.android.tools.r8.code.Format32x -> com.android.tools.r8.code.ja:
-    int BBBB -> f
-    boolean $assertionsDisabled -> g
-    int AAAA -> e
+com.android.tools.r8.code.Format32x -> com.android.tools.r8.code.oa:
+    int BBBB -> b
+    boolean $assertionsDisabled -> c
+    int AAAA -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:3:void <init>(int,com.android.tools.r8.code.BytecodeStream):21:23 -> <init>
     4:8:void <init>(int,int):26:30 -> <init>
@@ -3520,15 +3506,15 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):56:56 -> b
     1:5:boolean equals(java.lang.Object):47:51 -> equals
     1:1:int hashCode():42:42 -> hashCode
-com.android.tools.r8.code.Format35c -> com.android.tools.r8.code.ka:
-    byte G -> j
-    byte F -> i
-    com.android.tools.r8.graph.IndexedDexItem BBBB -> k
-    boolean $assertionsDisabled -> l
-    byte C -> f
-    byte A -> e
-    byte E -> h
-    byte D -> g
+com.android.tools.r8.code.Format35c -> com.android.tools.r8.code.pa:
+    byte C -> b
+    byte A -> a
+    byte E -> d
+    com.android.tools.r8.graph.IndexedDexItem BBBB -> g
+    boolean $assertionsDisabled -> h
+    byte D -> c
+    byte G -> f
+    byte F -> e
     1:1:void <clinit>():15:15 -> <clinit>
     1:10:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.IndexedDexItem[]):27:36 -> <init>
     11:24:void <init>(int,com.android.tools.r8.graph.IndexedDexItem,int,int,int,int,int):39:52 -> <init>
@@ -3539,11 +3525,11 @@
     1:9:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):92:100 -> b
     1:6:boolean equals(java.lang.Object):70:75 -> equals
     1:2:int hashCode():64:65 -> hashCode
-com.android.tools.r8.code.Format3rc -> com.android.tools.r8.code.la:
-    short AA -> e
-    com.android.tools.r8.graph.IndexedDexItem BBBB -> g
-    boolean $assertionsDisabled -> h
-    char CCCC -> f
+com.android.tools.r8.code.Format3rc -> com.android.tools.r8.code.qa:
+    char CCCC -> b
+    short AA -> a
+    com.android.tools.r8.graph.IndexedDexItem BBBB -> c
+    boolean $assertionsDisabled -> d
     1:1:void <clinit>():15:15 -> <clinit>
     1:4:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.IndexedDexItem[]):23:26 -> <init>
     5:10:void <init>(int,int,com.android.tools.r8.graph.IndexedDexItem):29:34 -> <init>
@@ -3555,8 +3541,8 @@
     1:5:boolean equals(java.lang.Object):51:55 -> equals
     1:1:int hashCode():46:46 -> hashCode
 com.android.tools.r8.code.Goto -> com.android.tools.r8.code.Goto:
-    boolean com.android.tools.r8.code.Format10t.$assertionsDisabled -> f
-    byte com.android.tools.r8.code.Format10t.AA -> e
+    byte com.android.tools.r8.code.Format10t.AA -> a
+    boolean com.android.tools.r8.code.Format10t.$assertionsDisabled -> b
     1:1:void com.android.tools.r8.code.Format10t.<clinit>():12:12 -> <clinit>
     1:3:void com.android.tools.r8.code.Format10t.<init>(int,com.android.tools.r8.code.BytecodeStream):18:20 -> <init>
     1:3:void <init>(int,com.android.tools.r8.code.BytecodeStream):15 -> <init>
@@ -3575,9 +3561,9 @@
     1:1:int[] getTargets():39:39 -> getTargets
     java.lang.String getSmaliName() -> h
     1:1:int com.android.tools.r8.code.Format10t.hashCode():35:35 -> o
-com.android.tools.r8.code.Goto16 -> com.android.tools.r8.code.ma:
-    short com.android.tools.r8.code.Format20t.AAAA -> e
-    boolean com.android.tools.r8.code.Format20t.$assertionsDisabled -> f
+com.android.tools.r8.code.Goto16 -> com.android.tools.r8.code.ra:
+    boolean com.android.tools.r8.code.Format20t.$assertionsDisabled -> b
+    short com.android.tools.r8.code.Format20t.AAAA -> a
     1:1:void com.android.tools.r8.code.Format20t.<clinit>():12:12 -> <clinit>
     1:2:void com.android.tools.r8.code.Format20t.<init>(int,com.android.tools.r8.code.BytecodeStream):18:19 -> <init>
     1:2:void <init>(int,com.android.tools.r8.code.BytecodeStream):15 -> <init>
@@ -4504,7 +4490,7 @@
     1:1:boolean hasMore():72:72 -> b
     1:7:int nextByte():59:65 -> c
     1:4:int nextShort():50:53 -> d
-com.android.tools.r8.code.IntToByte -> com.android.tools.r8.code.na:
+com.android.tools.r8.code.IntToByte -> com.android.tools.r8.code.sa:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4515,7 +4501,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.IntToChar -> com.android.tools.r8.code.oa:
+com.android.tools.r8.code.IntToChar -> com.android.tools.r8.code.ta:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4526,7 +4512,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.IntToDouble -> com.android.tools.r8.code.pa:
+com.android.tools.r8.code.IntToDouble -> com.android.tools.r8.code.ua:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4537,7 +4523,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.IntToFloat -> com.android.tools.r8.code.qa:
+com.android.tools.r8.code.IntToFloat -> com.android.tools.r8.code.va:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4548,7 +4534,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.IntToLong -> com.android.tools.r8.code.ra:
+com.android.tools.r8.code.IntToLong -> com.android.tools.r8.code.wa:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4559,7 +4545,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.IntToShort -> com.android.tools.r8.code.sa:
+com.android.tools.r8.code.IntToShort -> com.android.tools.r8.code.xa:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4570,7 +4556,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.InvokeCustom -> com.android.tools.r8.code.ta:
+com.android.tools.r8.code.InvokeCustom -> com.android.tools.r8.code.ya:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):19:19 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.IndexedDexItem,int,int,int,int,int):23:23 -> <init>
     1:1:com.android.tools.r8.graph.DexCallSite getCallSite():48:48 -> a
@@ -4582,7 +4568,7 @@
     boolean canThrow() -> d
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.InvokeCustomRange -> com.android.tools.r8.code.ua:
+com.android.tools.r8.code.InvokeCustomRange -> com.android.tools.r8.code.za:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexCallSite):22:22 -> <init>
     1:1:com.android.tools.r8.graph.DexCallSite getCallSite():42:42 -> a
@@ -4631,7 +4617,7 @@
     java.lang.String getName() -> e
     1:1:com.android.tools.r8.graph.DexMethod getMethod():48:48 -> getMethod
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.InvokePolymorphic -> com.android.tools.r8.code.va:
+com.android.tools.r8.code.InvokePolymorphic -> com.android.tools.r8.code.Aa:
     boolean com.android.tools.r8.code.Format45cc.$assertionsDisabled -> m
     byte com.android.tools.r8.code.Format45cc.G -> j
     byte com.android.tools.r8.code.Format45cc.F -> i
@@ -4675,7 +4661,7 @@
     1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.code.Format45cc.getMethod():0 -> getMethod
     java.lang.String getSmaliName() -> h
     1:9:int com.android.tools.r8.code.Format45cc.hashCode():62:70 -> o
-com.android.tools.r8.code.InvokePolymorphicRange -> com.android.tools.r8.code.wa:
+com.android.tools.r8.code.InvokePolymorphicRange -> com.android.tools.r8.code.Ba:
     com.android.tools.r8.graph.DexProto com.android.tools.r8.code.Format4rcc.HHHH -> h
     short com.android.tools.r8.code.Format4rcc.AA -> e
     boolean com.android.tools.r8.code.Format4rcc.$assertionsDisabled -> i
@@ -4831,7 +4817,7 @@
     java.lang.String getName() -> e
     1:1:com.android.tools.r8.graph.DexField getField():47:47 -> getField
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.LongToDouble -> com.android.tools.r8.code.xa:
+com.android.tools.r8.code.LongToDouble -> com.android.tools.r8.code.Ca:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4842,7 +4828,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.LongToFloat -> com.android.tools.r8.code.ya:
+com.android.tools.r8.code.LongToFloat -> com.android.tools.r8.code.Da:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4888,7 +4874,7 @@
     boolean canThrow() -> d
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.Move -> com.android.tools.r8.code.Aa:
+com.android.tools.r8.code.Move -> com.android.tools.r8.code.Fa:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4899,7 +4885,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.Move16 -> com.android.tools.r8.code.za:
+com.android.tools.r8.code.Move16 -> com.android.tools.r8.code.Ea:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4920,7 +4906,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.MoveFrom16 -> com.android.tools.r8.code.Ba:
+com.android.tools.r8.code.MoveFrom16 -> com.android.tools.r8.code.Ga:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4931,7 +4917,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.MoveObject -> com.android.tools.r8.code.Da:
+com.android.tools.r8.code.MoveObject -> com.android.tools.r8.code.Ia:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4942,7 +4928,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.MoveObject16 -> com.android.tools.r8.code.Ca:
+com.android.tools.r8.code.MoveObject16 -> com.android.tools.r8.code.Ha:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4952,7 +4938,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.MoveObjectFrom16 -> com.android.tools.r8.code.Ea:
+com.android.tools.r8.code.MoveObjectFrom16 -> com.android.tools.r8.code.Ja:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4974,7 +4960,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):7:7 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.MoveResultObject -> com.android.tools.r8.code.Fa:
+com.android.tools.r8.code.MoveResultObject -> com.android.tools.r8.code.Ka:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -4996,7 +4982,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.MoveWide -> com.android.tools.r8.code.Ha:
+com.android.tools.r8.code.MoveWide -> com.android.tools.r8.code.Ma:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5007,7 +4993,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.MoveWide16 -> com.android.tools.r8.code.Ga:
+com.android.tools.r8.code.MoveWide16 -> com.android.tools.r8.code.La:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5017,7 +5003,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.MoveWideFrom16 -> com.android.tools.r8.code.Ia:
+com.android.tools.r8.code.MoveWideFrom16 -> com.android.tools.r8.code.Na:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5029,7 +5015,7 @@
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
 com.android.tools.r8.code.MulDouble -> com.android.tools.r8.code.MulDouble:
-    boolean $assertionsDisabled -> i
+    boolean $assertionsDisabled -> e
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:7:void <init>(int,int,int):20:25 -> <init>
@@ -5052,7 +5038,7 @@
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
 com.android.tools.r8.code.MulFloat -> com.android.tools.r8.code.MulFloat:
-    boolean $assertionsDisabled -> i
+    boolean $assertionsDisabled -> e
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:7:void <init>(int,int,int):20:25 -> <init>
@@ -5075,7 +5061,7 @@
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
 com.android.tools.r8.code.MulInt -> com.android.tools.r8.code.MulInt:
-    boolean $assertionsDisabled -> i
+    boolean $assertionsDisabled -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:7:void <init>(int,int,int):19:24 -> <init>
@@ -5110,7 +5096,7 @@
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
 com.android.tools.r8.code.MulLong -> com.android.tools.r8.code.MulLong:
-    boolean $assertionsDisabled -> i
+    boolean $assertionsDisabled -> e
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:7:void <init>(int,int,int):20:25 -> <init>
@@ -5132,7 +5118,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.NegDouble -> com.android.tools.r8.code.Ja:
+com.android.tools.r8.code.NegDouble -> com.android.tools.r8.code.Oa:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5143,7 +5129,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.NegFloat -> com.android.tools.r8.code.Ka:
+com.android.tools.r8.code.NegFloat -> com.android.tools.r8.code.Pa:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5154,7 +5140,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.NegInt -> com.android.tools.r8.code.La:
+com.android.tools.r8.code.NegInt -> com.android.tools.r8.code.Qa:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5165,7 +5151,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.NegLong -> com.android.tools.r8.code.Ma:
+com.android.tools.r8.code.NegLong -> com.android.tools.r8.code.Ra:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5222,7 +5208,7 @@
     1:1:int hashCode():36:36 -> hashCode
     2:2:int com.android.tools.r8.code.Format10x.hashCode():30:30 -> hashCode
     2:2:int hashCode():36 -> hashCode
-com.android.tools.r8.code.NotInt -> com.android.tools.r8.code.Na:
+com.android.tools.r8.code.NotInt -> com.android.tools.r8.code.Sa:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5233,7 +5219,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.NotLong -> com.android.tools.r8.code.Oa:
+com.android.tools.r8.code.NotLong -> com.android.tools.r8.code.Ta:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5244,7 +5230,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.OrInt -> com.android.tools.r8.code.Qa:
+com.android.tools.r8.code.OrInt -> com.android.tools.r8.code.Va:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5254,7 +5240,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.OrInt2Addr -> com.android.tools.r8.code.Pa:
+com.android.tools.r8.code.OrInt2Addr -> com.android.tools.r8.code.Ua:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5265,19 +5251,19 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.OrIntLit16 -> com.android.tools.r8.code.Ra:
+com.android.tools.r8.code.OrIntLit16 -> com.android.tools.r8.code.Wa:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.OrIntLit8 -> com.android.tools.r8.code.Sa:
+com.android.tools.r8.code.OrIntLit8 -> com.android.tools.r8.code.Xa:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.OrLong -> com.android.tools.r8.code.Ua:
+com.android.tools.r8.code.OrLong -> com.android.tools.r8.code.Za:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5287,7 +5273,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.OrLong2Addr -> com.android.tools.r8.code.Ta:
+com.android.tools.r8.code.OrLong2Addr -> com.android.tools.r8.code.Ya:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5306,11 +5292,11 @@
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
     boolean isSwitch() -> m
-com.android.tools.r8.code.PackedSwitchPayload -> com.android.tools.r8.code.Va:
-    int[] targets -> g
-    int first_key -> f
-    boolean $assertionsDisabled -> h
-    int size -> e
+com.android.tools.r8.code.PackedSwitchPayload -> com.android.tools.r8.code._a:
+    int[] targets -> c
+    int first_key -> b
+    boolean $assertionsDisabled -> d
+    int size -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:6:void <init>(int,com.android.tools.r8.code.BytecodeStream):19:24 -> <init>
     7:11:void <init>(int,int[]):28:32 -> <init>
@@ -5326,7 +5312,7 @@
     1:1:int[] keys():85:85 -> o
     1:1:int numberOfKeys():75:75 -> p
     1:1:int[] switchTargetOffsets():80:80 -> q
-com.android.tools.r8.code.RemDouble -> com.android.tools.r8.code.Xa:
+com.android.tools.r8.code.RemDouble -> com.android.tools.r8.code.bb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5336,7 +5322,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.RemDouble2Addr -> com.android.tools.r8.code.Wa:
+com.android.tools.r8.code.RemDouble2Addr -> com.android.tools.r8.code.ab:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5347,7 +5333,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.RemFloat -> com.android.tools.r8.code.Za:
+com.android.tools.r8.code.RemFloat -> com.android.tools.r8.code.db:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5357,7 +5343,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.RemFloat2Addr -> com.android.tools.r8.code.Ya:
+com.android.tools.r8.code.RemFloat2Addr -> com.android.tools.r8.code.cb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5368,7 +5354,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.RemInt -> com.android.tools.r8.code.ab:
+com.android.tools.r8.code.RemInt -> com.android.tools.r8.code.fb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5379,7 +5365,7 @@
     boolean canThrow() -> d
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.RemInt2Addr -> com.android.tools.r8.code._a:
+com.android.tools.r8.code.RemInt2Addr -> com.android.tools.r8.code.eb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5391,7 +5377,7 @@
     boolean canThrow() -> d
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.RemIntLit16 -> com.android.tools.r8.code.bb:
+com.android.tools.r8.code.RemIntLit16 -> com.android.tools.r8.code.gb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
@@ -5405,7 +5391,7 @@
     boolean canThrow() -> d
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.RemLong -> com.android.tools.r8.code.db:
+com.android.tools.r8.code.RemLong -> com.android.tools.r8.code.ib:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5416,7 +5402,7 @@
     boolean canThrow() -> d
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.RemLong2Addr -> com.android.tools.r8.code.cb:
+com.android.tools.r8.code.RemLong2Addr -> com.android.tools.r8.code.hb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5482,13 +5468,13 @@
     java.lang.String getName() -> e
     1:1:int[] getTargets():39:39 -> getTargets
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.RsubInt -> com.android.tools.r8.code.eb:
+com.android.tools.r8.code.RsubInt -> com.android.tools.r8.code.jb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.RsubIntLit8 -> com.android.tools.r8.code.fb:
+com.android.tools.r8.code.RsubIntLit8 -> com.android.tools.r8.code.kb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
@@ -5599,7 +5585,7 @@
     java.lang.String getName() -> e
     1:1:com.android.tools.r8.graph.DexField getField():47:47 -> getField
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.ShlInt -> com.android.tools.r8.code.hb:
+com.android.tools.r8.code.ShlInt -> com.android.tools.r8.code.mb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5609,7 +5595,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.ShlInt2Addr -> com.android.tools.r8.code.gb:
+com.android.tools.r8.code.ShlInt2Addr -> com.android.tools.r8.code.lb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5620,13 +5606,13 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.ShlIntLit8 -> com.android.tools.r8.code.ib:
+com.android.tools.r8.code.ShlIntLit8 -> com.android.tools.r8.code.nb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.ShlLong -> com.android.tools.r8.code.kb:
+com.android.tools.r8.code.ShlLong -> com.android.tools.r8.code.pb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5636,7 +5622,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.ShlLong2Addr -> com.android.tools.r8.code.jb:
+com.android.tools.r8.code.ShlLong2Addr -> com.android.tools.r8.code.ob:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5647,7 +5633,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.ShrInt -> com.android.tools.r8.code.mb:
+com.android.tools.r8.code.ShrInt -> com.android.tools.r8.code.rb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5657,7 +5643,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.ShrInt2Addr -> com.android.tools.r8.code.lb:
+com.android.tools.r8.code.ShrInt2Addr -> com.android.tools.r8.code.qb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5668,13 +5654,13 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.ShrIntLit8 -> com.android.tools.r8.code.nb:
+com.android.tools.r8.code.ShrIntLit8 -> com.android.tools.r8.code.sb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.ShrLong -> com.android.tools.r8.code.pb:
+com.android.tools.r8.code.ShrLong -> com.android.tools.r8.code.ub:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5684,7 +5670,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.ShrLong2Addr -> com.android.tools.r8.code.ob:
+com.android.tools.r8.code.ShrLong2Addr -> com.android.tools.r8.code.tb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5703,11 +5689,11 @@
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
     boolean isSwitch() -> m
-com.android.tools.r8.code.SparseSwitchPayload -> com.android.tools.r8.code.qb:
-    int[] keys -> f
-    int[] targets -> g
-    boolean $assertionsDisabled -> h
-    int size -> e
+com.android.tools.r8.code.SparseSwitchPayload -> com.android.tools.r8.code.vb:
+    int[] keys -> b
+    int[] targets -> c
+    boolean $assertionsDisabled -> d
+    int size -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:10:void <init>(int,com.android.tools.r8.code.BytecodeStream):19:28 -> <init>
     11:15:void <init>(int[],int[]):32:36 -> <init>
@@ -5828,7 +5814,7 @@
     java.lang.String getName() -> e
     1:1:com.android.tools.r8.graph.DexField getField():47:47 -> getField
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.SubDouble -> com.android.tools.r8.code.sb:
+com.android.tools.r8.code.SubDouble -> com.android.tools.r8.code.xb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5838,7 +5824,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.SubDouble2Addr -> com.android.tools.r8.code.rb:
+com.android.tools.r8.code.SubDouble2Addr -> com.android.tools.r8.code.wb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5849,7 +5835,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.SubFloat -> com.android.tools.r8.code.ub:
+com.android.tools.r8.code.SubFloat -> com.android.tools.r8.code.zb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5859,7 +5845,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.SubFloat2Addr -> com.android.tools.r8.code.tb:
+com.android.tools.r8.code.SubFloat2Addr -> com.android.tools.r8.code.yb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5870,7 +5856,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.SubInt -> com.android.tools.r8.code.wb:
+com.android.tools.r8.code.SubInt -> com.android.tools.r8.code.Bb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5880,7 +5866,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.SubInt2Addr -> com.android.tools.r8.code.vb:
+com.android.tools.r8.code.SubInt2Addr -> com.android.tools.r8.code.Ab:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5891,7 +5877,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.SubLong -> com.android.tools.r8.code.yb:
+com.android.tools.r8.code.SubLong -> com.android.tools.r8.code.Db:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5901,7 +5887,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.SubLong2Addr -> com.android.tools.r8.code.xb:
+com.android.tools.r8.code.SubLong2Addr -> com.android.tools.r8.code.Cb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5912,7 +5898,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.SwitchPayload -> com.android.tools.r8.code.zb:
+com.android.tools.r8.code.SwitchPayload -> com.android.tools.r8.code.Eb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):11:11 -> <init>
     2:2:void <init>():14:14 -> <init>
     void buildIR(com.android.tools.r8.ir.conversion.IRBuilder) -> a
@@ -5932,7 +5918,7 @@
     boolean canThrow() -> d
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.UshrInt -> com.android.tools.r8.code.Bb:
+com.android.tools.r8.code.UshrInt -> com.android.tools.r8.code.Gb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5942,7 +5928,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.UshrInt2Addr -> com.android.tools.r8.code.Ab:
+com.android.tools.r8.code.UshrInt2Addr -> com.android.tools.r8.code.Fb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5953,13 +5939,13 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.UshrIntLit8 -> com.android.tools.r8.code.Cb:
+com.android.tools.r8.code.UshrIntLit8 -> com.android.tools.r8.code.Hb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.UshrLong -> com.android.tools.r8.code.Eb:
+com.android.tools.r8.code.UshrLong -> com.android.tools.r8.code.Jb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5969,7 +5955,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.UshrLong2Addr -> com.android.tools.r8.code.Db:
+com.android.tools.r8.code.UshrLong2Addr -> com.android.tools.r8.code.Ib:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5980,7 +5966,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.XorInt -> com.android.tools.r8.code.Gb:
+com.android.tools.r8.code.XorInt -> com.android.tools.r8.code.Lb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -5990,7 +5976,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.XorInt2Addr -> com.android.tools.r8.code.Fb:
+com.android.tools.r8.code.XorInt2Addr -> com.android.tools.r8.code.Kb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -6001,19 +5987,19 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.XorIntLit16 -> com.android.tools.r8.code.Hb:
+com.android.tools.r8.code.XorIntLit16 -> com.android.tools.r8.code.Mb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.XorIntLit8 -> com.android.tools.r8.code.Ib:
+com.android.tools.r8.code.XorIntLit8 -> com.android.tools.r8.code.Nb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.XorLong -> com.android.tools.r8.code.Kb:
+com.android.tools.r8.code.XorLong -> com.android.tools.r8.code.Pb:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -6023,7 +6009,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
     java.lang.String getName() -> e
     java.lang.String getSmaliName() -> h
-com.android.tools.r8.code.XorLong2Addr -> com.android.tools.r8.code.Jb:
+com.android.tools.r8.code.XorLong2Addr -> com.android.tools.r8.code.Ob:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -6119,8 +6105,7 @@
     boolean matches(char) -> a
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.none():117:117 -> negate
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher negate():1209 -> negate
-    2:2:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.none():117:117 -> negate
-    2:2:com.android.tools.r8.com.google.common.base.CharMatcher negate():1209 -> negate
+    2:2:com.android.tools.r8.com.google.common.base.CharMatcher negate():1209:1209 -> negate
     2:2:java.util.function.Predicate negate():1117 -> negate
 com.android.tools.r8.com.google.common.base.CharMatcher$Ascii -> com.android.tools.r8.a.a.a.a.d:
     com.android.tools.r8.com.google.common.base.CharMatcher$Ascii INSTANCE -> b
@@ -6245,9 +6230,6 @@
 com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.a.a.a.a.v:
     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.a.a.a.a.w:
-    1:1:void <init>():25:25 -> <init>
-    com.android.tools.r8.com.google.common.base.CommonMatcher matcher(java.lang.CharSequence) -> a
 com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.a.a.a.a.A:
     1:1:void <init>():41:41 -> <init>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
@@ -6258,20 +6240,20 @@
     3:3:com.android.tools.r8.com.google.common.base.Equivalence identity():336:336 -> b
     1:1:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(java.lang.Object):162:162 -> c
     1:1:boolean test(java.lang.Object,java.lang.Object):78:78 -> test
-com.android.tools.r8.com.google.common.base.Equivalence$1 -> com.android.tools.r8.a.a.a.a.x:
-com.android.tools.r8.com.google.common.base.Equivalence$Equals -> com.android.tools.r8.a.a.a.a.y:
+com.android.tools.r8.com.google.common.base.Equivalence$1 -> com.android.tools.r8.a.a.a.a.w:
+com.android.tools.r8.com.google.common.base.Equivalence$Equals -> com.android.tools.r8.a.a.a.a.x:
     com.android.tools.r8.com.google.common.base.Equivalence$Equals INSTANCE -> a
     1:1:void <clinit>():341:341 -> <clinit>
     1:1:void <init>():339:339 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):345:345 -> a
     2:2:int doHash(java.lang.Object):350:350 -> a
-com.android.tools.r8.com.google.common.base.Equivalence$Identity -> com.android.tools.r8.a.a.a.a.z:
+com.android.tools.r8.com.google.common.base.Equivalence$Identity -> com.android.tools.r8.a.a.a.a.y:
     com.android.tools.r8.com.google.common.base.Equivalence$Identity INSTANCE -> a
     1:1:void <clinit>():362:362 -> <clinit>
     1:1:void <init>():360:360 -> <init>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
     1:1:int doHash(java.lang.Object):371:371 -> a
-com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.a.a.a.a.A$a:
+com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.a.a.a.a.z:
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> a
     java.lang.Object reference -> b
     1:3:void <init>(com.android.tools.r8.com.google.common.base.Equivalence,java.lang.Object):187:189 -> <init>
@@ -6279,28 +6261,12 @@
     4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
     4:4:void <init>(com.android.tools.r8.com.google.common.base.Equivalence,java.lang.Object):188 -> <init>
     4:4:void <init>(com.android.tools.r8.com.google.common.base.Equivalence,java.lang.Object,com.android.tools.r8.com.google.common.base.Equivalence$1):183 -> <init>
-    1:1:java.lang.Object get():195:195 -> a
     1:11:boolean equals(java.lang.Object):208:218 -> equals
+    1:1:java.lang.Object get():195:195 -> get
     1:1:int hashCode():229:229 -> hashCode
     1:1:java.lang.String toString():238:238 -> toString
 com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.a.a.a.a.B:
-com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.a.a.a.a.D:
-    java.util.regex.Pattern pattern -> a
-    1:2:void <init>(java.util.regex.Pattern):29:30 -> <init>
-    3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
-    3:3:void <init>(java.util.regex.Pattern):30 -> <init>
-    1:1:com.android.tools.r8.com.google.common.base.CommonMatcher matcher(java.lang.CharSequence):35:35 -> a
-    1:4:boolean equals(java.lang.Object):60:63 -> equals
-    1:1:int hashCode():55:55 -> hashCode
-    1:1:java.lang.String toString():50:50 -> toString
-com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.a.a.a.a.C:
-    java.util.regex.Matcher matcher -> a
-    1:1:void com.android.tools.r8.com.google.common.base.CommonMatcher.<init>():25:25 -> <init>
-    1:1:void <init>(java.util.regex.Matcher):69 -> <init>
-    2:2:void <init>(java.util.regex.Matcher):70:70 -> <init>
-    3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
-    3:3:void <init>(java.util.regex.Matcher):70 -> <init>
-com.android.tools.r8.com.google.common.base.MoreObjects -> com.android.tools.r8.a.a.a.a.H:
+com.android.tools.r8.com.google.common.base.MoreObjects -> com.android.tools.r8.a.a.a.a.F:
     1:1:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.alwaysFalse():62:62 -> a
     2:6:com.android.tools.r8.com.google.common.base.Supplier com.android.tools.r8.com.google.common.base.Suppliers.memoize(com.android.tools.r8.com.google.common.base.Supplier):97:101 -> a
     7:7:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean):121:121 -> a
@@ -6345,8 +6311,8 @@
     6:6:java.lang.Object firstNonNull(java.lang.Object,java.lang.Object):56 -> b
     7:7:int com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndex(int,int,java.lang.String):1241:1241 -> b
     7:7:int com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndex(int,int):1223 -> b
-com.android.tools.r8.com.google.common.base.MoreObjects$1 -> com.android.tools.r8.a.a.a.a.E:
-com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper -> com.android.tools.r8.a.a.a.a.G:
+com.android.tools.r8.com.google.common.base.MoreObjects$1 -> com.android.tools.r8.a.a.a.a.C:
+com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper -> com.android.tools.r8.a.a.a.a.E:
     com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder holderTail -> c
     com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder holderHead -> b
     java.lang.String className -> a
@@ -6368,37 +6334,21 @@
     4:4:com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper addHolder(java.lang.String,java.lang.Object):372 -> b
     1:20:java.lang.String toString():331:350 -> toString
     21:39:java.lang.String toString():336:354 -> toString
-com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder -> com.android.tools.r8.a.a.a.a.F:
+com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder -> com.android.tools.r8.a.a.a.a.D:
     com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder next -> c
     java.lang.Object value -> b
     java.lang.String name -> a
     1:1:void <init>():376:376 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.common.base.MoreObjects$1):376 -> <init>
-com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.a.a.a.a.I:
+com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.a.a.a.a.G:
     1:1:void <init>():150:150 -> <init>
     java.lang.Object or(java.lang.Object) -> a
     1:1:com.android.tools.r8.com.google.common.base.Optional com.android.tools.r8.com.google.common.base.Absent.withType():33:33 -> a
     1:1:com.android.tools.r8.com.google.common.base.Optional absent():93 -> a
-com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.a.a.a.a.L:
-    com.android.tools.r8.com.google.common.base.PatternCompiler patternCompiler -> b
-    java.util.logging.Logger logger -> a
-    1:1:void <clinit>():35:35 -> <clinit>
-    2:16:com.android.tools.r8.com.google.common.base.PatternCompiler loadPatternCompiler():74:88 -> <clinit>
-    2:16:void <clinit>():36 -> <clinit>
-    17:17:void <clinit>():36:36 -> <clinit>
-    1:1:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):66:66 -> a
-    2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    2:2:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):65 -> a
-    3:3:void logPatternCompilerError(java.util.ServiceConfigurationError):92:92 -> a
-com.android.tools.r8.com.google.common.base.Platform$1 -> com.android.tools.r8.a.a.a.a.J:
-com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.a.a.a.a.K:
-    1:1:void <init>():95:95 -> <init>
-    1:1:void <init>(com.android.tools.r8.com.google.common.base.Platform$1):95 -> <init>
-    1:1:com.android.tools.r8.com.google.common.base.CommonPattern compile(java.lang.String):98:98 -> a
-com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.a.a.a.a.M:
+com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.a.a.a.a.H:
     1:1:boolean test(java.lang.Object):80:80 -> test
-com.android.tools.r8.com.google.common.base.Predicates$1 -> com.android.tools.r8.a.a.a.a.N:
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.a.a.a.a.T:
+com.android.tools.r8.com.google.common.base.Predicates$1 -> com.android.tools.r8.a.a.a.a.I:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.a.a.a.a.N:
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate NOT_NULL -> d
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate ALWAYS_FALSE -> b
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate IS_NULL -> c
@@ -6408,30 +6358,16 @@
     1:1:void <init>(java.lang.String,int):281:281 -> <init>
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.base.Predicates$1):281 -> <init>
     com.android.tools.r8.com.google.common.base.Predicate withNarrowedType() -> a
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.a.a.a.a.O:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.a.a.a.a.J:
     1:1:void <init>(java.lang.String,int):283:283 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.a.a.a.a.P:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.a.a.a.a.K:
     1:1:void <init>(java.lang.String,int):295:295 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> com.android.tools.r8.a.a.a.a.Q:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> com.android.tools.r8.a.a.a.a.L:
     1:1:void <init>(java.lang.String,int):307:307 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> com.android.tools.r8.a.a.a.a.S:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> com.android.tools.r8.a.a.a.a.M:
     1:1:void <init>(java.lang.String,int):319:319 -> <init>
-com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.a.a.a.a.V:
-    1:1:void <init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy):100:100 -> <init>
-    2:2:void <init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy,boolean,com.android.tools.r8.com.google.common.base.CharMatcher,int):103:103 -> <init>
-    2:2:void <init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy):100 -> <init>
-    1:1:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252:252 -> a
-    2:2:com.android.tools.r8.com.google.common.base.Splitter on(com.android.tools.r8.com.google.common.base.CommonPattern):214:214 -> a
-    2:2:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252 -> a
-    3:3:boolean com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher.matches():75:75 -> a
-    3:3:com.android.tools.r8.com.google.common.base.Splitter on(com.android.tools.r8.com.google.common.base.CommonPattern):214 -> a
-    3:3:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252 -> a
-    4:9:com.android.tools.r8.com.google.common.base.Splitter on(com.android.tools.r8.com.google.common.base.CommonPattern):213:218 -> a
-    4:9:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252 -> a
-com.android.tools.r8.com.google.common.base.Splitter$3 -> com.android.tools.r8.a.a.a.a.U:
-    1:1:void <init>(com.android.tools.r8.com.google.common.base.CommonPattern):219:219 -> <init>
-com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.a.a.a.a.W:
-com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.a.a.a.a.X:
+com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.a.a.a.a.O:
+com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.a.a.a.a.P:
     com.android.tools.r8.com.google.common.base.Supplier delegate -> a
     java.lang.Object value -> c
     boolean initialized -> b
@@ -6440,7 +6376,7 @@
     3:3:void <init>(com.android.tools.r8.com.google.common.base.Supplier):115 -> <init>
     1:11:java.lang.Object get():121:131 -> get
     1:1:java.lang.String toString():136:136 -> toString
-com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.a.a.a.a.Y:
+com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.a.a.a.a.Q:
     com.android.tools.r8.com.google.common.base.Supplier delegate -> a
     java.lang.Object value -> c
     boolean initialized -> b
@@ -6449,7 +6385,7 @@
     3:3:void <init>(com.android.tools.r8.com.google.common.base.Supplier):151 -> <init>
     1:13:java.lang.Object get():157:169 -> get
     1:1:java.lang.String toString():174:174 -> toString
-com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.a.a.a.a.Z:
+com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.a.a.a.a.S:
     java.lang.Object jla -> a
     1:3:java.lang.Object getJLA():482:484 -> <clinit>
     1:3:void <clinit>():452 -> <clinit>
@@ -6493,8 +6429,8 @@
     com.android.tools.r8.com.google.common.collect.AbstractIterator$State state -> a
     1:1:void <init>():68:68 -> <init>
     2:2:void <init>():65:65 -> <init>
-    java.lang.Object computeNext() -> d
-    1:1:java.lang.Object endOfData():125:125 -> e
+    java.lang.Object computeNext() -> c
+    1:1:java.lang.Object endOfData():125:125 -> d
     1:2:boolean hasNext():132:133 -> hasNext
     3:6:boolean tryToComputeNext():144:147 -> hasNext
     3:6:boolean hasNext():140 -> hasNext
@@ -6516,7 +6452,7 @@
     1:1:void <init>(java.lang.String,int):70:70 -> <init>
 com.android.tools.r8.com.google.common.collect.AbstractListMultimap -> com.android.tools.r8.a.a.a.b.d:
     1:1:void <init>(java.util.Map):45:45 -> <init>
-    1:1:java.util.Map asMap():117:117 -> b
+    1:1:java.util.Map asMap():117:117 -> asMap
     1:1:boolean equals(java.lang.Object):129:129 -> equals
     1:1:java.util.Collection get(java.lang.Object):35:35 -> get
     2:2:java.util.List get(java.lang.Object):67:67 -> get
@@ -6532,25 +6468,25 @@
     14:14:java.util.List wrapList(java.lang.Object,java.util.List,com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection):331:331 -> a
     15:20:void removeValuesForKey(java.lang.Object):1145:1150 -> a
     15:20:void access$400(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object):91 -> a
-    21:21:java.util.Collection entries():1240:1240 -> a
-    22:25:java.util.Spliterator lambda$entrySpliterator$1(java.util.Map$Entry):1266:1269 -> a
-    26:26:java.util.Spliterator lambda$entrySpliterator$1(java.util.Map$Entry):1268:1268 -> a
+    21:24:java.util.Spliterator lambda$entrySpliterator$1(java.util.Map$Entry):1266:1269 -> a
+    25:25:java.util.Spliterator lambda$entrySpliterator$1(java.util.Map$Entry):1268:1268 -> a
+    26:31:java.util.Map createAsMap():1284:1289 -> a
     1:1:int access$200(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap):91:91 -> b
     2:2:java.util.Map$Entry lambda$null$0(java.lang.Object,java.lang.Object):1269:1269 -> b
     1:1:int access$208(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap):91:91 -> c
+    2:7:java.util.Set createKeySet():932:937 -> c
     1:5:void clear():288:292 -> clear
     1:1:boolean containsKey(java.lang.Object):185:185 -> containsKey
     1:1:int access$210(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap):91:91 -> d
-    2:7:java.util.Map createAsMap():1284:1289 -> d
-    1:6:java.util.Set createKeySet():932:937 -> f
+    1:1:java.util.Iterator entryIterator():1253:1253 -> e
+    1:1:java.util.Collection entries():1240:1240 -> entries
+    1:10:java.util.Spliterator entrySpliterator():1263:1272 -> f
+    11:11:java.util.Spliterator entrySpliterator():1263:1263 -> f
+    java.util.Collection createCollection() -> g
     1:1:java.util.Collection get(java.lang.Object):304:304 -> get
     2:2:java.util.Collection createCollection(java.lang.Object):169:169 -> get
     2:2:java.util.Collection get(java.lang.Object):306 -> get
     3:3:java.util.Collection get(java.lang.Object):308:308 -> get
-    1:1:java.util.Iterator entryIterator():1253:1253 -> h
-    1:10:java.util.Spliterator entrySpliterator():1263:1272 -> i
-    11:11:java.util.Spliterator entrySpliterator():1263:1263 -> i
-    java.util.Collection createCollection() -> j
     1:1:boolean put(java.lang.Object,java.lang.Object):192:192 -> put
     2:2:java.util.Collection createCollection(java.lang.Object):169:169 -> put
     2:2:boolean put(java.lang.Object,java.lang.Object):194 -> put
@@ -6559,8 +6495,8 @@
 com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$2 -> com.android.tools.r8.a.a.a.b.e:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap):1253:1253 -> <init>
 com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap -> com.android.tools.r8.a.a.a.b.f$a:
-    java.util.Map submap -> d
-    com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> e
+    java.util.Map submap -> b
+    com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.Map):1301:1302 -> <init>
     1:2:java.util.Map$Entry wrapEntry(java.util.Map$Entry):1377:1378 -> a
     1:2:void clear():1369:1370 -> clear
@@ -6590,8 +6526,8 @@
 com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap$AsMapEntries -> com.android.tools.r8.a.a.a.b.f$a$a:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap this$1 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap):1382:1382 -> <init>
+    1:1:java.util.Map map():1385:1385 -> c
     1:1:boolean contains(java.lang.Object):1402:1402 -> contains
-    1:1:java.util.Map map():1385:1385 -> d
     1:1:java.util.Iterator iterator():1390:1390 -> iterator
     1:1:boolean contains(java.lang.Object):1402:1402 -> remove
     1:1:boolean remove(java.lang.Object):1407 -> remove
@@ -6658,7 +6594,7 @@
     1:2:java.lang.Object next():960:961 -> next
     1:5:void remove():966:970 -> remove
 com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$NavigableAsMap -> com.android.tools.r8.a.a.a.b.f$d:
-    com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> h
+    com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> f
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.NavigableMap):1500:1501 -> <init>
     1:8:java.util.Map$Entry pollAsMapEntry(java.util.Iterator):1576:1583 -> a
     9:18:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.unmodifiableCollectionSubclass(java.util.Collection):272:281 -> a
@@ -6711,12 +6647,12 @@
 com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$NavigableKeySet -> com.android.tools.r8.a.a.a.b.f$e:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.NavigableMap):1059:1060 -> <init>
+    1:1:java.util.SortedMap sortedMap():1057:1057 -> c
+    2:2:java.util.Map com.android.tools.r8.com.google.common.collect.Maps$KeySet.map():3844:3844 -> c
+    2:2:java.util.SortedMap com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$SortedKeySet.sortedMap():1023 -> c
+    2:2:java.util.NavigableMap sortedMap():1065 -> c
+    3:3:java.util.NavigableMap sortedMap():1065:1065 -> c
     1:1:java.lang.Object ceiling(java.lang.Object):1080:1080 -> ceiling
-    1:1:java.util.SortedMap sortedMap():1057:1057 -> d
-    2:2:java.util.Map com.android.tools.r8.com.google.common.collect.Maps$KeySet.map():3844:3844 -> d
-    2:2:java.util.SortedMap com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$SortedKeySet.sortedMap():1023 -> d
-    2:2:java.util.NavigableMap sortedMap():1065 -> d
-    3:3:java.util.NavigableMap sortedMap():1065:1065 -> d
     1:1:java.util.NavigableSet descendingSet():1100:1100 -> descendingIterator
     1:1:java.util.Iterator descendingIterator():1105 -> descendingIterator
     2:2:java.util.Iterator descendingIterator():1105:1105 -> descendingIterator
@@ -6759,8 +6695,8 @@
 com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$RandomAccessWrappedList -> com.android.tools.r8.a.a.a.b.f$f:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object,java.util.List,com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection):926:926 -> <init>
 com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$SortedAsMap -> com.android.tools.r8.a.a.a.b.f$g:
-    com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> g
-    java.util.SortedSet sortedKeySet -> f
+    java.util.SortedSet sortedKeySet -> d
+    com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> e
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.SortedMap):1444:1445 -> <init>
     1:1:java.util.Comparator comparator():1454:1454 -> comparator
     1:1:java.lang.Object firstKey():1459:1459 -> firstKey
@@ -6776,10 +6712,10 @@
 com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$SortedKeySet -> com.android.tools.r8.a.a.a.b.f$h:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.SortedMap):1018:1019 -> <init>
+    1:1:java.util.Map com.android.tools.r8.com.google.common.collect.Maps$KeySet.map():3844:3844 -> c
+    1:1:java.util.SortedMap sortedMap():1023 -> c
+    2:2:java.util.SortedMap sortedMap():1023:1023 -> c
     1:1:java.util.Comparator comparator():1028:1028 -> comparator
-    1:1:java.util.Map com.android.tools.r8.com.google.common.collect.Maps$KeySet.map():3844:3844 -> d
-    1:1:java.util.SortedMap sortedMap():1023 -> d
-    2:2:java.util.SortedMap sortedMap():1023:1023 -> d
     1:1:java.lang.Object first():1033:1033 -> first
     1:1:java.util.SortedSet headSet(java.lang.Object):1038:1038 -> headSet
     1:1:java.lang.Object last():1043:1043 -> last
@@ -6797,10 +6733,10 @@
     6:6:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object,java.util.Collection,com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection):365:365 -> <init>
     1:7:boolean add(java.lang.Object):514:520 -> add
     1:10:boolean addAll(java.util.Collection):534:543 -> addAll
+    1:4:void addToMap():413:416 -> c
     1:7:void clear():563:569 -> clear
     1:2:boolean contains(java.lang.Object):551:552 -> contains
     1:2:boolean containsAll(java.util.Collection):557:558 -> containsAll
-    1:4:void addToMap():413:416 -> d
     1:3:void refreshIfEmpty():376:378 -> e
     4:4:java.util.Collection getDelegate():448:448 -> e
     4:4:void refreshIfEmpty():378 -> e
@@ -6829,7 +6765,7 @@
     9:9:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection):469:469 -> <init>
     10:10:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection,java.util.Iterator):472:472 -> <init>
     11:18:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection,java.util.Iterator):466:473 -> <init>
-    1:3:void validateIterator():481:483 -> d
+    1:3:void validateIterator():481:483 -> c
     1:2:boolean hasNext():489:490 -> hasNext
     1:2:java.lang.Object next():495:496 -> next
     1:3:void remove():501:503 -> remove
@@ -6866,9 +6802,9 @@
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedList):872:872 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedList,int):874:875 -> <init>
     1:5:void add(java.lang.Object):909:913 -> add
-    1:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection$WrappedIterator.getDelegateIterator():507:508 -> e
-    1:2:java.util.ListIterator getDelegateListIterator():879 -> e
-    3:3:java.util.ListIterator getDelegateListIterator():879:879 -> e
+    1:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection$WrappedIterator.getDelegateIterator():507:508 -> d
+    1:2:java.util.ListIterator getDelegateListIterator():879 -> d
+    3:3:java.util.ListIterator getDelegateListIterator():879:879 -> d
     1:1:boolean hasPrevious():884:884 -> hasPrevious
     1:1:int nextIndex():894:894 -> nextIndex
     1:1:java.lang.Object previous():889:889 -> previous
@@ -6948,18 +6884,18 @@
     8:8:void <init>(java.util.Map):61 -> <init>
     1:1:java.util.Map access$000(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset):48:48 -> a
     2:2:long access$102(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset,long):48:48 -> a
-    3:22:int remove(java.lang.Object,int):247:266 -> a
+    3:8:int setCount(java.lang.Object,int):274:279 -> a
+    9:9:int getAndSet(com.android.tools.r8.com.google.common.collect.Count,int):299:299 -> a
+    9:9:int setCount(java.lang.Object,int):280 -> a
+    10:10:int setCount(java.lang.Object,int):282:282 -> a
+    11:11:int getAndSet(com.android.tools.r8.com.google.common.collect.Count,int):299:299 -> a
+    11:11:int setCount(java.lang.Object,int):283 -> a
+    12:16:int setCount(java.lang.Object,int):286:290 -> a
     1:1:long access$100(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset):48:48 -> b
     2:3:int count(java.lang.Object):208:209 -> b
-    4:18:int add(java.lang.Object,int):225:239 -> b
+    4:23:int remove(java.lang.Object,int):247:266 -> b
     1:1:long access$110(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset):48:48 -> c
-    2:7:int setCount(java.lang.Object,int):274:279 -> c
-    8:8:int getAndSet(com.android.tools.r8.com.google.common.collect.Count,int):299:299 -> c
-    8:8:int setCount(java.lang.Object,int):280 -> c
-    9:9:int setCount(java.lang.Object,int):282:282 -> c
-    10:10:int getAndSet(com.android.tools.r8.com.google.common.collect.Count,int):299:299 -> c
-    10:10:int setCount(java.lang.Object,int):283 -> c
-    11:15:int setCount(java.lang.Object,int):286:290 -> c
+    2:16:int add(java.lang.Object,int):225:239 -> c
     1:5:void clear():136:140 -> clear
     1:1:int distinctElements():145:145 -> e
     1:1:java.util.Set entrySet():81:81 -> entrySet
@@ -6978,11 +6914,11 @@
     java.util.Map$Entry val$mapEntry -> a
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$1 this$1 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$1,java.util.Map$Entry):99:99 -> <init>
-    1:3:int getCount():107:109 -> a
-    4:4:java.lang.Object getElement():102:102 -> a
-    4:4:int getCount():109 -> a
-    5:10:int getCount():109:114 -> a
-    1:1:java.lang.Object getElement():102:102 -> b
+    1:3:int getCount():107:109 -> getCount
+    4:4:java.lang.Object getElement():102:102 -> getCount
+    4:4:int getCount():109 -> getCount
+    5:10:int getCount():109:114 -> getCount
+    1:1:java.lang.Object getElement():102:102 -> getElement
 com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$MapBasedMultisetIterator -> com.android.tools.r8.a.a.a.b.j$a:
     java.util.Map$Entry currentEntry -> b
     java.util.Iterator entryIterator -> a
@@ -7006,24 +6942,24 @@
     java.util.Set keySet -> b
     com.android.tools.r8.com.google.common.collect.Multiset keys -> c
     1:1:void <init>():40:40 -> <init>
+    java.util.Map createAsMap() -> a
     1:2:boolean containsEntry(java.lang.Object,java.lang.Object):59:60 -> a
     3:8:boolean putAll(java.lang.Object,java.lang.Iterable):82:87 -> a
     9:9:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     9:9:boolean putAll(java.lang.Object,java.lang.Iterable):79 -> a
-    10:11:java.util.Collection entries():114:115 -> a
-    1:2:java.util.Map asMap():240:241 -> b
-    1:2:com.android.tools.r8.com.google.common.collect.Multiset keys():180:181 -> c
-    java.util.Map createAsMap() -> d
-    1:1:java.util.Collection createEntries():122:122 -> e
+    1:2:java.util.Map asMap():240:241 -> asMap
+    1:1:java.util.Collection createEntries():122:122 -> b
+    1:1:java.util.Set createKeySet():173:173 -> c
+    1:1:com.android.tools.r8.com.google.common.collect.Multiset createKeys():185:185 -> d
+    java.util.Iterator entryIterator() -> e
+    1:2:java.util.Collection entries():114:115 -> entries
     1:3:boolean com.android.tools.r8.com.google.common.collect.Multimaps.equalsImpl(com.android.tools.r8.com.google.common.collect.Multimap,java.lang.Object):2220:2222 -> equals
     1:3:boolean equals(java.lang.Object):250 -> equals
-    1:1:java.util.Set createKeySet():173:173 -> f
-    1:1:com.android.tools.r8.com.google.common.collect.Multiset createKeys():185:185 -> g
-    java.util.Iterator entryIterator() -> h
+    java.util.Spliterator entrySpliterator() -> f
     1:1:int hashCode():263:263 -> hashCode
-    java.util.Spliterator entrySpliterator() -> i
     1:1:boolean isEmpty():43:43 -> isEmpty
     1:2:java.util.Set keySet():168:169 -> keySet
+    1:2:com.android.tools.r8.com.google.common.collect.Multiset keys():180:181 -> keys
     1:2:boolean remove(java.lang.Object,java.lang.Object):66:67 -> remove
     1:1:java.lang.String toString():274:274 -> toString
 com.android.tools.r8.com.google.common.collect.AbstractMultimap$1 -> com.android.tools.r8.a.a.a.b.l:
@@ -7037,9 +6973,10 @@
     java.util.Set elementSet -> a
     java.util.Set entrySet -> b
     1:1:void <init>():47:47 -> <init>
-    int remove(java.lang.Object,int) -> a
-    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):966:970 -> a
-    1:5:boolean setCount(java.lang.Object,int,int):115 -> a
+    1:9:int com.android.tools.r8.com.google.common.collect.Multisets.setCountImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.lang.Object,int):948:956 -> a
+    1:9:int setCount(java.lang.Object,int):109 -> a
+    10:14: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):966:970 -> a
+    10:14:boolean setCount(java.lang.Object,int,int):115 -> a
     1:1:boolean add(java.lang.Object):84:84 -> add
     1:4:boolean com.android.tools.r8.com.google.common.collect.Multisets.addAllImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.util.Collection):905:908 -> addAll
     1:4:boolean addAll(java.util.Collection):129 -> addAll
@@ -7049,10 +6986,9 @@
     6:10:boolean com.android.tools.r8.com.google.common.collect.Multisets.addAllImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.util.Collection):910:914 -> addAll
     6:10:boolean addAll(java.util.Collection):129 -> addAll
     int count(java.lang.Object) -> b
-    1:1:int add(java.lang.Object,int):91:91 -> b
-    1:9:int com.android.tools.r8.com.google.common.collect.Multisets.setCountImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.lang.Object,int):948:956 -> c
-    1:9:int setCount(java.lang.Object,int):109 -> c
-    1:1:java.util.Set createEntrySet():212:212 -> d
+    int remove(java.lang.Object,int) -> b
+    1:1:int add(java.lang.Object,int):91:91 -> c
+    2:2:java.util.Set createEntrySet():212:212 -> c
     int distinctElements() -> e
     1:3:java.util.Set entrySet():186:188 -> entrySet
     1:1:boolean equals(java.lang.Object):226:226 -> equals
@@ -7080,7 +7016,7 @@
 com.android.tools.r8.com.google.common.collect.AbstractMultiset$EntrySet -> com.android.tools.r8.a.a.a.b.n$b:
     com.android.tools.r8.com.google.common.collect.AbstractMultiset this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMultiset):194:194 -> <init>
-    1:1:com.android.tools.r8.com.google.common.collect.Multiset multiset():197:197 -> d
+    1:1:com.android.tools.r8.com.google.common.collect.Multiset multiset():197:197 -> c
     1:1:java.util.Iterator iterator():202:202 -> iterator
     1:1:int size():207:207 -> size
 com.android.tools.r8.com.google.common.collect.AbstractTable -> com.android.tools.r8.a.a.a.b.o:
@@ -7117,26 +7053,26 @@
     2:2:void <init>():112 -> <init>
     3:3:void <init>():113:113 -> <init>
     1:1:boolean containsEntry(java.lang.Object,java.lang.Object):65:65 -> a
-    2:2:java.util.Collection entries():65:65 -> a
-    3:8:boolean com.android.tools.r8.com.google.common.collect.AbstractMultimap.putAll(java.lang.Object,java.lang.Iterable):82:87 -> a
-    3:8:boolean putAll(java.lang.Object,java.lang.Iterable):65 -> a
-    9:9:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    9:9:boolean com.android.tools.r8.com.google.common.collect.AbstractMultimap.putAll(java.lang.Object,java.lang.Iterable):79 -> a
-    9:9:boolean putAll(java.lang.Object,java.lang.Iterable):65 -> a
-    1:1:java.util.Map asMap():65:65 -> b
-    1:1:com.android.tools.r8.com.google.common.collect.Multiset keys():65:65 -> c
+    2:7:boolean com.android.tools.r8.com.google.common.collect.AbstractMultimap.putAll(java.lang.Object,java.lang.Iterable):82:87 -> a
+    2:7:boolean putAll(java.lang.Object,java.lang.Iterable):65 -> a
+    8:8:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    8:8:boolean com.android.tools.r8.com.google.common.collect.AbstractMultimap.putAll(java.lang.Object,java.lang.Iterable):79 -> a
+    8:8:boolean putAll(java.lang.Object,java.lang.Iterable):65 -> a
+    1:1:java.util.Map asMap():65:65 -> asMap
     1:1:void clear():65:65 -> clear
     1:1:boolean containsKey(java.lang.Object):65:65 -> containsKey
+    1:1:java.util.Collection entries():65:65 -> entries
     1:1:boolean equals(java.lang.Object):65:65 -> equals
+    1:1:java.util.List createCollection():137:137 -> g
+    1:1:java.util.Collection createCollection():65 -> g
     1:1:java.util.List get(java.lang.Object):65:65 -> get
+    1:1:com.android.tools.r8.com.google.common.collect.ArrayListMultimap create():80:80 -> h
     1:1:int com.android.tools.r8.com.google.common.collect.AbstractMultimap.hashCode():263:263 -> hashCode
     1:1:int hashCode():65 -> hashCode
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractMultimap.isEmpty():43:43 -> isEmpty
     1:1:boolean isEmpty():65 -> isEmpty
-    1:1:java.util.List createCollection():137:137 -> j
-    1:1:java.util.Collection createCollection():65 -> j
-    1:1:com.android.tools.r8.com.google.common.collect.ArrayListMultimap create():80:80 -> k
     1:1:java.util.Set keySet():65:65 -> keySet
+    1:1:com.android.tools.r8.com.google.common.collect.Multiset keys():65:65 -> keys
     1:1:boolean put(java.lang.Object,java.lang.Object):65:65 -> put
     1:2:boolean com.android.tools.r8.com.google.common.collect.AbstractMultimap.remove(java.lang.Object,java.lang.Object):66:67 -> remove
     1:2:boolean remove(java.lang.Object,java.lang.Object):65 -> remove
@@ -7290,131 +7226,121 @@
     257:257:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
     258:258:void com.android.tools.r8.com.google.common.base.Preconditions.checkState(boolean,java.lang.Object):459:459 -> a
     258:258:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):65 -> a
-    259:259:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator,java.util.Iterator):503:503 -> a
-    260:260:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.consumingForArray(java.lang.Object[]):471:471 -> a
-    260:260:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator,java.util.Iterator):503 -> a
-    261:261:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator):578:578 -> a
-    261:261:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator,java.util.Iterator):503 -> a
-    262:262:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    262:262:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator,java.util.Iterator):502 -> a
-    263:263:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    263:263:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator,java.util.Iterator):501 -> a
-    264:264:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627:627 -> a
-    265:268:int com.android.tools.r8.com.google.common.collect.Iterators.indexOf(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):796:799 -> a
-    265:268:boolean com.android.tools.r8.com.google.common.collect.Iterators.any(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):688 -> a
-    265:268:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627 -> a
-    269:269:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.find(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):669:669 -> a
-    270:272:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.find(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):745:747 -> a
-    270:272:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.find(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):669 -> a
-    273:273:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    273:273:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.find(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):744 -> a
-    273:273:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.find(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):669 -> a
-    274:274:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    274:274:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.find(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):743 -> a
-    274:274:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.find(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):669 -> a
-    275:275: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):817:817 -> a
-    276:276:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    276:276: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):816 -> a
-    277:284:java.util.List com.android.tools.r8.com.google.common.collect.Lists.reverse(java.util.List):840:847 -> a
-    285:297:boolean com.android.tools.r8.com.google.common.collect.Multisets.equalsImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.lang.Object):880:892 -> a
-    298:301:com.android.tools.r8.com.google.common.collect.Sets$SetView com.android.tools.r8.com.google.common.collect.Sets.difference(java.util.Set,java.util.Set):911:914 -> a
-    302:303:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.limit(java.util.Iterator,int):951:952 -> a
-    304:304:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    304:304:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.limit(java.util.Iterator,int):950 -> a
-    305:307:void com.android.tools.r8.com.google.common.collect.Iterators.clear(java.util.Iterator):1033:1035 -> a
-    308:308:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    308:308:void com.android.tools.r8.com.google.common.collect.Iterators.clear(java.util.Iterator):1032 -> a
-    309:314: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):1085:1090 -> a
-    315:315:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.emptyListIterator():90:90 -> a
-    315:315: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):1092 -> a
-    316:316: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):1094:1094 -> a
-    317:317:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.singletonIterator(java.lang.Object):1104:1104 -> a
-    318:318:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Multisets.lambda$spliteratorImpl$2(com.android.tools.r8.com.google.common.collect.Multiset$Entry):1126:1126 -> a
-    319:321:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.Multisets.copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1159:1161 -> a
-    322:323:int com.android.tools.r8.com.google.common.collect.Sets.hashCodeImpl(java.util.Set):1770:1771 -> a
-    324:328:boolean com.android.tools.r8.com.google.common.collect.Sets.equalsImpl(java.util.Set,java.lang.Object):1786:1790 -> a
-    329:332:java.util.NavigableSet com.android.tools.r8.com.google.common.collect.Sets.unmodifiableNavigableSet(java.util.NavigableSet):1817:1820 -> a
-    333:344:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):1988:1999 -> a
-    345:347:boolean com.android.tools.r8.com.google.common.collect.Iterators.removeAll(java.util.Iterator,java.util.Collection):208:210 -> a
-    345:347:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):1999 -> a
-    348:348:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):2001:2001 -> a
-    349:350:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Iterator):1980:1981 -> a
-    349:350:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):2001 -> a
-    351:351:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    351:351:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):1987 -> a
-    352:352:boolean com.android.tools.r8.com.google.common.collect.Maps.safeContainsKey(java.util.Map,java.lang.Object):3721:3721 -> a
-    353:353:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    353:353:boolean com.android.tools.r8.com.google.common.collect.Maps.safeContainsKey(java.util.Map,java.lang.Object):3719 -> a
-    354:359:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.Maps.indexMap(java.util.Collection):4375:4380 -> a
-    354:359:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1668 -> a
-    360:367:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1669:1676 -> a
+    259:259:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627:627 -> a
+    260:263:int com.android.tools.r8.com.google.common.collect.Iterators.indexOf(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):796:799 -> a
+    260:263:boolean com.android.tools.r8.com.google.common.collect.Iterators.any(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):688 -> a
+    260:263:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627 -> a
+    264:264:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.find(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):669:669 -> a
+    265:267:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.find(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):745:747 -> a
+    265:267:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.find(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):669 -> a
+    268:268:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    268:268:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.find(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):744 -> a
+    268:268:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.find(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):669 -> a
+    269:269:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    269:269:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.find(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):743 -> a
+    269:269:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.find(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):669 -> a
+    270:270: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):817:817 -> a
+    271:271:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    271:271: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):816 -> a
+    272:279:java.util.List com.android.tools.r8.com.google.common.collect.Lists.reverse(java.util.List):840:847 -> a
+    280:292:boolean com.android.tools.r8.com.google.common.collect.Multisets.equalsImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.lang.Object):880:892 -> a
+    293:296:com.android.tools.r8.com.google.common.collect.Sets$SetView com.android.tools.r8.com.google.common.collect.Sets.difference(java.util.Set,java.util.Set):911:914 -> a
+    297:298:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.limit(java.util.Iterator,int):951:952 -> a
+    299:299:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    299:299:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.limit(java.util.Iterator,int):950 -> a
+    300:302:void com.android.tools.r8.com.google.common.collect.Iterators.clear(java.util.Iterator):1033:1035 -> a
+    303:303:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    303:303:void com.android.tools.r8.com.google.common.collect.Iterators.clear(java.util.Iterator):1032 -> a
+    304:309: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):1085:1090 -> a
+    310:310:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.emptyListIterator():90:90 -> a
+    310:310: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):1092 -> a
+    311:311: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):1094:1094 -> a
+    312:312:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.singletonIterator(java.lang.Object):1104:1104 -> a
+    313:313:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Multisets.lambda$spliteratorImpl$2(com.android.tools.r8.com.google.common.collect.Multiset$Entry):1126:1126 -> a
+    314:316:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.Multisets.copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1159:1161 -> a
+    317:318:int com.android.tools.r8.com.google.common.collect.Sets.hashCodeImpl(java.util.Set):1770:1771 -> a
+    319:323:boolean com.android.tools.r8.com.google.common.collect.Sets.equalsImpl(java.util.Set,java.lang.Object):1786:1790 -> a
+    324:327:java.util.NavigableSet com.android.tools.r8.com.google.common.collect.Sets.unmodifiableNavigableSet(java.util.NavigableSet):1817:1820 -> a
+    328:339:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):1988:1999 -> a
+    340:342:boolean com.android.tools.r8.com.google.common.collect.Iterators.removeAll(java.util.Iterator,java.util.Collection):208:210 -> a
+    340:342:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):1999 -> a
+    343:343:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):2001:2001 -> a
+    344:345:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Iterator):1980:1981 -> a
+    344:345:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):2001 -> a
+    346:346:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    346:346:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):1987 -> a
+    347:347:boolean com.android.tools.r8.com.google.common.collect.Maps.safeContainsKey(java.util.Map,java.lang.Object):3721:3721 -> a
+    348:348:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    348:348:boolean com.android.tools.r8.com.google.common.collect.Maps.safeContainsKey(java.util.Map,java.lang.Object):3719 -> a
+    349:354:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.Maps.indexMap(java.util.Collection):4375:4380 -> a
+    349:354:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1668 -> a
+    355:362:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1669:1676 -> a
     1:1:int com.android.tools.r8.com.google.common.collect.Hashing.smearedHash(java.lang.Object):54:54 -> b
     2:2:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList():88:88 -> b
-    3:3:com.android.tools.r8.com.google.common.base.Function com.android.tools.r8.com.google.common.collect.Maps.keyFunction():111:111 -> b
-    3:3:java.util.Iterator com.android.tools.r8.com.google.common.collect.Maps.keyIterator(java.util.Iterator):120 -> b
-    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):817:817 -> b
-    4:4:java.util.Iterator com.android.tools.r8.com.google.common.collect.Maps.keyIterator(java.util.Iterator):120 -> b
-    5:5:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
-    5:5: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):816 -> b
-    5:5:java.util.Iterator com.android.tools.r8.com.google.common.collect.Maps.keyIterator(java.util.Iterator):120 -> b
-    6:6:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getOnlyElement(java.lang.Iterable):266:266 -> b
-    7:21:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getOnlyElement(java.util.Iterator):314:328 -> b
-    7:21:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getOnlyElement(java.lang.Iterable):266 -> b
-    22:22:java.util.HashMap com.android.tools.r8.com.google.common.collect.Maps.newHashMapWithExpectedSize(int):300:300 -> b
-    23:23:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):575:575 -> b
-    24:24:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
-    24:24:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):574 -> b
-    25:25:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
-    25:25:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):573 -> b
-    26:29:com.android.tools.r8.com.google.common.collect.Sets$SetView com.android.tools.r8.com.google.common.collect.Sets.intersection(java.util.Set,java.util.Set):839:842 -> b
-    30:30:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[]):1054:1054 -> b
-    31:38:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Multisets.spliteratorImpl(com.android.tools.r8.com.google.common.collect.Multiset):1123:1130 -> b
-    39:39:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Multisets.spliteratorImpl(com.android.tools.r8.com.google.common.collect.Multiset):1124:1124 -> b
-    40:40:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.immutableEntry(java.lang.Object,java.lang.Object):1421:1421 -> b
-    41:41:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeGet(java.util.Map,java.lang.Object):3706:3706 -> b
-    42:42:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
-    42:42:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeGet(java.util.Map,java.lang.Object):3704 -> b
-    1:1:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList():88:88 -> c
-    1:1:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.util.Iterator):164 -> c
-    2:2:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.util.Iterator):165:165 -> c
-    3:3:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):114:114 -> c
-    4:7:int com.android.tools.r8.com.google.common.collect.Lists.computeArrayListCapacity(int):122:125 -> c
-    4:7:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):114 -> c
-    8:9:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):115:116 -> c
-    10:10:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> c
-    10:10:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):112 -> c
-    11:11:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Iterable):148:148 -> c
-    12:12:java.util.Collection cast(java.lang.Iterable):377:377 -> c
-    12:12:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Iterable):149 -> c
-    13:14:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Iterable):149:150 -> c
-    15:15:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> c
-    15:15:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Iterable):146 -> c
-    16:16:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.newConcurrentHashSet():310:310 -> c
-    17:17:java.util.LinkedHashMap com.android.tools.r8.com.google.common.collect.Maps.newLinkedHashMapWithExpectedSize(int):377:377 -> c
-    18:21:com.android.tools.r8.com.google.common.collect.Sets$SetView com.android.tools.r8.com.google.common.collect.Sets.union(java.util.Set,java.util.Set):741:744 -> c
-    22:22:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeRemove(java.util.Map,java.lang.Object):3736:3736 -> c
-    23:23:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> c
-    23:23:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeRemove(java.util.Map,java.lang.Object):3734 -> c
+    3:3:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getOnlyElement(java.lang.Iterable):266:266 -> b
+    4:4:java.util.HashMap com.android.tools.r8.com.google.common.collect.Maps.newHashMapWithExpectedSize(int):300:300 -> b
+    5:19:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getOnlyElement(java.util.Iterator):314:328 -> b
+    20:20:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):575:575 -> b
+    21:21:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
+    21:21:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):574 -> b
+    22:22:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
+    22:22:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):573 -> b
+    23:26:com.android.tools.r8.com.google.common.collect.Sets$SetView com.android.tools.r8.com.google.common.collect.Sets.intersection(java.util.Set,java.util.Set):839:842 -> b
+    27:27:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[]):1054:1054 -> b
+    28:35:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Multisets.spliteratorImpl(com.android.tools.r8.com.google.common.collect.Multiset):1123:1130 -> b
+    36:36:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Multisets.spliteratorImpl(com.android.tools.r8.com.google.common.collect.Multiset):1124:1124 -> b
+    37:37:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.immutableEntry(java.lang.Object,java.lang.Object):1421:1421 -> b
+    38:38:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeGet(java.util.Map,java.lang.Object):3706:3706 -> b
+    39:39:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
+    39:39:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeGet(java.util.Map,java.lang.Object):3704 -> b
+    1:1:com.android.tools.r8.com.google.common.base.Function com.android.tools.r8.com.google.common.collect.Maps.keyFunction():111:111 -> c
+    1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.Maps.keyIterator(java.util.Iterator):120 -> c
+    2:2: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):817:817 -> c
+    2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.Maps.keyIterator(java.util.Iterator):120 -> c
+    3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> c
+    3:3: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):816 -> c
+    3:3:java.util.Iterator com.android.tools.r8.com.google.common.collect.Maps.keyIterator(java.util.Iterator):120 -> c
+    4:4:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):114:114 -> c
+    5:8:int com.android.tools.r8.com.google.common.collect.Lists.computeArrayListCapacity(int):122:125 -> c
+    5:8:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):114 -> c
+    9:10:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):115:116 -> c
+    11:11:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> c
+    11:11:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):112 -> c
+    12:12:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Iterable):148:148 -> c
+    13:13:java.util.Collection cast(java.lang.Iterable):377:377 -> c
+    13:13:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Iterable):149 -> c
+    14:15:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Iterable):149:150 -> c
+    16:16:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> c
+    16:16:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Iterable):146 -> c
+    17:17:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.newConcurrentHashSet():310:310 -> c
+    18:18:java.util.LinkedHashMap com.android.tools.r8.com.google.common.collect.Maps.newLinkedHashMapWithExpectedSize(int):377:377 -> c
+    19:22:com.android.tools.r8.com.google.common.collect.Sets$SetView com.android.tools.r8.com.google.common.collect.Sets.union(java.util.Set,java.util.Set):741:744 -> c
+    23:23:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeRemove(java.util.Map,java.lang.Object):3736:3736 -> c
+    24:24:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> c
+    24:24:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeRemove(java.util.Map,java.lang.Object):3734 -> c
     1:1:int com.android.tools.r8.com.google.common.collect.Hashing.smear(int):50:50 -> d
-    2:2:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet():218:218 -> d
-    3:3:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.lang.Iterable):275:275 -> d
-    4:4:java.util.Collection cast(java.lang.Iterable):377:377 -> d
-    4:4:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.lang.Iterable):276 -> d
-    5:6:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.lang.Iterable):276:277 -> d
-    7:8:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.util.Iterator):293:294 -> d
-    7:8:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.lang.Iterable):277 -> d
-    9:11:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.pollNext(java.util.Iterator):1017:1019 -> d
+    2:2:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList():88:88 -> d
+    2:2:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.util.Iterator):164 -> d
+    3:3:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.util.Iterator):165:165 -> d
+    4:4:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet():218:218 -> d
+    5:5:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.lang.Iterable):275:275 -> d
+    6:6:java.util.Collection cast(java.lang.Iterable):377:377 -> d
+    6:6:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.lang.Iterable):276 -> d
+    7:8:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.lang.Iterable):276:277 -> d
+    9:10:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.util.Iterator):293:294 -> d
+    9:10:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.lang.Iterable):277 -> d
     1:3:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.stream(java.lang.Iterable):62:64 -> e
-    4:4:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.stream(java.util.Iterator):82:82 -> e
-    5:5:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> e
-    1:6:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.unmodifiableIterator(java.util.Iterator):132:137 -> f
-    7:7:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> f
-    7:7:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.unmodifiableIterator(java.util.Iterator):131 -> f
-    8:10:java.util.Collection com.android.tools.r8.com.google.common.collect.Iterables.castOrCopyToCollection(java.lang.Iterable):318:320 -> f
-    8:10:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable):309 -> f
-    11:11:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable):309:309 -> f
-    12:12:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.newIdentityHashSet():466:466 -> f
-    1:1:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet():347:347 -> g
+    4:4:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> e
+    5:7:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.pollNext(java.util.Iterator):1017:1019 -> e
+    1:1:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.stream(java.util.Iterator):82:82 -> f
+    2:4:java.util.Collection com.android.tools.r8.com.google.common.collect.Iterables.castOrCopyToCollection(java.lang.Iterable):318:320 -> f
+    2:4:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable):309 -> f
+    5:5:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable):309:309 -> f
+    6:6:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.newIdentityHashSet():466:466 -> f
+    1:6:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.unmodifiableIterator(java.util.Iterator):132:137 -> g
+    7:7:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> g
+    7:7:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.unmodifiableIterator(java.util.Iterator):131 -> g
+    8:8:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet():347:347 -> g
 com.android.tools.r8.com.google.common.collect.ComparatorOrdering -> com.android.tools.r8.a.a.a.b.y:
     java.util.Comparator comparator -> a
     1:2:void <init>(java.util.Comparator):31:32 -> <init>
@@ -7427,12 +7353,12 @@
 com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.a.a.a.b.z:
     int value -> a
     1:2:void <init>(int):30:31 -> <init>
-    1:1:int get():35:35 -> a
-    2:2:void add(int):39:39 -> a
+    1:1:void add(int):39:39 -> a
     1:1:int addAndGet(int):43:43 -> b
     1:2:int getAndSet(int):51:52 -> c
     1:1:void set(int):47:47 -> d
     1:1:boolean equals(java.lang.Object):63:63 -> equals
+    1:1:int get():35:35 -> get
     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.a.a.a.b.A:
@@ -7542,17 +7468,17 @@
     1:2:boolean com.android.tools.r8.com.google.common.collect.StandardTable.containsValue(java.lang.Object):106 -> c
     1:2:boolean containsValue(java.lang.Object):133 -> c
     1:1:java.util.Map rowMap():55:55 -> d
-    1:2:int com.android.tools.r8.com.google.common.collect.StandardTable.size():122:123 -> e
-    1:2:int size():55 -> e
+    1:1:com.android.tools.r8.com.google.common.collect.HashBasedTable create():76:76 -> e
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractTable.equals(java.lang.Object):228:228 -> equals
     1:1:boolean equals(java.lang.Object):143 -> equals
-    1:1:com.android.tools.r8.com.google.common.collect.HashBasedTable create():76:76 -> f
-    1:1:boolean com.android.tools.r8.com.google.common.collect.StandardTable.isEmpty():116:116 -> g
-    1:1:boolean isEmpty():55 -> g
-    1:1:java.util.Set com.android.tools.r8.com.google.common.collect.StandardTable.rowKeySet():625:625 -> h
-    1:1:java.util.Set rowKeySet():55 -> h
+    1:1:java.util.Set com.android.tools.r8.com.google.common.collect.StandardTable.rowKeySet():625:625 -> f
+    1:1:java.util.Set rowKeySet():55 -> f
     1:1:int com.android.tools.r8.com.google.common.collect.AbstractTable.hashCode():233:233 -> hashCode
     1:1:int hashCode():55 -> hashCode
+    1:1:boolean com.android.tools.r8.com.google.common.collect.StandardTable.isEmpty():116:116 -> isEmpty
+    1:1:boolean isEmpty():55 -> isEmpty
+    1:2:int com.android.tools.r8.com.google.common.collect.StandardTable.size():122:123 -> size
+    1:2:int size():55 -> size
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.AbstractTable.toString():241:241 -> toString
     1:1:java.lang.String toString():55 -> toString
 com.android.tools.r8.com.google.common.collect.HashBasedTable$Factory -> com.android.tools.r8.a.a.a.b.J:
@@ -7758,7 +7684,7 @@
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):448:448 -> a
 com.android.tools.r8.com.google.common.collect.HashMultiset -> com.android.tools.r8.a.a.a.b.S:
     1:1:void <init>():70:70 -> <init>
-    1:1:int remove(java.lang.Object,int):33:33 -> a
+    1:1:int setCount(java.lang.Object,int):33:33 -> a
     2:6: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):966:970 -> a
     2:6:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.setCount(java.lang.Object,int,int):115 -> a
     2:6:boolean setCount(java.lang.Object,int,int):33 -> a
@@ -7774,9 +7700,9 @@
     6:10:boolean com.android.tools.r8.com.google.common.collect.Multisets.addAllImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.util.Collection):910:914 -> addAll
     6:10:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.addAll(java.util.Collection):129 -> addAll
     6:10:boolean addAll(java.util.Collection):33 -> addAll
-    1:1:int add(java.lang.Object,int):33:33 -> b
-    2:2:int count(java.lang.Object):33:33 -> b
-    1:1:int setCount(java.lang.Object,int):33:33 -> c
+    1:1:int count(java.lang.Object):33:33 -> b
+    2:2:int remove(java.lang.Object,int):33:33 -> b
+    1:1:int add(java.lang.Object,int):33:33 -> c
     1:1:void clear():33:33 -> clear
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.contains(java.lang.Object):62:62 -> contains
     1:1:boolean contains(java.lang.Object):33 -> contains
@@ -7813,7 +7739,7 @@
     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.a.a.a.b.U:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.a.a.a.b.V:
     1:1:void <init>():341:341 -> <init>
     1:1:java.lang.Object forcePut(java.lang.Object,java.lang.Object):376:376 -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap of(java.lang.Object,java.lang.Object):73:73 -> c
@@ -7826,7 +7752,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():36 -> values
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet values():358:358 -> values
     2:2:java.util.Collection values():36 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.a.a.a.b.U$a:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.a.a.a.b.U:
     1:1:void <init>():159:159 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap build():153:153 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder put(java.lang.Object,java.lang.Object):153:153 -> a
@@ -7840,19 +7766,19 @@
     29:36:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():270:277 -> a
     37:37:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():257:257 -> a
     38:38:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():255:255 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableBiMapFauxverideShim -> com.android.tools.r8.a.a.a.b.V:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMapFauxverideShim -> com.android.tools.r8.a.a.a.b.W:
     1:1:void <init>():32:32 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.a.a.a.b.Y:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.a.a.a.b.Z:
     java.lang.Object[] EMPTY_ARRAY -> a
     1:1:void <clinit>():181:181 -> <clinit>
     1:1:void <init>():168:168 -> <init>
     1:2:int copyIntoArray(java.lang.Object[],int):335:336 -> a
     1:1:boolean add(java.lang.Object):221:221 -> add
     1:1:boolean addAll(java.util.Collection):247:247 -> addAll
+    1:7:com.android.tools.r8.com.google.common.collect.ImmutableList asList():311:317 -> c
+    8:8:com.android.tools.r8.com.google.common.collect.ImmutableList asList():315:315 -> c
+    9:9:com.android.tools.r8.com.google.common.collect.ImmutableList asList():313:313 -> c
     1:1:void clear():297:297 -> clear
-    1:7:com.android.tools.r8.com.google.common.collect.ImmutableList asList():311:317 -> d
-    8:8:com.android.tools.r8.com.google.common.collect.ImmutableList asList():315:315 -> d
-    9:9:com.android.tools.r8.com.google.common.collect.ImmutableList asList():313:313 -> d
     boolean isPartialView() -> e
     1:1:boolean remove(java.lang.Object):234:234 -> remove
     1:1:boolean removeAll(java.util.Collection):260:260 -> removeAll
@@ -7867,7 +7793,7 @@
     15:18:java.lang.Object[] toArray(java.lang.Object[]):201:204 -> toArray
     19:19:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> toArray
     19:19:java.lang.Object[] toArray(java.lang.Object[]):197 -> toArray
-com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder -> com.android.tools.r8.a.a.a.b.W:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder -> com.android.tools.r8.a.a.a.b.X:
     java.lang.Object[] contents -> a
     int size -> b
     1:4:void <init>(int):459:462 -> <init>
@@ -7885,19 +7811,19 @@
     18:20:com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):510:512 -> a
     21:21:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     21:21:com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):509 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.a.a.a.b.X:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.a.a.a.b.Y:
     1:1:void <init>():370:370 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder add(java.lang.Object) -> a
     1:1:int expandedCapacity(int,int):361:361 -> a
     2:2:int expandedCapacity(int,int):356:356 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableEntry -> com.android.tools.r8.a.a.a.b.Z:
+com.android.tools.r8.com.google.common.collect.ImmutableEntry -> com.android.tools.r8.a.a.a.b.aa:
     java.lang.Object value -> b
     java.lang.Object key -> a
     1:3:void <init>(java.lang.Object,java.lang.Object):31:33 -> <init>
     1:1:java.lang.Object getKey():39:39 -> getKey
     1:1:java.lang.Object getValue():45:45 -> getValue
     1:1:java.lang.Object setValue(java.lang.Object):50:50 -> setValue
-com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.tools.r8.a.a.a.b.aa:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.tools.r8.a.a.a.b.ba:
     java.util.EnumMap delegate -> e
     1:1:void com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.<init>():445:445 -> <init>
     1:1:void <init>(java.util.EnumMap):51 -> <init>
@@ -7931,14 +7857,16 @@
     1:1:int size():68:68 -> size
     1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.values():445:445 -> values
     1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.values():0 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.a.a.a.b.ba:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.a.a.a.b.ca:
     java.util.EnumSet delegate -> c
     int hashCode -> d
     1:2:void <init>(java.util.EnumSet):58:59 -> <init>
     1:7:com.android.tools.r8.com.google.common.collect.ImmutableSet asImmutable(java.util.EnumSet):38:44 -> a
-    8:8:com.android.tools.r8.com.google.common.collect.ImmutableSet asImmutable(java.util.EnumSet):42:42 -> a
-    9:9:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():74:74 -> a
-    9:9:com.android.tools.r8.com.google.common.collect.ImmutableSet asImmutable(java.util.EnumSet):40 -> a
+    8:8:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getOnlyElement(java.lang.Iterable):266:266 -> a
+    8:8:com.android.tools.r8.com.google.common.collect.ImmutableSet asImmutable(java.util.EnumSet):42 -> a
+    9:9:com.android.tools.r8.com.google.common.collect.ImmutableSet asImmutable(java.util.EnumSet):42:42 -> a
+    10:10:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():74:74 -> a
+    10:10:com.android.tools.r8.com.google.common.collect.ImmutableSet asImmutable(java.util.EnumSet):40 -> a
     1:1:boolean contains(java.lang.Object):89:89 -> contains
     1:4:boolean containsAll(java.util.Collection):94:97 -> containsAll
     boolean isPartialView() -> e
@@ -7953,7 +7881,7 @@
     1:1:int size():84:84 -> size
     1:1:java.util.Spliterator spliterator():74:74 -> spliterator
     1:1:java.lang.String toString():132:132 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tools.r8.a.a.a.b.da:
+com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tools.r8.a.a.a.b.ga:
     1:1:void <init>():377:377 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object):93:93 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object):102:102 -> a
@@ -8021,9 +7949,9 @@
     7:7:com.android.tools.r8.com.google.common.collect.ImmutableList asImmutableList(java.lang.Object[],int):368:368 -> b
     8:8:com.android.tools.r8.com.google.common.collect.ImmutableList of():81:81 -> b
     8:8:com.android.tools.r8.com.google.common.collect.ImmutableList asImmutableList(java.lang.Object[],int):366 -> b
+    com.android.tools.r8.com.google.common.collect.ImmutableList asList() -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList subListUnchecked(int,int):454:454 -> c
     1:1:boolean contains(java.lang.Object):422:422 -> contains
-    com.android.tools.r8.com.google.common.collect.ImmutableList asList() -> d
     1:18:boolean com.android.tools.r8.com.google.common.collect.Lists.equalsImpl(java.util.List,java.lang.Object):1017:1034 -> equals
     1:18:boolean equals(java.lang.Object):663 -> equals
     19:29:boolean com.android.tools.r8.com.google.common.collect.Iterators.elementsEqual(java.util.Iterator,java.util.Iterator):274:284 -> equals
@@ -8060,11 +7988,11 @@
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableList of():81:81 -> subList
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):440 -> subList
     6:8:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):442:444 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.a.a.a.b.ca:
+com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.a.a.a.b.da:
     com.android.tools.r8.com.google.common.collect.ImmutableList this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,int,int):393:393 -> <init>
     1:1:java.lang.Object get(int):396:396 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableList$Builder -> com.android.tools.r8.a.a.a.b.da$a:
+com.android.tools.r8.com.google.common.collect.ImmutableList$Builder -> com.android.tools.r8.a.a.a.b.ea:
     1:1:void <init>(int):744:744 -> <init>
     1:1:void <init>():739 -> <init>
     2:2:void <init>(int):744:744 -> <init>
@@ -8074,13 +8002,13 @@
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder addAll(java.lang.Iterable):772:772 -> a
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):809:809 -> a
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableList build():819:819 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.a.a.a.b.ea:
+com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.a.a.a.b.fa:
     com.android.tools.r8.com.google.common.collect.ImmutableList forwardList -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):604:605 -> <init>
     1:1:boolean contains(java.lang.Object):623:623 -> contains
-    1:1:int reverseIndex(int):609:609 -> e
+    1:1:int reverseIndex(int):609:609 -> d
+    1:1:int reversePosition(int):613:613 -> e
     2:2:boolean isPartialView():657:657 -> e
-    1:1:int reversePosition(int):613:613 -> f
     1:2:java.lang.Object get(int):646:647 -> get
     3:3:int reverseIndex(int):609:609 -> get
     3:3:java.lang.Object get(int):647 -> get
@@ -8102,7 +8030,7 @@
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):641:641 -> subList
     6:7:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):640:641 -> subList
     6:7:java.util.List subList(int,int):601 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.a.a.a.b.da$b:
+com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.a.a.a.b.ga$a:
     int offset -> b
     int length -> c
     com.android.tools.r8.com.google.common.collect.ImmutableList this$0 -> d
@@ -8118,11 +8046,11 @@
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):479:480 -> subList
     3:4:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):479:480 -> subList
     3:4:java.util.List subList(int,int):457 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.a.a.a.b.ga:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.a.a.a.b.ia:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):391:391 -> <init>
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableList get(java.lang.Object):405:406 -> get
     1:2:java.util.Collection get(java.lang.Object):52 -> get
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.a.a.a.b.fa:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.a.a.a.b.ha:
     1:1:void <init>():237:237 -> <init>
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.put(java.lang.Object,java.lang.Object):168:169 -> a
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder put(java.lang.Object,java.lang.Object):242 -> a
@@ -8150,7 +8078,7 @@
     29:50:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.build():296 -> a
     29:50:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap build():328 -> a
     51:51:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap build():328:328 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableMap -> com.android.tools.r8.a.a.a.b.ia:
+com.android.tools.r8.com.google.common.collect.ImmutableMap -> com.android.tools.r8.a.a.a.b.ma:
     com.android.tools.r8.com.google.common.collect.ImmutableCollection values -> c
     java.util.Map$Entry[] EMPTY_ENTRY_ARRAY -> d
     com.android.tools.r8.com.google.common.collect.ImmutableSet keySet -> b
@@ -8218,12 +8146,12 @@
     4:13:java.lang.String toString():851 -> toString
     1:1:java.util.Collection values():60:60 -> values
     2:3:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():733:734 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.a.a.a.b.ha:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.a.a.a.b.ja:
     com.android.tools.r8.com.google.common.collect.UnmodifiableIterator val$entryIterator -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.UnmodifiableIterator):707:707 -> <init>
     1:1:boolean hasNext():710:710 -> hasNext
     1:1:java.lang.Object next():715:715 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.android.tools.r8.a.a.a.b.ia$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.android.tools.r8.a.a.a.b.ka:
     java.util.Map$Entry[] entries -> b
     int size -> c
     java.util.Comparator valueComparator -> a
@@ -8243,29 +8171,29 @@
     27:40:com.android.tools.r8.com.google.common.collect.ImmutableMap build():360:373 -> a
     41:41:com.android.tools.r8.com.google.common.collect.ImmutableMap build():371:371 -> a
     42:42:com.android.tools.r8.com.google.common.collect.ImmutableMap build():369:369 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.a.a.a.b.ja:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.a.a.a.b.la:
     com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap):463:463 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():471:471 -> iterator
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():471:471 -> iterator
     2:2:java.util.Iterator iterator():462 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():466:466 -> l
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.a.a.a.b.ma:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.a.a.a.b.pa:
     1:2:void <init>(java.lang.Object,java.lang.Object):48:49 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInKeyBucket() -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] createEntryArray(int):44:44 -> a
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInValueBucket() -> b
-    boolean isReusable() -> c
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableBiMapEntry -> com.android.tools.r8.a.a.a.b.ka:
+    boolean isReusable() -> d
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableBiMapEntry -> com.android.tools.r8.a.a.a.b.na:
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry nextInValueBucket -> d
     1:2:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry):104:105 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInValueBucket():111:111 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.a.a.a.b.la:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.a.a.a.b.oa:
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry nextInKeyBucket -> c
     1:2:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry):79:80 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInKeyBucket():86:86 -> a
-    boolean isReusable() -> c
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.a.a.a.b.oa:
+    boolean isReusable() -> d
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.a.a.a.b.ra:
     1:1:void <init>():77:77 -> <init>
     1:4:boolean contains(java.lang.Object):88:91 -> contains
     1:1:boolean isPartialView():98:98 -> e
@@ -8273,7 +8201,7 @@
     1:1:boolean isHashCodeFast():104:104 -> i
     com.android.tools.r8.com.google.common.collect.ImmutableMap map() -> l
     1:1:int size():83:83 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.a.a.a.b.na:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.a.a.a.b.qa:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> c
     java.util.Map$Entry[] entries -> d
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Map$Entry[]):43:45 -> <init>
@@ -8282,11 +8210,13 @@
     3:3:void forEach(java.util.function.Consumer):65 -> forEach
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():73:73 -> h
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():55:55 -> iterator
-    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():55:55 -> iterator
-    2:2:java.util.Iterator iterator():39 -> iterator
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[]):1054:1054 -> iterator
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():55 -> iterator
+    3:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():55:55 -> iterator
+    3:3:java.util.Iterator iterator():39 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():50:50 -> l
     1:1:java.util.Spliterator spliterator():60:60 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.a.a.a.b.pa:
+com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.a.a.a.b.sa:
     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:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):71:71 -> a
@@ -8301,16 +8231,16 @@
     2:2:java.util.Iterator iterator():35 -> iterator
     1:1:int size():45:45 -> size
     1:1:java.util.Spliterator spliterator():55:55 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android.tools.r8.a.a.a.b.sa:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android.tools.r8.a.a.a.b.va:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):40:41 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap access$000(com.android.tools.r8.com.google.common.collect.ImmutableMapValues):37:37 -> a
     2:2:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):100:100 -> a
+    1:2:com.android.tools.r8.com.google.common.collect.ImmutableList asList():82:83 -> c
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():51:51 -> contains
     1:1:boolean contains(java.lang.Object):72 -> contains
     2:3:boolean com.android.tools.r8.com.google.common.collect.Iterators.contains(java.util.Iterator,java.lang.Object):186:187 -> contains
     2:3:boolean contains(java.lang.Object):72 -> contains
-    1:2:com.android.tools.r8.com.google.common.collect.ImmutableList asList():82:83 -> d
     boolean isPartialView() -> e
     1:1:void forEach(java.util.function.Consumer):100:100 -> forEach
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> forEach
@@ -8320,65 +8250,65 @@
     2:2:java.util.Iterator iterator():36 -> iterator
     1:1:int size():46:46 -> size
     1:1:java.util.Spliterator spliterator():67:67 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues$1 -> com.android.tools.r8.a.a.a.b.qa:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$1 -> com.android.tools.r8.a.a.a.b.ta:
     com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryItr -> a
     com.android.tools.r8.com.google.common.collect.ImmutableMapValues this$0 -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMapValues):51:52 -> <init>
     1:1:boolean hasNext():56:56 -> hasNext
     1:1:java.lang.Object next():61:61 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues$2 -> com.android.tools.r8.a.a.a.b.ra:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$2 -> com.android.tools.r8.a.a.a.b.ua:
     com.android.tools.r8.com.google.common.collect.ImmutableMapValues this$0 -> c
     com.android.tools.r8.com.google.common.collect.ImmutableList val$entryList -> b
     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.a.a.a.b.wa:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap -> com.android.tools.r8.a.a.a.b.za:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> e
     int size -> f
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):354:356 -> <init>
     1:1:boolean containsEntry(java.lang.Object,java.lang.Object):67:67 -> a
     2:2:boolean putAll(java.lang.Object,java.lang.Iterable):440:440 -> a
-    3:3:com.android.tools.r8.com.google.common.collect.ImmutableCollection entries():528:528 -> a
-    3:3:java.util.Collection entries():67 -> a
+    3:3:java.util.Map createAsMap():520:520 -> a
     4:7:java.util.Spliterator lambda$entrySpliterator$1(java.util.Map$Entry):608:611 -> a
     8:8:java.util.Spliterator lambda$entrySpliterator$1(java.util.Map$Entry):610:610 -> a
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap asMap():515:515 -> b
-    1:1:java.util.Map asMap():67 -> b
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap asMap():515:515 -> asMap
+    1:1:java.util.Map asMap():67 -> asMap
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createEntries():533:533 -> b
+    1:1:java.util.Collection createEntries():67 -> b
     2:2:java.util.Map$Entry lambda$null$0(java.lang.Object,java.lang.Object):611:611 -> b
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMultiset keys():632:632 -> c
-    1:1:com.android.tools.r8.com.google.common.collect.Multiset keys():67 -> c
     1:1:void clear():396:396 -> clear
     1:1:boolean containsKey(java.lang.Object):483:483 -> containsKey
-    1:1:java.util.Map createAsMap():520:520 -> d
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createEntries():533:533 -> e
-    1:1:java.util.Collection createEntries():67 -> e
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMultiset createKeys():637:637 -> d
+    1:1:com.android.tools.r8.com.google.common.collect.Multiset createKeys():67 -> d
+    1:1:java.util.Iterator entryIterator():67:67 -> e
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator():595:595 -> e
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection entries():528:528 -> entries
+    1:1:java.util.Collection entries():67 -> entries
     1:1:boolean equals(java.lang.Object):67:67 -> equals
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMultiset createKeys():637:637 -> g
-    1:1:com.android.tools.r8.com.google.common.collect.Multiset createKeys():67 -> g
-    1:1:java.util.Iterator entryIterator():67:67 -> h
-    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator():595:595 -> h
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap asMap():515:515 -> f
+    1:1:java.util.Spliterator entrySpliterator():606 -> f
+    2:2:java.util.Spliterator entrySpliterator():606:606 -> f
+    3:3:int size():493:493 -> f
+    3:3:java.util.Spliterator entrySpliterator():614 -> f
+    4:4:java.util.Spliterator entrySpliterator():605:605 -> f
+    1:1:boolean isPartialView():476:476 -> g
     1:1:int com.android.tools.r8.com.google.common.collect.AbstractMultimap.hashCode():263:263 -> hashCode
     1:1:int hashCode():67 -> hashCode
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap asMap():515:515 -> i
-    1:1:java.util.Spliterator entrySpliterator():606 -> i
-    2:2:java.util.Spliterator entrySpliterator():606:606 -> i
-    3:3:int size():493:493 -> i
-    3:3:java.util.Spliterator entrySpliterator():614 -> i
-    4:4:java.util.Spliterator entrySpliterator():605:605 -> i
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractMultimap.isEmpty():43:43 -> isEmpty
     1:1:boolean isEmpty():67 -> isEmpty
-    1:1:boolean isPartialView():476:476 -> j
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet keySet():504:504 -> keySet
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet keySet():504:504 -> keySet
     2:2:java.util.Set keySet():67 -> keySet
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMultiset keys():632:632 -> keys
+    1:1:com.android.tools.r8.com.google.common.collect.Multiset keys():67 -> keys
     1:1:boolean put(java.lang.Object,java.lang.Object):427:427 -> put
     1:1:boolean remove(java.lang.Object,java.lang.Object):466:466 -> remove
     1:1:int size():493:493 -> size
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.AbstractMultimap.toString():274:274 -> toString
     1:1:java.lang.String toString():67 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.android.tools.r8.a.a.a.b.ta:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.android.tools.r8.a.a.a.b.wa:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):595:595 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder -> com.android.tools.r8.a.a.a.b.ua:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder -> com.android.tools.r8.a.a.a.b.xa:
     java.util.Comparator valueComparator -> c
     java.util.Comparator keyComparator -> b
     com.android.tools.r8.com.google.common.collect.Multimap builderMultimap -> a
@@ -8398,7 +8328,7 @@
     6:6:void <init>():156 -> <init>
     7:8:void <init>(com.android.tools.r8.com.google.common.collect.Multimap):159:160 -> <init>
     7:8:void <init>():156 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$EntryCollection -> com.android.tools.r8.a.a.a.b.va:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$EntryCollection -> com.android.tools.r8.a.a.a.b.ya:
     com.android.tools.r8.com.google.common.collect.ImmutableMultimap multimap -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):539:540 -> <init>
     1:3:boolean contains(java.lang.Object):560:562 -> contains
@@ -8409,7 +8339,7 @@
     1:1:int size():555:555 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.ImmutableMultimap.size():493:493 -> size
     2:2:int size():555 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Itr -> com.android.tools.r8.a.a.a.b.wa$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Itr -> com.android.tools.r8.a.a.a.b.za$a:
     java.util.Iterator valueIterator -> c
     java.util.Iterator mapIterator -> a
     java.lang.Object key -> b
@@ -8426,17 +8356,17 @@
     7:7:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1.output(java.lang.Object,java.lang.Object):598:598 -> next
     7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1.output(java.lang.Object,java.lang.Object):595 -> next
     7:7:java.lang.Object next():589 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.android.tools.r8.a.a.a.b.wa$b:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.android.tools.r8.a.a.a.b.za$b:
     com.android.tools.r8.com.google.common.collect.ImmutableMultimap this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):642:642 -> <init>
     1:2:int count(java.lang.Object):650:651 -> b
     1:1:boolean contains(java.lang.Object):645:645 -> contains
     2:2:boolean com.android.tools.r8.com.google.common.collect.ImmutableMultimap.containsKey(java.lang.Object):483:483 -> contains
     2:2:boolean contains(java.lang.Object):645 -> contains
+    1:2:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):666:667 -> d
+    3:3:com.android.tools.r8.com.google.common.collect.Multiset$Entry com.android.tools.r8.com.google.common.collect.Multisets.immutableEntry(java.lang.Object,int):251:251 -> d
+    3:3:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):667 -> d
     boolean isPartialView() -> e
-    1:2:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):666:667 -> e
-    3:3:com.android.tools.r8.com.google.common.collect.Multiset$Entry com.android.tools.r8.com.google.common.collect.Multisets.immutableEntry(java.lang.Object,int):251:251 -> e
-    3:3:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):667 -> e
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():656:656 -> f
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMultimap.keySet():504:504 -> f
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():656 -> f
@@ -8445,7 +8375,7 @@
     1:1:int size():661:661 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.ImmutableMultimap.size():493:493 -> size
     2:2:int size():661 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset -> com.android.tools.r8.a.a.a.b.ya:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset -> com.android.tools.r8.a.a.a.b.Ba:
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> b
     com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet -> c
     1:1:void <init>():235:235 -> <init>
@@ -8453,21 +8383,21 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableMultiset of():101:101 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableMultiset copyFromEntries(java.util.Collection):217 -> a
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableMultiset copyFromEntries(java.util.Collection):219:219 -> a
-    4:4:int remove(java.lang.Object,int):299:299 -> a
+    4:4:int setCount(java.lang.Object,int):312:312 -> a
     5:5:boolean setCount(java.lang.Object,int,int):325:325 -> a
     6:8:int copyIntoArray(java.lang.Object[],int):331:333 -> a
-    1:1:int add(java.lang.Object,int):286:286 -> b
-    1:1:int setCount(java.lang.Object,int):312:312 -> c
+    1:1:int remove(java.lang.Object,int):299:299 -> b
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableList asList():267:267 -> c
+    2:8:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableCollection.asList():311:317 -> c
+    2:8:com.android.tools.r8.com.google.common.collect.ImmutableList asList():268 -> c
+    9:9:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableCollection.asList():315:315 -> c
+    9:9:com.android.tools.r8.com.google.common.collect.ImmutableList asList():268 -> c
+    10:10:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableCollection.asList():313:313 -> c
+    10:10:com.android.tools.r8.com.google.common.collect.ImmutableList asList():268 -> c
+    11:11:com.android.tools.r8.com.google.common.collect.ImmutableList asList():268:268 -> c
+    12:12:int add(java.lang.Object,int):286:286 -> c
     1:1:boolean contains(java.lang.Object):273:273 -> contains
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableList asList():267:267 -> d
-    2:8:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableCollection.asList():311:317 -> d
-    2:8:com.android.tools.r8.com.google.common.collect.ImmutableList asList():268 -> d
-    9:9:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableCollection.asList():315:315 -> d
-    9:9:com.android.tools.r8.com.google.common.collect.ImmutableList asList():268 -> d
-    10:10:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableCollection.asList():313:313 -> d
-    10:10:com.android.tools.r8.com.google.common.collect.ImmutableList asList():268 -> d
-    11:11:com.android.tools.r8.com.google.common.collect.ImmutableList asList():268:268 -> d
-    com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int) -> e
+    com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int) -> d
     1:1:java.util.Set entrySet():53:53 -> entrySet
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet():362:362 -> entrySet
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():367:367 -> entrySet
@@ -8480,14 +8410,14 @@
     3:4:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():239:240 -> iterator
     3:4:java.util.Iterator iterator():53 -> iterator
     1:1:java.lang.String toString():350:350 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.a.a.a.b.xa:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.a.a.a.b.Aa:
     java.util.Iterator val$entryIterator -> c
     java.lang.Object element -> b
     int remaining -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset,java.util.Iterator):240:240 -> <init>
     1:1:boolean hasNext():246:246 -> hasNext
     1:7:java.lang.Object next():251:257 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$EntrySet -> com.android.tools.r8.a.a.a.b.ya$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$EntrySet -> com.android.tools.r8.a.a.a.b.Ba$a:
     com.android.tools.r8.com.google.common.collect.ImmutableMultiset this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset):373:373 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset,com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1):373 -> <init>
@@ -8497,9 +8427,9 @@
     1:1:java.lang.Object get(int):372 -> get
     1:1:int hashCode():404:404 -> hashCode
     1:1:int size():386:386 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMultisetGwtSerializationDependencies -> com.android.tools.r8.a.a.a.b.za:
+com.android.tools.r8.com.google.common.collect.ImmutableMultisetGwtSerializationDependencies -> com.android.tools.r8.a.a.a.b.Ca:
     1:1:void <init>():40:40 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.a.a.a.b.Aa:
+com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.a.a.a.b.Ga:
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> b
     1:1:void <init>():332:332 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet access$000(int,java.lang.Object[]):51:51 -> a
@@ -8507,22 +8437,21 @@
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet of(java.lang.Object,java.lang.Object):92:92 -> a
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet of(java.lang.Object,java.lang.Object,java.lang.Object):101:101 -> a
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableSet of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):110:110 -> a
-    6:6:com.android.tools.r8.com.google.common.collect.ImmutableSet of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):119:119 -> a
-    7:15:com.android.tools.r8.com.google.common.collect.ImmutableSet of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object[]):132:140 -> a
-    16:23:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.util.Collection):259:266 -> a
-    24:24:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOfEnumSet(java.util.EnumSet):329:329 -> a
-    24:24:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.util.Collection):266 -> a
-    25:26:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.util.Collection):268:269 -> a
-    27:33:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.lang.Object[]):317:323 -> a
-    34:34:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.lang.Object[]):321:321 -> a
-    35:35:com.android.tools.r8.com.google.common.collect.ImmutableSet of():74:74 -> a
-    35:35:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.lang.Object[]):319 -> a
+    6:14:com.android.tools.r8.com.google.common.collect.ImmutableSet of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object[]):132:140 -> a
+    15:22:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.util.Collection):259:266 -> a
+    23:23:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOfEnumSet(java.util.EnumSet):329:329 -> a
+    23:23:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.util.Collection):266 -> a
+    24:25:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.util.Collection):268:269 -> a
+    26:32:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.lang.Object[]):317:323 -> a
+    33:33:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.lang.Object[]):321:321 -> a
+    34:34:com.android.tools.r8.com.google.common.collect.ImmutableSet of():74:74 -> a
+    34:34:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.lang.Object[]):319 -> a
     1:36:com.android.tools.r8.com.google.common.collect.ImmutableSet construct(int,java.lang.Object[]):169:204 -> b
     37:38:com.android.tools.r8.com.google.common.collect.ImmutableSet construct(int,java.lang.Object[]):164:165 -> b
     39:39:com.android.tools.r8.com.google.common.collect.ImmutableSet of():74:74 -> b
     39:39:com.android.tools.r8.com.google.common.collect.ImmutableSet construct(int,java.lang.Object[]):161 -> b
-    1:2:com.android.tools.r8.com.google.common.collect.ImmutableList asList():368:369 -> d
-    1:9:int chooseTableSize(int):229:237 -> e
+    1:2:com.android.tools.r8.com.google.common.collect.ImmutableList asList():368:369 -> c
+    1:9:int chooseTableSize(int):229:237 -> d
     1:7:boolean equals(java.lang.Object):343:349 -> equals
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder builder():445:445 -> g
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():373:373 -> h
@@ -8530,7 +8459,7 @@
     boolean isHashCodeFast() -> i
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet of():74:74 -> j
     1:1:java.util.stream.Collector toImmutableSet():65:65 -> k
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.a.a.a.b.Aa$a:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.a.a.a.b.Da:
     1:1:void <init>(int):475:475 -> <init>
     1:1:void <init>():471 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder add(java.lang.Object):464:464 -> a
@@ -8539,7 +8468,7 @@
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder addAll(java.lang.Iterable):522:522 -> a
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):545:545 -> a
     6:9:com.android.tools.r8.com.google.common.collect.ImmutableSet build():555:558 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.a.a.a.b.Ca:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.a.a.a.b.Fa:
     1:1:void <init>():376:376 -> <init>
     1:3:void forEach(java.util.function.Consumer):392:394 -> forEach
     4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> forEach
@@ -8550,13 +8479,13 @@
     1:1:java.util.Spliterator spliterator():386:386 -> spliterator
     2:2:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.indexed(int,int,java.util.function.IntFunction):40:40 -> spliterator
     2:2:java.util.Spliterator spliterator():386 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1 -> com.android.tools.r8.a.a.a.b.Ba:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1 -> com.android.tools.r8.a.a.a.b.Ea:
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed this$0 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed):400:400 -> <init>
     1:1:java.lang.Object get(int):403:403 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed delegateCollection():408:408 -> j
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():400 -> j
-com.android.tools.r8.com.google.common.collect.ImmutableSortedAsList -> com.android.tools.r8.a.a.a.b.Da:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedAsList -> com.android.tools.r8.a.a.a.b.Ha:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet,com.android.tools.r8.com.google.common.collect.ImmutableList):34:34 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.subListUnchecked(int,int):454:454 -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList subListUnchecked(int,int):83 -> c
@@ -8587,25 +8516,21 @@
     5:5:java.util.Comparator comparator():44 -> spliterator
     5:5:java.util.Spliterator spliterator():93 -> spliterator
     6:6:java.util.Spliterator spliterator():89:89 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableSortedSet -> com.android.tools.r8.a.a.a.b.Ea:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedSet -> com.android.tools.r8.a.a.a.b.Ja:
     com.android.tools.r8.com.google.common.collect.ImmutableSortedSet descendingSet -> d
     java.util.Comparator comparator -> c
     1:2:void <init>(java.util.Comparator):564:565 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableSortedSet headSetImpl(java.lang.Object,boolean) -> a
     1:4:com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet emptySet(java.util.Comparator):86:89 -> a
-    5:5:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():81:81 -> a
-    5:5:com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet emptySet(java.util.Comparator):89 -> a
-    6:6:com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet emptySet(java.util.Comparator):89:89 -> a
-    7:18:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet copyOf(java.util.Comparator,java.lang.Iterable):311:322 -> a
-    7:18:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet copyOf(java.util.Comparator,java.util.Collection):345 -> a
-    19:19:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    19:19:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet copyOf(java.util.Comparator,java.lang.Iterable):310 -> a
-    19:19:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet copyOf(java.util.Comparator,java.util.Collection):345 -> a
-    20:20:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet construct(java.util.Comparator,int,java.lang.Object[]):390:390 -> a
-    21:21:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[],int):225:225 -> a
-    21:21:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet construct(java.util.Comparator,int,java.lang.Object[]):392 -> a
-    22:33:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet construct(java.util.Comparator,int,java.lang.Object[]):393:404 -> a
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder orderedBy(java.util.Comparator):416:416 -> b
+    5:16:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet copyOf(java.util.Comparator,java.lang.Iterable):311:322 -> a
+    5:16:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet copyOf(java.util.Comparator,java.util.Collection):345 -> a
+    17:17:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    17:17:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet copyOf(java.util.Comparator,java.lang.Iterable):310 -> a
+    17:17:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet copyOf(java.util.Comparator,java.util.Collection):345 -> a
+    18:18:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet construct(java.util.Comparator,int,java.lang.Object[]):390:390 -> a
+    19:19:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[],int):225:225 -> a
+    19:19:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet construct(java.util.Comparator,int,java.lang.Object[]):392 -> a
+    20:31:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet construct(java.util.Comparator,int,java.lang.Object[]):393:404 -> a
     1:1:java.util.Comparator comparator():577:577 -> comparator
     1:4:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet descendingSet():762:765 -> descendingSet
     1:4:java.util.NavigableSet descendingSet():63 -> descendingSet
@@ -8638,7 +8563,7 @@
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet tailSet(java.lang.Object,boolean):661 -> tailSet
     5:5:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> tailSet
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet tailSet(java.lang.Object,boolean):661 -> tailSet
-com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder -> com.android.tools.r8.a.a.a.b.Ea$a:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder -> com.android.tools.r8.a.a.a.b.Ia:
     java.util.Comparator comparator -> c
     1:2:void <init>(java.util.Comparator):462:463 -> <init>
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
@@ -8656,9 +8581,9 @@
     8:8:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):531:531 -> a
     8:8:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):455 -> a
     9:11:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet build():542:544 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableSortedSetFauxverideShim -> com.android.tools.r8.a.a.a.b.Fa:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedSetFauxverideShim -> com.android.tools.r8.a.a.a.b.Ka:
     1:1:void <init>():39:39 -> <init>
-com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.a.a.a.b.Ga:
+com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.a.a.a.b.La:
     com.android.tools.r8.com.google.common.base.Predicate val$retainIfTrue -> c
     java.lang.Iterable val$unfiltered -> b
     1:1:void <init>(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):575:575 -> <init>
@@ -8676,12 +8601,12 @@
     4:4:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.filter(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):657 -> iterator
     4:4:java.util.Iterator iterator():578 -> iterator
     1:1:java.util.Spliterator spliterator():594:594 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.a.a.a.b.Ha:
+com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.a.a.a.b.Ma:
     java.util.Iterator val$iterator -> a
     1:1:void <init>(java.util.Iterator):137:137 -> <init>
     1:1:boolean hasNext():140:140 -> hasNext
     1:1:java.lang.Object next():145:145 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$2 -> com.android.tools.r8.a.a.a.b.Ia:
+com.android.tools.r8.com.google.common.collect.Iterators$2 -> com.android.tools.r8.a.a.a.b.Na:
     java.util.Iterator iterator -> a
     java.lang.Iterable val$iterable -> b
     1:1:void <init>(java.lang.Iterable):411:411 -> <init>
@@ -8691,25 +8616,16 @@
     1:1:boolean hasNext():425:425 -> hasNext
     1:7:java.lang.Object next():430:436 -> next
     1:1:void remove():441:441 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$3 -> com.android.tools.r8.a.a.a.b.Ja:
-    java.lang.Object[] val$elements -> b
-    int index -> a
-    1:2:void <init>(java.lang.Object[]):471:472 -> <init>
-    1:1:boolean hasNext():476:476 -> hasNext
-    1:1:boolean hasNext():476:476 -> next
-    1:1:java.lang.Object next():481 -> next
-    2:4:java.lang.Object next():484:486 -> next
-    5:5:java.lang.Object next():482:482 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$5 -> com.android.tools.r8.a.a.a.b.Ka:
+com.android.tools.r8.com.google.common.collect.Iterators$5 -> com.android.tools.r8.a.a.a.b.Oa:
     java.util.Iterator val$unfiltered -> c
     com.android.tools.r8.com.google.common.base.Predicate val$retainIfTrue -> d
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):659:659 -> <init>
-    1:7:java.lang.Object computeNext():662:668 -> d
-com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.a.a.a.b.La:
+    1:7:java.lang.Object computeNext():662:668 -> c
+com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.a.a.a.b.Pa:
     com.android.tools.r8.com.google.common.base.Function val$function -> b
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):817:817 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):820:820 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.r8.a.a.a.b.Ma:
+com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.r8.a.a.a.b.Qa:
     java.util.Iterator val$iterator -> c
     int val$limitSize -> b
     int count -> a
@@ -8720,21 +8636,21 @@
     2:3:java.lang.Object next():965:966 -> next
     4:4:java.lang.Object next():963:963 -> next
     1:1:void remove():971:971 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$9 -> com.android.tools.r8.a.a.a.b.Na:
+com.android.tools.r8.com.google.common.collect.Iterators$9 -> com.android.tools.r8.a.a.a.b.Ra:
     java.lang.Object val$value -> b
     boolean done -> a
     1:1:void <init>(java.lang.Object):1104:1104 -> <init>
     1:1:boolean hasNext():1109:1109 -> hasNext
     1:5:java.lang.Object next():1114:1118 -> next
     6:6:java.lang.Object next():1115:1115 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> com.android.tools.r8.a.a.a.b.Oa:
+com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> com.android.tools.r8.a.a.a.b.Sa:
     com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator EMPTY -> e
     java.lang.Object[] array -> c
     int offset -> d
     1:1:void <clinit>():1058:1058 -> <clinit>
     1:3:void <init>(java.lang.Object[],int,int,int):1065:1067 -> <init>
     1:1:java.lang.Object get(int):1072:1072 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.a.a.a.b.Pa:
+com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.a.a.a.b.Ta:
     java.util.Deque metaIterators -> d
     java.util.Iterator topMetaIterator -> c
     java.util.Iterator iterator -> b
@@ -8760,17 +8676,17 @@
     12:38:java.lang.Object next():1423 -> next
     39:42:java.lang.Object next():1424:1427 -> next
     1:3:void remove():1433:1435 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.a.a.a.b.Qa:
+com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.a.a.a.b.Ua:
     com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator INSTANCE -> a
     1:1:void <clinit>():98:98 -> <clinit>
     2:2:void <clinit>():97:97 -> <clinit>
     1:1:void <init>(java.lang.String,int):97:97 -> <init>
     1:1:java.lang.Object next():107:107 -> next
     1:1:void remove():112:112 -> remove
-com.android.tools.r8.com.google.common.collect.ListMultimap -> com.android.tools.r8.a.a.a.b.Ra:
-com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.a.a.a.b.Sa:
+com.android.tools.r8.com.google.common.collect.ListMultimap -> com.android.tools.r8.a.a.a.b.Va:
+com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.a.a.a.b.Wa:
     1:1:void <init>(java.util.List):991:991 -> <init>
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.a.a.a.b.Ua:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.a.a.a.b.Ya:
     java.util.List forwardList -> a
     1:2:void <init>(java.util.List):854:855 -> <init>
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
@@ -8781,9 +8697,9 @@
     2:3:int reversePosition(int):869:870 -> add
     2:3:void add(int,java.lang.Object):876 -> add
     4:4:void add(int,java.lang.Object):876:876 -> add
+    1:1:java.util.List getForwardList():859:859 -> c
     1:1:void clear():881:881 -> clear
-    1:1:java.util.List getForwardList():859:859 -> d
-    1:2:int reverseIndex(int):863:864 -> e
+    1:2:int reverseIndex(int):863:864 -> d
     1:1:java.lang.Object get(int):901:901 -> get
     1:1:java.util.Iterator iterator():917:917 -> iterator
     1:2:int reversePosition(int):869:870 -> listIterator
@@ -8809,7 +8725,7 @@
     5:6:int reversePosition(int):869:870 -> subList
     5:6:java.util.List subList(int,int):912 -> subList
     7:7:java.util.List subList(int,int):912:912 -> subList
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.a.a.a.b.Ta:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.a.a.a.b.Xa:
     com.android.tools.r8.com.google.common.collect.Lists$ReverseList this$0 -> c
     java.util.ListIterator val$forwardIterator -> b
     boolean canRemoveOrSet -> a
@@ -8830,7 +8746,7 @@
     1:1:int previousIndex():970 -> previousIndex
     1:3:void remove():975:977 -> remove
     1:2:void set(java.lang.Object):982:983 -> set
-com.android.tools.r8.com.google.common.collect.MapMaker -> com.android.tools.r8.a.a.a.b.Va:
+com.android.tools.r8.com.google.common.collect.MapMaker -> com.android.tools.r8.a.a.a.b.Za:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength valueStrength -> e
     com.android.tools.r8.com.google.common.base.Equivalence keyEquivalence -> f
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength keyStrength -> d
@@ -8854,17 +8770,15 @@
     7:7:com.android.tools.r8.com.google.common.collect.MapMaker setValueStrength(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength):254 -> d
     7:7:com.android.tools.r8.com.google.common.collect.MapMaker weakValues():239 -> d
     1:17:java.lang.String toString():290:306 -> toString
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap -> com.android.tools.r8.a.a.a.b._a:
-    java.util.Set keySet -> g
-    java.util.Set entrySet -> i
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap -> com.android.tools.r8.a.a.a.b.db:
+    java.util.Set entrySet -> g
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntryHelper entryHelper -> f
+    com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference UNSET_WEAK_VALUE_REFERENCE -> h
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment[] segments -> c
-    com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference UNSET_WEAK_VALUE_REFERENCE -> j
     int concurrencyLevel -> d
     com.android.tools.r8.com.google.common.base.Equivalence keyEquivalence -> e
     int segmentShift -> b
     int segmentMask -> a
-    java.util.Collection values -> h
     1:1:void <clinit>():1023:1023 -> <clinit>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMaker,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntryHelper):160:160 -> <init>
     2:2:int com.android.tools.r8.com.google.common.collect.MapMaker.getConcurrencyLevel():186:186 -> <init>
@@ -9003,31 +8917,30 @@
     127:127:java.lang.Object replace(java.lang.Object,java.lang.Object):2497 -> replace
     1:6:int size():2361:2366 -> size
     1:2:java.util.Collection values():2522:2523 -> values
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$1 -> com.android.tools.r8.a.a.a.b.Wa:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$1 -> com.android.tools.r8.a.a.a.b._a:
     1:1:void <init>():1024:1024 -> <init>
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getEntry() -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference copyFor(java.lang.ref.ReferenceQueue,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry):1024:1024 -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$AbstractStrongKeyEntry -> com.android.tools.r8.a.a.a.b.Xa:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$AbstractStrongKeyEntry -> com.android.tools.r8.a.a.a.b.ab:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry next -> c
     java.lang.Object key -> a
     int hash -> b
     1:4:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry):360:363 -> <init>
-    1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getNext():378:378 -> a
-    1:1:int getHash():373:373 -> b
+    1:1:int getHash():373:373 -> a
+    1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getNext():378:378 -> b
     1:1:java.lang.Object getKey():368:368 -> getKey
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$AbstractWeakKeyEntry -> com.android.tools.r8.a.a.a.b.Ya:
-    com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry next -> b
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$AbstractWeakKeyEntry -> com.android.tools.r8.a.a.a.b.bb:
     int hash -> a
     1:3:void <init>(java.lang.ref.ReferenceQueue,java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry):671:673 -> <init>
-    1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getNext():688:688 -> a
-    1:1:int getHash():683:683 -> b
+    1:1:int getHash():683:683 -> a
+    1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getNext():688:688 -> b
     1:1:java.lang.Object getKey():678:678 -> getKey
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$DummyInternalEntry -> com.android.tools.r8.a.a.a.b.Za:
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$EntryIterator -> com.android.tools.r8.a.a.a.b._a$a:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$DummyInternalEntry -> com.android.tools.r8.a.a.a.b.cb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$EntryIterator -> com.android.tools.r8.a.a.a.b.db$a:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2711:2711 -> <init>
     1:1:java.util.Map$Entry next():2715:2715 -> next
     1:1:java.lang.Object next():2711 -> next
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$EntrySet -> com.android.tools.r8.a.a.a.b._a$b:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$EntrySet -> com.android.tools.r8.a.a.a.b.db$b:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2796:2796 -> <init>
     1:1:void clear():2840:2840 -> clear
@@ -9036,7 +8949,7 @@
     1:1:java.util.Iterator iterator():2800:2800 -> iterator
     1:6:boolean remove(java.lang.Object):2820:2825 -> remove
     1:1:int size():2830:2830 -> size
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$HashIterator -> com.android.tools.r8.a.a.a.b._a$c:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$HashIterator -> com.android.tools.r8.a.a.a.b.db$c:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry nextEntry -> e
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment currentSegment -> c
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap this$0 -> h
@@ -9047,32 +8960,32 @@
     int nextSegmentIndex -> a
     1:4:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2546:2549 -> <init>
     1:11:boolean advanceTo(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry):2612:2622 -> a
-    1:16:void advance():2556:2571 -> d
-    1:6:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry nextEntry():2632:2637 -> e
-    7:7:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry nextEntry():2633:2633 -> e
-    1:3:boolean nextInChain():2582:2584 -> f
-    4:4:boolean nextInChain():2583:2583 -> f
-    1:3:boolean nextInTable():2596:2598 -> g
+    1:16:void advance():2556:2571 -> c
+    1:6:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry nextEntry():2632:2637 -> d
+    7:7:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry nextEntry():2633:2633 -> d
+    1:3:boolean nextInChain():2582:2584 -> e
+    4:4:boolean nextInChain():2583:2583 -> e
+    1:3:boolean nextInTable():2596:2598 -> f
     1:1:boolean hasNext():2628:2628 -> hasNext
     1:2:void remove():2642:2643 -> remove
     3:3:java.lang.Object com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry.getKey():2679:2679 -> remove
     3:3:void remove():2643 -> remove
     4:5:void remove():2643:2644 -> remove
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry -> com.android.tools.r8.a.a.a.b.ab:
-    com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getNext() -> a
-    int getHash() -> b
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntryHelper -> com.android.tools.r8.a.a.a.b.bb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry -> com.android.tools.r8.a.a.a.b.eb:
+    int getHash() -> a
+    com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getNext() -> b
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntryHelper -> com.android.tools.r8.a.a.a.b.fb:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry copy(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry) -> a
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry newEntry(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment,java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry) -> a
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int) -> a
     void setValue(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry,java.lang.Object) -> a
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength valueStrength() -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$KeyIterator -> com.android.tools.r8.a.a.a.b._a$d:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$KeyIterator -> com.android.tools.r8.a.a.a.b.db$d:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2648:2648 -> <init>
     1:1:java.lang.Object next():2652:2652 -> next
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry.getKey():2679:2679 -> next
     2:2:java.lang.Object next():2652 -> next
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$KeySet -> com.android.tools.r8.a.a.a.b._a$e:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$KeySet -> com.android.tools.r8.a.a.a.b.db$e:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2720:2720 -> <init>
     1:1:void clear():2749:2749 -> clear
@@ -9081,12 +8994,12 @@
     1:1:java.util.Iterator iterator():2724:2724 -> iterator
     1:1:boolean remove(java.lang.Object):2744:2744 -> remove
     1:1:int size():2729:2729 -> size
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$SafeToArraySet -> com.android.tools.r8.a.a.a.b.cb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$SafeToArraySet -> com.android.tools.r8.a.a.a.b.gb:
     1:1:void <init>():2844:2844 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$1):2844 -> <init>
     1:1:java.lang.Object[] toArray():2850:2850 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):2855:2855 -> toArray
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment -> com.android.tools.r8.a.a.a.b.db:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment -> com.android.tools.r8.a.a.a.b.hb:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap map -> a
     java.util.concurrent.atomic.AtomicInteger readCount -> g
     int maxSegmentSize -> f
@@ -9150,7 +9063,7 @@
     1:6:void runLockedCleanup():2015:2020 -> e
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment self() -> f
     1:5:void tryDrainReferenceQueues():1367:1371 -> g
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength -> com.android.tools.r8.a.a.a.b.gb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength -> com.android.tools.r8.a.a.a.b.kb:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength STRONG -> a
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength WEAK -> b
     1:8:void <clinit>():257:264 -> <clinit>
@@ -9158,20 +9071,20 @@
     1:1:void <init>(java.lang.String,int):256:256 -> <init>
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$1):256 -> <init>
     com.android.tools.r8.com.google.common.base.Equivalence defaultEquivalence() -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength$1 -> com.android.tools.r8.a.a.a.b.eb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength$1 -> com.android.tools.r8.a.a.a.b.ib:
     1:1:void <init>(java.lang.String,int):257:257 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.Equivalence defaultEquivalence():260:260 -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength$2 -> com.android.tools.r8.a.a.a.b.fb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength$2 -> com.android.tools.r8.a.a.a.b.jb:
     1:1:void <init>(java.lang.String,int):264:264 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.Equivalence defaultEquivalence():267:267 -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry -> com.android.tools.r8.a.a.a.b.ib:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry -> com.android.tools.r8.a.a.a.b.mb:
     java.lang.Object value -> d
     1:1:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry):411:411 -> <init>
     2:2:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry):408:408 -> <init>
     1:1:void setValue(java.lang.Object):421:421 -> a
     2:4:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry copy(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry):425:427 -> a
     1:1:java.lang.Object getValue():417:417 -> getValue
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry$Helper -> com.android.tools.r8.a.a.a.b.hb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry$Helper -> com.android.tools.r8.a.a.a.b.lb:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry$Helper INSTANCE -> a
     1:1:void <clinit>():435:435 -> <clinit>
     1:1:void <init>():432:432 -> <init>
@@ -9188,10 +9101,10 @@
     8:8:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueSegment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):459:459 -> a
     8:8:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):432 -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry$Helper instance():439:439 -> b
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueSegment -> com.android.tools.r8.a.a.a.b.jb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueSegment -> com.android.tools.r8.a.a.a.b.nb:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2035:2035 -> <init>
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment self() -> f
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry -> com.android.tools.r8.a.a.a.b.lb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry -> com.android.tools.r8.a.a.a.b.pb:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference valueReference -> d
     1:1:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry):497:497 -> <init>
     2:2:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference com.android.tools.r8.com.google.common.collect.MapMakerInternalMap.unsetWeakValueReference():401:401 -> <init>
@@ -9201,7 +9114,7 @@
     6:8:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry copy(java.lang.ref.ReferenceQueue,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry):520:522 -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference getValueReference():528:528 -> c
     1:1:java.lang.Object getValue():502:502 -> getValue
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry$Helper -> com.android.tools.r8.a.a.a.b.kb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry$Helper -> com.android.tools.r8.a.a.a.b.ob:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry$Helper INSTANCE -> a
     1:1:void <clinit>():535:535 -> <clinit>
     1:1:void <init>():532:532 -> <init>
@@ -9218,7 +9131,7 @@
     11:11:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueSegment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):558:558 -> a
     11:11:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):532 -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry$Helper instance():539:539 -> b
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueSegment -> com.android.tools.r8.a.a.a.b.mb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueSegment -> com.android.tools.r8.a.a.a.b.qb:
     java.lang.ref.ReferenceQueue queueForValues -> h
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2060:2060 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2053:2053 -> <init>
@@ -9226,13 +9139,13 @@
     1:1:void maybeClearReferenceQueues():2112:2112 -> b
     1:1:void maybeDrainReferenceQueues():2107:2107 -> c
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment self() -> f
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongValueEntry -> com.android.tools.r8.a.a.a.b.nb:
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$ValueIterator -> com.android.tools.r8.a.a.a.b._a$f:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongValueEntry -> com.android.tools.r8.a.a.a.b.rb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$ValueIterator -> com.android.tools.r8.a.a.a.b.db$f:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2656:2656 -> <init>
     1:1:java.lang.Object next():2660:2660 -> next
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry.getValue():2684:2684 -> next
     2:2:java.lang.Object next():2660 -> next
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Values -> com.android.tools.r8.a.a.a.b._a$g:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Values -> com.android.tools.r8.a.a.a.b.db$g:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2754:2754 -> <init>
     1:1:void clear():2778:2778 -> clear
@@ -9242,8 +9155,8 @@
     1:1:int size():2763:2763 -> size
     1:1:java.lang.Object[] toArray():2786:2786 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):2791:2791 -> toArray
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry -> com.android.tools.r8.a.a.a.b.pb:
-    java.lang.Object value -> c
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry -> com.android.tools.r8.a.a.a.b.tb:
+    java.lang.Object value -> b
     1:1:void <init>(java.lang.ref.ReferenceQueue,java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry):780:780 -> <init>
     2:2:void <init>(java.lang.ref.ReferenceQueue,java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry):776:776 -> <init>
     1:1:void setValue(java.lang.Object):790:790 -> a
@@ -9252,7 +9165,7 @@
     3:3:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry copy(java.lang.ref.ReferenceQueue,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry):796 -> a
     4:5:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry copy(java.lang.ref.ReferenceQueue,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry):796:797 -> a
     1:1:java.lang.Object getValue():786:786 -> getValue
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry$Helper -> com.android.tools.r8.a.a.a.b.ob:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry$Helper -> com.android.tools.r8.a.a.a.b.sb:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry$Helper INSTANCE -> a
     1:1:void <clinit>():805:805 -> <clinit>
     1:1:void <init>():802:802 -> <init>
@@ -9272,7 +9185,7 @@
     9:9:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueSegment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):828:828 -> a
     9:9:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):802 -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry$Helper instance():809:809 -> b
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueSegment -> com.android.tools.r8.a.a.a.b.qb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueSegment -> com.android.tools.r8.a.a.a.b.ub:
     java.lang.ref.ReferenceQueue queueForKeys -> h
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2149:2149 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2142:2142 -> <init>
@@ -9280,8 +9193,8 @@
     1:1:void maybeClearReferenceQueues():2175:2175 -> b
     1:1:void maybeDrainReferenceQueues():2170:2170 -> c
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment self() -> f
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry -> com.android.tools.r8.a.a.a.b.sb:
-    com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference valueReference -> c
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry -> com.android.tools.r8.a.a.a.b.wb:
+    com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference valueReference -> b
     1:1:void <init>(java.lang.ref.ReferenceQueue,java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry):869:869 -> <init>
     2:2:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference com.android.tools.r8.com.google.common.collect.MapMakerInternalMap.unsetWeakValueReference():401:401 -> <init>
     2:2:void <init>(java.lang.ref.ReferenceQueue,java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry):865 -> <init>
@@ -9293,7 +9206,7 @@
     5:9:void setValue(java.lang.Object,java.lang.ref.ReferenceQueue):893:897 -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference getValueReference():902:902 -> c
     1:1:java.lang.Object getValue():874:874 -> getValue
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry$Helper -> com.android.tools.r8.a.a.a.b.rb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry$Helper -> com.android.tools.r8.a.a.a.b.vb:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry$Helper INSTANCE -> a
     1:1:void <clinit>():909:909 -> <clinit>
     1:1:void <init>():906:906 -> <init>
@@ -9313,7 +9226,7 @@
     12:12:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueSegment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):931:931 -> a
     12:12:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):906 -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry$Helper instance():913:913 -> b
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueSegment -> com.android.tools.r8.a.a.a.b.tb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueSegment -> com.android.tools.r8.a.a.a.b.xb:
     java.lang.ref.ReferenceQueue queueForKeys -> h
     java.lang.ref.ReferenceQueue queueForValues -> i
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2189:2189 -> <init>
@@ -9323,17 +9236,17 @@
     2:2:void maybeClearReferenceQueues():2247:2247 -> b
     1:2:void maybeDrainReferenceQueues():2241:2242 -> c
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment self() -> f
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueEntry -> com.android.tools.r8.a.a.a.b.ub:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueEntry -> com.android.tools.r8.a.a.a.b.yb:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference getValueReference() -> c
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference -> com.android.tools.r8.a.a.a.b.vb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference -> com.android.tools.r8.a.a.a.b.zb:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference copyFor(java.lang.ref.ReferenceQueue,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry) -> a
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getEntry() -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReferenceImpl -> com.android.tools.r8.a.a.a.b.wb:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReferenceImpl -> com.android.tools.r8.a.a.a.b.Ab:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry entry -> a
     1:2:void <init>(java.lang.ref.ReferenceQueue,java.lang.Object,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry):1051:1052 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getEntry():1057:1057 -> a
     2:2:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference copyFor(java.lang.ref.ReferenceQueue,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry):1062:1062 -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry -> com.android.tools.r8.a.a.a.b._a$h:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry -> com.android.tools.r8.a.a.a.b.db$h:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap this$0 -> c
     java.lang.Object value -> b
     java.lang.Object key -> a
@@ -9343,17 +9256,17 @@
     1:1:java.lang.Object getValue():2684:2684 -> getValue
     1:1:int hashCode():2700:2700 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):2705:2706 -> setValue
-com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.a.a.a.b.xb:
+com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.a.a.a.b.Bb:
     com.android.tools.r8.com.google.common.base.Function val$function -> b
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):993:993 -> <init>
     1:1:java.util.Map$Entry transform(java.lang.Object):996:996 -> a
     1:1:java.lang.Object transform(java.lang.Object):993 -> a
-com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.a.a.a.b.yb:
+com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.a.a.a.b.Cb:
     java.util.Map$Entry val$entry -> a
     1:1:void <init>(java.util.Map$Entry):1447:1447 -> <init>
     1:1:java.lang.Object getKey():1450:1450 -> getKey
     1:1:java.lang.Object getValue():1455:1455 -> getValue
-com.android.tools.r8.com.google.common.collect.Maps$6 -> com.android.tools.r8.a.a.a.b.zb:
+com.android.tools.r8.com.google.common.collect.Maps$6 -> com.android.tools.r8.a.a.a.b.Db:
     java.util.Iterator val$entryIterator -> a
     1:1:void <init>(java.util.Iterator):1462:1462 -> <init>
     1:1:boolean hasNext():1465:1465 -> hasNext
@@ -9366,28 +9279,28 @@
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.unmodifiableEntry(java.util.Map$Entry):1446 -> next
     3:3:java.util.Map$Entry next():1470 -> next
     3:3:java.lang.Object next():1462 -> next
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.a.a.a.b.Cb:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.a.a.a.b.Gb:
     com.android.tools.r8.com.google.common.collect.Maps$EntryFunction VALUE -> b
     com.android.tools.r8.com.google.common.collect.Maps$EntryFunction KEY -> a
     1:8:void <clinit>():93:100 -> <clinit>
     9:9:void <clinit>():92:92 -> <clinit>
     1:1:void <init>(java.lang.String,int):92:92 -> <init>
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.collect.Maps$1):92 -> <init>
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.a.a.a.b.Ab:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.a.a.a.b.Eb:
     1:1:void <init>(java.lang.String,int):93:93 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):93:93 -> apply
     2:2:java.lang.Object apply(java.util.Map$Entry):97:97 -> apply
     2:2:java.lang.Object apply(java.lang.Object):93 -> apply
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.a.a.a.b.Bb:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.a.a.a.b.Fb:
     1:1:void <init>(java.lang.String,int):100:100 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):100:100 -> apply
     2:2:java.lang.Object apply(java.util.Map$Entry):104:104 -> apply
     2:2:java.lang.Object apply(java.lang.Object):100 -> apply
-com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.a.a.a.b.Db:
+com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.a.a.a.b.Hb:
     1:1:void <init>():4112:4112 -> <init>
+    java.util.Map map() -> c
     1:1:void clear():4122:4122 -> clear
     1:5:boolean contains(java.lang.Object):4127:4131 -> contains
-    java.util.Map map() -> d
     1:1:boolean isEmpty():4138:4138 -> isEmpty
     1:3:boolean remove(java.lang.Object):4143:4145 -> remove
     1:1:boolean com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet.removeAll(java.util.Collection):80:80 -> removeAll
@@ -9405,22 +9318,22 @@
     4:4:boolean retainAll(java.util.Collection):4166 -> retainAll
     5:11:boolean retainAll(java.util.Collection):4167:4173 -> retainAll
     1:1:int size():4117:4117 -> size
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.a.a.a.b.Fb:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.a.a.a.b.Jb:
     1:1:void <init>():3653:3653 -> <init>
     1:1:java.util.Set entrySet():3666:3666 -> entrySet
     java.util.Iterator entryIterator() -> h
     1:1:java.util.Spliterator entrySpliterator():3661:3661 -> i
     2:2:java.util.Spliterator entrySpliterator():3660:3660 -> i
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.a.a.a.b.Eb:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.a.a.a.b.Ib:
     com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap):3666:3666 -> <init>
-    1:1:java.util.Map map():3669:3669 -> d
+    1:1:java.util.Map map():3669:3669 -> c
     1:1:void forEach(java.util.function.Consumer):3684:3684 -> forEach
     2:2:void com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap.forEachEntry(java.util.function.Consumer):3690:3690 -> forEach
     2:2:void forEach(java.util.function.Consumer):3684 -> forEach
     1:1:java.util.Iterator iterator():3674:3674 -> iterator
     1:1:java.util.Spliterator spliterator():3679:3679 -> spliterator
-com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.a.a.a.b.Gb:
+com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.a.a.a.b.Kb:
     java.util.Map map -> a
     1:2:void <init>(java.util.Map):3839:3840 -> <init>
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
@@ -9452,7 +9365,7 @@
     1:1:java.util.Map map():3844:3844 -> size
     1:1:int size():3861 -> size
     2:2:int size():3861:3861 -> size
-com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.a.a.a.b.Hb:
+com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.a.a.a.b.Lb:
     java.util.Map map -> a
     1:2:void <init>(java.util.Map):4026:4027 -> <init>
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
@@ -9508,10 +9421,8 @@
     1:1:java.util.Map map():4031:4031 -> size
     1:1:int size():4093 -> size
     2:2:int size():4093:4093 -> size
-com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap -> com.android.tools.r8.a.a.a.b.Ib:
-    java.util.Collection values -> c
+com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap -> com.android.tools.r8.a.a.a.b.Mb:
     java.util.Set entrySet -> a
-    java.util.Set keySet -> b
     1:1:void <init>():3612:3612 -> <init>
     1:2:java.util.Set entrySet():3624:3625 -> entrySet
     java.util.Set createEntrySet() -> h
@@ -9521,32 +9432,29 @@
     2:2:java.util.Collection createValues():3649:3649 -> values
     2:2:java.util.Collection values():3645 -> values
     3:3:java.util.Collection values():3645:3645 -> values
-com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.a.a.a.b.Jb:
+com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.a.a.a.b.Nb:
     boolean containsEntry(java.lang.Object,java.lang.Object) -> a
-    java.util.Collection entries() -> a
     boolean putAll(java.lang.Object,java.lang.Iterable) -> a
-    java.util.Map asMap() -> b
-    com.android.tools.r8.com.google.common.collect.Multiset keys() -> c
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$2 -> com.android.tools.r8.a.a.a.b.Kb:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$2 -> com.android.tools.r8.a.a.a.b.Ob:
     int val$expectedKeys -> a
     1:1:void <init>(int):127:127 -> <init>
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier -> com.android.tools.r8.a.a.a.b.Lb:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier -> com.android.tools.r8.a.a.a.b.Pb:
     int expectedValuesPerKey -> a
     1:2:void <init>(int):193:194 -> <init>
     1:1:java.util.List get():199:199 -> get
     1:1:java.lang.Object get():190 -> get
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder -> com.android.tools.r8.a.a.a.b.Mb:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder -> com.android.tools.r8.a.a.a.b.Qb:
     1:1:void com.android.tools.r8.com.google.common.collect.MultimapBuilder.<init>():77:77 -> <init>
     1:1:void com.android.tools.r8.com.google.common.collect.MultimapBuilder.<init>(com.android.tools.r8.com.google.common.collect.MultimapBuilder$1):71 -> <init>
     1:1:void <init>():438 -> <init>
     com.android.tools.r8.com.google.common.collect.ListMultimap build() -> a
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys com.android.tools.r8.com.google.common.collect.MultimapBuilder.linkedHashKeys(int):126:127 -> b
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys com.android.tools.r8.com.google.common.collect.MultimapBuilder.linkedHashKeys():113 -> b
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys -> com.android.tools.r8.a.a.a.b.Ob:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys -> com.android.tools.r8.a.a.a.b.Sb:
     1:1:void <init>():282:282 -> <init>
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder arrayListValues(int):300:301 -> a
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder arrayListValues():290 -> a
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys$1 -> com.android.tools.r8.a.a.a.b.Nb:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys$1 -> com.android.tools.r8.a.a.a.b.Rb:
     com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys this$0 -> b
     int val$expectedValuesPerKey -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys,int):301:301 -> <init>
@@ -9556,14 +9464,14 @@
     4:4:com.android.tools.r8.com.google.common.collect.ListMultimap build():305:305 -> a
     5:5:com.android.tools.r8.com.google.common.collect.ListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.newListMultimap(java.util.Map,com.android.tools.r8.com.google.common.base.Supplier):294:294 -> a
     5:5:com.android.tools.r8.com.google.common.collect.ListMultimap build():304 -> a
-com.android.tools.r8.com.google.common.collect.Multimaps$CustomListMultimap -> com.android.tools.r8.a.a.a.b.Pb:
+com.android.tools.r8.com.google.common.collect.Multimaps$CustomListMultimap -> com.android.tools.r8.a.a.a.b.Tb:
     com.android.tools.r8.com.google.common.base.Supplier factory -> g
     1:2:void <init>(java.util.Map,com.android.tools.r8.com.google.common.base.Supplier):301:302 -> <init>
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
     3:3:void <init>(java.util.Map,com.android.tools.r8.com.google.common.base.Supplier):302 -> <init>
-    1:1:java.util.List createCollection():307:307 -> j
-    1:1:java.util.Collection createCollection():297 -> j
-com.android.tools.r8.com.google.common.collect.Multimaps$Entries -> com.android.tools.r8.a.a.a.b.Qb:
+    1:1:java.util.List createCollection():307:307 -> g
+    1:1:java.util.Collection createCollection():297 -> g
+com.android.tools.r8.com.google.common.collect.Multimaps$Entries -> com.android.tools.r8.a.a.a.b.Ub:
     1:1:void <init>():1793:1793 -> <init>
     1:1:void clear():1821:1821 -> clear
     2:2:com.android.tools.r8.com.google.common.collect.Multimap com.android.tools.r8.com.google.common.collect.AbstractMultimap$Entries.multimap():130:130 -> clear
@@ -9581,18 +9489,18 @@
     2:2:com.android.tools.r8.com.google.common.collect.Multimap com.android.tools.r8.com.google.common.collect.AbstractMultimap$Entries.multimap():130:130 -> size
     2:2:int size():1798 -> size
     3:3:int size():1798:1798 -> size
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.a.a.a.b.Tb:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.a.a.a.b.Xb:
     com.android.tools.r8.com.google.common.collect.Multimap multimap -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multimap):1645:1646 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.util.Map$Entry):1678:1678 -> a
-    2:2:int remove(java.lang.Object,int):1755:1755 -> a
-    3:4:int count(java.lang.Object):1749:1750 -> a
-    3:4:int remove(java.lang.Object,int):1757 -> a
-    5:18:int remove(java.lang.Object,int):1760:1773 -> a
     1:2:int count(java.lang.Object):1749:1750 -> b
+    3:3:int remove(java.lang.Object,int):1755:1755 -> b
+    4:5:int count(java.lang.Object):1749:1750 -> b
+    4:5:int remove(java.lang.Object,int):1757 -> b
+    6:19:int remove(java.lang.Object,int):1760:1773 -> b
+    1:1:java.util.Set createEntrySet():1688:1688 -> c
     1:1:void clear():1781:1781 -> clear
     1:1:boolean contains(java.lang.Object):1739:1739 -> contains
-    1:1:java.util.Set createEntrySet():1688:1688 -> d
     1:1:int distinctElements():1683:1683 -> e
     1:1:java.util.Set elementSet():1786:1786 -> f
     1:1:void forEach(java.util.function.Consumer):1678:1678 -> forEach
@@ -9601,57 +9509,53 @@
     1:2:java.util.Iterator entryIterator():1651:1652 -> g
     1:1:java.util.Iterator iterator():1744:1744 -> iterator
     1:1:java.util.Spliterator spliterator():1672:1672 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.a.a.a.b.Sb:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.a.a.a.b.Wb:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys,java.util.Iterator):1652:1652 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):1652:1652 -> a
     2:2:com.android.tools.r8.com.google.common.collect.Multiset$Entry transform(java.util.Map$Entry):1655:1655 -> a
     2:2:java.lang.Object transform(java.lang.Object):1652 -> a
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.a.a.a.b.Rb:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.a.a.a.b.Vb:
     java.util.Map$Entry val$backingEntry -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1,java.util.Map$Entry):1655:1655 -> <init>
-    1:1:int getCount():1663:1663 -> a
-    1:1:java.lang.Object getElement():1658:1658 -> b
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$KeysEntrySet -> com.android.tools.r8.a.a.a.b.Tb$a:
+    1:1:int getCount():1663:1663 -> getCount
+    1:1:java.lang.Object getElement():1658:1658 -> getElement
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$KeysEntrySet -> com.android.tools.r8.a.a.a.b.Xb$a:
     com.android.tools.r8.com.google.common.collect.Multimaps$Keys this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys):1692:1692 -> <init>
+    1:1:com.android.tools.r8.com.google.common.collect.Multiset multiset():1695:1695 -> c
     1:4:boolean contains(java.lang.Object):1715:1718 -> contains
-    1:1:com.android.tools.r8.com.google.common.collect.Multiset multiset():1695:1695 -> d
     1:1:boolean isEmpty():1710:1710 -> isEmpty
     1:1:java.util.Iterator iterator():1700:1700 -> iterator
-    2:3:java.util.Iterator com.android.tools.r8.com.google.common.collect.Multimaps$Keys.entryIterator():1651:1652 -> iterator
-    2:3:java.util.Iterator iterator():1700 -> iterator
     1:5:boolean remove(java.lang.Object):1725:1729 -> remove
     1:1:int size():1705:1705 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.Multimaps$Keys.distinctElements():1683:1683 -> size
     2:2:int size():1705 -> size
-com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.a.a.a.b.Ub:
-    int remove(java.lang.Object,int) -> a
+com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.a.a.a.b.Zb:
+    int setCount(java.lang.Object,int) -> a
     boolean setCount(java.lang.Object,int,int) -> a
     1:4:void lambda$forEach$1(java.util.function.Consumer,com.android.tools.r8.com.google.common.collect.Multiset$Entry):494:497 -> a
-    int add(java.lang.Object,int) -> b
     int count(java.lang.Object) -> b
-    int setCount(java.lang.Object,int) -> c
+    int remove(java.lang.Object,int) -> b
+    int add(java.lang.Object,int) -> c
     java.util.Set elementSet() -> f
     1:2:void forEach(java.util.function.Consumer):491:492 -> forEach
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> forEach
     3:3:void forEach(java.util.function.Consumer):490 -> forEach
     1:1:java.util.Spliterator spliterator():504:504 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.a.a.a.b.Ub$a:
-    int getCount() -> a
-    java.lang.Object getElement() -> b
-com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.a.a.a.b.Vb:
+com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.a.a.a.b.Yb:
+com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.a.a.a.b._b:
     1:1:void <init>():833:833 -> <init>
     1:4:boolean equals(java.lang.Object):840:843 -> equals
     1:2:int hashCode():854:855 -> hashCode
     1:3:java.lang.String toString():867:869 -> toString
-com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.a.a.a.b.Wb:
+com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.a.a.a.b.ac:
     com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount INSTANCE -> a
     1:1:void <clinit>():1165:1165 -> <clinit>
     1:1:void <init>():1164:1164 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1164:1164 -> compare
     2:2:int compare(com.android.tools.r8.com.google.common.collect.Multiset$Entry,com.android.tools.r8.com.google.common.collect.Multiset$Entry):1168:1168 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1164 -> compare
-com.android.tools.r8.com.google.common.collect.Multisets$ElementSet -> com.android.tools.r8.a.a.a.b.Yb:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet -> com.android.tools.r8.a.a.a.b.cc:
     1:1:void <init>():977:977 -> <init>
     1:1:void clear():982:982 -> clear
     2:2:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.com.google.common.collect.AbstractMultiset$ElementSet.multiset():174:174 -> clear
@@ -9681,25 +9585,25 @@
     2:2:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.com.google.common.collect.AbstractMultiset$ElementSet.multiset():174:174 -> size
     2:2:int size():1017 -> size
     3:3:int size():1017:1017 -> size
-com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1 -> com.android.tools.r8.a.a.a.b.Xb:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1 -> com.android.tools.r8.a.a.a.b.bc:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multisets$ElementSet,java.util.Iterator):1002:1002 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):1002:1002 -> a
     2:2:java.lang.Object transform(com.android.tools.r8.com.google.common.collect.Multiset$Entry):1005:1005 -> a
     2:2:java.lang.Object transform(java.lang.Object):1002 -> a
-com.android.tools.r8.com.google.common.collect.Multisets$EntrySet -> com.android.tools.r8.a.a.a.b.Zb:
+com.android.tools.r8.com.google.common.collect.Multisets$EntrySet -> com.android.tools.r8.a.a.a.b.dc:
     1:1:void <init>():1021:1021 -> <init>
+    com.android.tools.r8.com.google.common.collect.Multiset multiset() -> c
     1:1:void clear():1061:1061 -> clear
     1:11:boolean contains(java.lang.Object):1026:1036 -> contains
-    com.android.tools.r8.com.google.common.collect.Multiset multiset() -> d
     1:9:boolean remove(java.lang.Object):1045:1053 -> remove
-com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.a.a.a.b._b:
+com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.a.a.a.b.ec:
     java.lang.Object element -> a
     int count -> b
     1:4:void <init>(java.lang.Object,int):258:261 -> <init>
-    1:1:int getCount():272:272 -> a
-    1:1:java.lang.Object getElement():267:267 -> b
-    com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket() -> c
-com.android.tools.r8.com.google.common.collect.NaturalOrdering -> com.android.tools.r8.a.a.a.b.ac:
+    com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket() -> a
+    1:1:int getCount():272:272 -> getCount
+    1:1:java.lang.Object getElement():267:267 -> getElement
+com.android.tools.r8.com.google.common.collect.NaturalOrdering -> com.android.tools.r8.a.a.a.b.fc:
     com.android.tools.r8.com.google.common.collect.NaturalOrdering INSTANCE -> a
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>():73:73 -> <init>
@@ -9712,7 +9616,7 @@
     4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> compare
     4:4:int compare(java.lang.Comparable,java.lang.Comparable):35 -> compare
     4:4:int compare(java.lang.Object,java.lang.Object):25 -> compare
-com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.a.a.a.b.bc:
+com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.a.a.a.b.gc:
     1:1:void <init>():390:390 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Ordering natural():161:161 -> a
     2:2:com.android.tools.r8.com.google.common.collect.Ordering from(java.util.Comparator):181:181 -> a
@@ -9720,7 +9624,7 @@
     1:1:com.android.tools.r8.com.google.common.base.Function com.android.tools.r8.com.google.common.collect.Maps.keyFunction():111:111 -> b
     1:1:com.android.tools.r8.com.google.common.collect.Ordering onKeys():452 -> b
     2:2:com.android.tools.r8.com.google.common.collect.Ordering onKeys():452:452 -> b
-com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.a.a.a.b.cc:
+com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.a.a.a.b.hc:
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegate -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList delegateList -> c
     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>
@@ -9735,7 +9639,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator listIterator(int):56:56 -> listIterator
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator listIterator(int):56:56 -> listIterator
     2:2:java.util.ListIterator listIterator(int):29 -> listIterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.a.a.a.b.fc:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.a.a.a.b.kc:
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> j
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] keyTable -> e
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap EMPTY -> k
@@ -9788,8 +9692,8 @@
     boolean isHashCodeFast() -> l
     boolean isPartialView() -> m
     1:1:int size():179:179 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.a.a.a.b.dc:
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.a.a.a.b.fc$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.a.a.a.b.ic:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.a.a.a.b.kc$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap this$0 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap):195:195 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap,com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1):195 -> <init>
@@ -9813,7 +9717,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():204:204 -> size
     1:1:int size():199 -> size
     2:2:int size():199:199 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.a.a.a.b.fc$a$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.a.a.a.b.kc$a$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse this$1 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse):240:240 -> <init>
     1:1:void forEach(java.util.function.Consumer):263:263 -> forEach
@@ -9824,13 +9728,13 @@
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():258:258 -> iterator
     2:2:java.util.Iterator iterator():239 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():243:243 -> l
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.a.a.a.b.ec:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.a.a.a.b.jc:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet this$2 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet):268:268 -> <init>
     1:2:java.util.Map$Entry get(int):271:272 -> get
     1:2:java.lang.Object get(int):268 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():277:277 -> j
-com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.a.a.a.b.gc:
+com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.a.a.a.b.lc:
     java.lang.Object[] array -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList EMPTY -> c
     1:1:void <clinit>():31:31 -> <clinit>
@@ -9843,7 +9747,7 @@
     2:2:java.util.ListIterator listIterator(int):28 -> listIterator
     1:1:int size():42:42 -> size
     1:1:java.util.Spliterator spliterator():73:73 -> spliterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.a.a.a.b.jc:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.a.a.a.b.oc:
     com.android.tools.r8.com.google.common.collect.ImmutableMap EMPTY -> h
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] table -> f
     java.util.Map$Entry[] entries -> e
@@ -9873,20 +9777,20 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():229:229 -> k
     boolean isPartialView() -> m
     1:1:int size():159:159 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.a.a.a.b.hc:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.a.a.a.b.mc:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):181:182 -> <init>
     1:1:boolean contains(java.lang.Object):192:192 -> contains
     boolean isPartialView() -> e
     1:1:java.lang.Object get(int):187:187 -> get
     1:1:int size():202:202 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.a.a.a.b.ic:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.a.a.a.b.nc:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):236:237 -> <init>
     boolean isPartialView() -> e
     1:1:java.lang.Object get(int):242:242 -> get
     1:1:int size():247:247 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.a.a.a.b.lc:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.a.a.a.b.qc:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset EMPTY -> i
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] hashTable -> e
     int size -> f
@@ -9898,15 +9802,15 @@
     1:1:com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] access$100(com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset):36:36 -> a
     1:11:int count(java.lang.Object):117:127 -> b
     12:12:int count(java.lang.Object):125:125 -> b
+    1:1:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):170:170 -> d
     boolean isPartialView() -> e
-    1:1:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):170:170 -> e
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():140:141 -> f
     3:4:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():140:141 -> f
     3:4:java.util.Set elementSet():34 -> f
     1:1:int hashCode():175:175 -> hashCode
     1:1:int size():135:135 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> com.android.tools.r8.a.a.a.b.kc:
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.a.a.a.b.lc$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> com.android.tools.r8.a.a.a.b.pc:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.a.a.a.b.qc$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset):145:145 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset,com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1):145 -> <init>
@@ -9914,11 +9818,11 @@
     boolean isPartialView() -> e
     1:1:java.lang.Object get(int):149:149 -> get
     1:1:int size():164:164 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.a.a.a.b.mc:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.a.a.a.b.rc:
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket -> c
     1:2:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry):100:101 -> <init>
-    1:1:com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket():106:106 -> c
-com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.a.a.a.b.nc:
+    1:1:com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket():106:106 -> a
+com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.a.a.a.b.sc:
     java.lang.Object[] table -> d
     com.android.tools.r8.com.google.common.collect.RegularImmutableSet EMPTY -> g
     java.lang.Object[] elements -> c
@@ -9933,11 +9837,13 @@
     1:1:int hashCode():100:100 -> hashCode
     boolean isHashCodeFast() -> i
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():74:74 -> iterator
-    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():74:74 -> iterator
-    2:2:java.util.Iterator iterator():30 -> iterator
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[]):1054:1054 -> iterator
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():74 -> iterator
+    3:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():74:74 -> iterator
+    3:3: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.RegularImmutableSortedSet -> com.android.tools.r8.a.a.a.b.oc:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet -> com.android.tools.r8.a.a.a.b.tc:
     com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet NATURAL_EMPTY_SET -> f
     com.android.tools.r8.com.google.common.collect.ImmutableList elements -> e
     1:2:void <clinit>():44:45 -> <clinit>
@@ -10018,7 +9924,7 @@
     1:1:java.util.Comparator unsafeComparator():273:273 -> m
     1:1:int size():77:77 -> size
     1:1:java.util.Spliterator spliterator():67:67 -> spliterator
-com.android.tools.r8.com.google.common.collect.Sets$1 -> com.android.tools.r8.a.a.a.b.qc:
+com.android.tools.r8.com.google.common.collect.Sets$1 -> com.android.tools.r8.a.a.a.b.vc:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
     1:1:void <init>(java.util.Set,java.util.Set):744:744 -> <init>
@@ -10030,13 +9936,13 @@
     1:1:java.util.stream.Stream parallelStream():790:790 -> parallelStream
     1:3:int size():747:749 -> size
     1:1:java.util.stream.Stream stream():785:785 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$1$1 -> com.android.tools.r8.a.a.a.b.pc:
+com.android.tools.r8.com.google.common.collect.Sets$1$1 -> com.android.tools.r8.a.a.a.b.uc:
     java.util.Iterator itr2 -> d
     java.util.Iterator itr1 -> c
     com.android.tools.r8.com.google.common.collect.Sets$1 this$0 -> e
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.Sets$1):763:765 -> <init>
-    1:10:java.lang.Object computeNext():769:778 -> d
-com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.a.a.a.b.sc:
+    1:10:java.lang.Object computeNext():769:778 -> c
+com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.a.a.a.b.xc:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
     1:1:void <init>(java.util.Set,java.util.Set):842:842 -> <init>
@@ -10048,12 +9954,12 @@
     1:1:java.util.stream.Stream parallelStream():868:868 -> parallelStream
     1:2:int size():874:875 -> size
     1:1:java.util.stream.Stream stream():863:863 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.a.a.a.b.rc:
+com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.a.a.a.b.wc:
     java.util.Iterator itr -> c
     com.android.tools.r8.com.google.common.collect.Sets$2 this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$2):845:846 -> <init>
-    1:7:java.lang.Object computeNext():850:856 -> d
-com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.a.a.a.b.uc:
+    1:7:java.lang.Object computeNext():850:856 -> c
+com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.a.a.a.b.zc:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
     1:1:void <init>(java.util.Set,java.util.Set):914:914 -> <init>
@@ -10066,12 +9972,12 @@
     1:1:java.util.stream.Stream parallelStream():939:939 -> parallelStream
     1:2:int size():945:946 -> size
     1:1:java.util.stream.Stream stream():934:934 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.a.a.a.b.tc:
+com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.a.a.a.b.yc:
     java.util.Iterator itr -> c
     com.android.tools.r8.com.google.common.collect.Sets$3 this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$3):917:918 -> <init>
-    1:7:java.lang.Object computeNext():921:927 -> d
-com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.a.a.a.b.yc:
+    1:7:java.lang.Object computeNext():921:927 -> c
+com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.a.a.a.b.Dc:
     com.android.tools.r8.com.google.common.collect.ImmutableMap val$index -> b
     int val$size -> a
     1:1:void <init>(int,com.android.tools.r8.com.google.common.collect.ImmutableMap):1676:1676 -> <init>
@@ -10079,31 +9985,31 @@
     1:1:java.util.Iterator iterator():1688:1688 -> iterator
     1:1:int size():1755:1755 -> size
     1:1:java.lang.String toString():1760:1760 -> toString
-com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.a.a.a.b.xc:
+com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.a.a.a.b.Cc:
     java.util.BitSet bits -> c
     com.android.tools.r8.com.google.common.collect.Sets$5 this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5):1688:1689 -> <init>
-    1:29:java.util.Set computeNext():1693:1721 -> d
-    1:29:java.lang.Object computeNext():1688 -> d
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.a.a.a.b.wc:
+    1:29:java.util.Set computeNext():1693:1721 -> c
+    1:29:java.lang.Object computeNext():1688 -> c
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.a.a.a.b.Bc:
     com.android.tools.r8.com.google.common.collect.Sets$5$1 this$1 -> b
     java.util.BitSet val$copy -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5$1,java.util.BitSet):1721:1721 -> <init>
     1:2:boolean contains(java.lang.Object):1724:1725 -> contains
     1:1:java.util.Iterator iterator():1730:1730 -> iterator
     1:1:int size():1746:1746 -> size
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.a.a.a.b.vc:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.a.a.a.b.Ac:
     com.android.tools.r8.com.google.common.collect.Sets$5$1$1 this$2 -> d
     int i -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5$1$1):1730:1731 -> <init>
-    1:5:java.lang.Object computeNext():1735:1739 -> d
-com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.a.a.a.b.zc:
+    1:5:java.lang.Object computeNext():1735:1739 -> c
+com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.a.a.a.b.Ec:
     1:1:void <init>():77:77 -> <init>
     1:1:boolean removeAll(java.util.Collection):80:80 -> removeAll
     1:1:boolean retainAll(java.util.Collection):85:85 -> retainAll
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> retainAll
     2:2:boolean retainAll(java.util.Collection):85 -> retainAll
-com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.a.a.a.b.Ac:
+com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.a.a.a.b.Fc:
     1:1:void <init>():600:600 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Sets$1):599 -> <init>
     1:1:boolean add(java.lang.Object):640:640 -> add
@@ -10113,7 +10019,7 @@
     1:1:boolean removeAll(java.util.Collection):679:679 -> removeAll
     1:1:boolean removeIf(java.util.function.Predicate):692:692 -> removeIf
     1:1:boolean retainAll(java.util.Collection):705:705 -> retainAll
-com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet -> com.android.tools.r8.a.a.a.b.Bc:
+com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet -> com.android.tools.r8.a.a.a.b.Gc:
     java.util.SortedSet unmodifiableDelegate -> b
     java.util.NavigableSet delegate -> a
     com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet descendingSet -> c
@@ -10143,7 +10049,7 @@
     1:2:java.util.NavigableSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):1910:1911 -> subSet
     3:3:java.util.NavigableSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):1910:1910 -> subSet
     1:1:java.util.NavigableSet tailSet(java.lang.Object,boolean):1921:1921 -> tailSet
-com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.a.a.a.b.Cc:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.a.a.a.b.Hc:
     java.lang.Object singleValue -> f
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> g
     java.lang.Object singleKey -> e
@@ -10161,7 +10067,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():85:85 -> i
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():90:90 -> j
     boolean isPartialView() -> m
-com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.a.a.a.b.Dc:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.a.a.a.b.Ic:
     java.lang.Object element -> b
     1:2:void <init>(java.lang.Object):37:38 -> <init>
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
@@ -10169,8 +10075,10 @@
     boolean isPartialView() -> e
     1:2:java.lang.Object get(int):43:44 -> get
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():49:49 -> iterator
-    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():49:49 -> iterator
-    2:2:java.util.Iterator iterator():31 -> iterator
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.singletonIterator(java.lang.Object):1104:1104 -> iterator
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():49 -> iterator
+    3:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():49:49 -> iterator
+    3:3:java.util.Iterator iterator():31 -> iterator
     1:1:java.util.Spliterator spliterator():54:54 -> spliterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):64:64 -> subList
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():81:81 -> subList
@@ -10181,7 +10089,7 @@
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):65 -> subList
     4:4:java.util.List subList(int,int):31 -> subList
     1:1:java.lang.String toString():70:70 -> toString
-com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.a.a.a.b.Ec:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.a.a.a.b.Jc:
     java.lang.Object element -> c
     int cachedHashCode -> d
     1:2:void <init>(java.lang.Object):44:45 -> <init>
@@ -10195,11 +10103,13 @@
     1:3:int hashCode():88:90 -> hashCode
     1:1:boolean isHashCodeFast():97:97 -> i
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():66:66 -> iterator
-    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():66:66 -> iterator
-    2:2:java.util.Iterator iterator():29 -> iterator
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.singletonIterator(java.lang.Object):1104:1104 -> iterator
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():66 -> iterator
+    3:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():66:66 -> iterator
+    3:3:java.util.Iterator iterator():29 -> iterator
     1:1:java.lang.String toString():102:102 -> toString
-com.android.tools.r8.com.google.common.collect.SortedIterable -> com.android.tools.r8.a.a.a.b.Fc:
-com.android.tools.r8.com.google.common.collect.StandardTable -> com.android.tools.r8.a.a.a.b.Hc:
+com.android.tools.r8.com.google.common.collect.SortedIterable -> com.android.tools.r8.a.a.a.b.Kc:
+com.android.tools.r8.com.google.common.collect.StandardTable -> com.android.tools.r8.a.a.a.b.Mc:
     java.util.Map backingMap -> b
     java.util.Map rowMap -> d
     com.android.tools.r8.com.google.common.base.Supplier factory -> c
@@ -10219,9 +10129,8 @@
     2:2:java.util.Map createRowMap():771:771 -> d
     2:2:java.util.Map rowMap():767 -> d
     3:3:java.util.Map rowMap():767:767 -> d
-    int size() -> e
-com.android.tools.r8.com.google.common.collect.StandardTable$1 -> com.android.tools.r8.a.a.a.b.Gc:
-com.android.tools.r8.com.google.common.collect.StandardTable$CellIterator -> com.android.tools.r8.a.a.a.b.Hc$a:
+com.android.tools.r8.com.google.common.collect.StandardTable$1 -> com.android.tools.r8.a.a.a.b.Lc:
+com.android.tools.r8.com.google.common.collect.StandardTable$CellIterator -> com.android.tools.r8.a.a.a.b.Mc$a:
     java.util.Map$Entry rowEntry -> b
     java.util.Iterator columnIterator -> c
     java.util.Iterator rowIterator -> a
@@ -10237,7 +10146,7 @@
     1:6:com.android.tools.r8.com.google.common.collect.Table$Cell next():251:256 -> next
     1:6:java.lang.Object next():239 -> next
     1:3:void remove():261:263 -> remove
-com.android.tools.r8.com.google.common.collect.StandardTable$Row -> com.android.tools.r8.a.a.a.b.Hc$b:
+com.android.tools.r8.com.google.common.collect.StandardTable$Row -> com.android.tools.r8.a.a.a.b.Mc$b:
     java.util.Map backingRowMap -> b
     java.lang.Object rowKey -> a
     com.android.tools.r8.com.google.common.collect.StandardTable this$0 -> c
@@ -10265,7 +10174,7 @@
     6:6:java.lang.Object put(java.lang.Object,java.lang.Object):328 -> put
     1:6:java.lang.Object remove(java.lang.Object):338:343 -> remove
     1:2:int size():358:359 -> size
-com.android.tools.r8.com.google.common.collect.StandardTable$Row$1 -> com.android.tools.r8.a.a.a.b.Ic:
+com.android.tools.r8.com.google.common.collect.StandardTable$Row$1 -> com.android.tools.r8.a.a.a.b.Nc:
     com.android.tools.r8.com.google.common.collect.StandardTable$Row this$1 -> b
     java.util.Iterator val$iterator -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.StandardTable$Row,java.util.Iterator):369:369 -> <init>
@@ -10273,7 +10182,7 @@
     1:1:java.util.Map$Entry next():377:377 -> next
     1:1:java.lang.Object next():369 -> next
     1:2:void remove():382:383 -> remove
-com.android.tools.r8.com.google.common.collect.StandardTable$Row$2 -> com.android.tools.r8.a.a.a.b.Jc:
+com.android.tools.r8.com.google.common.collect.StandardTable$Row$2 -> com.android.tools.r8.a.a.a.b.Oc:
     java.util.Map$Entry val$entry -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.StandardTable$Row,java.util.Map$Entry):398:398 -> <init>
     1:2:boolean com.android.tools.r8.com.google.common.collect.ForwardingMapEntry.standardEquals(java.lang.Object):96:97 -> equals
@@ -10305,8 +10214,8 @@
     2:2:java.lang.Object setValue(java.lang.Object):406 -> setValue
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> setValue
     3:3:java.lang.Object setValue(java.lang.Object):406 -> setValue
-com.android.tools.r8.com.google.common.collect.StandardTable$RowMap -> com.android.tools.r8.a.a.a.b.Hc$c:
-    com.android.tools.r8.com.google.common.collect.StandardTable this$0 -> d
+com.android.tools.r8.com.google.common.collect.StandardTable$RowMap -> com.android.tools.r8.a.a.a.b.Mc$c:
+    com.android.tools.r8.com.google.common.collect.StandardTable this$0 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.StandardTable):775:775 -> <init>
     1:1:boolean containsKey(java.lang.Object):778:778 -> containsKey
     1:1:java.util.Map get(java.lang.Object):785:785 -> get
@@ -10314,7 +10223,7 @@
     1:1:java.util.Set createEntrySet():795:795 -> h
     1:1:java.util.Map remove(java.lang.Object):790:790 -> remove
     1:1:java.lang.Object remove(java.lang.Object):774 -> remove
-com.android.tools.r8.com.google.common.collect.StandardTable$RowMap$EntrySet -> com.android.tools.r8.a.a.a.b.Hc$c$a:
+com.android.tools.r8.com.google.common.collect.StandardTable$RowMap$EntrySet -> com.android.tools.r8.a.a.a.b.Mc$c$a:
     com.android.tools.r8.com.google.common.collect.StandardTable$RowMap this$1 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.StandardTable$RowMap):799:799 -> <init>
     1:5:boolean contains(java.lang.Object):819:823 -> contains
@@ -10323,32 +10232,32 @@
     3:3:java.util.Iterator iterator():802 -> iterator
     1:5:boolean remove(java.lang.Object):830:834 -> remove
     1:1:int size():814:814 -> size
-com.android.tools.r8.com.google.common.collect.StandardTable$RowMap$EntrySet$1 -> com.android.tools.r8.a.a.a.b.Kc:
+com.android.tools.r8.com.google.common.collect.StandardTable$RowMap$EntrySet$1 -> com.android.tools.r8.a.a.a.b.Pc:
     com.android.tools.r8.com.google.common.collect.StandardTable$RowMap$EntrySet this$2 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.StandardTable$RowMap$EntrySet):804:804 -> <init>
     1:1:java.util.Map apply(java.lang.Object):807:807 -> apply
     1:1:java.lang.Object apply(java.lang.Object):804 -> apply
-com.android.tools.r8.com.google.common.collect.StandardTable$TableSet -> com.android.tools.r8.a.a.a.b.Hc$d:
+com.android.tools.r8.com.google.common.collect.StandardTable$TableSet -> com.android.tools.r8.a.a.a.b.Mc$d:
     com.android.tools.r8.com.google.common.collect.StandardTable this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.StandardTable):207:207 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.StandardTable,com.android.tools.r8.com.google.common.collect.StandardTable$1):207 -> <init>
     1:1:void clear():215:215 -> clear
     1:1:boolean isEmpty():210:210 -> isEmpty
-com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.a.a.a.b.Lc:
+com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.a.a.a.b.Qc:
     com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex val$function -> d
     java.lang.Object holder -> c
     1:2:void <init>(java.util.Spliterator,long,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):369:370 -> <init>
     1:1:void accept(java.lang.Object):375:375 -> accept
     1:6:boolean tryAdvance(java.util.function.Consumer):380:385 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.a.a.a.b.Mc:
+com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.a.a.a.b.Rc:
     java.util.Iterator val$fromIterator -> b
     long index -> a
     com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex val$function -> c
     1:2:void <init>(long,int,java.util.Iterator,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):352:353 -> <init>
     1:2:boolean tryAdvance(java.util.function.Consumer):357:358 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.a.a.a.b.Nc:
+com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.a.a.a.b.Sc:
     java.lang.Object apply(java.lang.Object,long) -> a
-com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.a.a.a.b.Oc:
+com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.a.a.a.b.Tc:
     long index -> b
     java.util.Spliterator fromSpliterator -> a
     1:3:void <init>(java.util.Spliterator,long):419:421 -> <init>
@@ -10362,32 +10271,33 @@
     6:6:java.util.Spliterator trySplit():413 -> trySplit
     7:7:com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator trySplit():434:434 -> trySplit
     7:7:java.util.Spliterator trySplit():413 -> trySplit
-com.android.tools.r8.com.google.common.collect.Table -> com.android.tools.r8.a.a.a.b.Qc:
-com.android.tools.r8.com.google.common.collect.Table$Cell -> com.android.tools.r8.a.a.a.b.Pc:
-com.android.tools.r8.com.google.common.collect.Tables -> com.android.tools.r8.a.a.a.b.Uc:
+com.android.tools.r8.com.google.common.collect.Table -> com.android.tools.r8.a.a.a.b.Vc:
+com.android.tools.r8.com.google.common.collect.Table$Cell -> com.android.tools.r8.a.a.a.b.Uc:
+com.android.tools.r8.com.google.common.collect.Tables -> com.android.tools.r8.a.a.a.b.Zc:
     1:1:void <clinit>():697:697 -> <clinit>
     1:1:com.android.tools.r8.com.google.common.collect.Table$Cell immutableCell(java.lang.Object,java.lang.Object,java.lang.Object):152:152 -> a
     2:4:boolean equalsImpl(com.android.tools.r8.com.google.common.collect.Table,java.lang.Object):741:743 -> a
-com.android.tools.r8.com.google.common.collect.Tables$1 -> com.android.tools.r8.a.a.a.b.Rc:
+com.android.tools.r8.com.google.common.collect.Tables$1 -> com.android.tools.r8.a.a.a.b.Wc:
+    1:1:void <init>():698:698 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):698:698 -> apply
     2:2:java.util.Map apply(java.util.Map):701:701 -> apply
     2:2:java.lang.Object apply(java.lang.Object):698 -> apply
-com.android.tools.r8.com.google.common.collect.Tables$AbstractCell -> com.android.tools.r8.a.a.a.b.Sc:
+com.android.tools.r8.com.google.common.collect.Tables$AbstractCell -> com.android.tools.r8.a.a.a.b.Xc:
     1:1:void <init>():186:186 -> <init>
     1:5:boolean equals(java.lang.Object):193:197 -> equals
     1:1:int hashCode():204:204 -> hashCode
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):76:76 -> hashCode
     2:2:int hashCode():204 -> hashCode
     1:1:java.lang.String toString():209:209 -> toString
-com.android.tools.r8.com.google.common.collect.Tables$ImmutableCell -> com.android.tools.r8.a.a.a.b.Tc:
+com.android.tools.r8.com.google.common.collect.Tables$ImmutableCell -> com.android.tools.r8.a.a.a.b.Yc:
     java.lang.Object columnKey -> b
     java.lang.Object value -> c
     java.lang.Object rowKey -> a
     1:4:void <init>(java.lang.Object,java.lang.Object,java.lang.Object):160:163 -> <init>
     1:1:java.lang.Object getColumnKey():173:173 -> a
     1:1:java.lang.Object getRowKey():168:168 -> b
-    1:1:java.lang.Object getValue():178:178 -> c
-com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.a.a.a.b.Vc:
+    1:1:java.lang.Object getValue():178:178 -> getValue
+com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.a.a.a.b._c:
     java.util.Iterator backingIterator -> a
     1:2:void <init>(java.util.Iterator):35:36 -> <init>
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
@@ -10396,10 +10306,10 @@
     1:1:boolean hasNext():43:43 -> hasNext
     1:1:java.lang.Object next():48:48 -> next
     1:1:void remove():53:53 -> remove
-com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.a.a.a.b.Wc:
+com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.a.a.a.b.ad:
     1:1:void <init>():35:35 -> <init>
     1:1:void remove():46:46 -> remove
-com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.a.a.a.b.Xc:
+com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.a.a.a.b.bd:
     1:1:void <init>():33:33 -> <init>
     1:1:void add(java.lang.Object):44:44 -> add
     1:1:void set(java.lang.Object):56:56 -> set
@@ -10684,54 +10594,13 @@
     1:1:void write(byte[]):603 -> write
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> write
     2:2:void write(byte[],int,int):609 -> write
-com.android.tools.r8.com.google.common.io.CharSequenceReader -> com.android.tools.r8.a.a.a.d.k:
-    java.lang.CharSequence seq -> a
-    int pos -> b
-    int mark -> c
-    1:2:void <init>(java.lang.CharSequence):43:44 -> <init>
-    3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
-    3:3:void <init>(java.lang.CharSequence):44 -> <init>
-    1:2:void checkOpen():48:49 -> a
-    1:1:boolean hasRemaining():54:54 -> b
-    1:1:int remaining():58:58 -> c
-    1:1:void close():130:130 -> close
-    1:3:void mark(int):117:119 -> mark
-    1:7:int read(java.nio.CharBuffer):64:70 -> read
-    8:8:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> read
-    8:8:int read(java.nio.CharBuffer):63 -> read
-    9:10:int read():77:78 -> read
-    11:18:int read(char[],int,int):83:90 -> read
-    1:1:boolean ready():106:106 -> ready
-    1:2:void reset():124:125 -> reset
-    1:4:long skip(long):97:100 -> skip
-com.android.tools.r8.com.google.common.io.CharSink -> com.android.tools.r8.a.a.a.d.l:
+com.android.tools.r8.com.google.common.io.CharSink -> com.android.tools.r8.a.a.a.d.k:
     1:1:void <init>():58:58 -> <init>
     java.io.Writer openStream() -> a
-com.android.tools.r8.com.google.common.io.CharSource -> com.android.tools.r8.a.a.a.d.o:
-    1:1:void <init>():76:76 -> <init>
-    java.io.Reader openStream() -> a
-    1:1:com.android.tools.r8.com.google.common.io.CharSource wrap(java.lang.CharSequence):479:479 -> a
-com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.a.a.a.d.m:
-    java.lang.CharSequence seq -> a
-    1:1:void <clinit>():525:525 -> <clinit>
-    1:2:void <init>(java.lang.CharSequence):529:530 -> <init>
-    3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> <init>
-    3:3:void <init>(java.lang.CharSequence):530 -> <init>
-    1:1:java.io.Reader openStream():535:535 -> a
-    1:1:java.lang.String toString():609:609 -> toString
-    2:20:java.lang.String com.android.tools.r8.com.google.common.base.Ascii.truncate(java.lang.CharSequence,int,java.lang.String):553:571 -> toString
-    2:20:java.lang.String toString():609 -> toString
-    21:21:java.lang.String toString():609:609 -> toString
-    22:22:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> toString
-    22:22:java.lang.String com.android.tools.r8.com.google.common.base.Ascii.truncate(java.lang.CharSequence,int,java.lang.String):546 -> toString
-    22:22:java.lang.String toString():609 -> toString
-com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.a.a.a.d.n:
-    1:1:void <init>(java.lang.String):630:630 -> <init>
-    1:1:java.io.Reader openStream():635:635 -> a
-com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.a.a.a.d.p:
+com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.a.a.a.d.l:
     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.a.a.a.d.t:
+com.android.tools.r8.com.google.common.io.Closer -> com.android.tools.r8.a.a.a.d.p:
     com.android.tools.r8.com.google.common.io.Closer$Suppressor suppressor -> a
     java.util.Deque stack -> b
     java.lang.Throwable thrown -> c
@@ -10749,12 +10618,12 @@
     6:6:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     6:6:java.lang.RuntimeException rethrow(java.lang.Throwable):148 -> a
     1:19:void close():210:228 -> close
-com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.a.a.a.d.q:
+com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.a.a.a.d.m:
     com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor INSTANCE -> a
     1:1:void <clinit>():251:251 -> <clinit>
     1:1:void <init>():249:249 -> <init>
     1:1:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):256:256 -> a
-com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> com.android.tools.r8.a.a.a.d.r:
+com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> com.android.tools.r8.a.a.a.d.n:
     com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor INSTANCE -> a
     java.lang.reflect.Method addSuppressed -> b
     1:1:void <clinit>():268:268 -> <clinit>
@@ -10765,20 +10634,20 @@
     1:1:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):291:291 -> a
     2:2:void com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor.suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):256:256 -> a
     2:2:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):294 -> a
-com.android.tools.r8.com.google.common.io.Closer$Suppressor -> com.android.tools.r8.a.a.a.d.s:
+com.android.tools.r8.com.google.common.io.Closer$Suppressor -> com.android.tools.r8.a.a.a.d.o:
     void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable) -> a
-com.android.tools.r8.com.google.common.io.FileWriteMode -> com.android.tools.r8.a.a.a.d.u:
+com.android.tools.r8.com.google.common.io.FileWriteMode -> com.android.tools.r8.a.a.a.d.q:
     com.android.tools.r8.com.google.common.io.FileWriteMode APPEND -> a
     1:1:void <clinit>():28:28 -> <clinit>
     2:2:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(java.lang.String,int):26:26 -> <init>
-com.android.tools.r8.com.google.common.io.Files -> com.android.tools.r8.a.a.a.d.x:
+com.android.tools.r8.com.google.common.io.Files -> com.android.tools.r8.a.a.a.d.t:
     1:1:com.android.tools.r8.com.google.common.io.ByteSink asByteSink(java.io.File,com.android.tools.r8.com.google.common.io.FileWriteMode[]):199:199 -> a
     1:1:com.android.tools.r8.com.google.common.io.CharSink asCharSink(java.io.File,java.nio.charset.Charset,com.android.tools.r8.com.google.common.io.FileWriteMode[]):242 -> a
     2:2:com.android.tools.r8.com.google.common.io.CharSink com.android.tools.r8.com.google.common.io.ByteSink.asCharSink(java.nio.charset.Charset):60:60 -> a
     2:2:com.android.tools.r8.com.google.common.io.CharSink asCharSink(java.io.File,java.nio.charset.Charset,com.android.tools.r8.com.google.common.io.FileWriteMode[]):242 -> a
-com.android.tools.r8.com.google.common.io.Files$1 -> com.android.tools.r8.a.a.a.d.v:
-com.android.tools.r8.com.google.common.io.Files$FileByteSink -> com.android.tools.r8.a.a.a.d.w:
+com.android.tools.r8.com.google.common.io.Files$1 -> com.android.tools.r8.a.a.a.d.r:
+com.android.tools.r8.com.google.common.io.Files$FileByteSink -> com.android.tools.r8.a.a.a.d.s:
     java.io.File file -> a
     com.android.tools.r8.com.google.common.collect.ImmutableSet modes -> b
     1:3:void <init>(java.io.File,com.android.tools.r8.com.google.common.io.FileWriteMode[]):207:209 -> <init>
@@ -10789,7 +10658,7 @@
     1:1:java.io.FileOutputStream openStream():214:214 -> a
     1:1:java.io.OutputStream openStream():202 -> a
     1:1:java.lang.String toString():219:219 -> toString
-com.android.tools.r8.com.google.common.io.LineProcessor -> com.android.tools.r8.a.a.a.d.y:
+com.android.tools.r8.com.google.common.io.LineProcessor -> com.android.tools.r8.a.a.a.d.u:
 com.android.tools.r8.com.google.common.math.IntMath -> com.android.tools.r8.a.a.a.e.b:
     int[] biggestBinomials -> a
     1:474:void <clinit>():202:675 -> <clinit>
@@ -10828,9 +10697,9 @@
     1:1:java.util.Iterator iterator():171:171 -> iterator
 com.android.tools.r8.com.google.gson.JsonElement -> com.android.tools.r8.a.a.b.b:
     1:1:void <init>():33:33 -> <init>
-    1:1:boolean isJsonObject():55:55 -> d
-    1:1:com.android.tools.r8.com.google.gson.JsonObject getAsJsonObject():87 -> d
-    2:4:com.android.tools.r8.com.google.gson.JsonObject getAsJsonObject():88:90 -> d
+    1:1:boolean isJsonObject():55:55 -> c
+    1:1:com.android.tools.r8.com.google.gson.JsonObject getAsJsonObject():87 -> c
+    2:4:com.android.tools.r8.com.google.gson.JsonObject getAsJsonObject():88:90 -> c
     1:1:long getAsLong():230:230 -> e
     1:1:java.lang.String getAsString():191:191 -> g
     1:1:boolean isJsonNull():74:74 -> h
@@ -10857,10 +10726,10 @@
     6:6:com.android.tools.r8.com.google.gson.JsonElement createJsonElement(java.lang.Object):122:122 -> a
     6:6:void addProperty(java.lang.String,java.lang.String):79 -> a
     7:7:void addProperty(java.lang.String,java.lang.String):79:79 -> a
-    8:8:com.android.tools.r8.com.google.gson.JsonElement get(java.lang.String):161:161 -> a
-    1:1:boolean has(java.lang.String):151:151 -> b
+    8:8:boolean has(java.lang.String):151:151 -> a
     1:1:java.util.Set entrySet():132:132 -> entrySet
     1:2:boolean equals(java.lang.Object):196:197 -> equals
+    1:1:com.android.tools.r8.com.google.gson.JsonElement get(java.lang.String):161:161 -> get
     1:1:int hashCode():202:202 -> hashCode
 com.android.tools.r8.com.google.gson.JsonParseException -> com.android.tools.r8.a.a.b.f:
     1:1:void <init>(java.lang.String):42:42 -> <init>
@@ -10933,12 +10802,11 @@
     1:1:java.lang.String toString():68:68 -> toString
 com.android.tools.r8.com.google.gson.internal.LinkedTreeMap -> com.android.tools.r8.a.a.b.a.d:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node header -> e
-    java.util.Comparator NATURAL_ORDER -> h
-    boolean $assertionsDisabled -> i
-    com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet keySet -> g
+    java.util.Comparator NATURAL_ORDER -> g
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node root -> b
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet entrySet -> f
     int modCount -> d
+    boolean $assertionsDisabled -> h
     int size -> c
     java.util.Comparator comparator -> a
     1:3:void <clinit>():38:40 -> <clinit>
@@ -11011,9 +10879,9 @@
     int expectedModCount -> c
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):531:531 -> <init>
     2:4:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):527:529 -> <init>
-    1:9:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():539:547 -> d
-    10:10:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():544:544 -> d
-    11:11:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():541:541 -> d
+    1:9:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():539:547 -> c
+    10:10:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():544:544 -> c
+    11:11:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():541:541 -> c
     1:1:boolean hasNext():535:535 -> hasNext
     1:6:void remove():551:556 -> remove
     7:7:void remove():552:552 -> remove
@@ -11766,7 +11634,7 @@
     26:41:void write(java.util.concurrent.ExecutorService):221:236 -> write
     42:99:void write(java.util.concurrent.ExecutorService):235:292 -> write
     100:110:void write(java.util.concurrent.ExecutorService):285:295 -> write
-com.android.tools.r8.dex.ApplicationWriter$1 -> com.android.tools.r8.dex.ApplicationWriter$1:
+com.android.tools.r8.dex.ApplicationWriter$1 -> com.android.tools.r8.dex.a:
     com.android.tools.r8.dex.ResourceAdapter val$resourceAdapter -> a
     com.android.tools.r8.DataResourceConsumer val$dataResourceConsumer -> b
     java.util.Set val$generatedResourceNames -> d
@@ -11812,7 +11680,7 @@
     1:2:int getUshort():62:63 -> k
     1:1:int position():82:82 -> l
     1:1:void position(int):86:86 -> position
-com.android.tools.r8.dex.CompatByteBuffer -> com.android.tools.r8.dex.a:
+com.android.tools.r8.dex.CompatByteBuffer -> com.android.tools.r8.dex.b:
     java.nio.ByteBuffer buffer -> a
     1:2:void <init>(java.nio.ByteBuffer):21:22 -> <init>
     1:1:java.nio.ByteBuffer asByteBuffer():34:34 -> a
@@ -11934,7 +11802,7 @@
     1:1:int position():143:143 -> position
     1:2:void putByte(byte):108:109 -> putByte
     1:2:void putBytes(byte[]):113:114 -> putBytes
-com.android.tools.r8.dex.DexOutputBuffer$1 -> com.android.tools.r8.dex.DexOutputBuffer$1:
+com.android.tools.r8.dex.DexOutputBuffer$1 -> com.android.tools.r8.dex.c:
     1:1:void <init>():29:29 -> <init>
 com.android.tools.r8.dex.DexParser -> com.android.tools.r8.dex.DexParser:
     com.android.tools.r8.graph.ClassKind classKind -> e
@@ -11950,164 +11818,141 @@
     1:1:void <clinit>():80:80 -> <clinit>
     1:1:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):127:127 -> <init>
     2:19:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):115:132 -> <init>
-    20:42:com.android.tools.r8.dex.DexSection[] parseMap():741:763 -> <init>
+    20:42:com.android.tools.r8.dex.DexSection[] parseMap():736:758 -> <init>
     20:42:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):133 -> <init>
     43:43:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):133:133 -> <init>
-    44:51:void parseStringIDs():718:725 -> <init>
+    44:51:void parseStringIDs():713:720 -> <init>
     44:51:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):134 -> <init>
     52:52:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):135:135 -> <init>
     1:16:void ensureCodesInited():140:155 -> a
-    1:16:void addClassDefsTo(java.util.function.Consumer):617 -> a
-    17:82:com.android.tools.r8.graph.DexCode parseCodeItem():768:833 -> a
+    1:16:void addClassDefsTo(java.util.function.Consumer):612 -> a
+    17:82:com.android.tools.r8.graph.DexCode parseCodeItem():763:828 -> a
     17:82:void ensureCodesInited():156 -> a
-    17:82:void addClassDefsTo(java.util.function.Consumer):617 -> a
+    17:82:void addClassDefsTo(java.util.function.Consumer):612 -> a
     83:83:void ensureCodesInited():157:157 -> a
-    83:83:void addClassDefsTo(java.util.function.Consumer):617 -> a
-    84:143:void addClassDefsTo(java.util.function.Consumer):618:677 -> a
-    144:180:void addClassDefsTo(java.util.function.Consumer):676:712 -> a
-    181:197:void addClassDefsTo(java.util.function.Consumer):697:713 -> a
-    198:198:void addClassDefsTo(java.util.function.Consumer):659:659 -> a
+    83:83:void addClassDefsTo(java.util.function.Consumer):612 -> a
+    84:143:void addClassDefsTo(java.util.function.Consumer):613:672 -> a
+    144:180:void addClassDefsTo(java.util.function.Consumer):671:707 -> a
+    181:197:void addClassDefsTo(java.util.function.Consumer):692:708 -> a
+    198:198:void addClassDefsTo(java.util.function.Consumer):654:654 -> a
     199:208:java.lang.Object cacheAt(int,java.util.function.Supplier):394:403 -> a
     209:209:com.android.tools.r8.graph.DexAnnotation annotationAt(int):416:416 -> a
-    210:225:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):572:587 -> a
-    226:243:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):594:611 -> a
-    244:246:void populateStrings():848:850 -> a
-    244:246:void populateIndexTables():838 -> a
-    247:256:com.android.tools.r8.graph.DexString stringAt(int):1062:1071 -> a
-    247:256:void populateStrings():850 -> a
-    247:256:void populateIndexTables():838 -> a
-    257:257:void populateStrings():850:850 -> a
-    257:257:void populateIndexTables():838 -> a
-    258:259:void populateTypes():871:872 -> a
-    258:259:void populateIndexTables():839 -> a
-    260:279:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):885:904 -> a
-    260:279:void populateTypes():872 -> a
-    260:279:void populateIndexTables():839 -> a
-    280:280:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):899:899 -> a
-    280:280:void populateTypes():872 -> a
-    280:280:void populateIndexTables():839 -> a
-    281:283:void populateTypes():873:875 -> a
-    281:283:void populateIndexTables():839 -> a
-    284:290:com.android.tools.r8.graph.DexType typeAt(int):1075:1081 -> a
-    284:290:void populateTypes():875 -> a
-    284:290:void populateIndexTables():839 -> a
-    291:291:void populateTypes():875:875 -> a
-    291:291:void populateIndexTables():839 -> a
-    292:293:void populateFields():913:914 -> a
-    292:293:void populateIndexTables():840 -> a
-    294:329:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):929:964 -> a
-    294:329:void populateFields():914 -> a
-    294:329:void populateIndexTables():840 -> a
-    330:340:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):961:971 -> a
-    330:340:void populateFields():914 -> a
-    330:340:void populateIndexTables():840 -> a
-    341:345:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):968:972 -> a
-    341:345:void populateFields():914 -> a
-    341:345:void populateIndexTables():840 -> a
-    346:346:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):957:957 -> a
-    346:346:void populateFields():914 -> a
-    346:346:void populateIndexTables():840 -> a
-    347:349:void populateFields():915:917 -> a
-    347:349:void populateIndexTables():840 -> a
-    350:362:com.android.tools.r8.graph.DexField fieldAt(int):1085:1097 -> a
-    350:362:void populateFields():917 -> a
-    350:362:void populateIndexTables():840 -> a
-    363:363:void populateFields():917:917 -> a
-    363:363:void populateIndexTables():840 -> a
-    364:367:void populateProtos():983:986 -> a
-    364:367:void populateIndexTables():841 -> a
-    368:380:com.android.tools.r8.graph.DexProto protoAt(int):1158:1170 -> a
-    368:380:void populateProtos():986 -> a
-    368:380:void populateIndexTables():841 -> a
-    381:381:void populateProtos():986:986 -> a
-    381:381:void populateIndexTables():841 -> a
-    382:383:void populateMethods():991:992 -> a
-    382:383:void populateIndexTables():842 -> a
-    384:419:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1008:1043 -> a
-    384:419:void populateMethods():992 -> a
-    384:419:void populateIndexTables():842 -> a
-    420:430:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1040:1050 -> a
-    420:430:void populateMethods():992 -> a
-    420:430:void populateIndexTables():842 -> a
-    431:435:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1047:1051 -> a
-    431:435:void populateMethods():992 -> a
-    431:435:void populateIndexTables():842 -> a
-    436:436:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1036:1036 -> a
-    436:436:void populateMethods():992 -> a
-    436:436:void populateIndexTables():842 -> a
-    437:439:void populateMethods():993:995 -> a
-    437:439:void populateIndexTables():842 -> a
-    440:452:com.android.tools.r8.graph.DexMethod methodAt(int):1174:1186 -> a
-    440:452:void populateMethods():995 -> a
-    440:452:void populateIndexTables():842 -> a
-    453:453:com.android.tools.r8.graph.DexMethod methodAt(int):1183:1183 -> a
-    453:453:void populateMethods():995 -> a
-    453:453:void populateIndexTables():842 -> a
-    454:454:void populateMethods():995:995 -> a
-    454:454:void populateIndexTables():842 -> a
-    455:458:void populateMethodHandles():855:858 -> a
-    455:458:void populateIndexTables():843 -> a
-    459:486:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1101:1128 -> a
-    459:486:void populateMethodHandles():858 -> a
-    459:486:void populateIndexTables():843 -> a
-    487:487:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1124:1124 -> a
-    487:487:void populateMethodHandles():858 -> a
-    487:487:void populateIndexTables():843 -> a
-    488:504:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1116:1132 -> a
-    488:504:void populateMethodHandles():858 -> a
-    488:504:void populateIndexTables():843 -> a
-    505:505:void populateMethodHandles():858:858 -> a
-    505:505:void populateIndexTables():843 -> a
-    506:509:void populateCallSites():863:866 -> a
-    506:509:void populateIndexTables():844 -> a
-    510:527:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1137:1154 -> a
-    510:527:void populateCallSites():866 -> a
-    510:527:void populateIndexTables():844 -> a
-    528:528:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1149:1149 -> a
-    528:528:void populateCallSites():866 -> a
-    528:528:void populateIndexTables():844 -> a
-    529:529:void populateCallSites():866:866 -> a
-    529:529:void populateIndexTables():844 -> a
+    210:225:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):567:582 -> a
+    226:243:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):589:606 -> a
+    244:246:void populateStrings():843:845 -> a
+    244:246:void populateIndexTables():833 -> a
+    247:256:com.android.tools.r8.graph.DexString stringAt(int):960:969 -> a
+    247:256:void populateStrings():845 -> a
+    247:256:void populateIndexTables():833 -> a
+    257:257:void populateStrings():845:845 -> a
+    257:257:void populateIndexTables():833 -> a
+    258:261:void populateTypes():866:869 -> a
+    258:261:void populateIndexTables():834 -> a
+    262:268:com.android.tools.r8.graph.DexType typeAt(int):973:979 -> a
+    262:268:void populateTypes():869 -> a
+    262:268:void populateIndexTables():834 -> a
+    269:269:void populateTypes():869:869 -> a
+    269:269:void populateIndexTables():834 -> a
+    270:271:void populateFields():874:875 -> a
+    270:271:void populateIndexTables():835 -> a
+    272:307:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):890:925 -> a
+    272:307:void populateFields():875 -> a
+    272:307:void populateIndexTables():835 -> a
+    308:318:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):922:932 -> a
+    308:318:void populateFields():875 -> a
+    308:318:void populateIndexTables():835 -> a
+    319:323:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):929:933 -> a
+    319:323:void populateFields():875 -> a
+    319:323:void populateIndexTables():835 -> a
+    324:324:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):918:918 -> a
+    324:324:void populateFields():875 -> a
+    324:324:void populateIndexTables():835 -> a
+    325:327:void populateFields():876:878 -> a
+    325:327:void populateIndexTables():835 -> a
+    328:340:com.android.tools.r8.graph.DexField fieldAt(int):983:995 -> a
+    328:340:void populateFields():878 -> a
+    328:340:void populateIndexTables():835 -> a
+    341:341:void populateFields():878:878 -> a
+    341:341:void populateIndexTables():835 -> a
+    342:345:void populateProtos():944:947 -> a
+    342:345:void populateIndexTables():836 -> a
+    346:358:com.android.tools.r8.graph.DexProto protoAt(int):1055:1067 -> a
+    346:358:void populateProtos():947 -> a
+    346:358:void populateIndexTables():836 -> a
+    359:359:void populateProtos():947:947 -> a
+    359:359:void populateIndexTables():836 -> a
+    360:363:void populateMethods():952:955 -> a
+    360:363:void populateIndexTables():837 -> a
+    364:376:com.android.tools.r8.graph.DexMethod methodAt(int):1071:1083 -> a
+    364:376:void populateMethods():955 -> a
+    364:376:void populateIndexTables():837 -> a
+    377:377:com.android.tools.r8.graph.DexMethod methodAt(int):1080:1080 -> a
+    377:377:void populateMethods():955 -> a
+    377:377:void populateIndexTables():837 -> a
+    378:378:void populateMethods():955:955 -> a
+    378:378:void populateIndexTables():837 -> a
+    379:382:void populateMethodHandles():850:853 -> a
+    379:382:void populateIndexTables():838 -> a
+    383:410:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):999:1026 -> a
+    383:410:void populateMethodHandles():853 -> a
+    383:410:void populateIndexTables():838 -> a
+    411:411:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1022:1022 -> a
+    411:411:void populateMethodHandles():853 -> a
+    411:411:void populateIndexTables():838 -> a
+    412:428:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1014:1030 -> a
+    412:428:void populateMethodHandles():853 -> a
+    412:428:void populateIndexTables():838 -> a
+    429:429:void populateMethodHandles():853:853 -> a
+    429:429:void populateIndexTables():838 -> a
+    430:433:void populateCallSites():858:861 -> a
+    430:433:void populateIndexTables():839 -> a
+    434:451:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1034:1051 -> a
+    434:451:void populateCallSites():861 -> a
+    434:451:void populateIndexTables():839 -> a
+    452:452:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1046:1046 -> a
+    452:452:void populateCallSites():861 -> a
+    452:452:void populateIndexTables():839 -> a
+    453:453:void populateCallSites():861:861 -> a
+    453:453:void populateIndexTables():839 -> a
     1:2:com.android.tools.r8.graph.DexAnnotation parseAnnotation():411:412 -> b
-    3:3:com.android.tools.r8.graph.DexAnnotationSet annotationSetAt(int):441:441 -> b
+    3:3:com.android.tools.r8.graph.DexAnnotationSet annotationSetAt(int):436:436 -> b
     4:6:java.lang.Object cacheAt(int,java.util.function.Supplier,java.util.function.Supplier):385:387 -> b
-    4:6:com.android.tools.r8.graph.DexAnnotationSet annotationSetAt(int):441 -> b
-    7:7:com.android.tools.r8.graph.DexAnnotationSet annotationSetAt(int):441:441 -> b
+    4:6:com.android.tools.r8.graph.DexAnnotationSet annotationSetAt(int):436 -> b
+    7:7:com.android.tools.r8.graph.DexAnnotationSet annotationSetAt(int):436:436 -> b
     1:1:com.android.tools.r8.graph.ParameterAnnotationsList annotationSetRefListAt(int):344:344 -> c
-    2:16:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():423:437 -> c
-    17:18:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():434:435 -> c
+    2:11:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():423:432 -> c
     1:10:com.android.tools.r8.graph.ParameterAnnotationsList parseAnnotationSetRefList():348:357 -> d
     11:11:void com.android.tools.r8.graph.ParameterAnnotationsList.<init>(com.android.tools.r8.graph.DexAnnotationSet[]):54:54 -> d
     11:11:com.android.tools.r8.graph.ParameterAnnotationsList parseAnnotationSetRefList():357 -> d
-    12:12:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):445:445 -> d
+    12:12:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):440:440 -> d
     13:15:java.lang.Object cacheAt(int,java.util.function.Supplier,java.util.function.Supplier):385:387 -> d
-    13:15:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):445 -> d
-    16:16:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):445:445 -> d
-    1:4:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():450:453 -> e
+    13:15:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):440 -> d
+    16:16:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):440:440 -> d
+    1:4:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():445:448 -> e
     5:18:com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[] parseFieldAnnotations(int):305:318 -> e
-    5:18:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():454 -> e
+    5:18:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():449 -> e
     19:32:com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[] parseMethodAnnotations(int):326:339 -> e
-    19:32:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():455 -> e
+    19:32:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():450 -> e
     33:48:com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[] parseParameterAnnotations(int):364:379 -> e
-    33:48:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():456 -> e
-    49:50:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():457:458 -> e
-    51:51:com.android.tools.r8.graph.DexDebugInfo debugInfoAt(int):465:465 -> e
+    33:48:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():451 -> e
+    49:50:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():452:453 -> e
+    51:51:com.android.tools.r8.graph.DexDebugInfo debugInfoAt(int):460:460 -> e
     1:1:com.android.tools.r8.graph.DexEncodedArray encodedArrayAt(int):298:298 -> f
-    2:66:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():469:533 -> f
-    67:69:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():527:529 -> f
-    70:70:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():523:523 -> f
-    71:71:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():519:519 -> f
-    72:72:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():515:515 -> f
-    73:73:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():511:511 -> f
-    74:82:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():499:507 -> f
-    83:83:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():503:503 -> f
-    84:90:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():488:494 -> f
-    91:91:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():491:491 -> f
-    92:92:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():485:485 -> f
-    93:145:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():482:534 -> f
-    146:205:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():479:538 -> f
+    2:66:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():464:528 -> f
+    67:69:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():522:524 -> f
+    70:70:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():518:518 -> f
+    71:71:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():514:514 -> f
+    72:72:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():510:510 -> f
+    73:73:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():506:506 -> f
+    74:82:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():494:502 -> f
+    83:83:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():498:498 -> f
+    84:90:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():483:489 -> f
+    91:91:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():486:486 -> f
+    92:92:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():480:480 -> f
+    93:145:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():477:529 -> f
+    146:205:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():474:533 -> f
     1:9:com.android.tools.r8.graph.DexEncodedAnnotation parseEncodedAnnotation():272:280 -> g
-    10:16:com.android.tools.r8.dex.DexSection lookupSection(int):730:736 -> g
+    10:16:com.android.tools.r8.dex.DexSection lookupSection(int):725:731 -> g
     1:3:com.android.tools.r8.graph.DexTypeList typeListAt(int):171:173 -> h
     4:4:com.android.tools.r8.graph.DexEncodedArray parseEncodedArray():294:294 -> h
     1:4:com.android.tools.r8.graph.DexValue[] parseEncodedArrayValues():284:287 -> i
@@ -12135,7 +11980,7 @@
     3:6:com.android.tools.r8.dex.DexSection[] parseMapFrom(com.android.tools.r8.dex.DexReader):99:102 -> parseMapFrom
     3:6:com.android.tools.r8.dex.DexSection[] parseMapFrom(java.io.InputStream,com.android.tools.r8.origin.Origin):95 -> parseMapFrom
     3:6:com.android.tools.r8.dex.DexSection[] parseMapFrom(java.nio.file.Path):91 -> parseMapFrom
-com.android.tools.r8.dex.DexParser$1 -> com.android.tools.r8.dex.b:
+com.android.tools.r8.dex.DexParser$1 -> com.android.tools.r8.dex.d:
     1:1:void <init>():101:101 -> <init>
 com.android.tools.r8.dex.DexParser$AnnotationsDirectory -> com.android.tools.r8.dex.DexParser$a:
     com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[] NO_METHOD_ANNOTATIONS -> g
@@ -12146,49 +11991,49 @@
     com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[] NO_FIELD_ANNOTATIONS -> f
     com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[] methods -> c
     com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[] parameters -> d
-    1:11:void <clinit>():1191:1201 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[]):1213:1217 -> <init>
-    1:1:com.android.tools.r8.dex.DexParser$AnnotationsDirectory empty():1221:1221 -> a
+    1:11:void <clinit>():1088:1098 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[]):1110:1114 -> <init>
+    1:1:com.android.tools.r8.dex.DexParser$AnnotationsDirectory empty():1118:1118 -> a
 com.android.tools.r8.dex.DexParser$AttributesAndAnnotations -> com.android.tools.r8.dex.DexParser$b:
     com.android.tools.r8.graph.EnclosingMethodAttribute enclosingMethodAttribute -> b
     java.util.List lazyAnnotations -> d
     com.android.tools.r8.graph.DexAnnotationSet originalAnnotations -> a
     java.util.List innerClasses -> c
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():1225:1225 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1251:1251 -> <init>
-    2:32:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1228:1258 -> <init>
+    1:1:void <clinit>():1122:1122 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1148:1148 -> <init>
+    2:32:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1125:1155 -> <init>
     33:33:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):99:99 -> <init>
-    33:33:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1259 -> <init>
-    34:35:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1260:1261 -> <init>
+    33:33:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1156 -> <init>
+    34:35:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1157:1158 -> <init>
     36:36:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingMethodAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):104:104 -> <init>
-    36:36:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1262 -> <init>
-    37:47:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1263:1273 -> <init>
-    48:48:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1272:1272 -> <init>
+    36:36:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1159 -> <init>
+    37:47:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1160:1170 -> <init>
+    48:48:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1169:1169 -> <init>
     49:49:boolean com.android.tools.r8.graph.DexAnnotation.isMemberClassesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):113:113 -> <init>
-    49:49:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1274 -> <init>
-    50:55:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1275:1280 -> <init>
-    56:57:void copyAnnotation(com.android.tools.r8.graph.DexAnnotation):1340:1341 -> <init>
-    56:57:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1283 -> <init>
-    58:87:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1288:1317 -> <init>
-    88:103:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1312:1327 -> <init>
-    104:104:com.android.tools.r8.graph.InnerClassAttribute com.android.tools.r8.graph.InnerClassAttribute.createUnknownNamedInnerClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):30:30 -> <init>
-    104:104:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1327 -> <init>
-    105:105:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1327:1327 -> <init>
-    1:7:com.android.tools.r8.graph.DexAnnotationSet getAnnotations():1233:1239 -> a
-    8:10:void ensureAnnotations(int):1333:1335 -> a
-    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():1247:1247 -> b
-    1:1:java.util.List getInnerClasses():1243:1243 -> c
+    49:49:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1171 -> <init>
+    50:55:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1172:1177 -> <init>
+    56:57:void copyAnnotation(com.android.tools.r8.graph.DexAnnotation):1237:1238 -> <init>
+    56:57:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1180 -> <init>
+    58:87:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1185:1214 -> <init>
+    88:103:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1209:1224 -> <init>
+    104:104:com.android.tools.r8.graph.InnerClassAttribute com.android.tools.r8.graph.InnerClassAttribute.createUnknownNamedInnerClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):29:29 -> <init>
+    104:104:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1224 -> <init>
+    105:105:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1224:1224 -> <init>
+    1:7:com.android.tools.r8.graph.DexAnnotationSet getAnnotations():1130:1136 -> a
+    8:10:void ensureAnnotations(int):1230:1232 -> a
+    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():1144:1144 -> b
+    1:1:java.util.List getInnerClasses():1140:1140 -> c
 com.android.tools.r8.dex.DexParser$MemberAnnotationIterator -> com.android.tools.r8.dex.DexParser$c:
     java.util.function.Supplier emptyValue -> c
     com.android.tools.r8.graph.DexMemberAnnotation[] annotations -> b
     int index -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier):548:548 -> <init>
-    1:1:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier,com.android.tools.r8.dex.DexParser$1):541 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier):543:550 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier,com.android.tools.r8.dex.DexParser$1):541 -> <init>
-    1:7:com.android.tools.r8.graph.DexItem getNextFor(com.android.tools.r8.graph.Descriptor):560:566 -> a
-    8:8:com.android.tools.r8.graph.DexItem getNextFor(com.android.tools.r8.graph.Descriptor):564:564 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier):543:543 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier,com.android.tools.r8.dex.DexParser$1):536 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier):538:545 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier,com.android.tools.r8.dex.DexParser$1):536 -> <init>
+    1:7:com.android.tools.r8.graph.DexItem getNextFor(com.android.tools.r8.graph.Descriptor):555:561 -> a
+    8:8:com.android.tools.r8.graph.DexItem getNextFor(com.android.tools.r8.graph.Descriptor):559:559 -> a
 com.android.tools.r8.dex.DexReader -> com.android.tools.r8.dex.DexReader:
     int version -> d
     1:1:void com.android.tools.r8.dex.BinaryReader.<init>(com.android.tools.r8.ProgramResource):22:22 -> <init>
@@ -12229,7 +12074,7 @@
     void setEnd(int) -> a
     1:1:java.lang.String typeName():33:33 -> a
     1:1:java.lang.String toString():83:83 -> toString
-com.android.tools.r8.dex.FileWriter -> com.android.tools.r8.dex.d:
+com.android.tools.r8.dex.FileWriter -> com.android.tools.r8.dex.j:
     com.android.tools.r8.graph.ObjectToOffsetMapping mapping -> a
     com.android.tools.r8.utils.InternalOptions options -> d
     com.android.tools.r8.dex.MethodToCodeObjectMapping codeMapping -> b
@@ -12262,19 +12107,19 @@
     163:168:void writeTypeList(com.android.tools.r8.graph.DexTypeList):500:505 -> a
     169:171:void writeStringData(com.android.tools.r8.graph.DexString):510:512 -> a
     172:172:com.android.tools.r8.graph.DexType lambda$writeAnnotationSet$2(com.android.tools.r8.graph.DexAnnotation):525:525 -> a
-    173:181:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):525:533 -> a
-    182:191:void writeAnnotationSetRefList(com.android.tools.r8.graph.ParameterAnnotationsList):538:547 -> a
-    192:194:void writeMemberAnnotations(java.util.List,java.util.function.ToIntFunction):553:555 -> a
-    195:207:void writeAnnotationDirectory(com.android.tools.r8.graph.DexAnnotationDirectory):560:572 -> a
-    208:208:int lambda$writeAnnotationDirectory$3(com.android.tools.r8.graph.DexEncodedField):569:569 -> a
-    209:216:void writeEncodedFields(java.util.List):577:584 -> a
-    217:233:void writeEncodedMethods(java.util.List,boolean):589:605 -> a
-    234:240:void addStaticFieldValues(com.android.tools.r8.graph.DexProgramClass):625:631 -> a
-    241:248:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):636:643 -> a
-    249:267:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):640:658 -> a
-    268:270:void writeCallSite(com.android.tools.r8.graph.DexCallSite):662:664 -> a
-    271:277:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):668:674 -> a
-    278:281:int writeMapItem(int,int,int):685:688 -> a
+    173:180:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):525:532 -> a
+    181:190:void writeAnnotationSetRefList(com.android.tools.r8.graph.ParameterAnnotationsList):537:546 -> a
+    191:193:void writeMemberAnnotations(java.util.List,java.util.function.ToIntFunction):552:554 -> a
+    194:206:void writeAnnotationDirectory(com.android.tools.r8.graph.DexAnnotationDirectory):559:571 -> a
+    207:207:int lambda$writeAnnotationDirectory$3(com.android.tools.r8.graph.DexEncodedField):568:568 -> a
+    208:215:void writeEncodedFields(java.util.List):576:583 -> a
+    216:232:void writeEncodedMethods(java.util.List,boolean):588:604 -> a
+    233:239:void addStaticFieldValues(com.android.tools.r8.graph.DexProgramClass):624:630 -> a
+    240:247:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):635:642 -> a
+    248:266:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):639:657 -> a
+    267:269:void writeCallSite(com.android.tools.r8.graph.DexCallSite):661:663 -> a
+    270:276:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):667:673 -> a
+    277:280:int writeMapItem(int,int,int):684:687 -> a
     1:7:void checkInterfaceMethods():225:231 -> b
     1:7:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():155 -> b
     8:18:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():157:167 -> b
@@ -12284,83 +12129,83 @@
     21:39:int sizeOfCodeItems(java.lang.Iterable):356 -> b
     21:39:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():167 -> b
     40:72:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():167:199 -> b
-    73:78:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):693:698 -> b
+    73:78:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):692:697 -> b
     73:78:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    79:82:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):697:700 -> b
+    79:82:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):696:699 -> b
     79:82:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    83:86:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):699:702 -> b
+    83:86:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):698:701 -> b
     83:86:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    87:90:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):701:704 -> b
+    87:90:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):700:703 -> b
     87:90:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    91:94:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):703:706 -> b
+    91:94:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):702:705 -> b
     91:94:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    95:98:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):705:708 -> b
+    95:98:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):704:707 -> b
     95:98:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    99:102:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):707:710 -> b
+    99:102:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):706:709 -> b
     99:102:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    103:106:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):709:712 -> b
+    103:106:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):708:711 -> b
     103:106:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    107:110:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):711:714 -> b
+    107:110:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):710:713 -> b
     107:110:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    111:114:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):713:716 -> b
+    111:114:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):712:715 -> b
     111:114:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    115:118:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):715:718 -> b
+    115:118:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):714:717 -> b
     115:118:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    119:122:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):717:720 -> b
+    119:122:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):716:719 -> b
     119:122:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    123:126:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):719:722 -> b
+    123:126:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):718:721 -> b
     123:126:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    127:130:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):721:724 -> b
+    127:130:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):720:723 -> b
     127:130:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    131:134:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):723:726 -> b
+    131:134:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):722:725 -> b
     131:134:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    135:138:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):725:728 -> b
+    135:138:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):724:727 -> b
     135:138:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    139:143:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):727:731 -> b
+    139:143:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):726:730 -> b
     139:143:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    144:149:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):729:734 -> b
+    144:149:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):728:733 -> b
     144:149:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
-    150:156:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):732:738 -> b
+    150:156:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):731:737 -> b
     150:156:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():200 -> b
     157:166:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():201:210 -> b
     167:169:void writeFixedSectionItems(com.android.tools.r8.graph.DexProgramClass[],int,java.util.function.Consumer):331:333 -> b
     167:169:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():210 -> b
     170:172:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():211:213 -> b
     173:173:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():212:212 -> b
-    174:179:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):742:747 -> b
+    174:179:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):741:746 -> b
     174:179:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():216 -> b
-    180:213:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):744:777 -> b
+    180:213:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):743:776 -> b
     180:213:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():216 -> b
-    214:216:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):782:784 -> b
+    214:216:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):781:783 -> b
     214:216:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():217 -> b
-    217:219:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):783:785 -> b
+    217:219:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):782:784 -> b
     217:219:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():217 -> b
-    220:222:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):792:794 -> b
+    220:222:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):791:793 -> b
     220:222:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():218 -> b
-    223:226:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):793:796 -> b
+    223:226:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):792:795 -> b
     223:226:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():218 -> b
     227:227:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():221:221 -> b
-    228:228:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):787:787 -> b
+    228:228:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):786:786 -> b
     228:228:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():217 -> b
     229:229:void writeStringItem(com.android.tools.r8.graph.DexString):393:393 -> b
     230:235:void writeAnnotation(com.android.tools.r8.graph.DexAnnotation):516:521 -> b
-    236:236:int lambda$writeAnnotationDirectory$4(com.android.tools.r8.graph.DexEncodedMethod):571:571 -> b
-    237:247:void writeClassData(com.android.tools.r8.graph.DexProgramClass):611:621 -> b
+    236:236:int lambda$writeAnnotationDirectory$4(com.android.tools.r8.graph.DexEncodedMethod):570:570 -> b
+    237:247:void writeClassData(com.android.tools.r8.graph.DexProgramClass):610:620 -> b
     1:4:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):430:433 -> c
     5:9:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):432:436 -> c
     10:14:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):435:439 -> c
-    15:15:int lambda$writeAnnotationDirectory$5(com.android.tools.r8.graph.DexEncodedMethod):573:573 -> c
-    16:17:void checkThatInvokeCustomIsAllowed():1330:1331 -> c
+    15:15:int lambda$writeAnnotationDirectory$5(com.android.tools.r8.graph.DexEncodedMethod):572:572 -> c
+    16:17:void checkThatInvokeCustomIsAllowed():1329:1330 -> c
     1:15:java.util.List sortDexCodesByClassName():286:300 -> d
-com.android.tools.r8.dex.FileWriter$1 -> com.android.tools.r8.dex.c:
+com.android.tools.r8.dex.FileWriter$1 -> com.android.tools.r8.dex.e:
     int[] $SwitchMap$com$android$tools$r8$graph$DexMethodHandle$MethodHandleType -> a
-    1:1:void <clinit>():638:638 -> <clinit>
-com.android.tools.r8.dex.FileWriter$ByteBufferResult -> com.android.tools.r8.dex.d$a:
+    1:1:void <clinit>():637:637 -> <clinit>
+com.android.tools.r8.dex.FileWriter$ByteBufferResult -> com.android.tools.r8.dex.f:
     com.android.tools.r8.dex.CompatByteBuffer buffer -> a
     int length -> b
     1:3:void <init>(com.android.tools.r8.dex.CompatByteBuffer,int):82:84 -> <init>
     1:3:void <init>(com.android.tools.r8.dex.CompatByteBuffer,int,com.android.tools.r8.dex.FileWriter$1):77 -> <init>
-com.android.tools.r8.dex.FileWriter$Layout -> com.android.tools.r8.dex.e:
+com.android.tools.r8.dex.FileWriter$Layout -> com.android.tools.r8.dex.g:
     int annotationsOffset -> n
     int annotationSetsOffset -> o
     int typeListsOffset -> l
@@ -12383,40 +12228,40 @@
     int encodedArrarysOffset -> s
     int annotationSetRefListsOffset -> p
     int annotationDirectoriesOffset -> q
-    1:1:void <clinit>():804:804 -> <clinit>
-    1:1:void <init>(int,int,int,int,int,int,int,int,int):836:836 -> <init>
-    2:35:void <init>(int,int,int,int,int,int,int,int,int):820:853 -> <init>
+    1:1:void <clinit>():803:803 -> <clinit>
+    1:1:void <init>(int,int,int,int,int,int,int,int,int):835:835 -> <init>
+    2:35:void <init>(int,int,int,int,int,int,int,int,int):819:852 -> <init>
     void alreadySetOffset(int) -> a
-    1:10:com.android.tools.r8.dex.FileWriter$Layout from(com.android.tools.r8.graph.ObjectToOffsetMapping):858:867 -> a
-    11:11:boolean isValidOffset(int,boolean):877:877 -> a
-    12:13:int getAnnotationDirectoriesOffset():955:956 -> a
-    1:2:int getAnnotationSetRefListsOffset():945:946 -> b
-    3:4:void setAnnotationDirectoriesOffset(int):960:961 -> b
-    1:2:int getAnnotationSetsOffset():931:932 -> c
-    3:4:void setAnnotationSetRefListsOffset(int):950:951 -> c
-    1:2:int getAnnotationsOffset():921:922 -> d
-    3:4:void setAnnotationSetsOffset(int):940:941 -> d
-    1:2:void setAnnotationsOffset(int):926:927 -> e
-    3:4:int getClassDataOffset():965:966 -> e
-    1:2:int getCodesOffset():881:882 -> f
-    3:4:void setClassDataOffset(int):970:971 -> f
-    1:2:void setCodesOffset(int):886:887 -> g
-    3:3:int getEndOfFile():993:993 -> g
-    3:3:int getDataSectionSize():871 -> g
-    4:5:int getDataSectionSize():871:872 -> g
-    1:2:int getDebugInfosOffset():891:892 -> h
-    3:4:void setDebugInfosOffset(int):896:897 -> h
-    1:2:int getEncodedArrarysOffset():975:976 -> i
-    3:4:void setEncodedArrarysOffset(int):980:981 -> i
-    1:1:int getEndOfFile():993:993 -> j
-    2:2:void setEndOfFile(int):997:997 -> j
-    1:1:int getMapOffset():985:985 -> k
-    2:2:void setMapOffset(int):989:989 -> k
-    1:2:int getStringDataOffsets():911:912 -> l
-    3:4:void setStringDataOffsets(int):916:917 -> l
-    1:2:int getTypeListsOffset():901:902 -> m
-    3:4:void setTypeListsOffset(int):906:907 -> m
-com.android.tools.r8.dex.FileWriter$MixedSectionOffsets -> com.android.tools.r8.dex.f:
+    1:10:com.android.tools.r8.dex.FileWriter$Layout from(com.android.tools.r8.graph.ObjectToOffsetMapping):857:866 -> a
+    11:11:boolean isValidOffset(int,boolean):876:876 -> a
+    12:13:int getAnnotationDirectoriesOffset():954:955 -> a
+    1:2:int getAnnotationSetRefListsOffset():944:945 -> b
+    3:4:void setAnnotationDirectoriesOffset(int):959:960 -> b
+    1:2:int getAnnotationSetsOffset():930:931 -> c
+    3:4:void setAnnotationSetRefListsOffset(int):949:950 -> c
+    1:2:int getAnnotationsOffset():920:921 -> d
+    3:4:void setAnnotationSetsOffset(int):939:940 -> d
+    1:2:void setAnnotationsOffset(int):925:926 -> e
+    3:4:int getClassDataOffset():964:965 -> e
+    1:2:int getCodesOffset():880:881 -> f
+    3:4:void setClassDataOffset(int):969:970 -> f
+    1:2:void setCodesOffset(int):885:886 -> g
+    3:3:int getEndOfFile():992:992 -> g
+    3:3:int getDataSectionSize():870 -> g
+    4:5:int getDataSectionSize():870:871 -> g
+    1:2:int getDebugInfosOffset():890:891 -> h
+    3:4:void setDebugInfosOffset(int):895:896 -> h
+    1:2:int getEncodedArrarysOffset():974:975 -> i
+    3:4:void setEncodedArrarysOffset(int):979:980 -> i
+    1:1:int getEndOfFile():992:992 -> j
+    2:2:void setEndOfFile(int):996:996 -> j
+    1:1:int getMapOffset():984:984 -> k
+    2:2:void setMapOffset(int):988:988 -> k
+    1:2:int getStringDataOffsets():910:911 -> l
+    3:4:void setStringDataOffsets(int):915:916 -> l
+    1:2:int getTypeListsOffset():900:901 -> m
+    3:4:void setTypeListsOffset(int):905:906 -> m
+com.android.tools.r8.dex.FileWriter$MixedSectionOffsets -> com.android.tools.r8.dex.h:
     boolean $assertionsDisabled -> n
     int minApiLevel -> m
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap debugInfos -> c
@@ -12431,103 +12276,103 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap classesWithData -> j
     java.util.Map clazzToAnnotationDirectory -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap encodedArrays -> k
-    1:1:void <clinit>():1009:1009 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping):1045:1045 -> <init>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.dex.FileWriter$1):1009 -> <init>
-    2:33:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping):1016:1047 -> <init>
-    2:33:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.dex.FileWriter$1):1009 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$100(com.android.tools.r8.dex.FileWriter$MixedSectionOffsets):1009:1009 -> a
-    2:3:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,java.lang.Object):1051:1052 -> a
-    4:4:boolean add(com.android.tools.r8.graph.DexProgramClass):1068:1068 -> a
-    5:5:boolean add(com.android.tools.r8.graph.DexEncodedArray):1073:1073 -> a
-    6:9:boolean add(com.android.tools.r8.graph.DexAnnotationSet):1080:1083 -> a
-    10:10:void visit(com.android.tools.r8.graph.DexEncodedMethod):1088:1088 -> a
-    11:11:boolean add(com.android.tools.r8.graph.DexCode):1093:1093 -> a
-    12:13:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1059:1060 -> a
-    12:13:boolean add(com.android.tools.r8.graph.DexCode):1093 -> a
-    14:14:boolean add(com.android.tools.r8.graph.DexDebugInfo):1098:1098 -> a
-    15:18:boolean add(com.android.tools.r8.graph.DexTypeList):1103:1106 -> a
-    19:22:boolean add(com.android.tools.r8.graph.ParameterAnnotationsList):1111:1114 -> a
-    23:23:boolean add(com.android.tools.r8.graph.DexAnnotation):1119:1119 -> a
-    24:26:boolean setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory):1125:1127 -> a
-    27:27:boolean add(com.android.tools.r8.graph.DexString):1131:1131 -> a
-    28:29:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1059:1060 -> a
-    28:29:boolean add(com.android.tools.r8.graph.DexString):1131 -> a
-    30:30:java.util.Collection getAnnotationDirectories():1167:1167 -> a
+    1:1:void <clinit>():1008:1008 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping):1044:1044 -> <init>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.dex.FileWriter$1):1008 -> <init>
+    2:33:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping):1015:1046 -> <init>
+    2:33:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.dex.FileWriter$1):1008 -> <init>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$100(com.android.tools.r8.dex.FileWriter$MixedSectionOffsets):1008:1008 -> a
+    2:3:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,java.lang.Object):1050:1051 -> a
+    4:4:boolean add(com.android.tools.r8.graph.DexProgramClass):1067:1067 -> a
+    5:5:boolean add(com.android.tools.r8.graph.DexEncodedArray):1072:1072 -> a
+    6:9:boolean add(com.android.tools.r8.graph.DexAnnotationSet):1079:1082 -> a
+    10:10:void visit(com.android.tools.r8.graph.DexEncodedMethod):1087:1087 -> a
+    11:11:boolean add(com.android.tools.r8.graph.DexCode):1092:1092 -> a
+    12:13:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1058:1059 -> a
+    12:13:boolean add(com.android.tools.r8.graph.DexCode):1092 -> a
+    14:14:boolean add(com.android.tools.r8.graph.DexDebugInfo):1097:1097 -> a
+    15:18:boolean add(com.android.tools.r8.graph.DexTypeList):1102:1105 -> a
+    19:22:boolean add(com.android.tools.r8.graph.ParameterAnnotationsList):1110:1113 -> a
+    23:23:boolean add(com.android.tools.r8.graph.DexAnnotation):1118:1118 -> a
+    24:26:boolean setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory):1124:1126 -> a
+    27:27:boolean add(com.android.tools.r8.graph.DexString):1130:1130 -> a
+    28:29:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1058:1059 -> a
+    28:29:boolean add(com.android.tools.r8.graph.DexString):1130 -> a
+    30:30:java.util.Collection getAnnotationDirectories():1166:1166 -> a
     31:31:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.keySet():87:87 -> a
-    31:31:java.util.Collection getAnnotationDirectories():1167 -> a
-    32:33:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1178:1179 -> a
-    34:35:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1187:1188 -> a
-    36:37:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1250:1251 -> a
-    38:39:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1255:1256 -> a
-    40:40:void setOffsetFor(com.android.tools.r8.graph.DexDebugInfo,int):1260:1260 -> a
-    41:41:void setOffsetFor(com.android.tools.r8.graph.DexCode,int):1264:1264 -> a
-    42:43:void setOffsetFor(com.android.tools.r8.graph.DexTypeList,int):1268:1269 -> a
-    44:44:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1273:1273 -> a
-    45:45:void setOffsetFor(com.android.tools.r8.graph.DexAnnotation,int):1277:1277 -> a
-    46:47:void setOffsetFor(com.android.tools.r8.graph.DexAnnotationSet,int):1283:1284 -> a
-    48:48:void setOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexAnnotationDirectory,int):1288:1288 -> a
-    49:49:void setOffsetFor(com.android.tools.r8.graph.DexProgramClass,int):1292:1292 -> a
-    50:50:void setOffsetFor(com.android.tools.r8.graph.DexEncodedArray,int):1296:1296 -> a
-    51:52:void setOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList,int):1300:1301 -> a
-    1:1:java.util.Collection getAnnotationSetRefLists():1159:1159 -> b
+    31:31:java.util.Collection getAnnotationDirectories():1166 -> a
+    32:33:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1177:1178 -> a
+    34:35:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1186:1187 -> a
+    36:37:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1249:1250 -> a
+    38:39:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1254:1255 -> a
+    40:40:void setOffsetFor(com.android.tools.r8.graph.DexDebugInfo,int):1259:1259 -> a
+    41:41:void setOffsetFor(com.android.tools.r8.graph.DexCode,int):1263:1263 -> a
+    42:43:void setOffsetFor(com.android.tools.r8.graph.DexTypeList,int):1267:1268 -> a
+    44:44:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1272:1272 -> a
+    45:45:void setOffsetFor(com.android.tools.r8.graph.DexAnnotation,int):1276:1276 -> a
+    46:47:void setOffsetFor(com.android.tools.r8.graph.DexAnnotationSet,int):1282:1283 -> a
+    48:48:void setOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexAnnotationDirectory,int):1287:1287 -> a
+    49:49:void setOffsetFor(com.android.tools.r8.graph.DexProgramClass,int):1291:1291 -> a
+    50:50:void setOffsetFor(com.android.tools.r8.graph.DexEncodedArray,int):1295:1295 -> a
+    51:52:void setOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList,int):1299:1300 -> a
+    1:1:java.util.Collection getAnnotationSetRefLists():1158:1158 -> b
     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 -> b
-    2:2:java.util.Collection getAnnotationSetRefLists():1159 -> b
-    3:3:int getOffsetFor(com.android.tools.r8.graph.DexString):1193:1193 -> b
-    4:7:int getOffsetFor(com.android.tools.r8.graph.DexTypeList):1197:1200 -> b
-    8:8:int getOffsetFor(com.android.tools.r8.graph.DexProgramClass):1204:1204 -> b
-    9:9:int getOffsetFor(com.android.tools.r8.graph.DexEncodedArray):1208:1208 -> b
-    10:10:int getOffsetFor(com.android.tools.r8.graph.DexDebugInfo):1212:1212 -> b
-    11:11:int getOffsetFor(com.android.tools.r8.graph.DexAnnotation):1226:1226 -> b
-    12:15:int getOffsetFor(com.android.tools.r8.graph.DexAnnotationSet):1232:1235 -> b
-    16:19:int getOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList):1239:1242 -> b
-    20:20:int getOffsetFor(com.android.tools.r8.graph.DexCode):1246:1246 -> b
-    1:1:java.util.Collection getAnnotationSets():1155:1155 -> c
+    2:2:java.util.Collection getAnnotationSetRefLists():1158 -> b
+    3:3:int getOffsetFor(com.android.tools.r8.graph.DexString):1192:1192 -> b
+    4:7:int getOffsetFor(com.android.tools.r8.graph.DexTypeList):1196:1199 -> b
+    8:8:int getOffsetFor(com.android.tools.r8.graph.DexProgramClass):1203:1203 -> b
+    9:9:int getOffsetFor(com.android.tools.r8.graph.DexEncodedArray):1207:1207 -> b
+    10:10:int getOffsetFor(com.android.tools.r8.graph.DexDebugInfo):1211:1211 -> b
+    11:11:int getOffsetFor(com.android.tools.r8.graph.DexAnnotation):1225:1225 -> b
+    12:15:int getOffsetFor(com.android.tools.r8.graph.DexAnnotationSet):1231:1234 -> b
+    16:19:int getOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList):1238:1241 -> b
+    20:20:int getOffsetFor(com.android.tools.r8.graph.DexCode):1245:1245 -> b
+    1:1:java.util.Collection getAnnotationSets():1154:1154 -> 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 getAnnotationSets():1155 -> c
-    3:7:int getOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexProgramClass):1217:1221 -> c
-    1:1:java.util.Collection getAnnotations():1151:1151 -> d
+    2:2:java.util.Collection getAnnotationSets():1154 -> c
+    3:7:int getOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexProgramClass):1216:1220 -> c
+    1:1:java.util.Collection getAnnotations():1150:1150 -> d
     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 -> d
-    2:2:java.util.Collection getAnnotations():1151 -> d
-    1:1:java.util.Collection getClassesWithData():1163:1163 -> e
+    2:2:java.util.Collection getAnnotations():1150 -> d
+    1:1:java.util.Collection getClassesWithData():1162:1162 -> e
     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 -> e
-    2:2:java.util.Collection getClassesWithData():1163 -> e
-    1:1:java.util.Collection getCodes():1135:1135 -> f
-    1:1:java.util.Collection getDebugInfos():1139:1139 -> g
+    2:2:java.util.Collection getClassesWithData():1162 -> e
+    1:1:java.util.Collection getCodes():1134:1134 -> f
+    1:1:java.util.Collection getDebugInfos():1138:1138 -> g
     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 -> g
-    2:2:java.util.Collection getDebugInfos():1139 -> g
-    1:1:java.util.Collection getEncodedArrays():1171:1171 -> h
+    2:2:java.util.Collection getDebugInfos():1138 -> g
+    1:1:java.util.Collection getEncodedArrays():1170:1170 -> h
     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 -> h
-    2:2:java.util.Collection getEncodedArrays():1171 -> h
-    1:1:java.util.Collection getStringData():1147:1147 -> i
-    1:1:java.util.Collection getTypeLists():1143:1143 -> j
+    2:2:java.util.Collection getEncodedArrays():1170 -> h
+    1:1:java.util.Collection getStringData():1146:1146 -> i
+    1:1:java.util.Collection getTypeLists():1142:1142 -> j
     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 -> j
-    2:2:java.util.Collection getTypeLists():1143 -> j
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap createObject2IntMap():1034:1035 -> k
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1040:1040 -> l
+    2:2:java.util.Collection getTypeLists():1142 -> j
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap createObject2IntMap():1033:1034 -> k
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1039:1039 -> l
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.<init>():176:176 -> l
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1040 -> l
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1041:1041 -> l
-com.android.tools.r8.dex.FileWriter$ProgramClassDependencyCollector -> com.android.tools.r8.dex.g:
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1039 -> l
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1040:1040 -> l
+com.android.tools.r8.dex.FileWriter$ProgramClassDependencyCollector -> com.android.tools.r8.dex.i:
     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[]):1309:1310 -> <init>
-    3:7:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1307:1311 -> <init>
+    1:2:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1308:1309 -> <init>
+    3:7:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1306:1310 -> <init>
     void visit(com.android.tools.r8.graph.DexType) -> a
-    1:4:void visit(com.android.tools.r8.graph.DexClass):1322:1325 -> a
-com.android.tools.r8.dex.IndexedItemCollection -> com.android.tools.r8.dex.h:
+    1:4:void visit(com.android.tools.r8.graph.DexClass):1321:1324 -> a
+com.android.tools.r8.dex.IndexedItemCollection -> com.android.tools.r8.dex.k:
     boolean addCallSite(com.android.tools.r8.graph.DexCallSite) -> a
     boolean addClass(com.android.tools.r8.graph.DexProgramClass) -> a
+    boolean addField(com.android.tools.r8.graph.DexField) -> a
+    boolean addMethod(com.android.tools.r8.graph.DexMethod) -> a
     boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle) -> a
     boolean addProto(com.android.tools.r8.graph.DexProto) -> a
     boolean addString(com.android.tools.r8.graph.DexString) -> a
-    1:1:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):103:103 -> a
-    2:2:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):107:107 -> a
-    3:3:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):111:111 -> a
-    boolean addField(com.android.tools.r8.graph.DexField) -> b
-    boolean addMethod(com.android.tools.r8.graph.DexMethod) -> b
-    boolean addType(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.dex.InheritanceClassInDexDistributor -> com.android.tools.r8.dex.l:
+    boolean addType(com.android.tools.r8.graph.DexType) -> a
+    1:1:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):103:103 -> b
+    2:2:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):107:107 -> b
+    3:3:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):111:111 -> b
+com.android.tools.r8.dex.InheritanceClassInDexDistributor -> com.android.tools.r8.dex.o:
     com.android.tools.r8.dex.VirtualFile mainDex -> b
     com.android.tools.r8.dex.InheritanceClassInDexDistributor$DirectSubClassesInfo directSubClasses -> i
     java.util.Comparator DEX_PROGRAM_CLASS_COMPARATOR -> j
@@ -12598,7 +12443,7 @@
     146:146:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):653:653 -> b
     147:148:java.util.List getSortedCopy(java.util.Collection):682:683 -> b
     1:1:com.android.tools.r8.graph.DexApplication access$400(com.android.tools.r8.dex.InheritanceClassInDexDistributor):43:43 -> c
-com.android.tools.r8.dex.InheritanceClassInDexDistributor$CategorizedInheritanceGroupWithMainDexDependency -> com.android.tools.r8.dex.i:
+com.android.tools.r8.dex.InheritanceClassInDexDistributor$CategorizedInheritanceGroupWithMainDexDependency -> com.android.tools.r8.dex.l:
     com.android.tools.r8.dex.InheritanceClassInDexDistributor this$0 -> d
     java.util.Set dependentsOfMainDexIndependents -> c
     boolean $assertionsDisabled -> e
@@ -12611,7 +12456,7 @@
     1:12:boolean isDependingOnMainDexClass(java.util.Set,com.android.tools.r8.graph.DexProgramClass):166:177 -> a
     13:28:boolean isDependingOnMainDexClass(java.util.Set,com.android.tools.r8.graph.DexProgramClass):176:191 -> a
     29:56:boolean isDependingOnMainDexIndependents(com.android.tools.r8.graph.DexProgramClass):203:230 -> a
-com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup -> com.android.tools.r8.dex.j:
+com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup -> com.android.tools.r8.dex.m:
     com.android.tools.r8.dex.InheritanceClassInDexDistributor this$0 -> e
     boolean $assertionsDisabled -> f
     java.util.Set members -> a
@@ -12632,7 +12477,7 @@
     5:25:int compareTo(java.lang.Object):54 -> compareTo
     26:29:int compareTo(com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup):107:110 -> compareTo
     26:29:int compareTo(java.lang.Object):54 -> compareTo
-com.android.tools.r8.dex.InheritanceClassInDexDistributor$DirectSubClassesInfo -> com.android.tools.r8.dex.k:
+com.android.tools.r8.dex.InheritanceClassInDexDistributor$DirectSubClassesInfo -> com.android.tools.r8.dex.n:
     java.util.Map directSubClasses -> a
     java.util.Set classes -> b
     boolean $assertionsDisabled -> c
@@ -12756,12 +12601,12 @@
     1:1:void <clinit>():26:26 -> <clinit>
     1:1:void <init>(java.lang.String,int):26:26 -> <init>
     1:1:com.android.tools.r8.dex.Marker$Tool[] values():26:26 -> values
-com.android.tools.r8.dex.MethodToCodeObjectMapping -> com.android.tools.r8.dex.o:
+com.android.tools.r8.dex.MethodToCodeObjectMapping -> com.android.tools.r8.dex.r:
     1:1:void <init>():12:12 -> <init>
     void clearCode(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
     com.android.tools.r8.graph.DexCode getCode(com.android.tools.r8.graph.DexEncodedMethod) -> a
     boolean verifyCodeObjects(java.util.Collection) -> a
-com.android.tools.r8.dex.MethodToCodeObjectMapping$MapBacking -> com.android.tools.r8.dex.m:
+com.android.tools.r8.dex.MethodToCodeObjectMapping$MapBacking -> com.android.tools.r8.dex.p:
     java.util.Map codes -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():53:53 -> <clinit>
@@ -12769,7 +12614,7 @@
     1:1:com.android.tools.r8.graph.DexCode getCode(com.android.tools.r8.graph.DexEncodedMethod):63:63 -> a
     2:2:void clearCode(com.android.tools.r8.graph.DexEncodedMethod,boolean):69:69 -> a
     3:3:boolean verifyCodeObjects(java.util.Collection):74:74 -> a
-com.android.tools.r8.dex.MethodToCodeObjectMapping$MethodBacking -> com.android.tools.r8.dex.n:
+com.android.tools.r8.dex.MethodToCodeObjectMapping$MethodBacking -> com.android.tools.r8.dex.q:
     com.android.tools.r8.dex.MethodToCodeObjectMapping$MethodBacking INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():28:30 -> <clinit>
@@ -12778,7 +12623,7 @@
     1:1:com.android.tools.r8.dex.MethodToCodeObjectMapping$MethodBacking access$000():28:28 -> a
     2:4:com.android.tools.r8.graph.DexCode getCode(com.android.tools.r8.graph.DexEncodedMethod):34:36 -> a
     5:5:void clearCode(com.android.tools.r8.graph.DexEncodedMethod,boolean):43:43 -> a
-com.android.tools.r8.dex.MixedSectionCollection -> com.android.tools.r8.dex.p:
+com.android.tools.r8.dex.MixedSectionCollection -> com.android.tools.r8.dex.s:
     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
@@ -12792,7 +12637,7 @@
     1:1:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
     1:1:void visit(com.android.tools.r8.graph.DexEncodedMethod):63 -> a
     2:2:void visit(com.android.tools.r8.graph.DexEncodedMethod):62:62 -> a
-com.android.tools.r8.dex.ResourceAdapter -> com.android.tools.r8.dex.w:
+com.android.tools.r8.dex.ResourceAdapter -> com.android.tools.r8.dex.z:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.GraphLense graphLense -> c
@@ -12822,32 +12667,32 @@
     1:1:com.android.tools.r8.graph.GraphLense access$100(com.android.tools.r8.dex.ResourceAdapter):32:32 -> b
     2:23:boolean shouldBeDeleted(com.android.tools.r8.DataEntryResource):100:121 -> b
     1:1:com.android.tools.r8.naming.NamingLens access$200(com.android.tools.r8.dex.ResourceAdapter):32:32 -> c
-com.android.tools.r8.dex.ResourceAdapter$DefaultFileNameAdapter -> com.android.tools.r8.dex.q:
+com.android.tools.r8.dex.ResourceAdapter$DefaultFileNameAdapter -> com.android.tools.r8.dex.t:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):435:435 -> <init>
     1:1:boolean isRenamingCandidate(int,int):440:440 -> b
-com.android.tools.r8.dex.ResourceAdapter$DirectoryNameAdapter -> com.android.tools.r8.dex.r:
+com.android.tools.r8.dex.ResourceAdapter$DirectoryNameAdapter -> com.android.tools.r8.dex.u:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):467:467 -> <init>
     boolean isRenamingCandidate(int,int) -> b
-com.android.tools.r8.dex.ResourceAdapter$FileContentsAdapter -> com.android.tools.r8.dex.s:
+com.android.tools.r8.dex.ResourceAdapter$FileContentsAdapter -> com.android.tools.r8.dex.v:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):369:369 -> <init>
     boolean allowRenamingOfPrefixes() -> a
     1:1:boolean shouldRecordPrefix(char):384:384 -> a
     2:2:boolean handlePrefix(int,int):389:389 -> a
     1:2:boolean isRenamingCandidate(int,int):395:396 -> b
     char getClassNameSeparator() -> c
-com.android.tools.r8.dex.ResourceAdapter$FileNameAdapter -> com.android.tools.r8.dex.t:
+com.android.tools.r8.dex.ResourceAdapter$FileNameAdapter -> com.android.tools.r8.dex.w:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):406:406 -> <init>
     boolean allowRenamingOfPrefixes() -> a
     1:1:boolean shouldRecordPrefix(char):421:421 -> a
     2:5:boolean handlePrefix(int,int):426:429 -> a
     6:6:boolean handlePrefix(int,int):427:427 -> a
     char getClassNameSeparator() -> c
-com.android.tools.r8.dex.ResourceAdapter$ServiceFileNameAdapter -> com.android.tools.r8.dex.u:
+com.android.tools.r8.dex.ResourceAdapter$ServiceFileNameAdapter -> com.android.tools.r8.dex.x:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):446:446 -> <init>
     boolean allowRenamingOfPrefixes() -> a
     1:1:boolean isRenamingCandidate(int,int):461:461 -> b
     char getClassNameSeparator() -> c
-com.android.tools.r8.dex.ResourceAdapter$StringAdapter -> com.android.tools.r8.dex.v:
+com.android.tools.r8.dex.ResourceAdapter$StringAdapter -> com.android.tools.r8.dex.y:
     java.lang.StringBuilder result -> b
     java.lang.String contents -> a
     int outputFrom -> d
@@ -12897,7 +12742,7 @@
     42:54:boolean run():199 -> e
     55:66:boolean run():200:211 -> e
     67:67:void outputRangeFromInput(int,int):349:349 -> e
-com.android.tools.r8.dex.VDexParser -> com.android.tools.r8.dex.x:
+com.android.tools.r8.dex.VDexParser -> com.android.tools.r8.dex.A:
     java.util.List dexFiles -> b
     com.android.tools.r8.dex.VDexReader vDexReader -> a
     1:1:void <init>(com.android.tools.r8.dex.VDexReader):26:26 -> <init>
@@ -12909,7 +12754,7 @@
     39:39:void com.android.tools.r8.dex.VDexReader.setByteOrder():87:87 -> <init>
     39:39:void <init>(com.android.tools.r8.dex.VDexReader):28 -> <init>
     1:1:java.util.List getDexFiles():33:33 -> a
-com.android.tools.r8.dex.VDexReader -> com.android.tools.r8.dex.y:
+com.android.tools.r8.dex.VDexReader -> com.android.tools.r8.dex.B:
     boolean $assertionsDisabled -> e
     int version -> d
     1:1:void <clinit>():22:22 -> <clinit>
@@ -12981,6 +12826,7 @@
     1:1:java.lang.String getPrimaryClassDescriptor():100:100 -> h
     1:1:boolean isEmpty():211:211 -> i
     1:1:boolean isFull():178:178 -> j
+com.android.tools.r8.dex.VirtualFile$1 -> com.android.tools.r8.dex.C:
 com.android.tools.r8.dex.VirtualFile$Distributor -> com.android.tools.r8.dex.VirtualFile$a:
     com.android.tools.r8.graph.DexApplication application -> a
     java.util.List virtualFiles -> c
@@ -13042,21 +12888,21 @@
     1:1:java.util.Set access$1400(com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction):523:523 -> a
     2:5:boolean maybeInsert(com.android.tools.r8.graph.DexItem,java.util.Set,java.util.Set):544:547 -> a
     6:6:boolean addClass(com.android.tools.r8.graph.DexProgramClass):557:557 -> a
-    7:7:boolean addString(com.android.tools.r8.graph.DexString):572:572 -> a
-    8:8:boolean addProto(com.android.tools.r8.graph.DexProto):577:577 -> a
-    9:9:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):587:587 -> a
-    10:10:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):592:592 -> a
-    11:11:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):597:597 -> a
-    12:13:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):602:603 -> a
-    14:14:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):608:608 -> a
-    15:19:void commitItemsIn(java.util.Set,java.util.function.Function):620:624 -> a
-    20:21:void lambda$commitItemsIn$0(java.util.function.Function,com.android.tools.r8.graph.DexItem):621:622 -> a
-    22:27:void abort():639:644 -> a
+    7:7:boolean addField(com.android.tools.r8.graph.DexField):562:562 -> a
+    8:8:boolean addMethod(com.android.tools.r8.graph.DexMethod):567:567 -> a
+    9:9:boolean addString(com.android.tools.r8.graph.DexString):572:572 -> a
+    10:10:boolean addProto(com.android.tools.r8.graph.DexProto):577:577 -> a
+    11:11:boolean addType(com.android.tools.r8.graph.DexType):582:582 -> a
+    12:12:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):587:587 -> a
+    13:13:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):592:592 -> a
+    14:18:void commitItemsIn(java.util.Set,java.util.function.Function):620:624 -> a
+    19:20:void lambda$commitItemsIn$0(java.util.function.Function,com.android.tools.r8.graph.DexItem):621:622 -> a
+    21:26:void abort():639:644 -> a
     1:1:void addClassAndDependencies(com.android.tools.r8.graph.DexProgramClass):552:552 -> b
-    2:2:boolean addField(com.android.tools.r8.graph.DexField):562:562 -> b
-    3:3:boolean addMethod(com.android.tools.r8.graph.DexMethod):567:567 -> b
-    4:4:boolean addType(com.android.tools.r8.graph.DexType):582:582 -> b
-    5:12:void commit():628:635 -> b
+    2:2:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):597:597 -> b
+    3:4:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):602:603 -> b
+    5:5:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):608:608 -> b
+    6:13:void commit():628:635 -> b
     1:1:int getNumberOfClasses():653:653 -> c
     1:1:int getNumberOfFields():616:616 -> d
     1:1:int getNumberOfMethods():612:612 -> e
@@ -13117,19 +12963,19 @@
     2:13:void <init>(com.android.tools.r8.naming.NamingLens):439:450 -> <init>
     1:1:java.util.Set access$100(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):435:435 -> a
     2:2:boolean addClass(com.android.tools.r8.graph.DexProgramClass):456:456 -> a
-    3:3:boolean addString(com.android.tools.r8.graph.DexString):471:471 -> a
-    4:4:boolean addProto(com.android.tools.r8.graph.DexProto):476:476 -> a
-    5:5:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):486:486 -> a
-    6:6:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):491:491 -> a
-    7:7:int getNumberOfFields():499:499 -> a
-    8:8:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):508:508 -> a
-    9:10:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):513:514 -> a
-    11:11:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):519:519 -> a
+    3:3:boolean addField(com.android.tools.r8.graph.DexField):461:461 -> a
+    4:4:boolean addMethod(com.android.tools.r8.graph.DexMethod):466:466 -> a
+    5:5:boolean addString(com.android.tools.r8.graph.DexString):471:471 -> a
+    6:6:boolean addProto(com.android.tools.r8.graph.DexProto):476:476 -> a
+    7:7:boolean addType(com.android.tools.r8.graph.DexType):481:481 -> a
+    8:8:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):486:486 -> a
+    9:9:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):491:491 -> a
+    10:10:int getNumberOfFields():499:499 -> a
     1:1:java.util.Set access$200(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):435:435 -> b
-    2:2:boolean addField(com.android.tools.r8.graph.DexField):461:461 -> b
-    3:3:boolean addMethod(com.android.tools.r8.graph.DexMethod):466:466 -> b
-    4:4:boolean addType(com.android.tools.r8.graph.DexType):481:481 -> b
-    5:5:int getNumberOfMethods():495:495 -> b
+    2:2:int getNumberOfMethods():495:495 -> b
+    3:3:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):508:508 -> b
+    4:5:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):513:514 -> b
+    6:6:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):519:519 -> b
     1:1:java.util.Set access$300(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):435:435 -> c
     1:1:java.util.Set access$400(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):435:435 -> d
     1:1:java.util.Set access$500(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):435:435 -> e
@@ -13144,44 +12990,27 @@
     19:21:void com.android.tools.r8.dexfilemerger.DexFileMerger$Options.<init>(com.android.tools.r8.dexfilemerger.DexFileMerger$1):94 -> run
     19:21:com.android.tools.r8.dexfilemerger.DexFileMerger$Options parseArguments(java.lang.String[]):127 -> run
     19:21:void run(java.lang.String[]):312 -> run
-    22:40:com.android.tools.r8.dexfilemerger.DexFileMerger$Options parseArguments(java.lang.String[]):128:146 -> run
-    22:40:void run(java.lang.String[]):312 -> run
-    41:51:com.android.tools.r8.dexfilemerger.DexFileMerger$MultidexStrategy com.android.tools.r8.dexfilemerger.DexFileMerger$MultidexStrategy.parse(java.lang.String):78:88 -> run
-    41:51:com.android.tools.r8.dexfilemerger.DexFileMerger$Options parseArguments(java.lang.String[]):148 -> run
-    41:51:void run(java.lang.String[]):312 -> run
-    52:52:com.android.tools.r8.dexfilemerger.DexFileMerger$MultidexStrategy com.android.tools.r8.dexfilemerger.DexFileMerger$MultidexStrategy.parse(java.lang.String):86:86 -> run
-    52:52:com.android.tools.r8.dexfilemerger.DexFileMerger$Options parseArguments(java.lang.String[]):148 -> run
-    52:52:void run(java.lang.String[]):312 -> run
-    53:53:com.android.tools.r8.dexfilemerger.DexFileMerger$MultidexStrategy com.android.tools.r8.dexfilemerger.DexFileMerger$MultidexStrategy.parse(java.lang.String):84:84 -> run
-    53:53:com.android.tools.r8.dexfilemerger.DexFileMerger$Options parseArguments(java.lang.String[]):148 -> run
-    53:53:void run(java.lang.String[]):312 -> run
-    54:54:com.android.tools.r8.dexfilemerger.DexFileMerger$MultidexStrategy com.android.tools.r8.dexfilemerger.DexFileMerger$MultidexStrategy.parse(java.lang.String):82:82 -> run
-    54:54:com.android.tools.r8.dexfilemerger.DexFileMerger$Options parseArguments(java.lang.String[]):148 -> run
-    54:54:void run(java.lang.String[]):312 -> run
-    55:55:com.android.tools.r8.dexfilemerger.DexFileMerger$MultidexStrategy com.android.tools.r8.dexfilemerger.DexFileMerger$MultidexStrategy.parse(java.lang.String):80:80 -> run
-    55:55:com.android.tools.r8.dexfilemerger.DexFileMerger$Options parseArguments(java.lang.String[]):148 -> run
-    55:55:void run(java.lang.String[]):312 -> run
-    56:93:com.android.tools.r8.dexfilemerger.DexFileMerger$Options parseArguments(java.lang.String[]):151:188 -> run
-    56:93:void run(java.lang.String[]):312 -> run
-    94:94:com.android.tools.r8.dexfilemerger.DexFileMerger$Options parseArguments(java.lang.String[]):134:134 -> run
-    94:94:void run(java.lang.String[]):312 -> run
-    95:100:void run(java.lang.String[]):314:319 -> run
-    101:109:boolean com.android.tools.r8.dexfilemerger.DexFileMerger$MultidexStrategy.isMultidexAllowed():66:74 -> run
-    101:109:void run(java.lang.String[]):323 -> run
-    110:112:void run(java.lang.String[]):330:332 -> run
-    113:150:void run(java.lang.String[]):325:362 -> run
-    151:154:void run(java.lang.String[]):352:355 -> run
-    155:163:int parseFileIndexFromShardFilename(java.lang.String):295:303 -> run
-    155:163:void run(java.lang.String[]):355 -> run
-    164:164:void run(java.lang.String[]):355:355 -> run
-    165:166:int parseFileIndexFromShardFilename(java.lang.String):305:306 -> run
-    165:166:void run(java.lang.String[]):355 -> run
-    167:168:int parseFileIndexFromShardFilename(java.lang.String):299:300 -> run
-    167:168:void run(java.lang.String[]):355 -> run
-    169:169:void run(java.lang.String[]):353:353 -> run
-    170:201:void run(java.lang.String[]):349:380 -> run
-    202:202:void run(java.lang.String[]):315:315 -> run
-com.android.tools.r8.dexfilemerger.DexFileMerger$1 -> com.android.tools.r8.dexfilemerger.DexFileMerger$1:
+    22:82:com.android.tools.r8.dexfilemerger.DexFileMerger$Options parseArguments(java.lang.String[]):128:188 -> run
+    22:82:void run(java.lang.String[]):312 -> run
+    83:83:com.android.tools.r8.dexfilemerger.DexFileMerger$Options parseArguments(java.lang.String[]):134:134 -> run
+    83:83:void run(java.lang.String[]):312 -> run
+    84:89:void run(java.lang.String[]):314:319 -> run
+    90:98:boolean com.android.tools.r8.dexfilemerger.DexFileMerger$MultidexStrategy.isMultidexAllowed():66:74 -> run
+    90:98:void run(java.lang.String[]):323 -> run
+    99:101:void run(java.lang.String[]):330:332 -> run
+    102:139:void run(java.lang.String[]):325:362 -> run
+    140:143:void run(java.lang.String[]):352:355 -> run
+    144:152:int parseFileIndexFromShardFilename(java.lang.String):295:303 -> run
+    144:152:void run(java.lang.String[]):355 -> run
+    153:153:void run(java.lang.String[]):355:355 -> run
+    154:155:int parseFileIndexFromShardFilename(java.lang.String):305:306 -> run
+    154:155:void run(java.lang.String[]):355 -> run
+    156:157:int parseFileIndexFromShardFilename(java.lang.String):299:300 -> run
+    156:157:void run(java.lang.String[]):355 -> run
+    158:158:void run(java.lang.String[]):353:353 -> run
+    159:190:void run(java.lang.String[]):349:380 -> run
+    191:191:void run(java.lang.String[]):315:315 -> run
+com.android.tools.r8.dexfilemerger.DexFileMerger$1 -> com.android.tools.r8.dexfilemerger.a:
     int[] $SwitchMap$com$android$tools$r8$dexfilemerger$DexFileMerger$MultidexStrategy -> a
     1:1:void <clinit>():66:66 -> <clinit>
 com.android.tools.r8.dexfilemerger.DexFileMerger$ArchiveConsumer -> com.android.tools.r8.dexfilemerger.DexFileMerger$a:
@@ -13205,8 +13034,7 @@
     14:17:java.lang.String getDexFileName(int):222:225 -> a
     14:17:void writeEntry(int,byte[],java.util.Set,com.android.tools.r8.DiagnosticsHandler):266 -> a
     14:17:void lambda$accept$0(int,byte[],java.util.Set,com.android.tools.r8.DiagnosticsHandler):237 -> a
-    18:18:com.android.tools.r8.ByteDataView com.android.tools.r8.ByteDataView.of(byte[]):17:17 -> a
-    18:18:void writeEntry(int,byte[],java.util.Set,com.android.tools.r8.DiagnosticsHandler):267 -> a
+    18:18:void writeEntry(int,byte[],java.util.Set,com.android.tools.r8.DiagnosticsHandler):267:267 -> a
     18:18:void lambda$accept$0(int,byte[],java.util.Set,com.android.tools.r8.DiagnosticsHandler):237 -> a
     19:26:void writeEntry(int,byte[],java.util.Set,com.android.tools.r8.DiagnosticsHandler):264:271 -> a
     19:26:void lambda$accept$0(int,byte[],java.util.Set,com.android.tools.r8.DiagnosticsHandler):237 -> a
@@ -13222,6 +13050,11 @@
     14:14:void <clinit>():49:49 -> <clinit>
     1:1:void <init>(java.lang.String,int):49:49 -> <init>
     1:1:com.android.tools.r8.dexfilemerger.DexFileMerger$MultidexStrategy[] values():49:49 -> a
+    2:12:com.android.tools.r8.dexfilemerger.DexFileMerger$MultidexStrategy parse(java.lang.String):78:88 -> a
+    13:13:com.android.tools.r8.dexfilemerger.DexFileMerger$MultidexStrategy parse(java.lang.String):86:86 -> a
+    14:14:com.android.tools.r8.dexfilemerger.DexFileMerger$MultidexStrategy parse(java.lang.String):84:84 -> a
+    15:15:com.android.tools.r8.dexfilemerger.DexFileMerger$MultidexStrategy parse(java.lang.String):82:82 -> a
+    16:16:com.android.tools.r8.dexfilemerger.DexFileMerger$MultidexStrategy parse(java.lang.String):80:80 -> a
 com.android.tools.r8.dexsplitter.DexSplitter -> com.android.tools.r8.dexsplitter.DexSplitter:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():36:36 -> <clinit>
@@ -13304,7 +13137,7 @@
     1:1:void setOutput(java.lang.String):125:125 -> setOutput
     1:1:void setProguardMap(java.lang.String):141:141 -> setProguardMap
     1:1:void setSplitNonClassResources(boolean):173:173 -> setSplitNonClassResources
-com.android.tools.r8.dexsplitter.DexSplitter$Options$1 -> com.android.tools.r8.dexsplitter.DexSplitter$Options$1:
+com.android.tools.r8.dexsplitter.DexSplitter$Options$1 -> com.android.tools.r8.dexsplitter.a:
     1:1:void <init>():101:101 -> <init>
 com.android.tools.r8.dexsplitter.DexSplitter$ZipFileOrigin -> com.android.tools.r8.dexsplitter.DexSplitter$b:
     1:1:void <init>(java.nio.file.Path):78:78 -> <init>
@@ -13412,7 +13245,7 @@
     1:1:com.android.tools.r8.experimental.graphinfo.GraphNode cycle():36:36 -> isCycle
     1:1:boolean isCycle():40 -> isCycle
     1:1:boolean isLibraryNode():44:44 -> isLibraryNode
-com.android.tools.r8.experimental.graphinfo.GraphNode$1 -> com.android.tools.r8.experimental.graphinfo.GraphNode$1:
+com.android.tools.r8.experimental.graphinfo.GraphNode$1 -> com.android.tools.r8.experimental.graphinfo.a:
     1:1:void <init>(boolean):12:12 -> <init>
 com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode -> com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode:
     com.android.tools.r8.shaking.ProguardKeepRule rule -> c
@@ -13497,256 +13330,189 @@
     2:15:void <init>(com.android.tools.r8.graph.DexApplication):23:36 -> <init>
     16:16:void <init>(com.android.tools.r8.graph.AppInfo):39:39 -> <init>
     17:38:void <init>(com.android.tools.r8.graph.AppInfo):23:44 -> <init>
-    1:1:void copyMetadataFromPrevious(com.android.tools.r8.graph.AppInfo):48:48 -> a
-    2:2:boolean checkIfObsolete():64:64 -> a
-    3:6:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):80:83 -> a
-    7:7:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):95:95 -> a
-    8:8:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):96:96 -> a
-    9:17:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):113:121 -> a
-    18:23:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):143:148 -> a
-    24:25:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):155:156 -> a
-    26:31:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):280:285 -> a
-    32:34:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):327:329 -> a
-    35:55:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):328:348 -> a
-    56:79:com.android.tools.r8.graph.DexEncodedMethod resolveMethodStep3Helper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfo$MultiResultBuilder):385:408 -> a
-    80:83:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):461:464 -> a
-    84:86:com.android.tools.r8.graph.DexEncodedMethod dispatchDirectInvoke(com.android.tools.r8.graph.AppInfo$ResolutionResult):543:545 -> a
-    87:91:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):557:561 -> a
-    92:93:boolean isInMainDexList(com.android.tools.r8.graph.DexType):593:594 -> a
-    1:2:com.android.tools.r8.graph.DexApplication app():69:70 -> app
-    1:2:java.lang.Iterable classes():102:103 -> b
-    3:5:com.android.tools.r8.origin.Origin originFor(com.android.tools.r8.graph.DexType):136:138 -> b
-    6:18:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):301:313 -> b
-    19:19:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):305:305 -> b
-    20:28:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):364:372 -> b
-    29:30:com.android.tools.r8.graph.DexEncodedField resolveField(com.android.tools.r8.graph.DexField):485:486 -> b
-    31:50:com.android.tools.r8.graph.DexEncodedField resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):496:515 -> b
-    51:53:com.android.tools.r8.graph.DexEncodedMethod dispatchStaticInvoke(com.android.tools.r8.graph.AppInfo$ResolutionResult):529:531 -> b
-    1:7:java.util.Map computeDefinitions(com.android.tools.r8.graph.DexType):92:98 -> c
-    8:9:java.lang.Iterable classesWithDeterministicOrder():107:108 -> c
-    10:35:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):426:451 -> c
-    36:36:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):432:432 -> c
-    1:2:java.util.Collection getSynthesizedClassesForSanityCheck():87:88 -> d
-    3:9:java.util.Map getDefinitions(com.android.tools.r8.graph.DexType):160:166 -> d
-    1:7:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):126:132 -> definitionFor
-    1:2:com.android.tools.r8.graph.DexItemFactory dexItemFactory():75:76 -> dexItemFactory
-    1:1:boolean hasLiveness():578:578 -> e
-    1:1:boolean hasSubtyping():568:568 -> f
-    1:1:boolean isObsolete():52:52 -> g
-    1:1:void markObsolete():56:56 -> h
-    1:1:void unsetObsolete():60:60 -> i
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():583:583 -> j
-    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():573:573 -> k
-    1:4:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod):228:231 -> lookupDirectTarget
-    1:4:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod):180:183 -> lookupStaticTarget
-    5:8:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):474:477 -> lookupStaticTarget
-    1:20:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):197:216 -> lookupSuperTarget
-    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):241:245 -> lookupVirtualTarget
-    1:1:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):589:589 -> registerNewType
-    1:11:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):259:269 -> resolveMethod
+    1:1:boolean checkIfObsolete():60:60 -> a
+    2:5:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):76:79 -> a
+    6:6:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):91:91 -> a
+    7:7:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):92:92 -> a
+    8:16:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):109:117 -> a
+    17:23:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):122:128 -> a
+    24:29:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):139:144 -> a
+    30:31:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):151:152 -> a
+    32:37:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):276:281 -> a
+    38:40:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):323:325 -> a
+    41:61:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):324:344 -> a
+    62:85:com.android.tools.r8.graph.DexEncodedMethod resolveMethodStep3Helper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfo$MultiResultBuilder):381:404 -> a
+    86:89:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):457:460 -> a
+    90:92:com.android.tools.r8.graph.DexEncodedMethod dispatchDirectInvoke(com.android.tools.r8.graph.AppInfo$ResolutionResult):539:541 -> a
+    93:97:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):553:557 -> a
+    98:98:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):585:585 -> a
+    1:2:com.android.tools.r8.graph.DexApplication app():65:66 -> app
+    1:2:java.lang.Iterable classes():98:99 -> b
+    3:15:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):297:309 -> b
+    16:16:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):301:301 -> b
+    17:25:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):360:368 -> b
+    26:27:com.android.tools.r8.graph.DexEncodedField resolveField(com.android.tools.r8.graph.DexField):481:482 -> b
+    28:47:com.android.tools.r8.graph.DexEncodedField resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):492:511 -> b
+    48:50:com.android.tools.r8.graph.DexEncodedMethod dispatchStaticInvoke(com.android.tools.r8.graph.AppInfo$ResolutionResult):525:527 -> b
+    51:52:boolean isInMainDexList(com.android.tools.r8.graph.DexType):589:590 -> b
+    1:2:java.lang.Iterable classesWithDeterministicOrder():103:104 -> c
+    3:5:com.android.tools.r8.origin.Origin originFor(com.android.tools.r8.graph.DexType):132:134 -> c
+    6:31:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):422:447 -> c
+    32:32:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):428:428 -> c
+    1:2:java.util.Collection getSynthesizedClassesForSanityCheck():83:84 -> d
+    3:9:java.util.Map computeDefinitions(com.android.tools.r8.graph.DexType):88:94 -> d
+    1:2:com.android.tools.r8.graph.DexItemFactory dexItemFactory():71:72 -> dexItemFactory
+    1:7:java.util.Map getDefinitions(com.android.tools.r8.graph.DexType):156:162 -> e
+    8:8:boolean hasLiveness():574:574 -> e
+    1:1:boolean hasSubtyping():564:564 -> f
+    1:1:boolean isObsolete():48:48 -> g
+    1:1:void markObsolete():52:52 -> h
+    1:1:void unsetObsolete():56:56 -> i
+    1:1:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness withLiveness():579:579 -> j
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():569:569 -> k
+    1:4:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod):224:227 -> lookupDirectTarget
+    1:4:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod):176:179 -> lookupStaticTarget
+    5:8:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):470:473 -> lookupStaticTarget
+    1:20:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):193:212 -> lookupSuperTarget
+    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):237:241 -> lookupVirtualTarget
+    1:11:com.android.tools.r8.graph.AppInfo$ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):255:265 -> resolveMethod
+com.android.tools.r8.graph.AppInfo$1 -> com.android.tools.r8.graph.a:
 com.android.tools.r8.graph.AppInfo$EmptyResult -> com.android.tools.r8.graph.AppInfo$a:
     com.android.tools.r8.graph.AppInfo$EmptyResult SINGLETON -> a
-    1:1:void <clinit>():675:675 -> <clinit>
-    1:1:void <init>():677:677 -> <init>
+    1:1:void <clinit>():671:671 -> <clinit>
+    1:1:void <init>():673:673 -> <init>
+    com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> a
     void forEachTarget(java.util.function.Consumer) -> a
-    boolean hasSingleTarget() -> a
-    com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> b
-    1:1:java.util.List asListOfTargets():702:702 -> c
-    1:1:com.android.tools.r8.graph.AppInfo$EmptyResult get():682:682 -> d
-    1:1:com.android.tools.r8.graph.AppInfo$EmptyResult access$000():673 -> d
+    1:1:java.util.List asListOfTargets():698:698 -> b
+    boolean hasSingleTarget() -> c
+    1:1:com.android.tools.r8.graph.AppInfo$EmptyResult get():678:678 -> d
+    1:1:com.android.tools.r8.graph.AppInfo$EmptyResult access$000():669 -> d
 com.android.tools.r8.graph.AppInfo$MultiResult -> com.android.tools.r8.graph.AppInfo$b:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList methods -> a
-    1:1:void <clinit>():636:636 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):640:642 -> <init>
-    1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.graph.AppInfo$1):636 -> <init>
-    boolean hasSingleTarget() -> a
-    1:1:void forEachTarget(java.util.function.Consumer):669:669 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve():648:648 -> asResultOfResolve
-    com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> b
-    1:1:java.util.List asListOfTargets():664:664 -> c
+    1:1:void <clinit>():632:632 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):636:638 -> <init>
+    1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.graph.AppInfo$1):632 -> <init>
+    com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> a
+    1:1:void forEachTarget(java.util.function.Consumer):665:665 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve():644:644 -> asResultOfResolve
+    1:1:java.util.List asListOfTargets():660:660 -> b
+    boolean hasSingleTarget() -> c
 com.android.tools.r8.graph.AppInfo$MultiResultBuilder -> com.android.tools.r8.graph.AppInfo$c:
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder builder -> a
     com.android.tools.r8.graph.DexEncodedMethod singleResult -> b
-    1:1:void <init>():610:610 -> <init>
-    1:1:void <init>(com.android.tools.r8.graph.AppInfo$1):610 -> <init>
-    1:8:void add(com.android.tools.r8.graph.DexEncodedMethod):616:623 -> a
-    9:12:com.android.tools.r8.graph.AppInfo$ResolutionResult build():628:631 -> a
+    1:1:void <init>():606:606 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppInfo$1):606 -> <init>
+    1:8:void add(com.android.tools.r8.graph.DexEncodedMethod):612:619 -> a
+    9:12:com.android.tools.r8.graph.AppInfo$ResolutionResult build():624:627 -> a
 com.android.tools.r8.graph.AppInfo$ResolutionResult -> com.android.tools.r8.graph.AppInfo$ResolutionResult:
+    com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> a
     void forEachTarget(java.util.function.Consumer) -> a
-    boolean hasSingleTarget() -> a
-    com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> b
-    java.util.List asListOfTargets() -> c
+    java.util.List asListOfTargets() -> b
+    boolean hasSingleTarget() -> c
 com.android.tools.r8.graph.AppInfoWithSubtyping -> com.android.tools.r8.graph.AppInfoWithSubtyping:
     java.util.Set missingClasses -> g
-    java.util.Set NO_DIRECT_SUBTYPE -> j
-    boolean $assertionsDisabled -> k
-    java.util.Map typeInfo -> i
+    boolean $assertionsDisabled -> i
     java.util.Map subtypeMap -> h
-    1:8:void <clinit>():25:32 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication):121:121 -> <init>
-    2:14:void <init>(com.android.tools.r8.graph.DexApplication):112:124 -> <init>
-    15:15:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):128:128 -> <init>
-    16:36:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):112:132 -> <init>
-    1:24:void populateAllSuperTypes(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):174:197 -> a
-    25:33:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):203:211 -> a
-    34:68:boolean validateLevelsAreCorrect(java.util.function.Function,com.android.tools.r8.graph.DexItemFactory):216:250 -> a
-    34:68:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):211 -> a
-    69:70:void lambda$lookupVirtualTargets$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):285:286 -> a
-    71:81:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):395:405 -> a
-    82:82:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():99:99 -> a
-    82:82:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):405 -> a
-    83:96:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):416:429 -> a
-    97:97:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):398:398 -> a
-    98:101:boolean isStringConcat(com.android.tools.r8.graph.DexMethodHandle):436:439 -> a
-    102:115:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):496:509 -> a
-    116:121:boolean isSubtypeOfClass(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,boolean):536:541 -> a
-    116:121:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):511 -> a
-    122:122:void forAllExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):552:552 -> a
-    123:135:void implementedInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):617:629 -> a
-    136:138:boolean isDirectSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):645:647 -> a
-    1:4:void populateSuperType(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):160:163 -> b
-    5:5:void forAllImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):576:576 -> b
-    6:54:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):654:702 -> b
-    1:10:boolean isInterfaceSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):515:524 -> c
-    11:19:java.lang.Iterable allExtendsSubtypes(com.android.tools.r8.graph.DexType):556:564 -> c
-    1:1:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):462:462 -> d
-    2:2:boolean lambda$isStrictSubtypeOf$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):509:509 -> d
-    1:5:java.lang.Iterable allImplementsSubtypes(com.android.tools.r8.graph.DexType):580:584 -> e
-    1:1:boolean hasSubtyping():451:451 -> f
-    2:5:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):634:637 -> f
-    6:6:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809:809 -> f
-    6:6:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):637 -> f
-    7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getNext(java.util.Iterator,java.lang.Object):888:888 -> f
-    7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809 -> f
-    7:7:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):637 -> f
-    8:8:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):637:637 -> f
-    1:1:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):322:322 -> g
-    1:1:boolean hasSubtypes(com.android.tools.r8.graph.DexType):475:475 -> h
-    1:1:boolean isExternalizable(com.android.tools.r8.graph.DexType):593:593 -> i
-    1:12:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):602:613 -> implementedInterfaces
-    13:13:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):612:612 -> implementedInterfaces
-    1:1:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):485:485 -> isStrictSubtypeOf
-    1:1:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):480:480 -> isSubtype
-    1:1:boolean isMarkedAsInterface(com.android.tools.r8.graph.DexType):470:470 -> j
-    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():457:457 -> k
-    2:3:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):588:589 -> k
-    1:1:java.util.Set access$000():25:25 -> l
-    2:2:boolean isSerializable(com.android.tools.r8.graph.DexType):597:597 -> l
-    1:47:java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.DexMethod):328:374 -> lookupInterfaceTargets
-    1:9:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):310:318 -> lookupSuperTarget
-    1:25:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.DexMethod):259:283 -> lookupVirtualTargets
-    1:2:java.util.Set getMissingClasses():146:147 -> m
-    3:3:boolean isUnknown(com.android.tools.r8.graph.DexType):466:466 -> m
-    4:4:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():99:99 -> m
-    4:4:boolean isUnknown(com.android.tools.r8.graph.DexType):466 -> m
-    1:1:java.lang.Iterable libraryClasses():141:141 -> n
-    2:2:com.android.tools.r8.graph.DirectMappedDexApplication getDirectApplication():137:137 -> n
-    2:2:java.lang.Iterable libraryClasses():142 -> n
-    3:3:java.lang.Iterable libraryClasses():142:142 -> n
-    4:4:com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo getTypeInfo(com.android.tools.r8.graph.DexType):169:169 -> n
-    1:1:boolean lambda$allExtendsSubtypes$3(com.android.tools.r8.graph.DexType):559:559 -> o
-    1:1:boolean lambda$allExtendsSubtypes$4(com.android.tools.r8.graph.DexType):562:562 -> p
-    1:1:boolean lambda$allImplementsSubtypes$5(com.android.tools.r8.graph.DexType):582:582 -> q
-    1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):160:160 -> r
-    1:3:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):444:446 -> registerNewType
-    1:4:java.util.Set subtypes(com.android.tools.r8.graph.DexType):151:154 -> subtypes
-com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo -> com.android.tools.r8.graph.AppInfoWithSubtyping$a:
-    java.util.Set directSubtypes -> c
-    java.util.Set implementedInterfaces -> d
-    boolean $assertionsDisabled -> e
-    com.android.tools.r8.graph.DexType type -> a
-    int hierarchyLevel -> b
-    1:1:void <clinit>():34:34 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType):47:47 -> <init>
-    2:13:void <init>(com.android.tools.r8.graph.DexType):37:48 -> <init>
-    1:11:void setLevel(int):63:73 -> a
-    12:15:void addDirectSubtype(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):78:81 -> a
-    16:18:boolean isInterface():93:95 -> a
-    19:21:void addInterfaceSubtype(com.android.tools.r8.graph.DexType):105:107 -> a
-    1:1:void tagAsInteface():89:89 -> b
-    1:1:void tagAsSubtypeRoot():85:85 -> c
-    1:2:void ensureDirectSubTypeSet():57:58 -> d
-    1:1:java.lang.String toString():53:53 -> toString
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication):29:29 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexApplication):24:31 -> <init>
+    10:10:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):35:35 -> <init>
+    11:25:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):24:38 -> <init>
+    1:24:void populateAllSuperTypes(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):76:99 -> a
+    25:34:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):105:114 -> a
+    35:36:void lambda$lookupVirtualTargets$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):145:146 -> a
+    37:71:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):254:288 -> a
+    72:72:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):257:257 -> a
+    73:76:boolean isStringConcat(com.android.tools.r8.graph.DexMethodHandle):295:298 -> a
+    77:79:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):303:305 -> a
+    1:4:void populateSuperType(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):66:69 -> b
+    1:1:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):181:181 -> d
+    1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):66:66 -> e
+    1:1:boolean hasSubtyping():310:310 -> f
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():316:316 -> k
+    1:2:java.util.Set getMissingClasses():52:53 -> l
+    1:47:java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.DexMethod):187:233 -> lookupInterfaceTargets
+    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):170:177 -> lookupSuperTarget
+    1:25:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.DexMethod):119:143 -> lookupVirtualTargets
+    1:1:java.lang.Iterable libraryClasses():47:47 -> m
+    2:2:com.android.tools.r8.graph.DirectMappedDexApplication getDirectApplication():43:43 -> m
+    2:2:java.lang.Iterable libraryClasses():48 -> m
+    3:3:java.lang.Iterable libraryClasses():48:48 -> m
+    1:4:java.util.Set subtypes(com.android.tools.r8.graph.DexType):57:60 -> subtypes
 com.android.tools.r8.graph.AppServices -> com.android.tools.r8.graph.AppServices:
     java.util.Map services -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():31:31 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):40:42 -> <init>
-    4:6:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):40:42 -> <init>
-    4:6:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.AppServices$1):31 -> <init>
-    1:2:java.util.Set allServiceTypes():46:47 -> a
-    3:11:java.util.List serviceImplementationsFor(com.android.tools.r8.graph.DexType):51:59 -> a
-    12:14:java.util.List serviceImplementationsFor(com.android.tools.r8.graph.DexType):55:57 -> a
-    15:24:com.android.tools.r8.graph.AppServices rewrittenWithLens(com.android.tools.r8.graph.GraphLense):65:74 -> a
-    1:4:boolean verifyRewrittenWithLens():78:81 -> b
-    1:1:com.android.tools.r8.graph.AppServices$Builder builder(com.android.tools.r8.graph.AppView):88:88 -> builder
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):38:40 -> <init>
+    4:6:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):38:40 -> <init>
+    4:6:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.AppServices$1):29 -> <init>
+    1:2:java.util.Set allServiceTypes():44:45 -> a
+    3:11:java.util.Set serviceImplementationsFor(com.android.tools.r8.graph.DexType):49:57 -> a
+    12:14:java.util.Set serviceImplementationsFor(com.android.tools.r8.graph.DexType):53:55 -> a
+    15:24:com.android.tools.r8.graph.AppServices rewrittenWithLens(com.android.tools.r8.graph.GraphLense):63:72 -> a
+    1:4:boolean verifyRewrittenWithLens():76:79 -> b
+    1:1:com.android.tools.r8.graph.AppServices$Builder builder(com.android.tools.r8.graph.AppView):86:86 -> builder
+com.android.tools.r8.graph.AppServices$1 -> com.android.tools.r8.graph.b:
 com.android.tools.r8.graph.AppServices$Builder -> com.android.tools.r8.graph.AppServices$Builder:
     java.util.Map services -> b
     com.android.tools.r8.graph.AppView appView -> a
-    1:1:void <init>(com.android.tools.r8.graph.AppView):96:96 -> <init>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppServices$1):91 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView):94:97 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppServices$1):91 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.graph.AppServices$Builder):91:91 -> a
-    1:1:java.util.Map access$400(com.android.tools.r8.graph.AppServices$Builder):91:91 -> b
-    1:1:com.android.tools.r8.graph.AppServices build():101:101 -> build
-    2:4:void readServices(com.android.tools.r8.DataResourceProvider):109:111 -> build
-    2:4:com.android.tools.r8.graph.AppServices build():102 -> build
-    5:5:com.android.tools.r8.graph.AppServices build():104:104 -> build
+    1:1:void <init>(com.android.tools.r8.graph.AppView):94:94 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppServices$1):89 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.AppView):92:95 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppServices$1):89 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.graph.AppServices$Builder):89:89 -> a
+    1:1:java.util.Map access$400(com.android.tools.r8.graph.AppServices$Builder):89:89 -> b
+    1:1:com.android.tools.r8.graph.AppServices build():99:99 -> build
+    2:4:void readServices(com.android.tools.r8.DataResourceProvider):107:109 -> build
+    2:4:com.android.tools.r8.graph.AppServices build():100 -> build
+    5:5:com.android.tools.r8.graph.AppServices build():102:102 -> build
 com.android.tools.r8.graph.AppServices$Builder$DataResourceProviderVisitor -> com.android.tools.r8.graph.AppServices$Builder$a:
     com.android.tools.r8.graph.AppServices$Builder this$0 -> a
-    1:1:void <init>(com.android.tools.r8.graph.AppServices$Builder):115:115 -> <init>
-    1:1:void <init>(com.android.tools.r8.graph.AppServices$Builder,com.android.tools.r8.graph.AppServices$1):115 -> <init>
-    1:28:java.util.List readServiceImplementationsForService(java.lang.String,com.android.tools.r8.origin.Origin):144:171 -> a
-    29:29:boolean lambda$readServiceImplementationsForService$0(java.lang.String):148:148 -> a
-    30:38:boolean lambda$readServiceImplementationsForService$1(com.android.tools.r8.origin.Origin,java.util.Set,com.android.tools.r8.graph.DexType):154:162 -> a
-    39:47:boolean lambda$readServiceImplementationsForService$1(com.android.tools.r8.origin.Origin,java.util.Set,com.android.tools.r8.graph.DexType):159:167 -> a
-    1:2:java.lang.String prefixUntilCommentChar(java.lang.String):175:176 -> b
-    1:10:void visit(com.android.tools.r8.DataEntryResource):125:134 -> visit
-    11:16:void visit(com.android.tools.r8.DataEntryResource):133:138 -> visit
+    1:1:void <init>(com.android.tools.r8.graph.AppServices$Builder):113:113 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppServices$Builder,com.android.tools.r8.graph.AppServices$1):113 -> <init>
+    1:26:java.util.Set readServiceImplementationsForService(java.lang.String,com.android.tools.r8.origin.Origin):142:167 -> a
+    27:27:boolean lambda$readServiceImplementationsForService$0(java.lang.String):144:144 -> a
+    28:36:boolean lambda$readServiceImplementationsForService$1(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType):150:158 -> a
+    37:37:boolean lambda$readServiceImplementationsForService$1(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType):155:155 -> a
+    1:10:void visit(com.android.tools.r8.DataEntryResource):123:132 -> visit
+    11:16:void visit(com.android.tools.r8.DataEntryResource):131:136 -> visit
 com.android.tools.r8.graph.AppView -> com.android.tools.r8.graph.AppView:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
-    boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.AppServices appServices -> b
     com.android.tools.r8.graph.GraphLense graphLense -> e
     com.android.tools.r8.graph.AppView$WholeProgramOptimizations wholeProgramOptimizations -> d
+    com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses verticallyMergedClasses -> g
     com.android.tools.r8.utils.InternalOptions options -> f
+    boolean $assertionsDisabled -> h
     com.android.tools.r8.graph.AppInfo appInfo -> a
-    com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet -> g
-    com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses verticallyMergedClasses -> h
-    1:1:void <clinit>():13:13 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):30:35 -> <init>
-    1:1:com.android.tools.r8.graph.AppServices appServices():63:63 -> a
-    2:2:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):72:72 -> a
-    3:3:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):77:77 -> a
-    4:4:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):82:82 -> a
-    5:14:com.android.tools.r8.OptionalBool isInterface(com.android.tools.r8.graph.DexType):93:102 -> a
-    15:16:boolean setGraphLense(com.android.tools.r8.graph.GraphLense):120:121 -> a
-    17:17:void setVerticallyMergedClasses(com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses):147:147 -> a
-    1:1:com.android.tools.r8.graph.AppInfo appInfo():47:47 -> appInfo
-    1:1:boolean enableWholeProgramOptimizations():111:111 -> b
-    2:4:com.android.tools.r8.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):164:166 -> b
-    1:1:com.android.tools.r8.graph.GraphLense graphLense():115:115 -> c
-    1:1:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):39:39 -> createForD8
-    1:1:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):43:43 -> createForR8
-    1:1:com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses verticallyMergedClasses():143:143 -> d
-    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):87:87 -> definitionFor
-    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():107:107 -> dexItemFactory
-    1:1:com.android.tools.r8.utils.InternalOptions options():128:128 -> options
-    1:1:com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet():132:132 -> rootSet
-    1:5:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):51:55 -> setAppInfo
-    1:1:void setAppServices(com.android.tools.r8.graph.AppServices):67:67 -> setAppServices
-    1:2:void setRootSet(com.android.tools.r8.shaking.RootSetBuilder$RootSet):136:137 -> setRootSet
-    1:1:com.android.tools.r8.graph.AppView withSubtyping():152:152 -> withSubtyping
+    1:1:void <clinit>():11:11 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):27:32 -> <init>
+    1:1:com.android.tools.r8.graph.AppServices appServices():57:57 -> a
+    2:2:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):66:66 -> a
+    3:3:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):71:71 -> a
+    4:4:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):76:76 -> a
+    5:5:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):81:81 -> a
+    6:6:void setGraphLense(com.android.tools.r8.graph.GraphLense):98:98 -> a
+    7:7:void setVerticallyMergedClasses(com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses):112:112 -> a
+    1:1:com.android.tools.r8.graph.AppInfo appInfo():44:44 -> appInfo
+    1:1:boolean enableWholeProgramOptimizations():90:90 -> b
+    1:1:com.android.tools.r8.graph.GraphLense graphLense():94:94 -> c
+    1:1:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):36:36 -> createForD8
+    1:1:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):40:40 -> createForR8
+    1:1:com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses verticallyMergedClasses():108:108 -> d
+    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():86:86 -> dexItemFactory
+    1:1:com.android.tools.r8.utils.InternalOptions options():102:102 -> options
+    1:5:void setAppInfo(com.android.tools.r8.graph.AppInfo):48:52 -> setAppInfo
+    1:1:void setAppServices(com.android.tools.r8.graph.AppServices):61:61 -> setAppServices
 com.android.tools.r8.graph.AppView$WholeProgramOptimizations -> com.android.tools.r8.graph.AppView$a:
     com.android.tools.r8.graph.AppView$WholeProgramOptimizations ON -> a
     com.android.tools.r8.graph.AppView$WholeProgramOptimizations OFF -> b
-    1:2:void <clinit>():16:17 -> <clinit>
-    3:3:void <clinit>():15:15 -> <clinit>
-    1:1:void <init>(java.lang.String,int):15:15 -> <init>
-com.android.tools.r8.graph.AppliedGraphLens -> com.android.tools.r8.graph.a:
+    1:2:void <clinit>():14:15 -> <clinit>
+    3:3:void <clinit>():13:13 -> <clinit>
+    1:1:void <init>(java.lang.String,int):13:13 -> <init>
+com.android.tools.r8.graph.AppliedGraphLens -> com.android.tools.r8.graph.c:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.com.google.common.collect.BiMap originalTypeNames -> c
     com.android.tools.r8.com.google.common.collect.BiMap originalFieldSignatures -> d
@@ -13769,7 +13535,7 @@
     3:7:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):111:115 -> b
     com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField) -> c
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):126:126 -> f
-com.android.tools.r8.graph.ArgumentUse -> com.android.tools.r8.graph.b:
+com.android.tools.r8.graph.ArgumentUse -> com.android.tools.r8.graph.d:
     1:1:void <init>():7:7 -> <init>
     boolean register(int) -> a
 com.android.tools.r8.graph.AssemblyWriter -> com.android.tools.r8.graph.AssemblyWriter:
@@ -13793,12 +13559,6 @@
     1:18:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):55:72 -> b
     1:1:void writeFieldsFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):98:98 -> c
     1:4:void writeFieldsHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):77:80 -> d
-com.android.tools.r8.graph.BottomUpClassHierarchyTraversal -> com.android.tools.r8.graph.c:
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):12:12 -> <init>
-    com.android.tools.r8.graph.ClassHierarchyTraversal self() -> a
-    1:1:void visit(java.lang.Iterable,java.util.function.Consumer):7:7 -> a
-    2:2:com.android.tools.r8.graph.BottomUpClassHierarchyTraversal forProgramClasses(com.android.tools.r8.graph.AppView):30:30 -> a
-    3:18:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):43:58 -> a
 com.android.tools.r8.graph.CachedHashValueDexItem -> com.android.tools.r8.graph.CachedHashValueDexItem:
     int hash -> a
     1:5:void <init>():9:13 -> <init>
@@ -13808,12 +13568,12 @@
     1:1:void flushCachedValues():35:35 -> flushCachedValues
     1:7:int hashCode():21:27 -> hashCode
 com.android.tools.r8.graph.CfCode -> com.android.tools.r8.graph.CfCode:
-    java.util.List tryCatchRanges -> f
-    int maxStack -> d
-    boolean $assertionsDisabled -> h
-    int maxLocals -> e
-    java.util.List localVariables -> g
-    com.android.tools.r8.graph.DexMethod method -> c
+    java.util.List localVariables -> e
+    java.util.List tryCatchRanges -> d
+    boolean $assertionsDisabled -> f
+    int maxStack -> b
+    int maxLocals -> c
+    com.android.tools.r8.graph.DexMethod method -> a
     1:1:void <clinit>():28:28 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.DexMethod,int,int,java.util.List,java.util.List,java.util.List):88:94 -> <init>
     1:24:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,int):156:179 -> a
@@ -13823,8 +13583,8 @@
     1:1:boolean computeEquals(java.lang.Object):201:201 -> b
     1:2:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):219:220 -> buildIR
     1:4:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):231:234 -> buildInliningIR
-    1:2:int countNonStackOperations(int):133:134 -> d
-    3:3:int computeHashCode():196:196 -> d
+    1:2:int countNonStackOperations(int):133:134 -> c
+    1:1:int computeHashCode():196:196 -> d
     1:1:int getMaxLocals():106:106 -> e
     1:1:int estimatedSizeForInlining():123:123 -> estimatedSizeForInlining
     1:1:boolean estimatedSizeForInliningAtMost(int):128:128 -> estimatedSizeForInliningAtMost
@@ -13879,29 +13639,7 @@
     1:1:void unsetAbstract():145:145 -> w
     1:1:void unsetAnnotation():157:157 -> x
     1:1:void unsetInterface():133:133 -> y
-com.android.tools.r8.graph.ClassHierarchy -> com.android.tools.r8.graph.d:
-    boolean isDirectSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
-com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.graph.f:
-    java.util.Deque worklist -> d
-    com.android.tools.r8.graph.AppView appView -> a
-    java.util.Set visited -> c
-    com.android.tools.r8.graph.ClassHierarchyTraversal$Scope scope -> b
-    boolean excludeInterfaces -> e
-    boolean $assertionsDisabled -> f
-    1:1:void <clinit>():14:14 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):30:30 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):25:32 -> <init>
-    void addDependentsToWorklist(com.android.tools.r8.graph.DexClass) -> a
-    com.android.tools.r8.graph.ClassHierarchyTraversal self() -> a
-    1:22:void visit(java.lang.Iterable,java.util.function.Consumer):43:64 -> a
-    23:36:void visit(java.lang.Iterable,java.util.function.Consumer):47:60 -> a
-com.android.tools.r8.graph.ClassHierarchyTraversal$Scope -> com.android.tools.r8.graph.e:
-    com.android.tools.r8.graph.ClassHierarchyTraversal$Scope ALL_CLASSES -> a
-    com.android.tools.r8.graph.ClassHierarchyTraversal$Scope ONLY_PROGRAM_CLASSES -> b
-    1:2:void <clinit>():18:19 -> <clinit>
-    3:3:void <clinit>():17:17 -> <clinit>
-    1:1:void <init>(java.lang.String,int):17:17 -> <init>
-com.android.tools.r8.graph.ClassKind -> com.android.tools.r8.graph.h:
+com.android.tools.r8.graph.ClassKind -> com.android.tools.r8.graph.e:
     com.android.tools.r8.graph.ClassKind CLASSPATH -> d
     com.android.tools.r8.graph.ClassKind LIBRARY -> e
     java.util.function.Predicate check -> b
@@ -13915,10 +13653,10 @@
     2:2:boolean isOfKind(com.android.tools.r8.graph.DexClass):81:81 -> a
     3:3:java.util.function.Consumer bridgeConsumer(java.util.function.Consumer):85:85 -> a
     4:6:void lambda$bridgeConsumer$0(java.util.function.Consumer,com.android.tools.r8.graph.DexClass):86:88 -> a
-com.android.tools.r8.graph.ClassKind$Factory -> com.android.tools.r8.graph.g:
+com.android.tools.r8.graph.ClassKind$Factory -> com.android.tools.r8.graph.e$a:
     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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean) -> a
 com.android.tools.r8.graph.Code -> com.android.tools.r8.graph.Code:
-    com.android.tools.r8.graph.DexEncodedMethod owner -> b
+    com.android.tools.r8.graph.DexEncodedMethod owner -> a
     1:1:void <init>():16:16 -> <init>
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):104:104 -> a
     2:2:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):109:109 -> a
@@ -13951,7 +13689,7 @@
     1:3:void <clinit>():16:18 -> <clinit>
     4:4:void <clinit>():15:15 -> <clinit>
     1:1:void <init>(java.lang.String,int):15:15 -> <init>
-com.android.tools.r8.graph.Descriptor -> com.android.tools.r8.graph.i:
+com.android.tools.r8.graph.Descriptor -> com.android.tools.r8.graph.f:
     1:1:void <init>():6:6 -> <init>
     boolean match(com.android.tools.r8.graph.DexItem) -> a
 com.android.tools.r8.graph.DexAnnotation -> com.android.tools.r8.graph.DexAnnotation:
@@ -13994,14 +13732,14 @@
     4:4:void com.android.tools.r8.utils.Pair.<init>():20:20 -> c
     4:4:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):135 -> c
     5:12:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):136:143 -> c
+    13:13:com.android.tools.r8.graph.DexValue$DexValueType[] lambda$createAnnotationSynthesizedClassMap$0(int):364:364 -> c
     1:8:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):161:168 -> d
-    9:9:com.android.tools.r8.graph.DexValue$DexValueType[] lambda$createAnnotationSynthesizedClassMap$0(int):364:364 -> d
     1:1:boolean isInnerClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):108:108 -> e
     1:3:boolean equals(java.lang.Object):47:49 -> equals
     1:1:boolean isSignatureAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):249:249 -> f
     1:1:int hashCode():39:39 -> hashCode
     1:1:java.lang.String toString():56:56 -> toString
-com.android.tools.r8.graph.DexAnnotationDirectory -> com.android.tools.r8.graph.j:
+com.android.tools.r8.graph.DexAnnotationDirectory -> com.android.tools.r8.graph.g:
     java.util.List methodAnnotations -> b
     java.util.List fieldAnnotations -> d
     com.android.tools.r8.graph.DexProgramClass clazz -> a
@@ -14032,35 +13770,32 @@
     1:1:int hashCode():22:22 -> hashCode
     1:1:java.lang.String toString():39:39 -> toString
 com.android.tools.r8.graph.DexAnnotationSet -> com.android.tools.r8.graph.DexAnnotationSet:
-    com.android.tools.r8.graph.DexAnnotationSet THE_EMPTY_ANNOTATIONS_SET -> c
-    int sorted -> b
-    boolean $assertionsDisabled -> d
-    1:4:void <clinit>():16:19 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexAnnotation[]):25:25 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.DexAnnotation[]):23:26 -> <init>
-    1:1:com.android.tools.r8.graph.DexType findDuplicateEntryType(com.android.tools.r8.graph.DexAnnotation[]):30:30 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):64:64 -> a
-    3:4:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):69:70 -> a
-    5:5:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):82:82 -> a
-    6:7:com.android.tools.r8.graph.DexAnnotation getFirstMatching(com.android.tools.r8.graph.DexType):90:91 -> a
-    8:21:com.android.tools.r8.graph.DexAnnotationSet getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):123:136 -> a
-    22:22:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):140:140 -> a
-    23:23:com.android.tools.r8.graph.DexAnnotation lambda$keepIf$1(java.util.function.Predicate,com.android.tools.r8.graph.DexAnnotation):140:140 -> a
-    24:31:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):144:151 -> a
-    32:32:com.android.tools.r8.graph.DexAnnotationSet empty():44:44 -> a
-    32:32:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):152 -> a
-    33:33:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):154:154 -> a
-    1:4:com.android.tools.r8.graph.DexType findDuplicateEntryType(java.util.List):34:37 -> b
-    5:7:boolean computeEquals(java.lang.Object):54:56 -> b
-    8:15:com.android.tools.r8.graph.DexAnnotationSet getWithout(com.android.tools.r8.graph.DexType):100:107 -> b
-    1:1:int computeHashCode():49:49 -> d
-    1:2:void sort():78:79 -> e
-    3:3:int sortedHashCode():115:115 -> e
-    3:3:void sort():79 -> e
-    4:11:void sort():79:86 -> e
-    1:1:com.android.tools.r8.graph.DexAnnotationSet empty():44:44 -> empty
-    1:1:boolean isEmpty():74:74 -> isEmpty
-    1:1:java.lang.String toString():159:159 -> toString
+    com.android.tools.r8.graph.DexAnnotationSet THE_EMPTY_ANNOTATIONS_SET -> b
+    boolean $assertionsDisabled -> c
+    int sorted -> a
+    1:4:void <clinit>():13:16 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexAnnotation[]):22:22 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.DexAnnotation[]):20:23 -> <init>
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):47:47 -> a
+    2:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):52:53 -> a
+    4:4:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):65:65 -> a
+    5:6:com.android.tools.r8.graph.DexAnnotation getFirstMatching(com.android.tools.r8.graph.DexType):73:74 -> a
+    7:20:com.android.tools.r8.graph.DexAnnotationSet getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):106:119 -> a
+    21:21:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):123:123 -> a
+    22:22:com.android.tools.r8.graph.DexAnnotation lambda$keepIf$1(java.util.function.Predicate,com.android.tools.r8.graph.DexAnnotation):123:123 -> a
+    23:30:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):127:134 -> a
+    31:31:com.android.tools.r8.graph.DexAnnotationSet empty():27:27 -> a
+    31:31:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):135 -> a
+    32:32:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):137:137 -> a
+    1:3:boolean computeEquals(java.lang.Object):37:39 -> b
+    4:11:com.android.tools.r8.graph.DexAnnotationSet getWithout(com.android.tools.r8.graph.DexType):83:90 -> b
+    1:1:int computeHashCode():32:32 -> d
+    1:2:void sort():61:62 -> e
+    3:3:int sortedHashCode():98:98 -> e
+    3:3:void sort():62 -> e
+    4:11:void sort():62:69 -> e
+    1:1:com.android.tools.r8.graph.DexAnnotationSet empty():27:27 -> empty
+    1:1:boolean isEmpty():57:57 -> isEmpty
 com.android.tools.r8.graph.DexApplication -> com.android.tools.r8.graph.DexApplication:
     com.android.tools.r8.utils.Timing timing -> e
     com.android.tools.r8.naming.ClassNameMapper proguardMap -> d
@@ -14140,22 +13875,22 @@
     34:34:void lambda$writeClass$3(java.io.PrintStream,com.android.tools.r8.graph.DexEncodedField):86:86 -> a
     35:35:void lambda$writeClass$4(java.io.PrintStream,com.android.tools.r8.graph.DexEncodedMethod):89:89 -> a
     void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> b
-    void writeMethodsFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> b
     1:1:com.android.tools.r8.utils.ThrowingFunction oneFilePerClass(java.nio.file.Path):35:35 -> b
     void writeFieldsFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> c
-    void writeMethodsHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> c
     void writeFieldsHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> d
-    1:8:void writeClass(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):84:91 -> e
+    void writeMethodsFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> e
+    void writeMethodsHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> f
+    1:8:void writeClass(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):84:91 -> g
     1:1:void write(java.io.PrintStream):57:57 -> write
-com.android.tools.r8.graph.DexCallSite -> com.android.tools.r8.graph.l:
-    com.android.tools.r8.graph.DexString methodName -> d
-    int instructionOffset -> j
-    boolean $assertionsDisabled -> k
-    com.android.tools.r8.graph.DexProto methodProto -> e
-    com.android.tools.r8.graph.DexEncodedArray encodedArray -> h
-    com.android.tools.r8.graph.DexMethod method -> i
-    com.android.tools.r8.graph.DexMethodHandle bootstrapMethod -> f
-    java.util.List bootstrapArgs -> g
+com.android.tools.r8.graph.DexCallSite -> com.android.tools.r8.graph.i:
+    com.android.tools.r8.graph.DexString methodName -> c
+    java.util.List bootstrapArgs -> f
+    boolean $assertionsDisabled -> j
+    com.android.tools.r8.graph.DexProto methodProto -> d
+    com.android.tools.r8.graph.DexEncodedArray encodedArray -> g
+    com.android.tools.r8.graph.DexMethod method -> h
+    int instructionOffset -> i
+    com.android.tools.r8.graph.DexMethodHandle bootstrapMethod -> e
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):43:43 -> <init>
     2:22:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):32:52 -> <init>
@@ -14177,8 +13912,8 @@
     1:1:java.lang.String getHash():155:155 -> h
     1:1:java.lang.String toSmaliString():151:151 -> toSmaliString
     1:11:java.lang.String toString():104:114 -> toString
-com.android.tools.r8.graph.DexCallSite$1 -> com.android.tools.r8.graph.k:
-com.android.tools.r8.graph.DexCallSite$HashBuilder -> com.android.tools.r8.graph.l$a:
+com.android.tools.r8.graph.DexCallSite$1 -> com.android.tools.r8.graph.h:
+com.android.tools.r8.graph.DexCallSite$HashBuilder -> com.android.tools.r8.graph.i$a:
     java.io.ByteArrayOutputStream bytes -> a
     com.android.tools.r8.graph.DexCallSite this$0 -> c
     java.io.ObjectOutputStream out -> b
@@ -14208,124 +13943,118 @@
     com.android.tools.r8.graph.DexEncodedField[] instanceFields -> d
     java.util.List innerClasses -> h
     com.android.tools.r8.graph.DexEncodedField[] staticFields -> c
-    1:2:void <clinit>():27:28 -> <clinit>
-    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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):81:81 -> <init>
-    2:71: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):38:107 -> <init>
-    72: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):97:97 -> <init>
-    1:1:boolean hasDefaultInitializer():661:661 -> A
-    1:1:boolean hasKotlinInfo():809:809 -> B
-    1:9:boolean hasNonTrivialClassInitializer():649:657 -> C
-    boolean isClasspathClass() -> D
-    1:1:boolean isEnum():558:558 -> E
-    boolean isLibraryClass() -> F
-    boolean isNotProgramClass() -> G
-    boolean isProgramClass() -> H
-    1:2:boolean isValid():813:814 -> I
-    3:8:boolean isValid():813:818 -> I
-    1:4:boolean verifyNoDuplicateFields():480:483 -> J
-    1:4:boolean verifyNoDuplicateMethods():259:262 -> K
-    java.util.Iterator lambda$allImmediateSupertypes$2(java.util.Iterator) -> a
-    1:3:java.lang.Iterable fields(java.util.function.Predicate):117:119 -> a
+    1:2:void <clinit>():25:26 -> <clinit>
+    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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):79:79 -> <init>
+    2:71: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):36:105 -> <init>
+    72: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.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):95:95 -> <init>
+    1:1:boolean hasKotlinInfo():791:791 -> A
+    1:9:boolean hasNonTrivialClassInitializer():645:653 -> B
+    boolean isClasspathClass() -> C
+    1:1:boolean isEnum():556:556 -> D
+    boolean isLibraryClass() -> E
+    boolean isProgramClass() -> F
+    1:2:boolean isValid():795:796 -> G
+    3:8:boolean isValid():795:800 -> G
+    1:4:boolean verifyNoDuplicateFields():478:481 -> H
+    1:4:boolean verifyNoDuplicateMethods():257:260 -> I
+    1:3:java.lang.Iterable fields(java.util.function.Predicate):115:117 -> a
     4:4:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    4:4:java.lang.Iterable fields(java.util.function.Predicate):117 -> a
-    5:5:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):134:134 -> a
-    6:12:void appendDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):146:152 -> a
-    13:23:void appendDirectMethods(java.util.Collection):156:166 -> a
-    24:27:void setDirectMethod(int,com.android.tools.r8.graph.DexEncodedMethod):178:181 -> a
-    28:31:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):185:188 -> a
-    32:32:int lambda$allMethodsSorted$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):283:283 -> a
-    33:55:void virtualizeMethods(java.util.Set):288:310 -> a
-    56:57:boolean definesStaticField(com.android.tools.r8.graph.DexField):404:405 -> a
-    58:60:void setInstanceField(int,com.android.tools.r8.graph.DexEncodedField):451:453 -> a
-    61:63:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):457:459 -> a
-    64:65:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):473:474 -> a
-    66:66:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):525:525 -> a
-    67:68:com.android.tools.r8.graph.DexItem lookupTarget(com.android.tools.r8.graph.DexItem[],com.android.tools.r8.graph.Descriptor):544:545 -> a
-    69:71:com.android.tools.r8.graph.DexEncodedMethod getInitializer(com.android.tools.r8.graph.DexType[]):665:667 -> a
-    72:76:boolean hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithSubtyping):679:683 -> a
-    77:77:boolean isExternalizable(com.android.tools.r8.graph.AppView):695:695 -> a
-    78:78:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier):699:699 -> a
-    79:89:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Predicate):704:714 -> a
-    90:90:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$3(com.android.tools.r8.graph.DexEncodedField):745:745 -> a
+    4:4:java.lang.Iterable fields(java.util.function.Predicate):115 -> a
+    5:5:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):132:132 -> a
+    6:12:void appendDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):144:150 -> a
+    13:23:void appendDirectMethods(java.util.Collection):154:164 -> a
+    24:27:void setDirectMethod(int,com.android.tools.r8.graph.DexEncodedMethod):176:179 -> a
+    28:31:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):183:186 -> a
+    32:32:int lambda$allMethodsSorted$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):281:281 -> a
+    33:55:void virtualizeMethods(java.util.Set):286:308 -> a
+    56:57:boolean definesStaticField(com.android.tools.r8.graph.DexField):402:403 -> a
+    58:60:void setInstanceField(int,com.android.tools.r8.graph.DexEncodedField):449:451 -> a
+    61:63:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):455:457 -> a
+    64:65:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):471:472 -> a
+    66:66:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):523:523 -> a
+    67:68:com.android.tools.r8.graph.DexItem lookupTarget(com.android.tools.r8.graph.DexItem[],com.android.tools.r8.graph.Descriptor):542:543 -> a
+    69:69:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier):690:690 -> a
+    70:80:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Predicate):695:705 -> a
+    81:81:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$2(com.android.tools.r8.graph.DexEncodedField):727:727 -> a
     void addDependencies(com.android.tools.r8.dex.MixedSectionCollection) -> b
-    1:3:java.lang.Iterable methods(java.util.function.Predicate):127:129 -> b
+    1:3:java.lang.Iterable methods(java.util.function.Predicate):125:127 -> b
     4:4:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> b
-    4:4:java.lang.Iterable methods(java.util.function.Predicate):127 -> b
-    5:10:void appendVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):200:205 -> b
-    11:20:void appendVirtualMethods(java.util.Collection):209:218 -> b
-    21:23:void setVirtualMethod(int,com.android.tools.r8.graph.DexEncodedMethod):230:232 -> b
-    24:26:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):236:238 -> b
-    27:28:boolean verifyCorrectnessOfMethodHolders(java.lang.Iterable):252:253 -> b
-    29:51:void forEachAnnotation(java.util.function.Consumer):318:340 -> b
-    52:54:void setStaticField(int,com.android.tools.r8.graph.DexEncodedField):392:394 -> b
-    55:57:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):398:400 -> b
-    58:62:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):463:467 -> b
-    63:64:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):517:518 -> b
-    65:66:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):539:540 -> b
-    67:67:boolean isSerializable(com.android.tools.r8.graph.AppView):691:691 -> b
-    68:68:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier):727:727 -> b
-    69:74:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Predicate):732:737 -> b
-    1:5:void forEachField(java.util.function.Consumer):346:350 -> c
-    6:6:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):510:510 -> c
-    7:7:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):532:532 -> c
-    8:9:void removeEnclosingMethod(java.util.function.Predicate):761:762 -> c
-    10:10:boolean lambda$isValid$4(com.android.tools.r8.graph.DexEncodedMethod):814:814 -> c
+    4:4:java.lang.Iterable methods(java.util.function.Predicate):125 -> b
+    5:10:void appendVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):198:203 -> b
+    11:20:void appendVirtualMethods(java.util.Collection):207:216 -> b
+    21:23:void setVirtualMethod(int,com.android.tools.r8.graph.DexEncodedMethod):228:230 -> b
+    24:26:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):234:236 -> b
+    27:28:boolean verifyCorrectnessOfMethodHolders(java.lang.Iterable):250:251 -> b
+    29:51:void forEachAnnotation(java.util.function.Consumer):316:338 -> b
+    52:54:void setStaticField(int,com.android.tools.r8.graph.DexEncodedField):390:392 -> b
+    55:57:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):396:398 -> b
+    58:62:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):461:465 -> b
+    63:64:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):515:516 -> b
+    65:66:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):537:538 -> b
+    67:71:boolean hasMissingSuperType(com.android.tools.r8.graph.DexDefinitionSupplier):670:674 -> b
+    72:77:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Predicate):714:719 -> b
+    1:5:void removeDirectMethod(int):168:172 -> c
+    6:10:void forEachField(java.util.function.Consumer):344:348 -> c
+    11:11:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):508:508 -> c
+    12:12:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):530:530 -> c
+    13:13:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier):709:709 -> c
+    14:15:void removeEnclosingMethod(java.util.function.Predicate):743:744 -> c
+    16:16:boolean lambda$isValid$3(com.android.tools.r8.graph.DexEncodedMethod):796:796 -> c
     com.android.tools.r8.graph.DexClass asDexClass() -> d
-    1:5:void removeDirectMethod(int):170:174 -> d
-    6:10:boolean verifyCorrectnessOfMethodHolder(com.android.tools.r8.graph.DexEncodedMethod):242:246 -> d
-    11:11:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):503:503 -> d
-    12:12:void removeInnerClasses(java.util.function.Predicate):771:771 -> d
-    1:5:java.util.List directMethods():138:142 -> directMethods
-    1:5:void forEachMethod(java.util.function.Consumer):268:272 -> forEachMethod
+    1:5:boolean verifyCorrectnessOfMethodHolder(com.android.tools.r8.graph.DexEncodedMethod):240:244 -> d
+    6:6:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):501:501 -> d
+    7:7:boolean isExternalizable(com.android.tools.r8.graph.DexDefinitionSupplier):686:686 -> d
+    8:8:void removeInnerClasses(java.util.function.Predicate):753:753 -> d
+    1:5:java.util.List directMethods():136:140 -> directMethods
+    1:1:boolean isSerializable(com.android.tools.r8.graph.DexDefinitionSupplier):682:682 -> e
+    1:5:void forEachMethod(java.util.function.Consumer):266:270 -> forEachMethod
     boolean isDexClass() -> g
-    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():753:753 -> getEnclosingMethod
-    1:1:java.util.List getInnerClasses():749:749 -> getInnerClasses
-    1:5:java.util.List instanceFields():413:417 -> instanceFields
-    1:4:boolean isAnonymousClass():799:802 -> isAnonymousClass
-    1:1:boolean isInterface():554:554 -> isInterface
-    1:4:boolean isLocalClass():784:787 -> isLocalClass
-    1:5:boolean isMemberClass():791:795 -> isMemberClass
+    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():735:735 -> getEnclosingMethod
+    1:1:java.util.List getInnerClasses():731:731 -> getInnerClasses
+    1:5:java.util.List instanceFields():411:415 -> instanceFields
+    1:4:boolean isAnonymousClass():781:784 -> isAnonymousClass
+    1:1:boolean isInterface():552:552 -> isInterface
+    1:4:boolean isLocalClass():766:769 -> isLocalClass
+    1:5:boolean isMemberClass():773:777 -> isMemberClass
     boolean isStaticMember() -> j
-    1:1:com.android.tools.r8.graph.DexReference toReference():565:565 -> k
-    1:3:java.lang.Iterable allImmediateSupertypes():719:721 -> l
-    4:7:java.lang.Iterable allImmediateSupertypes():720:723 -> l
-    1:6:com.android.tools.r8.graph.DexEncodedMethod[] allMethodsSorted():277:282 -> m
-    1:1:java.lang.Iterable methods():123:123 -> methods
-    com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> n
-    com.android.tools.r8.graph.DexProgramClass asProgramClass() -> o
-    1:1:void clearEnclosingMethod():757:757 -> p
-    1:1:void clearInnerClasses():767:767 -> q
-    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():744:745 -> r
-    1:1:java.lang.Iterable fields():113:113 -> s
-    1:5:java.util.List staticFields():355:359 -> staticFields
-    1:10:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():615:624 -> t
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():675:675 -> u
-    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():775:776 -> v
-    1:5:java.util.List virtualMethods():192:196 -> virtualMethods
-    com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> w
-    1:1:com.android.tools.r8.origin.Origin getOrigin():628:628 -> x
-    1:1:com.android.tools.r8.graph.DexType getType():632:632 -> y
-    1:1:boolean hasClassInitializer():636:636 -> z
+    1:1:com.android.tools.r8.graph.DexReference toReference():563:563 -> k
+    1:6:com.android.tools.r8.graph.DexEncodedMethod[] allMethodsSorted():275:280 -> l
+    com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> m
+    1:1:java.lang.Iterable methods():121:121 -> methods
+    com.android.tools.r8.graph.DexProgramClass asProgramClass() -> n
+    1:1:void clearEnclosingMethod():739:739 -> o
+    1:1:void clearInnerClasses():749:749 -> p
+    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():726:727 -> q
+    1:1:java.lang.Iterable fields():111:111 -> r
+    1:10:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():611:620 -> s
+    1:5:java.util.List staticFields():353:357 -> staticFields
+    1:2:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():661:662 -> t
+    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():757:758 -> u
+    com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> v
+    1:5:java.util.List virtualMethods():190:194 -> virtualMethods
+    1:1:com.android.tools.r8.origin.Origin getOrigin():624:624 -> w
+    1:1:com.android.tools.r8.graph.DexType getType():628:628 -> x
+    1:1:boolean hasClassInitializer():632:632 -> y
+    1:1:boolean hasDefaultInitializer():657:657 -> z
 com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.graph.DexClass$a:
     void setField(int,com.android.tools.r8.graph.DexEncodedField) -> a
 com.android.tools.r8.graph.DexClass$MethodSetter -> com.android.tools.r8.graph.DexClass$b:
     void setMethod(int,com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.graph.DexClasspathClass -> com.android.tools.r8.graph.m:
+com.android.tools.r8.graph.DexClasspathClass -> com.android.tools.r8.graph.j:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():16:16 -> <clinit>
     1:16:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):34:49 -> <init>
-    boolean isClasspathClass() -> D
-    boolean isNotProgramClass() -> G
+    boolean isClasspathClass() -> C
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):55:55 -> a
     1:1:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):66:66 -> b
     1:1:java.lang.String toString():60:60 -> toString
-    1:1:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo():86:86 -> w
+    1:1:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo():81:81 -> v
 com.android.tools.r8.graph.DexCode -> com.android.tools.r8.graph.DexCode:
-    com.android.tools.r8.graph.DexString highestSortingString -> d
-    boolean $assertionsDisabled -> g
-    com.android.tools.r8.graph.DexDebugInfo debugInfo -> e
-    int outgoingRegisterSize -> c
-    com.android.tools.r8.graph.DexDebugInfoForWriting debugInfoForWriting -> f
+    com.android.tools.r8.graph.DexString highestSortingString -> b
+    com.android.tools.r8.graph.DexDebugInfo debugInfo -> c
+    boolean $assertionsDisabled -> e
+    com.android.tools.r8.graph.DexDebugInfoForWriting debugInfoForWriting -> d
+    int outgoingRegisterSize -> a
     1:1:void <clinit>():33:33 -> <clinit>
     1:9:void <init>(int,int,int,com.android.tools.r8.code.Instruction[],com.android.tools.r8.graph.DexCode$Try[],com.android.tools.r8.graph.DexCode$TryHandler[],com.android.tools.r8.graph.DexDebugInfo):56:64 -> <init>
     1:3:void setDebugInfo(com.android.tools.r8.graph.DexDebugInfo):104:106 -> a
@@ -14434,6 +14163,7 @@
     61:62:void startArgument(int,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):139 -> a
     63:66:com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry getEntry(int):206:209 -> a
     1:6:java.util.List build():190:195 -> build
+com.android.tools.r8.graph.DexDebugEntryBuilder$1 -> com.android.tools.r8.graph.k:
 com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry -> com.android.tools.r8.graph.DexDebugEntryBuilder$a:
     com.android.tools.r8.graph.DebugLocalInfo current -> a
     com.android.tools.r8.graph.DebugLocalInfo last -> b
@@ -14455,7 +14185,7 @@
     1:1:int hashCode():170:170 -> hashCode
     1:1:java.lang.String toString():165:165 -> toString
 com.android.tools.r8.graph.DexDebugEvent$AdvancePC -> com.android.tools.r8.graph.DexDebugEvent$AdvancePC:
-    boolean $assertionsDisabled -> b
+    boolean $assertionsDisabled -> a
     1:1:void <clinit>():41:41 -> <clinit>
     1:2:void <init>(int):51:52 -> <init>
     1:2:void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping):47:48 -> a
@@ -14600,7 +14330,7 @@
     void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd) -> a
     void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal) -> a
 com.android.tools.r8.graph.DexDebugInfo -> com.android.tools.r8.graph.DexDebugInfo:
-    boolean $assertionsDisabled -> b
+    boolean $assertionsDisabled -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:8:void <init>(int,com.android.tools.r8.graph.DexString[],com.android.tools.r8.graph.DexDebugEvent[]):17:24 -> <init>
     1:5:java.util.List computeEntries(com.android.tools.r8.graph.DexMethod):28:32 -> a
@@ -14609,11 +14339,11 @@
     1:9:boolean computeEquals(java.lang.Object):44:52 -> b
     1:3:int computeHashCode():37:39 -> d
     1:8:java.lang.String toString():71:78 -> toString
-com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.graph.n:
+com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.graph.l:
     1:4:void <init>(com.android.tools.r8.graph.DexDebugInfo):17:20 -> <init>
     5:5:void <init>(com.android.tools.r8.graph.DexDebugInfo):17:17 -> <init>
     1:1:boolean lambda$new$0(com.android.tools.r8.graph.DexDebugEvent):19:19 -> a
-    1:1:com.android.tools.r8.graph.DexDebugEvent[] lambda$new$1(int):20:20 -> d
+    1:1:com.android.tools.r8.graph.DexDebugEvent[] lambda$new$1(int):20:20 -> c
 com.android.tools.r8.graph.DexDebugPositionState -> com.android.tools.r8.graph.DexDebugPositionState:
     com.android.tools.r8.graph.DexString currentFile -> c
     boolean $assertionsDisabled -> f
@@ -14639,7 +14369,7 @@
     1:1:com.android.tools.r8.graph.DexMethod getCurrentMethod():102:102 -> c
     1:1:int getCurrentLine():94:94 -> getCurrentLine
     1:1:int getCurrentPc():90:90 -> getCurrentPc
-com.android.tools.r8.graph.DexDefinition -> com.android.tools.r8.graph.o:
+com.android.tools.r8.graph.DexDefinition -> com.android.tools.r8.graph.m:
     1:1:void <init>():13:13 -> <init>
     1:1:java.util.stream.Stream filterDexEncodedField(java.util.stream.Stream):71:71 -> a
     2:2:java.util.stream.Stream filter(java.util.stream.Stream,java.util.function.Predicate,java.util.function.Function):63:63 -> a
@@ -14655,7 +14385,8 @@
     boolean isDexEncodedMethod() -> i
     boolean isStaticMember() -> j
     com.android.tools.r8.graph.DexReference toReference() -> k
-com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.graph.p:
+com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.graph.DexDefinitionSupplier:
+    com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType) -> a
 com.android.tools.r8.graph.DexEncodedAnnotation -> com.android.tools.r8.graph.DexEncodedAnnotation:
     boolean $assertionsDisabled -> b
     int sorted -> a
@@ -14676,7 +14407,7 @@
     1:3:boolean equals(java.lang.Object):54:56 -> equals
     1:1:int hashCode():46:46 -> hashCode
     1:1:java.lang.String toString():41:41 -> toString
-com.android.tools.r8.graph.DexEncodedArray -> com.android.tools.r8.graph.q:
+com.android.tools.r8.graph.DexEncodedArray -> com.android.tools.r8.graph.n:
     com.android.tools.r8.graph.DexValue[] values -> a
     1:2:void <init>(com.android.tools.r8.graph.DexValue[]):14:15 -> <init>
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):21:21 -> a
@@ -14692,134 +14423,133 @@
     1:3:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):33:35 -> a
     4:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):43:46 -> a
     8:8:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):52:52 -> a
-    9:11:void setStaticValue(com.android.tools.r8.graph.DexValue):114:116 -> a
-    12:21:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.InternalOptions):129:138 -> a
-    22:25:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):144:147 -> a
+    9:11:void setStaticValue(com.android.tools.r8.graph.DexValue):110:112 -> a
+    12:21:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.InternalOptions):125:134 -> a
+    22:25:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):140:143 -> a
     com.android.tools.r8.graph.DexEncodedField asDexEncodedField() -> e
-    1:2:com.android.tools.r8.graph.DexValue getStaticValue():120:121 -> getStaticValue
+    1:2:com.android.tools.r8.graph.DexValue getStaticValue():116:117 -> getStaticValue
     boolean isDexEncodedField() -> h
-    1:2:boolean hasExplicitStaticValue():109:110 -> hasExplicitStaticValue
+    1:2:boolean hasExplicitStaticValue():105:106 -> hasExplicitStaticValue
     1:1:boolean isStatic():92:92 -> isStatic
-    1:1:boolean isStaticMember():101:101 -> j
+    1:1:boolean isStaticMember():97:97 -> j
     1:1:com.android.tools.r8.graph.DexReference toReference():77:77 -> k
     1:1:com.android.tools.r8.graph.PresortedComparable getKey():13:13 -> l
     2:2:com.android.tools.r8.graph.DexField getKey():72:72 -> l
-    1:1:boolean hasAnnotation():105:105 -> m
-    1:1:boolean isPrivate():96:96 -> n
+    1:1:boolean hasAnnotation():101:101 -> m
     1:1:java.lang.String toSmaliString():62:62 -> toSmaliString
     1:1:java.lang.String toSourceString():67:67 -> toSourceString
     1:1:java.lang.String toString():57:57 -> toString
 com.android.tools.r8.graph.DexEncodedMethod -> com.android.tools.r8.graph.DexEncodedMethod:
     com.android.tools.r8.graph.OptimizationInfo optimizationInfo -> d
-    boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.Code code -> b
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> c
+    boolean obsolete -> f
     com.android.tools.r8.graph.ParameterAnnotationsList parameterAnnotationsList -> a
-    boolean obsolete -> g
+    boolean $assertionsDisabled -> h
     int classFileVersion -> e
-    com.android.tools.r8.graph.DexEncodedMethod SENTINEL -> h
-    com.android.tools.r8.graph.DexEncodedMethod defaultInterfaceMethodImplementation -> f
-    1:40:void <clinit>():58:97 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):170:170 -> <init>
-    2:72:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):107:177 -> <init>
-    73:74:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,int):187:188 -> <init>
-    1:2:void markNotProcessed():346:347 -> A
-    1:3:void removeCode():426:428 -> B
-    1:1:void setObsolete():132:132 -> C
-    1:7:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():510:516 -> D
-    1:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():579:585 -> E
-    1:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex():555:564 -> F
-    1:7:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():707:713 -> G
-    1:1:void unsetObsolete():162:162 -> H
-    1:2:void voidCodeOwnership():438:439 -> I
-    1:1:void checkIfObsolete():120:120 -> J
-    1:2:void setCodeOwnership():432:433 -> K
-    1:1:com.android.tools.r8.graph.Code access$400(com.android.tools.r8.graph.DexEncodedMethod):58:58 -> a
-    2:2:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$502(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$CompilationState):58:58 -> a
-    3:3:com.android.tools.r8.graph.OptimizationInfo access$602(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.OptimizationInfo):58:58 -> a
-    4:6:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):192:194 -> a
-    7:8:boolean isInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):287:288 -> a
-    9:32:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):293:316 -> a
-    33:33:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):314:314 -> a
-    34:34:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):312:312 -> a
-    35:51:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):323:339 -> a
-    52:52:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):336:336 -> a
-    53:53:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):333:333 -> a
-    54:54:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):330:330 -> a
-    55:70:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):327:342 -> a
-    71:72:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):361:362 -> a
-    73:76:void setCode(com.android.tools.r8.graph.Code):367:370 -> a
-    77:83:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):388:394 -> a
-    84:84:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):399:399 -> a
-    85:90:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):404:409 -> a
-    91:99:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):472:480 -> a
-    100:116:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):484:500 -> a
-    117:127:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):530:540 -> a
-    128:132:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.DexItemFactory):589:593 -> a
-    133:141:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.DexItemFactory):592:600 -> a
-    142:175:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.DexItemFactory):599:632 -> a
-    176:185:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):636:645 -> a
-    186:228:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):661:703 -> a
-    229:237:com.android.tools.r8.ir.conversion.SourceCode lambda$toForwardingMethod$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Position):682:690 -> a
-    238:241:void lambda$toForwardingMethod$1(com.android.tools.r8.graph.UseRegistry):692:695 -> a
-    242:253:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):720:731 -> a
-    254:264:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):730:740 -> a
-    265:266:void setOptimizationInfo(com.android.tools.r8.graph.UpdatableOptimizationInfo):1301:1302 -> a
-    267:267:boolean hasSingleTarget():1399:1399 -> a
-    268:269:void forEachTarget(java.util.function.Consumer):1411:1412 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve():1387:1387 -> asResultOfResolve
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$500(com.android.tools.r8.graph.DexEncodedMethod):58:58 -> b
-    2:2:com.android.tools.r8.graph.DexEncodedMethod asSingleTarget():1393:1393 -> b
-    1:2:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):351:352 -> buildIR
-    1:1:com.android.tools.r8.graph.OptimizationInfo access$600(com.android.tools.r8.graph.DexEncodedMethod):58:58 -> c
-    2:3:java.util.List asListOfTargets():1405:1406 -> c
-    1:2:java.lang.String codeToString():746:747 -> codeToString
-    1:1:int access$700(com.android.tools.r8.graph.DexEncodedMethod):58:58 -> d
-    2:5:void upgradeClassFileVersion(int):455:458 -> d
-    1:2:java.lang.String descriptor():467:468 -> descriptor
-    1:7:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1306:1312 -> e
-    1:10:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):140:149 -> f
-    11:11:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():771:771 -> f
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1317:1317 -> g
-    1:2:com.android.tools.r8.graph.Code getCode():421:422 -> getCode
-    1:5:com.android.tools.r8.graph.UpdatableOptimizationInfo getMutableOptimizationInfo():1293:1297 -> getMutableOptimizationInfo
-    1:1:boolean hasCode():417:417 -> hasCode
-    1:1:boolean isDexEncodedMethod():765:765 -> i
-    1:2:boolean isClassInitializer():220:221 -> isClassInitializer
-    1:2:boolean isInstanceInitializer():210:211 -> isInstanceInitializer
-    1:2:boolean isPublicMethod():248:249 -> isPublicMethod
-    1:2:boolean isStatic():267:268 -> isStatic
-    1:2:boolean isSyntheticMethod():281:282 -> isSyntheticMethod
-    1:2:boolean isVirtualMethod():229:230 -> isVirtualMethod
-    1:2:boolean isStaticMember():273:274 -> j
-    1:2:com.android.tools.r8.graph.DexReference toReference():759:760 -> k
-    1:1:com.android.tools.r8.graph.PresortedComparable getKey():58:58 -> l
-    2:2:com.android.tools.r8.graph.DexMethod getKey():754:754 -> l
-    1:8:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():568:575 -> m
-    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():550:551 -> n
-    1:3:int getClassFileVersion():444:446 -> o
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInterfaceMethodImplementation():136:136 -> p
-    1:2:com.android.tools.r8.graph.OptimizationInfo getOptimizationInfo():1288:1289 -> q
-    1:2:java.lang.String qualifiedName():462:463 -> qualifiedName
-    1:2:boolean hasAnnotation():776:777 -> r
-    1:6:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):781:786 -> registerCodeReferences
-    1:2:boolean hasClassFileVersion():450:451 -> s
-    1:3:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions):374:376 -> setCode
-    1:1:boolean shouldNotHaveCode():413:413 -> shouldNotHaveCode
-    1:2:boolean isDirectMethod():261:262 -> t
-    1:2:java.lang.String toSourceString():505:506 -> toSourceString
-    1:2:java.lang.String toString():381:382 -> toString
-    1:2:boolean isInitializer():205:206 -> u
-    1:2:boolean isNonAbstractVirtualMethod():238:239 -> v
-    1:1:boolean isObsolete():126:126 -> w
-    1:2:boolean isPrivateMethod():253:254 -> x
-    1:2:boolean isProcessed():200:201 -> y
-    1:2:boolean isPublicized():243:244 -> z
-com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.graph.DexEncodedMethod$1:
+    com.android.tools.r8.graph.DexEncodedMethod SENTINEL -> g
+    1:40:void <clinit>():56:95 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):149:149 -> <init>
+    2:52:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):105:155 -> <init>
+    53:54:void setCodeOwnership():403:404 -> <init>
+    53:54:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):156 -> <init>
+    55:56:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,int):166:167 -> <init>
+    1:2:boolean isVirtualMethod():200:201 -> A
+    1:2:void markNotProcessed():317:318 -> B
+    1:3:void removeCode():397:399 -> C
+    1:1:void setObsolete():128:128 -> D
+    1:7:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():481:487 -> E
+    1:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():550:556 -> F
+    1:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex():526:535 -> G
+    1:7:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():678:684 -> H
+    1:1:void unsetObsolete():141:141 -> I
+    1:2:void voidCodeOwnership():409:410 -> J
+    1:1:void checkIfObsolete():116:116 -> K
+    1:1:com.android.tools.r8.graph.Code access$400(com.android.tools.r8.graph.DexEncodedMethod):56:56 -> a
+    2:2:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$502(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$CompilationState):56:56 -> a
+    3:3:com.android.tools.r8.graph.OptimizationInfo access$602(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.OptimizationInfo):56:56 -> a
+    4:5:boolean isInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):258:259 -> a
+    6:29:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):264:287 -> a
+    30:30:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):285:285 -> a
+    31:31:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):283:283 -> a
+    32:48:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):294:310 -> a
+    49:49:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):307:307 -> a
+    50:50:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):304:304 -> a
+    51:51:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):301:301 -> a
+    52:67:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):298:313 -> a
+    68:69:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):332:333 -> a
+    70:72:void setCode(com.android.tools.r8.graph.Code):338:340 -> a
+    73:74:void setCodeOwnership():403:404 -> a
+    73:74:void setCode(com.android.tools.r8.graph.Code):341 -> a
+    75:81:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):359:365 -> a
+    82:82:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):370:370 -> a
+    83:88:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):375:380 -> a
+    89:97:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):443:451 -> a
+    98:114:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):455:471 -> a
+    115:125:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):501:511 -> a
+    126:130:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.DexItemFactory):560:564 -> a
+    131:139:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.DexItemFactory):563:571 -> a
+    140:173:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.DexItemFactory):570:603 -> a
+    174:183:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):607:616 -> a
+    184:226:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):632:674 -> a
+    227:235:com.android.tools.r8.ir.conversion.SourceCode lambda$toForwardingMethod$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Position):653:661 -> a
+    236:239:void lambda$toForwardingMethod$1(com.android.tools.r8.graph.UseRegistry):663:666 -> a
+    240:251:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):691:702 -> a
+    252:262:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):701:711 -> a
+    263:264:void setOptimizationInfo(com.android.tools.r8.graph.UpdatableOptimizationInfo):1254:1255 -> a
+    265:265:com.android.tools.r8.graph.DexEncodedMethod asSingleTarget():1346:1346 -> a
+    266:267:void forEachTarget(java.util.function.Consumer):1364:1365 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve():1340:1340 -> asResultOfResolve
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$500(com.android.tools.r8.graph.DexEncodedMethod):56:56 -> b
+    2:3:java.util.List asListOfTargets():1358:1359 -> b
+    1:2:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):322:323 -> buildIR
+    1:1:com.android.tools.r8.graph.OptimizationInfo access$600(com.android.tools.r8.graph.DexEncodedMethod):56:56 -> c
+    2:5:void upgradeClassFileVersion(int):426:429 -> c
+    6:6:boolean hasSingleTarget():1352:1352 -> c
+    1:2:java.lang.String codeToString():717:718 -> codeToString
+    1:1:int access$700(com.android.tools.r8.graph.DexEncodedMethod):56:56 -> d
+    1:2:java.lang.String descriptor():438:439 -> descriptor
+    1:7:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1259:1265 -> e
+    1:1:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():742:742 -> f
+    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1270:1270 -> f
+    1:2:com.android.tools.r8.graph.Code getCode():392:393 -> getCode
+    1:5:com.android.tools.r8.graph.UpdatableOptimizationInfo getMutableOptimizationInfo():1246:1250 -> getMutableOptimizationInfo
+    1:1:boolean hasCode():388:388 -> hasCode
+    1:1:boolean isDexEncodedMethod():736:736 -> i
+    1:2:boolean isClassInitializer():191:192 -> isClassInitializer
+    1:2:boolean isInstanceInitializer():181:182 -> isInstanceInitializer
+    1:2:boolean isPublicMethod():219:220 -> isPublicMethod
+    1:2:boolean isStatic():238:239 -> isStatic
+    1:2:boolean isSyntheticMethod():252:253 -> isSyntheticMethod
+    1:2:boolean isStaticMember():244:245 -> j
+    1:2:com.android.tools.r8.graph.DexReference toReference():730:731 -> k
+    1:1:com.android.tools.r8.graph.PresortedComparable getKey():56:56 -> l
+    2:2:com.android.tools.r8.graph.DexMethod getKey():725:725 -> l
+    1:8:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():539:546 -> m
+    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():521:522 -> n
+    1:3:int getClassFileVersion():415:417 -> o
+    1:2:com.android.tools.r8.graph.OptimizationInfo getOptimizationInfo():1241:1242 -> p
+    1:2:boolean hasAnnotation():747:748 -> q
+    1:2:java.lang.String qualifiedName():433:434 -> qualifiedName
+    1:2:boolean hasClassFileVersion():421:422 -> r
+    1:6:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):752:757 -> registerCodeReferences
+    1:2:boolean isDefaultInitializer():186:187 -> s
+    1:3:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions):345:347 -> setCode
+    1:1:boolean shouldNotHaveCode():384:384 -> shouldNotHaveCode
+    1:2:boolean isDirectMethod():232:233 -> t
+    1:2:java.lang.String toSourceString():476:477 -> toSourceString
+    1:2:java.lang.String toString():352:353 -> toString
+    1:2:boolean isInitializer():176:177 -> u
+    1:2:boolean isNonAbstractVirtualMethod():209:210 -> v
+    1:1:boolean isObsolete():122:122 -> w
+    1:2:boolean isPrivateMethod():224:225 -> x
+    1:2:boolean isProcessed():171:172 -> y
+    1:2:boolean isPublicized():214:215 -> z
+com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.graph.o:
     int[] $SwitchMap$com$android$tools$r8$ir$optimize$Inliner$Constraint -> b
     int[] $SwitchMap$com$android$tools$r8$graph$DexEncodedMethod$CompilationState -> a
-    1:1:void <clinit>():325:325 -> <clinit>
-    2:2:void <clinit>():308:308 -> <clinit>
+    1:1:void <clinit>():296:296 -> <clinit>
+    2:2:void <clinit>():279:279 -> <clinit>
 com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.graph.DexEncodedMethod$a:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> f
     com.android.tools.r8.graph.DexAnnotationSet annotations -> c
@@ -14830,19 +14560,19 @@
     com.android.tools.r8.graph.MethodAccessFlags accessFlags -> b
     com.android.tools.r8.graph.OptimizationInfo optimizationInfo -> g
     com.android.tools.r8.graph.DexMethod method -> a
-    1:1:void <clinit>():1320:1320 -> <clinit>
-    1:10:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1331:1340 -> <init>
-    1:10:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1320 -> <init>
-    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1320:1320 -> a
-    2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1344:1344 -> a
-    3:3:void setCode(com.android.tools.r8.graph.Code):1368:1368 -> a
-    4:12:com.android.tools.r8.graph.DexEncodedMethod build():1372:1380 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1348:1348 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder unsetOptimizationInfo():1353:1353 -> c
-    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1358:1362 -> d
+    1:1:void <clinit>():1273:1273 -> <clinit>
+    1:10:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1284:1293 -> <init>
+    1:10:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1273 -> <init>
+    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1273:1273 -> a
+    2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1297:1297 -> a
+    3:3:void setCode(com.android.tools.r8.graph.Code):1321:1321 -> a
+    4:12:com.android.tools.r8.graph.DexEncodedMethod build():1325:1333 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1301:1301 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder unsetOptimizationInfo():1306:1306 -> c
+    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1311:1315 -> d
 com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility -> com.android.tools.r8.graph.DexEncodedMethod$b:
     boolean returnsReceiver -> a
-    1:2:void <init>(boolean):797:798 -> <init>
+    1:2:void <init>(boolean):768:769 -> <init>
 com.android.tools.r8.graph.DexEncodedMethod$CompilationState -> com.android.tools.r8.graph.DexEncodedMethod$c:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_CLASS -> f
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_NOT_INLINING_CANDIDATE -> b
@@ -14851,148 +14581,143 @@
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_PACKAGE -> e
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] $VALUES -> g
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState NOT_PROCESSED -> a
-    1:24:void <clinit>():70:93 -> <clinit>
-    25:25:void <clinit>():66:66 -> <clinit>
-    1:1:void <init>(java.lang.String,int):66:66 -> <init>
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] values():66:66 -> a
+    1:24:void <clinit>():68:91 -> <clinit>
+    25:25:void <clinit>():64:64 -> <clinit>
+    1:1:void <init>(java.lang.String,int):64:64 -> <init>
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] values():64:64 -> a
 com.android.tools.r8.graph.DexEncodedMethod$DefaultOptimizationInfoImpl -> com.android.tools.r8.graph.DexEncodedMethod$d:
-    boolean UNKNOWN_INITIALIZER_ENABLING_JAVA_ASSERTIONS -> n
-    boolean UNKNOWN_MAY_HAVE_SIDE_EFFECTS -> p
-    boolean DOES_NOT_USE_IDNETIFIER_NAME_STRING -> i
-    boolean UNKNOWN_CHECKS_NULL_RECEIVER_BEFORE_ANY_SIDE_EFFECT -> j
-    boolean UNKNOWN_TRIGGERS_CLASS_INIT_BEFORE_ANY_SIDE_EFFECT -> k
-    long UNKNOWN_RETURNED_CONSTANT_NUMBER -> g
-    com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer UNKNOWN_TRIVIAL_INITIALIZER -> m
-    java.util.BitSet NO_NULL_PARAMETER_OR_THROW_FACTS -> q
-    java.util.Set UNKNOWN_INITIALIZED_CLASSES_ON_NORMAL_EXIT -> b
-    int UNKNOWN_RETURNED_ARGUMENT -> c
-    java.util.BitSet NO_NULL_PARAMETER_ON_NORMAL_EXITS_FACTS -> r
-    com.android.tools.r8.graph.ParameterUsagesInfo UNKNOWN_PARAMETER_USAGE_INFO -> o
-    boolean $assertionsDisabled -> s
+    boolean UNKNOWN_INITIALIZER_ENABLING_JAVA_ASSERTIONS -> m
+    boolean UNKNOWN_MAY_HAVE_SIDE_EFFECTS -> o
+    long UNKNOWN_RETURNED_CONSTANT_NUMBER -> f
+    boolean UNKNOWN_CHECKS_NULL_RECEIVER_BEFORE_ANY_SIDE_EFFECT -> i
+    boolean UNKNOWN_TRIGGERS_CLASS_INIT_BEFORE_ANY_SIDE_EFFECT -> j
+    java.util.BitSet NO_NULL_PARAMETER_ON_NORMAL_EXITS_FACTS -> q
+    java.util.BitSet NO_NULL_PARAMETER_OR_THROW_FACTS -> p
+    int UNKNOWN_RETURNED_ARGUMENT -> b
+    com.android.tools.r8.graph.ParameterUsagesInfo UNKNOWN_PARAMETER_USAGE_INFO -> n
+    boolean $assertionsDisabled -> r
     com.android.tools.r8.graph.OptimizationInfo DEFAULT_INSTANCE -> a
-    boolean UNKNOWN_NEVER_RETURNS_NORMALLY -> e
-    com.android.tools.r8.graph.DexString UNKNOWN_RETURNED_CONSTANT_STRING -> h
-    boolean UNKNOWN_RETURNS_CONSTANT -> f
-    boolean UNKNOWN_NEVER_RETURNS_NULL -> d
-    com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility UNKNOWN_CLASS_INLINER_ELIGIBILITY -> l
-    1:20:void <clinit>():824:843 -> <clinit>
-    1:1:void <init>():845:845 -> <init>
-    1:1:boolean isInitializerEnablingJavaAssertions():933:933 -> A
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo():854:854 -> B
-    1:1:java.util.BitSet getNonNullParamOrThrow():865:865 -> C
-    1:1:com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):859:859 -> a
-    2:2:com.android.tools.r8.graph.UpdatableOptimizationInfo mutableCopy():968:968 -> a
-    1:1:java.util.BitSet getNonNullParamOnNormalExits():870:870 -> b
-    1:1:boolean checksNullReceiverBeforeAnySideEffect():953:953 -> c
-    1:2:int getReturnedArgument():885:886 -> e
-    1:1:com.android.tools.r8.graph.DexString getReturnedConstantString():927:927 -> f
-    2:2:boolean returnsConstantString():911:911 -> f
-    2:2:com.android.tools.r8.graph.DexString getReturnedConstantString():927 -> f
-    3:4:com.android.tools.r8.graph.DexString getReturnedConstantString():927:928 -> f
-    boolean neverInline() -> g
-    1:1:boolean neverReturnsNormally():896:896 -> h
-    1:1:boolean returnsConstant():901:901 -> i
-    1:1:boolean returnsConstantString():911:911 -> k
-    1:1:boolean useIdentifierNameString():938:938 -> n
-    1:1:boolean triggersClassInitBeforeAnySideEffect():958:958 -> o
-    1:1:boolean returnsConstantNumber():906:906 -> p
-    boolean returnsArgument() -> q
-    1:1:boolean neverReturnsNull():891:891 -> r
-    boolean isReachabilitySensitive() -> s
-    boolean forceInline() -> t
-    1:1:boolean mayHaveSideEffects():963:963 -> w
-    1:1:long getReturnedConstantNumber():921:921 -> x
-    2:2:boolean returnsConstantNumber():906:906 -> x
-    2:2:long getReturnedConstantNumber():921 -> x
-    3:4:long getReturnedConstantNumber():921:922 -> x
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility():916:916 -> y
-    1:1:java.util.Set getInitializedClassesOnNormalExit():849:849 -> z
+    com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer UNKNOWN_TRIVIAL_INITIALIZER -> l
+    com.android.tools.r8.graph.DexString UNKNOWN_RETURNED_CONSTANT_STRING -> g
+    boolean UNKNOWN_RETURNS_CONSTANT -> e
+    boolean DOES_NOT_USE_IDNETIFIER_NAME_STRING -> h
+    com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility UNKNOWN_CLASS_INLINER_ELIGIBILITY -> k
+    boolean UNKNOWN_NEVER_RETURNS_NULL -> c
+    boolean UNKNOWN_NEVER_RETURNS_NORMALLY -> d
+    1:19:void <clinit>():795:813 -> <clinit>
+    1:1:void <init>():815:815 -> <init>
+    1:1:boolean returnsConstantNumber():871:871 -> A
+    1:1:long getReturnedConstantNumber():886:886 -> B
+    2:2:boolean returnsConstantNumber():871:871 -> B
+    2:2:long getReturnedConstantNumber():886 -> B
+    3:4:long getReturnedConstantNumber():886:887 -> B
+    1:1:com.android.tools.r8.graph.UpdatableOptimizationInfo mutableCopy():933:933 -> a
+    1:1:com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):824:824 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo():819:819 -> d
+    1:1:boolean returnsConstantString():876:876 -> e
+    1:1:boolean triggersClassInitBeforeAnySideEffect():923:923 -> g
+    1:1:java.util.BitSet getNonNullParamOrThrow():830:830 -> h
+    boolean returnsArgument() -> j
+    1:1:boolean isInitializerEnablingJavaAssertions():898:898 -> k
+    1:1:boolean checksNullReceiverBeforeAnySideEffect():918:918 -> l
+    boolean forceInline() -> n
+    1:1:boolean mayHaveSideEffects():928:928 -> o
+    boolean neverInline() -> p
+    1:1:com.android.tools.r8.graph.DexString getReturnedConstantString():892:892 -> r
+    2:2:boolean returnsConstantString():876:876 -> r
+    2:2:com.android.tools.r8.graph.DexString getReturnedConstantString():892 -> r
+    3:4:com.android.tools.r8.graph.DexString getReturnedConstantString():892:893 -> r
+    1:1:boolean useIdentifierNameString():903:903 -> s
+    boolean isReachabilitySensitive() -> t
+    1:1:boolean neverReturnsNull():856:856 -> u
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility():881:881 -> v
+    1:2:int getReturnedArgument():850:851 -> w
+    1:1:boolean returnsConstant():866:866 -> x
+    1:1:java.util.BitSet getNonNullParamOnNormalExits():835:835 -> y
+    1:1:boolean neverReturnsNormally():861:861 -> z
 com.android.tools.r8.graph.DexEncodedMethod$OptimizationInfoImpl -> com.android.tools.r8.graph.DexEncodedMethod$e:
-    boolean triggersClassInitBeforeAnySideEffect -> m
-    boolean initializerEnablingJavaAssertions -> p
-    boolean useIdentifierNameString -> k
-    long returnedConstantNumber -> g
-    boolean checksNullReceiverBeforeAnySideEffect -> l
-    boolean $assertionsDisabled -> u
-    com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer trivialInitializerInfo -> o
-    java.util.Set initializedClassesOnNormalExit -> a
-    int returnedArgument -> b
-    com.android.tools.r8.graph.OptimizationInfo$InlinePreference inlining -> j
-    java.util.BitSet nonNullParamOnNormalExits -> s
-    java.util.BitSet nonNullParamOrThrow -> r
-    boolean reachabilitySensitive -> t
-    com.android.tools.r8.graph.ParameterUsagesInfo parametersUsages -> q
-    boolean neverReturnsNormally -> e
-    boolean returnsConstantNumber -> f
-    com.android.tools.r8.graph.DexString returnedConstantString -> i
-    com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility classInlinerEligibility -> n
-    boolean returnsConstantString -> h
-    boolean mayHaveSideEffects -> c
-    boolean neverReturnsNull -> d
-    1:1:void <clinit>():972:972 -> <clinit>
-    1:1:void <init>():1022:1022 -> <init>
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):972 -> <init>
-    2:48:void <init>():974:1020 -> <init>
-    2:48:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):972 -> <init>
-    49:49:void <init>(com.android.tools.r8.graph.DexEncodedMethod$OptimizationInfoImpl):1026:1026 -> <init>
-    50:120:void <init>(com.android.tools.r8.graph.DexEncodedMethod$OptimizationInfoImpl):974:1044 -> <init>
-    1:1:boolean isInitializerEnablingJavaAssertions():1133:1133 -> A
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo():1054:1054 -> B
-    1:1:java.util.BitSet getNonNullParamOrThrow():1064:1064 -> C
-    1:1:com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):1059:1059 -> a
-    2:2:void setParameterUsages(com.android.tools.r8.graph.ParameterUsagesInfo):1168:1168 -> a
-    3:3:void setNonNullParamOrThrow(java.util.BitSet):1173:1173 -> a
-    4:4:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):1188:1188 -> a
-    5:5:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):1193:1193 -> a
-    6:6:void markInitializesClassesOnNormalExit(java.util.Set):1203:1203 -> a
-    7:10:void markReturnsConstantNumber(long):1230:1233 -> a
-    11:14:void markReturnsConstantString(com.android.tools.r8.graph.DexString):1238:1241 -> a
-    15:15:void markTriggerClassInitBeforeAnySideEffect(boolean):1277:1277 -> a
-    16:17:com.android.tools.r8.graph.UpdatableOptimizationInfo mutableCopy():1282:1283 -> a
-    1:1:java.util.BitSet getNonNullParamOnNormalExits():1069:1069 -> b
-    2:2:void setNonNullParamOnNormalExits(java.util.BitSet):1178:1178 -> b
-    3:5:void markReturnsArgument(int):1208:1210 -> b
-    6:6:void markCheckNullReceiverBeforeAnySideEffect(boolean):1272:1272 -> b
-    1:1:boolean checksNullReceiverBeforeAnySideEffect():1153:1153 -> c
-    2:2:void setReachabilitySensitive(boolean):1183:1183 -> c
-    1:1:void setInitializerEnablingJavaAssertions():1198:1198 -> d
-    1:1:int getReturnedArgument():1084:1084 -> e
-    2:2:boolean returnsArgument():1079:1079 -> e
-    2:2:int getReturnedArgument():1084 -> e
-    3:4:int getReturnedArgument():1084:1085 -> e
-    1:2:com.android.tools.r8.graph.DexString getReturnedConstantString():1127:1128 -> f
-    1:1:boolean neverInline():1148:1148 -> g
-    1:1:boolean neverReturnsNormally():1095:1095 -> h
-    1:2:boolean returnsConstant():1100:1101 -> i
-    1:1:void markMayNotHaveSideEffects():1215:1215 -> j
-    1:1:boolean returnsConstantString():1111:1111 -> k
-    1:1:void markNeverReturnsNormally():1225:1225 -> l
-    1:1:void markUseIdentifierNameString():1267:1267 -> m
-    1:2:void markForceInline():1247:1248 -> markForceInline
-    1:1:boolean useIdentifierNameString():1138:1138 -> n
-    1:1:boolean triggersClassInitBeforeAnySideEffect():1158:1158 -> o
-    1:1:boolean returnsConstantNumber():1106:1106 -> p
-    1:1:boolean returnsArgument():1079:1079 -> q
-    1:1:boolean neverReturnsNull():1090:1090 -> r
-    1:1:boolean isReachabilitySensitive():1074:1074 -> s
-    1:1:boolean forceInline():1143:1143 -> t
-    1:1:void markNeverReturnsNull():1220:1220 -> u
-    1:2:void unsetForceInline():1254:1255 -> unsetForceInline
-    1:2:void markNeverInline():1261:1262 -> v
-    1:1:boolean mayHaveSideEffects():1163:1163 -> w
-    1:2:long getReturnedConstantNumber():1121:1122 -> x
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility():1116:1116 -> y
-    1:1:java.util.Set getInitializedClassesOnNormalExit():1049:1049 -> z
+    boolean initializerEnablingJavaAssertions -> o
+    long returnedConstantNumber -> f
+    boolean useIdentifierNameString -> j
+    boolean checksNullReceiverBeforeAnySideEffect -> k
+    boolean triggersClassInitBeforeAnySideEffect -> l
+    java.util.BitSet nonNullParamOrThrow -> q
+    com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer trivialInitializerInfo -> n
+    com.android.tools.r8.graph.OptimizationInfo$InlinePreference inlining -> i
+    java.util.BitSet nonNullParamOnNormalExits -> r
+    boolean reachabilitySensitive -> s
+    boolean $assertionsDisabled -> t
+    int returnedArgument -> a
+    com.android.tools.r8.graph.ParameterUsagesInfo parametersUsages -> p
+    boolean returnsConstantNumber -> e
+    com.android.tools.r8.graph.DexString returnedConstantString -> h
+    boolean returnsConstantString -> g
+    boolean mayHaveSideEffects -> b
+    boolean neverReturnsNull -> c
+    com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility classInlinerEligibility -> m
+    boolean neverReturnsNormally -> d
+    1:1:void <clinit>():937:937 -> <clinit>
+    1:1:void <init>():985:985 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):937 -> <init>
+    2:46:void <init>():939:983 -> <init>
+    2:46:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):937 -> <init>
+    47:47:void <init>(com.android.tools.r8.graph.DexEncodedMethod$OptimizationInfoImpl):989:989 -> <init>
+    48:116:void <init>(com.android.tools.r8.graph.DexEncodedMethod$OptimizationInfoImpl):939:1007 -> <init>
+    1:1:boolean returnsConstantNumber():1064:1064 -> A
+    1:2:long getReturnedConstantNumber():1079:1080 -> B
+    1:1:void setParameterUsages(com.android.tools.r8.graph.ParameterUsagesInfo):1126:1126 -> a
+    2:2:void setNonNullParamOrThrow(java.util.BitSet):1131:1131 -> a
+    3:3:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):1146:1146 -> a
+    4:4:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):1151:1151 -> a
+    5:7:void markReturnsArgument(int):1161:1163 -> a
+    8:11:void markReturnsConstantNumber(long):1183:1186 -> a
+    12:15:void markReturnsConstantString(com.android.tools.r8.graph.DexString):1191:1194 -> a
+    16:16:void markTriggerClassInitBeforeAnySideEffect(boolean):1230:1230 -> a
+    17:18:com.android.tools.r8.graph.UpdatableOptimizationInfo mutableCopy():1235:1236 -> a
+    1:1:com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):1017:1017 -> b
+    2:2:void setNonNullParamOnNormalExits(java.util.BitSet):1136:1136 -> b
+    3:3:void setReachabilitySensitive(boolean):1141:1141 -> b
+    4:4:void markNeverReturnsNull():1173:1173 -> b
+    1:2:void markNeverInline():1214:1215 -> c
+    3:3:void markCheckNullReceiverBeforeAnySideEffect(boolean):1225:1225 -> c
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo():1012:1012 -> d
+    1:1:boolean returnsConstantString():1069:1069 -> e
+    1:1:void markUseIdentifierNameString():1220:1220 -> f
+    1:1:boolean triggersClassInitBeforeAnySideEffect():1116:1116 -> g
+    1:1:java.util.BitSet getNonNullParamOrThrow():1022:1022 -> h
+    1:1:void setInitializerEnablingJavaAssertions():1156:1156 -> i
+    1:1:boolean returnsArgument():1037:1037 -> j
+    1:1:boolean isInitializerEnablingJavaAssertions():1091:1091 -> k
+    1:1:boolean checksNullReceiverBeforeAnySideEffect():1111:1111 -> l
+    1:1:void markNeverReturnsNormally():1178:1178 -> m
+    1:2:void markForceInline():1200:1201 -> markForceInline
+    1:1:boolean forceInline():1101:1101 -> n
+    1:1:boolean mayHaveSideEffects():1121:1121 -> o
+    1:1:boolean neverInline():1106:1106 -> p
+    1:1:void markMayNotHaveSideEffects():1168:1168 -> q
+    1:2:com.android.tools.r8.graph.DexString getReturnedConstantString():1085:1086 -> r
+    1:1:boolean useIdentifierNameString():1096:1096 -> s
+    1:1:boolean isReachabilitySensitive():1032:1032 -> t
+    1:1:boolean neverReturnsNull():1048:1048 -> u
+    1:2:void unsetForceInline():1207:1208 -> unsetForceInline
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility():1074:1074 -> v
+    1:1:int getReturnedArgument():1042:1042 -> w
+    2:2:boolean returnsArgument():1037:1037 -> w
+    2:2:int getReturnedArgument():1042 -> w
+    3:4:int getReturnedArgument():1042:1043 -> w
+    1:2:boolean returnsConstant():1058:1059 -> x
+    1:1:java.util.BitSet getNonNullParamOnNormalExits():1027:1027 -> y
+    1:1:boolean neverReturnsNormally():1053:1053 -> z
 com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer -> com.android.tools.r8.graph.DexEncodedMethod$f:
-    1:1:void <init>():803:803 -> <init>
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):802 -> <init>
+    1:1:void <init>():774:774 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):773 -> <init>
 com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer -> com.android.tools.r8.graph.DexEncodedMethod$f$a:
     com.android.tools.r8.graph.DexField field -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexField):818:819 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexField):789:790 -> <init>
 com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer -> com.android.tools.r8.graph.DexEncodedMethod$f$b:
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer INSTANCE -> a
-    1:1:void <clinit>():809:809 -> <clinit>
-    1:1:void <init>():808:808 -> <init>
+    1:1:void <clinit>():780:780 -> <clinit>
+    1:1:void <init>():779:779 -> <init>
 com.android.tools.r8.graph.DexField -> com.android.tools.r8.graph.DexField:
     1:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,boolean):17:23 -> <init>
     1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):10:10 -> a
@@ -15030,319 +14755,293 @@
     1:1:java.lang.String toSmaliString():60:60 -> toSmaliString
     1:1:java.lang.String toSourceString():64:64 -> toSourceString
 com.android.tools.r8.graph.DexItemFactory -> com.android.tools.r8.graph.DexItemFactory:
-    boolean $assertionsDisabled -> wc
-    com.android.tools.r8.graph.DexString contentEqualsMethodName -> Q
+    com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> Q
     com.android.tools.r8.utils.LRUCacheTable leastUpperBoundOfInterfacesTable -> q
-    com.android.tools.r8.graph.DexString constructorMethodName -> Ua
-    com.android.tools.r8.graph.DexType listType -> vb
-    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> Nb
+    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> Ua
     com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd setPrologueEnd -> m
-    com.android.tools.r8.graph.DexType invocationHandlerType -> rb
-    com.android.tools.r8.graph.DexString toStringMethodName -> Y
+    com.android.tools.r8.graph.DexString valueOfMethodName -> Y
     com.android.tools.r8.graph.DexString boxedShortDescriptor -> z
-    com.android.tools.r8.graph.DexType autoCloseableType -> nb
-    com.android.tools.r8.graph.DexString finalizeMethodName -> aa
-    com.android.tools.r8.graph.DexType enumType -> jb
+    com.android.tools.r8.graph.DexType serviceLoaderType -> nb
+    boolean $assertionsDisabled -> kc
+    com.android.tools.r8.graph.DexString getClassMethodName -> aa
+    com.android.tools.r8.graph.DexType varHandleType -> jb
     com.android.tools.r8.graph.DexString boxedNumberDescriptor -> A
-    com.android.tools.r8.graph.DexType boxedLongType -> fb
-    com.android.tools.r8.graph.DexString exceptionInInitializerErrorDescriptor -> Ea
-    com.android.tools.r8.graph.DexType boxedCharType -> bb
+    com.android.tools.r8.graph.DexType annotationType -> fb
+    com.android.tools.r8.graph.DexString stringBuilderDescriptor -> Ea
+    com.android.tools.r8.graph.DexType boxedShortType -> bb
     java.util.concurrent.ConcurrentHashMap strings -> a
-    com.android.tools.r8.graph.DexString varHandleDescriptor -> Ia
-    com.android.tools.r8.graph.DexString unboxDoubleMethodName -> I
-    com.android.tools.r8.graph.DexString npeDescriptor -> Ma
-    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> Qa
-    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> Zb
-    com.android.tools.r8.graph.DexString indexOfMethodName -> R
-    com.android.tools.r8.graph.DexString classDescriptor -> ua
-    com.android.tools.r8.graph.DexType annotationMethodParameters -> Vb
+    com.android.tools.r8.graph.DexString methodTypeDescriptor -> Ia
+    com.android.tools.r8.graph.DexString unboxFloatMethodName -> I
+    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> Ma
+    com.android.tools.r8.graph.DexString classConstructorMethodName -> Qa
+    com.android.tools.r8.graph.DexType comparableType -> Zb
+    com.android.tools.r8.graph.DexString contentEqualsMethodName -> R
+    com.android.tools.r8.graph.DexString classLoaderDescriptor -> ua
+    com.android.tools.r8.graph.DexType callSiteType -> Vb
     com.android.tools.r8.graph.DexString boxedBooleanDescriptor -> s
-    com.android.tools.r8.graph.DexString constructorDescriptor -> ya
-    com.android.tools.r8.graph.DexType annotationEnclosingClass -> Rb
-    com.android.tools.r8.graph.DexString getClassMethodName -> Z
+    com.android.tools.r8.graph.DexString methodDescriptor -> ya
+    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> vb
+    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> Rb
+    com.android.tools.r8.graph.DexString toStringMethodName -> Z
+    com.android.tools.r8.graph.DexType annotationSignature -> Nb
+    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> ac
     boolean sorted -> r
-    com.android.tools.r8.graph.DexString unboxBooleanMethodName -> B
-    com.android.tools.r8.graph.DexString getNameName -> ea
-    com.android.tools.r8.graph.DexType externalizableType -> gc
-    com.android.tools.r8.graph.DexString getDeclaredConstructorName -> ia
-    com.android.tools.r8.graph.DexType metafactoryType -> cc
-    com.android.tools.r8.graph.DexItemFactory$LongMethods longMethods -> Ab
+    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> Jb
+    com.android.tools.r8.graph.DexString initMethodName -> B
+    com.android.tools.r8.graph.DexString forNameMethodName -> ea
+    com.android.tools.r8.graph.DexString getTypeNameName -> ia
     java.util.concurrent.ConcurrentHashMap referenceTypeLatticeElements -> p
-    com.android.tools.r8.graph.DexMethod stringConcatWithConstantsMethod -> mc
-    com.android.tools.r8.graph.DexString isEmptyMethodName -> J
+    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> Cb
+    com.android.tools.r8.graph.DexString unboxDoubleMethodName -> J
     com.android.tools.r8.graph.DexString getDeclaredMethodName -> ma
-    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> Mb
-    com.android.tools.r8.graph.DexString invokeExactMethodName -> qa
-    com.android.tools.r8.graph.DexString lastIndexOfMethodName -> S
-    com.android.tools.r8.graph.DexString newUpdaterName -> Ta
+    com.android.tools.r8.graph.DexString charSequenceDescriptor -> qa
+    com.android.tools.r8.graph.DexType boxedFloatType -> Za
+    com.android.tools.r8.graph.DexType boxedCharType -> Xa
+    java.util.IdentityHashMap internalSentinels -> jc
+    com.android.tools.r8.graph.DexString indexOfMethodName -> S
     com.android.tools.r8.graph.DexString boxedByteDescriptor -> t
-    com.android.tools.r8.graph.DexType serviceLoaderType -> ub
+    com.android.tools.r8.graph.DexType charArrayType -> Ta
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advanceLines -> g
-    com.android.tools.r8.graph.DexString charArrayDescriptor -> Xa
-    com.android.tools.r8.graph.DexType methodTypeType -> qb
-    com.android.tools.r8.graph.DexType classLoaderType -> mb
-    com.android.tools.r8.graph.DexType classArrayType -> ib
-    com.android.tools.r8.graph.DexString throwableDescriptor -> Da
-    com.android.tools.r8.graph.DexString unboxByteMethodName -> C
-    com.android.tools.r8.graph.DexType boxedIntType -> eb
-    com.android.tools.r8.graph.DexString stringBufferDescriptor -> Ha
-    com.android.tools.r8.graph.DexType boxedByteType -> ab
-    com.android.tools.r8.graph.DexString lengthMethodName -> K
-    com.android.tools.r8.graph.DexString invocationHandlerDescriptor -> La
-    java.util.Set libraryTypesWithoutStaticInitialization -> qc
-    com.android.tools.r8.graph.DexString listDescriptor -> Pa
-    com.android.tools.r8.graph.DexString unknownTypeName -> uc
-    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> Kb
-    com.android.tools.r8.graph.DexType annotationThrows -> Yb
-    com.android.tools.r8.graph.DexString objectArrayDescriptor -> ta
-    com.android.tools.r8.graph.DexString compareToMethodName -> T
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> wb
+    java.util.Set libraryTypesWithoutStaticInitialization -> ec
+    com.android.tools.r8.graph.DexType npeType -> mb
+    com.android.tools.r8.graph.DexType autoCloseableType -> ib
+    com.android.tools.r8.graph.DexString objectsDescriptor -> Da
+    com.android.tools.r8.graph.DexString unboxBooleanMethodName -> C
+    com.android.tools.r8.graph.DexType enumType -> eb
+    com.android.tools.r8.graph.DexString methodHandleDescriptor -> Ha
+    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> ub
+    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> Bb
+    com.android.tools.r8.graph.DexType boxedLongType -> ab
+    com.android.tools.r8.graph.DexString isEmptyMethodName -> K
+    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> La
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> ob
+    com.android.tools.r8.graph.DexString constructorMethodName -> Pa
+    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> zb
+    com.android.tools.r8.graph.DexType externalizableType -> Yb
+    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> wb
+    com.android.tools.r8.graph.DexString classDescriptor -> ta
+    com.android.tools.r8.graph.DexString lastIndexOfMethodName -> T
     java.util.Map setFiles -> n
     com.android.tools.r8.graph.DexString boxedCharDescriptor -> u
-    com.android.tools.r8.graph.DexType annotationMemberClasses -> Ub
-    com.android.tools.r8.graph.DexString classArrayDescriptor -> xa
-    com.android.tools.r8.graph.DexType annotationDefault -> Qb
-    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> zb
+    com.android.tools.r8.graph.DexType metafactoryType -> Ub
+    com.android.tools.r8.graph.DexString fieldDescriptor -> xa
+    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> Qb
+    com.android.tools.r8.graph.DexType annotationMethodParameters -> Mb
+    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> Db
+    com.android.tools.r8.graph.DexMethod stringConcatMethod -> dc
     java.util.concurrent.ConcurrentHashMap methodHandles -> f
-    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> yb
-    com.android.tools.r8.graph.DexString forNameMethodName -> da
-    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> Fb
-    com.android.tools.r8.graph.DexString unboxCharMethodName -> D
-    com.android.tools.r8.graph.DexType iteratorType -> fc
-    com.android.tools.r8.graph.DexString getTypeNameName -> ha
-    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> bc
+    com.android.tools.r8.graph.DexType annotationEnclosingClass -> Ib
+    com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> da
+    com.android.tools.r8.graph.DexString unknownTypeName -> ic
+    com.android.tools.r8.graph.DexString unboxByteMethodName -> D
+    com.android.tools.r8.graph.DexString getSimpleNameName -> ha
+    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> Eb
+    com.android.tools.r8.graph.DexType stringConcatFactoryType -> bc
     com.android.tools.r8.graph.DexString getMethodName -> la
-    com.android.tools.r8.graph.DexString containsMethodName -> L
-    com.android.tools.r8.graph.DexType charArrayType -> Ya
-    com.android.tools.r8.graph.DexString invokeMethodName -> pa
-    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> Sa
-    java.util.Set libraryMethodsReturningNonNull -> pc
-    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> xb
-    com.android.tools.r8.graph.DexString thisName -> Wa
-    com.android.tools.r8.graph.DexType proxyType -> tb
-    com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> U
+    com.android.tools.r8.graph.DexString lengthMethodName -> L
+    com.android.tools.r8.graph.DexType boxedDoubleType -> Ya
+    com.android.tools.r8.graph.DexString invokeExactMethodName -> pa
+    com.android.tools.r8.graph.DexString charArrayDescriptor -> Sa
+    com.android.tools.r8.graph.DexType boxedByteType -> Wa
+    com.android.tools.r8.graph.DexString compareToMethodName -> U
     java.util.Map setInlineFrames -> o
     com.android.tools.r8.graph.DexString boxedDoubleDescriptor -> v
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap defaults -> i
-    com.android.tools.r8.graph.DexType methodHandleType -> pb
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods utilArraysMethods -> Bb
-    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> lb
-    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> Pb
-    com.android.tools.r8.kotlin.Kotlin kotlin -> Jb
-    com.android.tools.r8.graph.DexType boxedNumberType -> hb
-    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> Eb
-    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> Ib
-    com.android.tools.r8.graph.DexString annotationDescriptor -> Ca
+    com.android.tools.r8.graph.DexType methodTypeType -> lb
+    com.android.tools.r8.graph.DexMethod metafactoryMethod -> _b
+    com.android.tools.r8.graph.DexType classLoaderType -> hb
+    com.android.tools.r8.graph.DexString exceptionInInitializerErrorDescriptor -> Ca
     com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin setEpilogueBegin -> l
     java.util.concurrent.ConcurrentHashMap methods -> e
-    com.android.tools.r8.graph.DexType boxedFloatType -> db
-    com.android.tools.r8.graph.DexString unboxShortMethodName -> E
-    com.android.tools.r8.graph.DexString stringBuilderDescriptor -> Ga
-    com.android.tools.r8.graph.DexString methodTypeDescriptor -> Ka
-    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> Lb
-    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> Cb
-    com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> Oa
-    com.android.tools.r8.graph.DexString startsWithMethodName -> M
-    com.android.tools.r8.graph.DexString stringArrayDescriptor -> sa
-    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> Xb
-    com.android.tools.r8.graph.DexString autoCloseableDescriptor -> wa
-    com.android.tools.r8.graph.DexType annotationInnerClass -> Tb
-    com.android.tools.r8.graph.DexString cloneMethodName -> V
+    com.android.tools.r8.graph.DexType classArrayType -> db
+    com.android.tools.r8.graph.DexString unboxCharMethodName -> E
+    com.android.tools.r8.graph.DexString varHandleDescriptor -> Ga
+    com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> Ka
+    com.android.tools.r8.graph.DexString newUpdaterName -> Oa
+    com.android.tools.r8.graph.DexString containsMethodName -> M
+    com.android.tools.r8.graph.DexString objectArrayDescriptor -> sa
+    com.android.tools.r8.graph.DexItemFactory$LongMethods longMethods -> tb
+    com.android.tools.r8.graph.DexType iteratorType -> Xb
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> pb
+    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> sb
+    com.android.tools.r8.graph.DexString classArrayDescriptor -> wa
+    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> Tb
+    com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> V
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advancePCs -> h
     com.android.tools.r8.graph.DexString boxedFloatDescriptor -> w
-    com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> ca
+    com.android.tools.r8.graph.DexType annotationThrows -> Pb
+    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> yb
+    com.android.tools.r8.graph.DexType annotationMemberClasses -> Lb
+    com.android.tools.r8.graph.DexMethod stringConcatWithConstantsMethod -> cc
+    com.android.tools.r8.graph.DexString ordinalMethodName -> ca
+    com.android.tools.r8.graph.DexType annotationDefault -> Hb
     java.util.concurrent.ConcurrentHashMap protos -> d
-    com.android.tools.r8.graph.DexString getSimpleNameName -> ga
-    com.android.tools.r8.graph.DexType lookupType -> ec
-    java.util.IdentityHashMap internalSentinels -> vc
-    com.android.tools.r8.graph.DexString unboxIntMethodName -> F
-    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> kc
+    com.android.tools.r8.graph.DexString getCanonicalNameName -> ga
+    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> rb
+    com.android.tools.r8.graph.DexString unboxShortMethodName -> F
     com.android.tools.r8.graph.DexString getDeclaredFieldName -> ka
-    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> ac
-    com.android.tools.r8.graph.DexString assertionsDisabled -> oa
-    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> Hb
-    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> Ob
-    com.android.tools.r8.graph.DexString endsWithMethodName -> N
-    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> Ra
-    java.util.Set libraryMethodsReturningReceiver -> oc
-    com.android.tools.r8.graph.DexString classConstructorMethodName -> Va
-    com.android.tools.r8.graph.DexString substringName -> W
-    com.android.tools.r8.graph.DexType npeType -> sb
+    com.android.tools.r8.graph.DexString invokeMethodName -> oa
+    com.android.tools.r8.graph.DexString startsWithMethodName -> N
+    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> gc
+    com.android.tools.r8.graph.DexString thisName -> Ra
+    com.android.tools.r8.graph.DexType boxedBooleanType -> Va
+    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> qb
+    com.android.tools.r8.kotlin.Kotlin kotlin -> Ab
+    com.android.tools.r8.graph.DexString cloneMethodName -> W
     com.android.tools.r8.graph.DexString boxedIntDescriptor -> x
-    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> Za
+    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> xb
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap restartLocals -> k
-    boolean skipNameValidationForTesting -> rc
-    com.android.tools.r8.graph.DexType varHandleType -> ob
-    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> sc
-    com.android.tools.r8.graph.DexType annotationType -> kb
-    com.android.tools.r8.graph.DexString enumDescriptor -> Ba
-    com.android.tools.r8.graph.DexType boxedShortType -> gb
-    com.android.tools.r8.graph.DexString objectsDescriptor -> Fa
+    com.android.tools.r8.graph.DexType methodHandleType -> kb
+    com.android.tools.r8.graph.DexString throwableDescriptor -> Ba
+    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> gb
+    com.android.tools.r8.graph.DexString stringBufferDescriptor -> Fa
     java.util.concurrent.ConcurrentHashMap fields -> c
-    com.android.tools.r8.graph.DexString unboxLongMethodName -> G
-    com.android.tools.r8.graph.DexType boxedDoubleType -> cb
-    com.android.tools.r8.graph.DexString methodHandleDescriptor -> Ja
-    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> _b
-    com.android.tools.r8.graph.DexString proxyDescriptor -> Na
-    com.android.tools.r8.graph.DexString equalsMethodName -> O
-    com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> P
-    com.android.tools.r8.graph.DexString charSequenceDescriptor -> ra
-    com.android.tools.r8.graph.DexType annotationSignature -> Wb
-    com.android.tools.r8.graph.DexString classLoaderDescriptor -> va
-    com.android.tools.r8.graph.DexType nullValueType -> tc
-    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> Sb
-    com.android.tools.r8.graph.DexString valueOfMethodName -> X
+    com.android.tools.r8.graph.DexString unboxIntMethodName -> G
+    com.android.tools.r8.graph.DexType boxedNumberType -> cb
+    boolean skipNameValidationForTesting -> fc
+    com.android.tools.r8.graph.DexString npeDescriptor -> Ja
+    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> Na
+    com.android.tools.r8.graph.DexString endsWithMethodName -> O
+    com.android.tools.r8.graph.DexString equalsMethodName -> P
+    com.android.tools.r8.graph.DexString stringArrayDescriptor -> ra
+    com.android.tools.r8.graph.DexType lookupType -> Wb
+    com.android.tools.r8.graph.DexString autoCloseableDescriptor -> va
+    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> Sb
+    com.android.tools.r8.graph.DexString substringName -> X
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap endLocals -> j
     com.android.tools.r8.graph.DexString boxedLongDescriptor -> y
-    com.android.tools.r8.graph.DexString fieldDescriptor -> za
-    com.android.tools.r8.graph.DexString methodDescriptor -> Aa
-    com.android.tools.r8.graph.DexType stringConcatFactoryType -> lc
-    com.android.tools.r8.graph.DexString ordinalMethodName -> ba
-    com.android.tools.r8.graph.DexType comparableType -> hc
-    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> ic
-    com.android.tools.r8.graph.DexString getCanonicalNameName -> fa
+    com.android.tools.r8.graph.DexString enumDescriptor -> za
+    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> Ob
+    com.android.tools.r8.graph.DexString annotationDescriptor -> Aa
+    com.android.tools.r8.graph.DexType annotationInnerClass -> Kb
+    com.android.tools.r8.graph.DexString finalizeMethodName -> ba
+    com.android.tools.r8.graph.DexType nullValueType -> hc
+    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> Fb
+    com.android.tools.r8.graph.DexString getNameName -> fa
     java.util.concurrent.ConcurrentHashMap types -> b
-    com.android.tools.r8.graph.DexType callSiteType -> dc
-    com.android.tools.r8.graph.DexMethod metafactoryMethod -> jc
-    com.android.tools.r8.graph.DexString unboxFloatMethodName -> H
-    com.android.tools.r8.graph.DexType boxedBooleanType -> _a
+    com.android.tools.r8.graph.DexString unboxLongMethodName -> H
+    com.android.tools.r8.graph.DexType boxedIntType -> _a
     com.android.tools.r8.graph.DexString getFieldName -> ja
-    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> Db
-    com.android.tools.r8.graph.DexMethod stringConcatMethod -> nc
-    com.android.tools.r8.graph.DexString newInstanceName -> na
-    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> Gb
-    1:39:void <clinit>():49:87 -> <clinit>
-    1:1:void <init>():91:91 -> <init>
-    2:288:void <init>():53:339 -> <init>
-    289:305:void <init>():329:345 -> <init>
-    306:324:void <init>():342:360 -> <init>
-    325:345:void <init>():351:371 -> <init>
-    346:405:void <init>():364:423 -> <init>
-    406:406:void <init>():413:413 -> <init>
-    407:407:void <init>():92:92 -> <init>
+    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> Gb
+    com.android.tools.r8.graph.DexString assertionsDisabled -> na
+    1:39:void <clinit>():51:89 -> <clinit>
+    1:1:void <init>():93:93 -> <init>
+    2:276:void <init>():55:329 -> <init>
+    277:293:void <init>():319:335 -> <init>
+    294:312:void <init>():332:350 -> <init>
+    313:333:void <init>():341:361 -> <init>
+    334:375:void <init>():354:395 -> <init>
+    376:376:void <init>():385:385 -> <init>
+    377:377:void <init>():94:94 -> <init>
     com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame lambda$createSetInlineFrame$0(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
-    1:1:com.android.tools.r8.graph.DexType access$1700(com.android.tools.r8.graph.DexItemFactory):49:49 -> a
-    2:2:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):96:96 -> a
-    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):426:427 -> a
-    5:7:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):934:936 -> a
-    8:9:com.android.tools.r8.graph.DexString createString(int,byte[]):941:942 -> a
-    10:10:com.android.tools.r8.graph.DexString lookupString(java.lang.String):951:951 -> a
-    11:13:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList):1019:1021 -> a
-    14:18:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1032:1036 -> a
-    19:28:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1053:1062 -> a
-    19:28:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1036 -> a
-    29:35:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1037:1043 -> a
-    36:40:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1042:1046 -> a
-    41:43:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):1088:1090 -> a
-    44:45: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):1099:1100 -> a
-    46:48:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1119:1121 -> a
-    49:51:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1157:1159 -> a
-    52:54:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1164:1166 -> a
-    55:55:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1174:1174 -> a
-    56:56:void clearReferenceTypeLatticeElementsCache():1178:1178 -> a
-    57:64:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1203:1210 -> a
-    65:93:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1209:1237 -> a
-    94:102:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1217:1225 -> a
-    103:114:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1224:1235 -> a
-    115:119:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1242:1246 -> a
-    120:120:int lambda$assignSortedIndices$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1243:1243 -> a
-    121:121:void forAllTypes(java.util.function.Consumer):1274:1274 -> a
-    1:1:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):431:431 -> b
-    2:2:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1000:1000 -> b
-    3:5:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1125:1127 -> b
-    6:6:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1149:1149 -> b
-    7:7:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1170:1170 -> b
-    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):410:410 -> c
-    2:4:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1131:1133 -> c
-    5:5:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1153:1153 -> c
-    1:2:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1004:1005 -> createArrayType
-    1:3: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):1009:1011 -> createField
-    4:4:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1015:1015 -> createField
-    1:3: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):1075:1077 -> createMethod
-    4:4:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1081:1081 -> createMethod
-    5:14: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[]):1106:1115 -> createMethod
-    1:1:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1025:1025 -> createProto
-    2:7:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1066:1071 -> createProto
-    2:7:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1026 -> createProto
-    8:8:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1027:1027 -> createProto
-    9:9:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1026:1026 -> createProto
-    1:2:com.android.tools.r8.graph.DexString createString(java.lang.String):946:947 -> createString
-    1:7:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):982:988 -> createType
-    8:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):987:990 -> createType
-    12:12:com.android.tools.r8.graph.DexType createType(java.lang.String):996:996 -> createType
-    1:5:java.util.List extractMarkers():971:975 -> d
-    6:8:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1137:1139 -> d
-    1:1:boolean getSkipNameValidationForTesting():406:406 -> e
-    2:4:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1143:1145 -> e
-    1:5:java.util.Collection extractMarker():957:961 -> extractMarker
-    1:1:boolean verifyNoCachedReferenceTypeLatticeElements():1182:1182 -> f
-    1:10:void resetSortedIndices():1261:1270 -> resetSortedIndices
-    1:1:void setSkipNameValidationForTesting(boolean):402:402 -> setSkipNameValidationForTesting
-    1:7:void sort(com.android.tools.r8.naming.NamingLens):1251:1257 -> sort
+    1:1:com.android.tools.r8.graph.DexType access$1200(com.android.tools.r8.graph.DexItemFactory):51:51 -> a
+    2:2:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):98:98 -> a
+    3:3:void clearSubtypeInformation():382:382 -> a
+    4:5:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):398:399 -> a
+    6:8:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):833:835 -> a
+    9:10:com.android.tools.r8.graph.DexString createString(int,byte[]):840:841 -> a
+    11:11:com.android.tools.r8.graph.DexString lookupString(java.lang.String):850:850 -> a
+    12:14:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList):918:920 -> a
+    15:19:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):931:935 -> a
+    20:29:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):952:961 -> a
+    20:29:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):935 -> a
+    30:36:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):936:942 -> a
+    37:41:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):941:945 -> a
+    42:44:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor):986:988 -> a
+    45:46: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):997:998 -> a
+    47:49:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1017:1019 -> a
+    50:52:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1055:1057 -> a
+    53:55:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1062:1064 -> a
+    56:56:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1072:1072 -> a
+    57:92:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier):1077:1112 -> a
+    93:93:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier):1107:1107 -> a
+    94:98:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1117:1121 -> a
+    99:99:int lambda$assignSortedIndices$1(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1118:1118 -> a
+    100:100:void forAllTypes(java.util.function.Consumer):1149:1149 -> a
+    1:1:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):403:403 -> b
+    2:2:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):899:899 -> b
+    3:5:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1023:1025 -> b
+    6:6:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1047:1047 -> b
+    7:7:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1068:1068 -> b
+    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):378:378 -> c
+    2:4:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1029:1031 -> c
+    5:5:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1051:1051 -> c
+    1:2:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):903:904 -> createArrayType
+    1:3: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):908:910 -> createField
+    4:4:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):914:914 -> createField
+    1:3: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):974:976 -> createMethod
+    4:4:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):980:980 -> createMethod
+    5:14: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[]):1004:1013 -> createMethod
+    1:1:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):924:924 -> createProto
+    2:7:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):965:970 -> createProto
+    2:7:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):925 -> createProto
+    8:8:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):926:926 -> createProto
+    9:9:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):925:925 -> createProto
+    1:2:com.android.tools.r8.graph.DexString createString(java.lang.String):845:846 -> createString
+    1:7:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):881:887 -> createType
+    8:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):886:889 -> createType
+    12:12:com.android.tools.r8.graph.DexType createType(java.lang.String):895:895 -> createType
+    1:5:java.util.List extractMarkers():870:874 -> d
+    6:8:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1035:1037 -> d
+    1:1:boolean getSkipNameValidationForTesting():374:374 -> e
+    2:4:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1041:1043 -> e
+    1:5:java.util.Collection extractMarker():856:860 -> extractMarker
+    1:10:void resetSortedIndices():1136:1145 -> resetSortedIndices
+    1:1:void setSkipNameValidationForTesting(boolean):370:370 -> setSkipNameValidationForTesting
+    1:7:void sort(com.android.tools.r8.naming.NamingLens):1126:1132 -> sort
+com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.graph.p:
 com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.graph.DexItemFactory$a:
     java.util.Set updaters -> d
     com.android.tools.r8.graph.DexMethod referenceUpdater -> c
     com.android.tools.r8.graph.DexMethod longUpdater -> b
     com.android.tools.r8.graph.DexMethod intUpdater -> a
-    1:20:void <init>(com.android.tools.r8.graph.DexItemFactory):653:672 -> <init>
-    1:20:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):647 -> <init>
-    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):676:676 -> a
+    1:20:void <init>(com.android.tools.r8.graph.DexItemFactory):582:601 -> <init>
+    1:20:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):576 -> <init>
+    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):605:605 -> a
 com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.graph.DexItemFactory$b:
-    com.android.tools.r8.graph.DexMethod newInstance -> l
-    com.android.tools.r8.graph.DexMethod getDeclaredMethod -> k
-    com.android.tools.r8.graph.DexMethod getMethod -> j
-    com.android.tools.r8.graph.DexMethod getDeclaredField -> i
-    com.android.tools.r8.graph.DexMethod getField -> h
-    com.android.tools.r8.graph.DexMethod getDeclaredConstructor -> g
+    com.android.tools.r8.graph.DexMethod getDeclaredMethod -> j
+    com.android.tools.r8.graph.DexMethod getMethod -> i
+    com.android.tools.r8.graph.DexMethod getDeclaredField -> h
+    com.android.tools.r8.graph.DexMethod getField -> g
     com.android.tools.r8.graph.DexMethod getTypeName -> f
     com.android.tools.r8.graph.DexMethod getSimpleName -> e
     com.android.tools.r8.graph.DexMethod getCanonicalName -> d
     com.android.tools.r8.graph.DexMethod getName -> c
+    java.util.Set getMembers -> k
     com.android.tools.r8.graph.DexMethod forName -> b
+    java.util.Set getNames -> l
     com.android.tools.r8.graph.DexMethod desiredAssertionStatus -> a
-    java.util.Set getMembers -> m
-    java.util.Set getNames -> n
-    1:30:void <init>(com.android.tools.r8.graph.DexItemFactory):514:543 -> <init>
-    1:30:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):497 -> <init>
-    1:1:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):547:547 -> a
-    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):551:551 -> b
-com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.graph.DexItemFactory$c:
-    com.android.tools.r8.graph.DexMethod newInstance -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):559:561 -> <init>
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):555 -> <init>
-com.android.tools.r8.graph.DexItemFactory$EnumMethods -> com.android.tools.r8.graph.DexItemFactory$d:
+    1:22:void <init>(com.android.tools.r8.graph.DexItemFactory):470:491 -> <init>
+    1:22:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):455 -> <init>
+    1:1:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):495:495 -> a
+    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):499:499 -> b
+com.android.tools.r8.graph.DexItemFactory$EnumMethods -> com.android.tools.r8.graph.DexItemFactory$c:
     com.android.tools.r8.graph.DexMethod valueOf -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):573:575 -> <init>
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):569 -> <init>
-com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.graph.DexItemFactory$e:
-    com.android.tools.r8.graph.DexMethod asList -> a
-    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):448:452 -> <init>
-    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):444 -> <init>
-    6:6:void <init>(com.android.tools.r8.graph.DexItemFactory):450:450 -> <init>
-    6:6:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):444 -> <init>
-com.android.tools.r8.graph.DexItemFactory$LongMethods -> com.android.tools.r8.graph.DexItemFactory$f:
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):507:509 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):503 -> <init>
+com.android.tools.r8.graph.DexItemFactory$LongMethods -> com.android.tools.r8.graph.DexItemFactory$d:
     com.android.tools.r8.graph.DexMethod compare -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):438:440 -> <init>
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):434 -> <init>
-    4:4:void <init>(com.android.tools.r8.graph.DexItemFactory):439:439 -> <init>
-    4:4:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):434 -> <init>
-com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.graph.DexItemFactory$g:
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):410:412 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):406 -> <init>
+    4:4:void <init>(com.android.tools.r8.graph.DexItemFactory):411:411 -> <init>
+    4:4:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):406 -> <init>
+com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.graph.DexItemFactory$e:
     com.android.tools.r8.graph.DexMethod init -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):587:589 -> <init>
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):583 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ObjectMethods -> com.android.tools.r8.graph.DexItemFactory$h:
+    1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):521:522 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):517 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ObjectMethods -> com.android.tools.r8.graph.DexItemFactory$f:
     com.android.tools.r8.graph.DexMethod finalize -> c
     com.android.tools.r8.graph.DexMethod constructor -> b
     com.android.tools.r8.graph.DexMethod getClass -> a
-    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):477:482 -> <init>
-    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):471 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.graph.DexItemFactory$i:
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):435:440 -> <init>
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):429 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.graph.DexItemFactory$g:
     com.android.tools.r8.graph.DexMethod requireNonNull -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):491:493 -> <init>
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):487 -> <init>
-    4:4:void <init>(com.android.tools.r8.graph.DexItemFactory):492:492 -> <init>
-    4:4:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):487 -> <init>
-com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.graph.DexItemFactory$j:
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):449:451 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):445 -> <init>
+    4:4:void <init>(com.android.tools.r8.graph.DexItemFactory):450:450 -> <init>
+    4:4:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):445 -> <init>
+com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.graph.DexItemFactory$h:
     com.android.tools.r8.graph.DexProto compareAndSetSignature -> c
     java.util.Set varHandleMethods -> d
     com.android.tools.r8.graph.DexItemFactory this$0 -> g
@@ -15350,10 +15049,10 @@
     java.util.Set varHandleCompareAndSetMethods -> f
     com.android.tools.r8.graph.DexProto signature -> a
     com.android.tools.r8.graph.DexProto setSignature -> b
-    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):822:857 -> <init>
-    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):865:875 -> a
-    12:17:java.util.Set createStrings(java.lang.String[]):882:887 -> a
-com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.graph.DexItemFactory$k:
+    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):737:772 -> <init>
+    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):780:790 -> a
+    12:17:java.util.Set createStrings(java.lang.String[]):797:802 -> a
+com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.graph.DexItemFactory$i:
     com.android.tools.r8.graph.DexField longTYPE -> f
     com.android.tools.r8.graph.DexField intTYPE -> e
     com.android.tools.r8.graph.DexField doubleTYPE -> h
@@ -15363,30 +15062,21 @@
     com.android.tools.r8.graph.DexField booleanTYPE -> a
     com.android.tools.r8.graph.DexField shortTYPE -> d
     com.android.tools.r8.graph.DexField charTYPE -> c
-    1:21:void <init>(com.android.tools.r8.graph.DexItemFactory):615:635 -> <init>
-    1:21:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):603 -> <init>
-    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):639:639 -> a
-com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.graph.DexItemFactory$l:
-    com.android.tools.r8.graph.DexMethod newProxyInstance -> a
-    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):895:900 -> <init>
-    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):891 -> <init>
-    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):897:897 -> <init>
-    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):891 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.graph.DexItemFactory$m:
-    com.android.tools.r8.graph.DexMethod iterator -> d
+    1:21:void <init>(com.android.tools.r8.graph.DexItemFactory):544:564 -> <init>
+    1:21:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):532 -> <init>
+    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):568:568 -> a
+com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.graph.DexItemFactory$j:
     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:7:void <init>(com.android.tools.r8.graph.DexItemFactory):911:917 -> <init>
-    1:7:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):904 -> <init>
-    8:16:void <init>(com.android.tools.r8.graph.DexItemFactory):915:923 -> <init>
-    8:16:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):904 -> <init>
-    17:22:void <init>(com.android.tools.r8.graph.DexItemFactory):920:925 -> <init>
-    17:22:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):904 -> <init>
-    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):929:929 -> a
-com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods:
-    com.android.tools.r8.graph.DexMethod intConstructor -> o
-    com.android.tools.r8.graph.DexMethod charSequenceConstructor -> n
+    1:7:void <init>(com.android.tools.r8.graph.DexItemFactory):812:818 -> <init>
+    1:7:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):806 -> <init>
+    8:16:void <init>(com.android.tools.r8.graph.DexItemFactory):816:824 -> <init>
+    8:16:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):806 -> <init>
+    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):821:821 -> <init>
+    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):806 -> <init>
+    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):828:828 -> a
+com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.graph.DexItemFactory$k:
     com.android.tools.r8.graph.DexMethod appendStringBuffer -> m
     com.android.tools.r8.graph.DexMethod appendString -> l
     com.android.tools.r8.graph.DexMethod appendObject -> k
@@ -15400,14 +15090,11 @@
     com.android.tools.r8.graph.DexMethod appendCharArray -> c
     com.android.tools.r8.graph.DexMethod appendChar -> b
     com.android.tools.r8.graph.DexMethod appendBoolean -> a
-    java.util.Set appendMethods -> q
-    java.util.Set constructorMethods -> r
-    com.android.tools.r8.graph.DexMethod stringConstructor -> p
-    1:45:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):769:813 -> <init>
-    1:45:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):746 -> <init>
-    1:1:java.util.Set access$1500(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):746:746 -> a
-    1:1:java.util.Set access$1600(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):746:746 -> b
-com.android.tools.r8.graph.DexItemFactory$StringMethods -> com.android.tools.r8.graph.DexItemFactory$n:
+    java.util.Set appenders -> n
+    1:34:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):692:725 -> <init>
+    1:34:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):675 -> <init>
+    1:1:void forEachAppendMethod(java.util.function.Consumer):733:733 -> a
+com.android.tools.r8.graph.DexItemFactory$StringMethods -> com.android.tools.r8.graph.DexItemFactory$l:
     com.android.tools.r8.graph.DexMethod valueOf -> o
     com.android.tools.r8.graph.DexMethod compareToIgnoreCase -> n
     com.android.tools.r8.graph.DexMethod compareTo -> m
@@ -15424,32 +15111,29 @@
     com.android.tools.r8.graph.DexMethod length -> b
     com.android.tools.r8.graph.DexMethod isEmpty -> a
     com.android.tools.r8.graph.DexMethod toString -> p
-    1:41:void <init>(com.android.tools.r8.graph.DexItemFactory):701:741 -> <init>
-    1:41:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):680 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.graph.DexItemFactory$o:
+    1:41:void <init>(com.android.tools.r8.graph.DexItemFactory):630:670 -> <init>
+    1:41:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):609 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.graph.DexItemFactory$m:
     com.android.tools.r8.graph.DexMethod getSuppressed -> b
     com.android.tools.r8.graph.DexMethod addSuppressed -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):463:465 -> <init>
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):458 -> <init>
-    4:7:void <init>(com.android.tools.r8.graph.DexItemFactory):464:467 -> <init>
-    4:7:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):458 -> <init>
-    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):466:466 -> <init>
-    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):458 -> <init>
-com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.graph.r:
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):421:423 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):416 -> <init>
+    4:7:void <init>(com.android.tools.r8.graph.DexItemFactory):422:425 -> <init>
+    4:7:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):416 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):424:424 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):416 -> <init>
+com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.graph.q:
     boolean $assertionsDisabled -> k
-    1:1:void <clinit>():17:17 -> <clinit>
-    1:25:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):35:59 -> <init>
-    boolean isLibraryClass() -> F
-    boolean isNotProgramClass() -> G
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):78:78 -> a
-    1:1:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):94:94 -> b
-    1:2:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):70:71 -> c
-    1:3:boolean verifyLibraryMethod(com.android.tools.r8.graph.DexEncodedMethod):63:65 -> e
-    com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> n
-    1:1:java.lang.String toSourceString():88:88 -> toSourceString
-    1:1:java.lang.String toString():83:83 -> toString
-    com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> w
-com.android.tools.r8.graph.DexMemberAnnotation -> com.android.tools.r8.graph.s:
+    1:1:void <clinit>():16:16 -> <clinit>
+    1:21:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):34:54 -> <init>
+    boolean isLibraryClass() -> E
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):60:60 -> a
+    1:1:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):76:76 -> b
+    com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> m
+    1:1:java.lang.String toSourceString():70:70 -> toSourceString
+    1:1:java.lang.String toString():65:65 -> toString
+    com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> v
+com.android.tools.r8.graph.DexMemberAnnotation -> com.android.tools.r8.graph.u:
     com.android.tools.r8.graph.Descriptor item -> a
     com.android.tools.r8.graph.DexItem annotations -> b
     1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexItem):14:16 -> <init>
@@ -15457,15 +15141,15 @@
     3:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):28:28 -> a
     1:3:boolean equals(java.lang.Object):41:43 -> equals
     1:1:int hashCode():33:33 -> hashCode
-com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation -> com.android.tools.r8.graph.s$a:
+com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation -> com.android.tools.r8.graph.r:
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexAnnotationSet):51:51 -> <init>
-com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation -> com.android.tools.r8.graph.s$b:
+com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation -> com.android.tools.r8.graph.s:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexAnnotationSet):58:58 -> <init>
-com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation -> com.android.tools.r8.graph.s$c:
+com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation -> com.android.tools.r8.graph.t:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ParameterAnnotationsList):66:66 -> <init>
 com.android.tools.r8.graph.DexMethod -> com.android.tools.r8.graph.DexMethod:
-    java.util.Map singleTargetCache -> d
-    boolean $assertionsDisabled -> e
+    java.util.Map singleTargetCache -> a
+    boolean $assertionsDisabled -> b
     1:1:void <clinit>():12:12 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,boolean):22:28 -> <init>
     1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):12:12 -> a
@@ -15494,42 +15178,41 @@
     1:1:java.lang.String toSmaliString():161:161 -> toSmaliString
     1:15:java.lang.String toSourceString():166:180 -> toSourceString
     1:1:java.lang.String toString():35:35 -> toString
-com.android.tools.r8.graph.DexMethodHandle -> com.android.tools.r8.graph.t:
-    com.android.tools.r8.graph.DexMethodHandle$MethodHandleType type -> d
-    com.android.tools.r8.graph.Descriptor fieldOrMethod -> e
-    com.android.tools.r8.graph.DexMethod rewrittenTarget -> g
-    boolean isInterface -> f
-    boolean $assertionsDisabled -> h
+com.android.tools.r8.graph.DexMethodHandle -> com.android.tools.r8.graph.w:
+    com.android.tools.r8.graph.Descriptor fieldOrMethod -> d
+    com.android.tools.r8.graph.DexMethodHandle$MethodHandleType type -> c
+    boolean $assertionsDisabled -> f
+    com.android.tools.r8.graph.DexMethod rewrittenTarget -> e
     1:1:void <clinit>():15:15 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):208:212 -> <init>
-    6:10:void <init>(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean,com.android.tools.r8.graph.DexMethod):219:223 -> <init>
+    1:4:void <init>(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor):205:208 -> <init>
+    5:8:void <init>(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexMethod):214:217 -> <init>
     1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):15:15 -> a
-    2:8:int layeredCompareTo(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.naming.NamingLens):344:350 -> a
+    2:8:int layeredCompareTo(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.naming.NamingLens):339:345 -> a
     2:8:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):15 -> a
     9:9:int slowCompareTo(java.lang.Object):15:15 -> a
-    10:15: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):228:233 -> a
-    16:16: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.Descriptor,boolean):109:109 -> a
-    16:16: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):233 -> a
-    17:27:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):266:276 -> a
-    28:28:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):283:283 -> a
-    29:35:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):316:322 -> a
-    36:58:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):366:388 -> a
-    59:80:int getAsmTag():392:413 -> a
-    59:80:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):388 -> a
-    81:81:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):388:388 -> a
-    1:6:boolean computeEquals(java.lang.Object):243:248 -> b
+    10:14: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):222:226 -> a
+    15:15: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.Descriptor):108:108 -> a
+    15:15: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):227 -> a
+    16:26:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):261:271 -> a
+    27:27:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):278:278 -> a
+    28:34:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):311:317 -> a
+    35:56:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):361:382 -> a
+    57:78:int getAsmTag():386:407 -> a
+    57:78:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):382 -> a
+    79:79:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):382:382 -> a
+    1:5:boolean computeEquals(java.lang.Object):239:243 -> b
     1:1:int compareTo(java.lang.Object):15:15 -> compareTo
-    2:2:int compareTo(com.android.tools.r8.graph.DexMethodHandle):358:358 -> compareTo
+    2:2:int compareTo(com.android.tools.r8.graph.DexMethodHandle):353:353 -> compareTo
     2:2:int compareTo(java.lang.Object):15 -> compareTo
-    1:1:int computeHashCode():238:238 -> d
-    1:2:com.android.tools.r8.graph.DexField asField():310:311 -> g
-    1:2:com.android.tools.r8.graph.DexMethod asMethod():305:306 -> h
-    1:1:boolean isFieldHandle():293:293 -> i
-    1:1:boolean isMethodHandle():297:297 -> j
-    1:1:boolean isStaticHandle():301:301 -> k
-    1:1:java.lang.String toSmaliString():289:289 -> toSmaliString
-    1:6:java.lang.String toString():255:260 -> toString
-com.android.tools.r8.graph.DexMethodHandle$MethodHandleType -> com.android.tools.r8.graph.t$a:
+    1:3:int computeHashCode():232:234 -> d
+    1:2:com.android.tools.r8.graph.DexField asField():305:306 -> g
+    1:2:com.android.tools.r8.graph.DexMethod asMethod():300:301 -> h
+    1:1:boolean isFieldHandle():288:288 -> i
+    1:1:boolean isMethodHandle():292:292 -> j
+    1:1:boolean isStaticHandle():296:296 -> k
+    1:1:java.lang.String toSmaliString():284:284 -> toSmaliString
+    1:6:java.lang.String toString():250:255 -> toString
+com.android.tools.r8.graph.DexMethodHandle$MethodHandleType -> com.android.tools.r8.graph.v:
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType INVOKE_CONSTRUCTOR -> h
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType INVOKE_INSTANCE -> g
@@ -15546,53 +15229,53 @@
     1:12:void <clinit>():18:29 -> <clinit>
     13:13:void <clinit>():18:18 -> <clinit>
     1:2:void <init>(java.lang.String,int,short):33:34 -> <init>
-    1:1:short getValue():38:38 -> a
-    2:29:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):85:112 -> a
-    30:34:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):106:110 -> a
-    35:48:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):95:108 -> a
-    49:49:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):104:104 -> a
-    50:50:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):93:93 -> a
-    51:51:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):91:91 -> a
-    52:52:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):89:89 -> a
-    53:53:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):87:87 -> a
-    1:1:boolean isFieldType():117:117 -> b
-    2:2:boolean isInstancePut():134:134 -> b
-    2:2:boolean isFieldType():117 -> b
-    3:3:boolean isInstanceGet():138:138 -> b
-    3:3:boolean isFieldType():117 -> b
-    1:1:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):76:76 -> c
-    2:2:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):73:73 -> c
-    3:3:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):70:70 -> c
-    4:4:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):67:67 -> c
-    5:5:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):64:64 -> c
-    6:6:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):61:61 -> c
-    7:7:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):58:58 -> c
-    8:8:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):55:55 -> c
-    9:9:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):52:52 -> c
-    10:10:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):49:49 -> c
-    11:44:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):46:79 -> c
-    45:45:short getValue():38:38 -> c
-    45:45:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):79 -> c
-    46:46:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):79:79 -> c
-    47:47:boolean isInvokeConstructor():162:162 -> c
-    1:1:boolean isInvokeDirect():146:146 -> d
-    1:1:boolean isInvokeInstance():150:150 -> e
-    1:1:boolean isInvokeInterface():154:154 -> f
-    1:1:boolean isInvokeStatic():142:142 -> g
-    1:1:boolean isMethodType():121:121 -> h
-    2:2:boolean isInvokeSuper():158:158 -> h
-    2:2:boolean isMethodType():121 -> h
-    3:3:boolean isMethodType():122:122 -> h
-    1:1:boolean isStaticGet():130:130 -> i
-    1:1:boolean isStaticPut():126:126 -> j
-    1:16:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():166:181 -> k
-    17:17:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():179:179 -> k
-    18:18:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():177:177 -> k
-    19:19:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():175:175 -> k
-    20:20:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():173:173 -> k
-    21:21:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():171:171 -> k
-    22:22:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():169:169 -> k
-    1:1:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType[] values():18:18 -> l
+    1:28:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):85:112 -> a
+    29:33:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):106:110 -> a
+    34:47:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):95:108 -> a
+    48:48:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):104:104 -> a
+    49:49:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):93:93 -> a
+    50:50:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):91:91 -> a
+    51:51:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):89:89 -> a
+    52:52:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):87:87 -> a
+    53:53:boolean isFieldType():117:117 -> a
+    54:54:boolean isInstancePut():134:134 -> a
+    54:54:boolean isFieldType():117 -> a
+    55:55:boolean isInstanceGet():138:138 -> a
+    55:55:boolean isFieldType():117 -> a
+    1:1:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):76:76 -> b
+    2:2:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):73:73 -> b
+    3:3:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):70:70 -> b
+    4:4:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):67:67 -> b
+    5:5:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):64:64 -> b
+    6:6:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):61:61 -> b
+    7:7:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):58:58 -> b
+    8:8:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):55:55 -> b
+    9:9:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):52:52 -> b
+    10:10:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):49:49 -> b
+    11:44:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):46:79 -> b
+    45:45:short getValue():38:38 -> b
+    45:45:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):79 -> b
+    46:46:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType getKind(int):79:79 -> b
+    47:47:boolean isInvokeConstructor():162:162 -> b
+    1:1:boolean isInvokeDirect():146:146 -> c
+    1:1:boolean isInvokeInstance():150:150 -> d
+    1:1:boolean isInvokeInterface():154:154 -> e
+    1:1:boolean isInvokeStatic():142:142 -> f
+    1:1:boolean isMethodType():121:121 -> g
+    2:2:boolean isInvokeSuper():158:158 -> g
+    2:2:boolean isMethodType():121 -> g
+    3:3:boolean isMethodType():122:122 -> g
+    1:1:short getValue():38:38 -> getValue
+    1:1:boolean isStaticGet():130:130 -> h
+    1:1:boolean isStaticPut():126:126 -> i
+    1:16:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():166:181 -> j
+    17:17:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():179:179 -> j
+    18:18:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():177:177 -> j
+    19:19:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():175:175 -> j
+    20:20:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():173:173 -> j
+    21:21:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():171:171 -> j
+    22:22:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():169:169 -> j
+    1:1:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType[] values():18:18 -> k
 com.android.tools.r8.graph.DexProgramClass -> com.android.tools.r8.graph.DexProgramClass:
     com.android.tools.r8.ProgramResource$Kind originKind -> k
     int initialClassFileVersion -> n
@@ -15607,49 +15290,48 @@
     2:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):49:49 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,java.util.Collection):85:85 -> <init>
     4:79:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,java.util.Collection):28:103 -> <init>
-    boolean isNotProgramClass() -> G
-    boolean isProgramClass() -> H
-    1:20:void computeStaticValues():276:295 -> J
-    1:2:int getInitialClassFileVersion():386:387 -> K
-    1:2:com.android.tools.r8.graph.DexEncodedArray getStaticValues():316:317 -> L
-    1:1:java.util.Collection getSynthesizedFrom():154:154 -> M
-    1:5:boolean hasAnnotations():240:244 -> N
-    1:1:boolean hasClassFileVersion():382:382 -> O
-    1:2:boolean hasMethodsOrFields():234:235 -> P
-    1:4:boolean hasOnlyInternalizableAnnotations():248:251 -> Q
-    1:4:boolean isSorted():300:303 -> R
-    1:1:boolean originatesFromClassResource():111:111 -> S
-    1:1:boolean originatesFromDexResource():107:107 -> T
-    1:4:void sortMembers():353:356 -> U
+    boolean isProgramClass() -> F
+    1:20:void computeStaticValues():271:290 -> H
+    1:2:int getInitialClassFileVersion():381:382 -> I
+    1:2:com.android.tools.r8.graph.DexEncodedArray getStaticValues():311:312 -> J
+    1:1:java.util.Collection getSynthesizedFrom():154:154 -> K
+    1:5:boolean hasAnnotations():235:239 -> L
+    1:1:boolean hasClassFileVersion():377:377 -> M
+    1:2:boolean hasMethodsOrFields():229:230 -> N
+    1:4:boolean hasOnlyInternalizableAnnotations():243:246 -> O
+    1:4:boolean isSorted():295:298 -> P
+    1:1:boolean originatesFromClassResource():111:111 -> Q
+    1:1:boolean originatesFromDexResource():107:107 -> R
+    1:4:void sortMembers():348:351 -> S
     1:26:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):117:142 -> a
     27:30:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):159:162 -> a
-    31:32:void setKotlinInfo(com.android.tools.r8.kotlin.KotlinInfo):229:230 -> a
-    33:36:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):267:270 -> a
-    37:41:boolean isSorted(com.android.tools.r8.graph.KeyedDexItem[]):308:312 -> a
-    42:65:boolean hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):399:422 -> a
+    31:32:void setKotlinInfo(com.android.tools.r8.kotlin.KotlinInfo):224:225 -> a
+    33:36:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):262:265 -> a
+    37:41:boolean isSorted(com.android.tools.r8.graph.KeyedDexItem[]):303:307 -> a
+    42:65:boolean hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):394:417 -> a
     1:3:void synchronizedCollectAll(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexItem[]):148:150 -> b
     4:24:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):168:188 -> b
     25:27:void synchronizedCollectAll(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexItem[]):193:195 -> b
-    1:3:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedField[]):255:257 -> c
-    4:6:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedMethod[]):261:263 -> c
-    7:8:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):344:345 -> c
-    9:14:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):344:349 -> c
-    15:15:com.android.tools.r8.graph.DexField lambda$sortEncodedFields$0(com.android.tools.r8.graph.DexEncodedField):361:361 -> c
-    1:6:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):324:329 -> d
-    7:7:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):327:327 -> d
-    8:10:void sortEncodedFields(com.android.tools.r8.graph.DexEncodedField[]):360:362 -> d
-    11:13:void sortEncodedMethods(com.android.tools.r8.graph.DexEncodedMethod[]):366:368 -> d
-    1:7:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):334:340 -> e
-    8:9:void setInitialClassFileVersion(int):377:378 -> e
-    1:1:com.android.tools.r8.graph.DexMethod lambda$sortEncodedMethods$1(com.android.tools.r8.graph.DexEncodedMethod):367:367 -> f
+    1:3:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedField[]):250:252 -> c
+    4:6:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedMethod[]):256:258 -> c
+    7:8:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):339:340 -> c
+    9:14:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):339:344 -> c
+    15:15:com.android.tools.r8.graph.DexField lambda$sortEncodedFields$0(com.android.tools.r8.graph.DexEncodedField):356:356 -> c
+    1:6:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):319:324 -> d
+    7:7:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):322:322 -> d
+    8:10:void sortEncodedFields(com.android.tools.r8.graph.DexEncodedField[]):355:357 -> d
+    11:13:void sortEncodedMethods(com.android.tools.r8.graph.DexEncodedMethod[]):361:363 -> d
+    14:15:void setInitialClassFileVersion(int):372:373 -> d
+    1:7:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):329:335 -> e
+    1:1:com.android.tools.r8.graph.DexMethod lambda$sortEncodedMethods$1(com.android.tools.r8.graph.DexEncodedMethod):362:362 -> f
     1:1:java.lang.Object get():21:21 -> get
-    com.android.tools.r8.graph.DexProgramClass asProgramClass() -> o
+    com.android.tools.r8.graph.DexProgramClass asProgramClass() -> n
     1:1:java.lang.String toSourceString():205:205 -> toSourceString
     1:1:java.lang.String toString():200:200 -> toString
-    1:1:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo():225:225 -> w
+    1:1:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo():220:220 -> v
 com.android.tools.r8.graph.DexProto -> com.android.tools.r8.graph.DexProto:
-    com.android.tools.r8.graph.DexString shorty -> d
-    com.android.tools.r8.graph.DexProto SENTINEL -> e
+    com.android.tools.r8.graph.DexString shorty -> a
+    com.android.tools.r8.graph.DexProto SENTINEL -> b
     1:1:void <clinit>():11:11 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList):17:20 -> <init>
     1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):9:9 -> a
@@ -15657,16 +15339,16 @@
     3:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):49:52 -> a
     7:7:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):58:58 -> a
     8:8:int compareTo(com.android.tools.r8.graph.DexProto):63:63 -> a
-    9:16:java.lang.String toDescriptorString(com.android.tools.r8.naming.NamingLens):103:110 -> a
+    9:11:int layeredCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):86:88 -> a
+    12:19:java.lang.String toDescriptorString(com.android.tools.r8.naming.NamingLens):103:110 -> a
     1:5:boolean computeEquals(java.lang.Object):32:36 -> b
-    6:8:int layeredCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):86:88 -> b
-    1:3:int slowCompareTo(com.android.tools.r8.graph.DexProto):68:70 -> c
+    6:8:int slowCompareTo(com.android.tools.r8.graph.DexProto):68:70 -> b
     1:1:int compareTo(java.lang.Object):9:9 -> compareTo
     1:3:int computeHashCode():25:27 -> d
     1:1:java.lang.String toDescriptorString():99:99 -> toDescriptorString
     1:1:java.lang.String toSmaliString():95:95 -> toSmaliString
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.graph.DexReference -> com.android.tools.r8.graph.u:
+com.android.tools.r8.graph.DexReference -> com.android.tools.r8.graph.x:
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     1:1:java.util.stream.Stream filterDexReference(java.util.stream.Stream):59:59 -> a
@@ -15680,8 +15362,8 @@
     boolean isDexMethod() -> k
     boolean isDexType() -> l
 com.android.tools.r8.graph.DexString -> com.android.tools.r8.graph.DexString:
-    boolean $assertionsDisabled -> e
-    int size -> d
+    boolean $assertionsDisabled -> b
+    int size -> a
     1:3:void <clinit>():14:16 -> <clinit>
     1:3:void <init>(int,byte[]):21:23 -> <init>
     4:5:void <init>(java.lang.String):26:27 -> <init>
@@ -15696,12 +15378,12 @@
     3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):144:144 -> a
     4:4:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):149:149 -> a
     5:5:int compareTo(com.android.tools.r8.graph.DexString):154:154 -> a
+    6:6:int layeredCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.NamingLens):199:199 -> a
     1:3:boolean computeEquals(java.lang.Object):38:40 -> b
     4:8:boolean endsWith(com.android.tools.r8.graph.DexString):318:322 -> b
-    1:1:int layeredCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.NamingLens):199:199 -> c
+    1:5:boolean startsWith(com.android.tools.r8.graph.DexString):306:310 -> c
     1:1:int compareTo(java.lang.Object):14:14 -> compareTo
     1:1:int computeHashCode():33:33 -> d
-    2:6:boolean startsWith(com.android.tools.r8.graph.DexString):306:310 -> d
     1:11:java.lang.String dump():292:302 -> dump
     1:1:boolean isValidClassDescriptor():285:285 -> g
     2:13:boolean isValidClassDescriptor(java.lang.String):203:214 -> g
@@ -15726,65 +15408,105 @@
     1:3:java.lang.String toASCIIString():56:58 -> toASCIIString
     1:3:java.lang.String toString():48:50 -> toString
 com.android.tools.r8.graph.DexType -> com.android.tools.r8.graph.DexType:
-    boolean $assertionsDisabled -> f
+    java.util.Set directSubtypes -> c
+    java.util.Set implementedInterfaces -> d
+    java.util.Set NO_DIRECT_SUBTYPE -> f
+    boolean $assertionsDisabled -> g
+    java.lang.String toStringCache -> a
+    int hierarchyLevel -> b
     com.android.tools.r8.graph.DexType[] EMPTY_ARRAY -> e
-    java.lang.String toStringCache -> d
-    1:2:void <clinit>():23:24 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexString):29:29 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexString):27:31 -> <init>
-    1:4:java.lang.String toBinaryName():86:89 -> A
-    5:8:java.lang.String toBinaryName():87:90 -> A
-    1:1:char toShorty():107:107 -> B
+    1:9:void <clinit>():32:40 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexString):54:54 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.DexString):43:56 -> <init>
+    1:1:boolean isLongType():455:455 -> A
+    1:4:boolean isPrimitiveArrayType():473:476 -> B
+    1:1:boolean isPrimitiveType():418:418 -> C
+    1:1:boolean isShortType():443:443 -> D
+    1:1:boolean isUnknown():150:150 -> E
+    1:1:void tagAsInteface():105:105 -> F
+    1:1:void tagAsSubtypeRoot():101:101 -> G
+    1:1:char toShorty():349:349 -> H
+    1:2:void ensureDirectSubTypeSet():73:74 -> I
     boolean isPrimitiveType(char) -> a
-    1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):23:23 -> a
-    2:2:int slowCompareTo(java.lang.Object):23:23 -> a
-    3:4:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Predicate):53:54 -> a
-    5:5:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppInfo):58:58 -> a
-    6:7:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppInfo,java.util.function.Predicate):63:64 -> a
-    8:12:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):68:72 -> a
-    13:14:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):124:125 -> a
-    15:15:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):138:138 -> a
-    16:16:int compareTo(com.android.tools.r8.graph.DexType):153:153 -> a
-    17:19:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):170:172 -> a
-    20:21:boolean isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):249:250 -> a
-    22:31:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):292:301 -> a
-    32:34:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):305:307 -> a
-    35:37:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):306:308 -> a
-    38:45:java.lang.String getPackageOrName(boolean):312:319 -> a
-    1:2:boolean computeEquals(java.lang.Object):41:42 -> b
-    3:3:boolean isSamePackage(com.android.tools.r8.graph.DexType):78:78 -> b
-    4:9:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):282:287 -> b
-    10:12:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):286:288 -> b
-    1:1:int slowCompareTo(com.android.tools.r8.graph.DexType):158:158 -> c
-    1:1:int compareTo(java.lang.Object):23:23 -> compareTo
-    1:1:int computeHashCode():36:36 -> d
-    1:2:void flushCachedValues():132:133 -> flushCachedValues
-    1:4:java.lang.String getName():328:331 -> getName
-    1:1:java.lang.String getPackageDescriptor():324:324 -> getPackageDescriptor
+    1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):32:32 -> a
+    2:2:int slowCompareTo(java.lang.Object):32:32 -> a
+    3:6:void addDirectSubtype(com.android.tools.r8.graph.DexType):94:97 -> a
+    7:8:boolean isExternalizable(com.android.tools.r8.graph.DexDefinitionSupplier):120:121 -> a
+    9:10:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Predicate):135:136 -> a
+    11:11:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppInfo):140:140 -> a
+    12:13:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppInfo,java.util.function.Predicate):145:146 -> a
+    14:24:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):188:198 -> a
+    25:28:boolean isSubtypeOfClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):228:231 -> a
+    25:28:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):200 -> a
+    29:38:boolean isInterfaceSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):205:214 -> a
+    39:40:java.lang.Iterable allInterfaces(com.android.tools.r8.graph.DexItemFactory):282:283 -> a
+    41:53:void implementedInterfaces(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Set):311:323 -> a
+    54:55:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):366:367 -> a
+    56:56:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):380:380 -> a
+    57:59:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):412:414 -> a
+    60:69:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):529:538 -> a
+    70:100:boolean validateLevelsAreCorrect(java.util.function.Function,com.android.tools.r8.graph.DexItemFactory):550:580 -> a
+    101:108:java.lang.String getPackageOrName(boolean):588:595 -> a
+    109:153:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):634:678 -> a
+    1:2:boolean computeEquals(java.lang.Object):66:67 -> b
+    3:4:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexDefinitionSupplier):109:110 -> b
+    5:7:void addInterfaceSubtype(com.android.tools.r8.graph.DexType):156:158 -> b
+    8:8:boolean lambda$isStrictSubtypeOf$0(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):198:198 -> b
+    9:9:void forAllExtendsSubtypes(java.util.function.Consumer):248:248 -> b
+    10:12:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):542:544 -> b
+    13:15:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):543:545 -> b
+    1:2:boolean isSerializable(com.android.tools.r8.graph.DexDefinitionSupplier):125:126 -> c
+    3:4:void clearSubtypeInformation(com.android.tools.r8.graph.DexType):162:163 -> c
+    5:5:void forAllImplementsSubtypes(java.util.function.Consumer):271:271 -> c
+    6:11:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):519:524 -> c
+    12:14:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):523:525 -> c
+    1:1:int compareTo(java.lang.Object):32:32 -> compareTo
+    1:1:int computeHashCode():61:61 -> d
+    2:12:void setLevel(int):79:89 -> d
+    13:13:int compareTo(com.android.tools.r8.graph.DexType):395:395 -> d
+    1:2:boolean isImmediateSubtypeOf(com.android.tools.r8.graph.DexType):626:627 -> e
+    1:1:boolean isSamePackage(com.android.tools.r8.graph.DexType):328:328 -> f
+    1:2:void flushCachedValues():374:375 -> flushCachedValues
+    1:1:int slowCompareTo(com.android.tools.r8.graph.DexType):400:400 -> g
+    1:4:java.lang.String getName():613:616 -> getName
+    1:1:java.lang.String getPackageDescriptor():609:609 -> getPackageDescriptor
+    1:1:boolean lambda$allExtendsSubtypes$1(com.android.tools.r8.graph.DexType):257:257 -> h
     com.android.tools.r8.graph.DexType asDexType() -> i
-    1:1:boolean isArrayType():221:221 -> isArrayType
-    1:1:boolean isBooleanType():189:189 -> isBooleanType
-    1:1:boolean isIntType():205:205 -> isIntType
-    1:1:boolean isVoidType():185:185 -> isVoidType
+    1:1:boolean lambda$allImplementsSubtypes$2(com.android.tools.r8.graph.DexType):276:276 -> i
+    1:11:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexDefinitionSupplier):297:307 -> implementedInterfaces
+    12:12:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexDefinitionSupplier):306:306 -> implementedInterfaces
+    1:1:boolean isArrayType():463:463 -> isArrayType
+    1:1:boolean isBooleanType():431:431 -> isBooleanType
+    1:1:boolean isIntType():447:447 -> isIntType
+    1:3:boolean isInterface():114:116 -> isInterface
+    1:1:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):176:176 -> isStrictSubtypeOf
+    1:1:boolean isSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):167:167 -> isSubtypeOf
+    1:1:boolean isVoidType():427:427 -> isVoidType
     boolean isDexType() -> l
-    1:16:int elementSizeForPrimitiveArrayType():254:269 -> m
-    1:2:java.lang.String getInternalName():336:337 -> n
-    1:1:int getNumberOfLeadingSquareBrackets():275:275 -> o
-    1:1:java.lang.String getPackageName():341:341 -> p
-    1:1:boolean isByteType():193:193 -> q
-    1:1:boolean isCharType():197:197 -> r
-    1:1:boolean isClassType():226:226 -> s
-    1:8:boolean isD8R8SynthesizedClassType():238:245 -> t
-    1:1:java.lang.String toDescriptorString():82:82 -> toDescriptorString
-    1:1:java.lang.String toSmaliString():113:113 -> toSmaliString
-    1:9:java.lang.String toSourceString():95:103 -> toSourceString
-    1:1:java.lang.String toString():118:118 -> toString
-    1:1:boolean isDoubleType():217:217 -> u
-    1:1:boolean isFloatType():209:209 -> v
-    1:1:boolean isLongType():213:213 -> w
-    1:4:boolean isPrimitiveArrayType():231:234 -> x
-    1:1:boolean isPrimitiveType():176:176 -> y
-    1:1:boolean isShortType():201:201 -> z
+    1:8:java.lang.Iterable allExtendsSubtypes():252:259 -> m
+    1:1:java.util.Set allImmediateSubtypes():237:237 -> n
+    1:4:java.lang.Iterable allImplementsSubtypes():275:278 -> o
+    1:16:int elementSizeForPrimitiveArrayType():491:506 -> p
+    1:2:java.lang.String getInternalName():621:622 -> q
+    1:1:int getNumberOfLeadingSquareBrackets():512:512 -> r
+    1:3:com.android.tools.r8.graph.DexType getSingleSubtype():600:602 -> s
+    4:4:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809:809 -> s
+    4:4:com.android.tools.r8.graph.DexType getSingleSubtype():602 -> s
+    5:5:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getNext(java.util.Iterator,java.lang.Object):888:888 -> s
+    5:5:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809 -> s
+    5:5:com.android.tools.r8.graph.DexType getSingleSubtype():602 -> s
+    6:6:com.android.tools.r8.graph.DexType getSingleSubtype():602:602 -> s
+    1:1:boolean hasSubtypes():171:171 -> t
+    1:1:java.lang.String toDescriptorString():332:332 -> toDescriptorString
+    1:1:java.lang.String toSmaliString():355:355 -> toSmaliString
+    1:9:java.lang.String toSourceString():337:345 -> toSourceString
+    1:1:java.lang.String toString():360:360 -> toString
+    1:1:boolean isByteType():435:435 -> u
+    1:1:boolean isCharType():439:439 -> v
+    1:1:boolean isClassType():468:468 -> w
+    1:8:boolean isD8R8SynthesizedClassType():480:487 -> x
+    1:1:boolean isDoubleType():459:459 -> y
+    1:1:boolean isFloatType():451:451 -> z
 com.android.tools.r8.graph.DexTypeList -> com.android.tools.r8.graph.DexTypeList:
     com.android.tools.r8.graph.DexTypeList theEmptyTypeList -> a
     boolean $assertionsDisabled -> b
@@ -15825,9 +15547,10 @@
     java.lang.Object getBoxedValue() -> g
     boolean mayHaveSideEffects() -> h
     void sort() -> i
+com.android.tools.r8.graph.DexValue$1 -> com.android.tools.r8.graph.y:
 com.android.tools.r8.graph.DexValue$DexItemBasedValueString -> com.android.tools.r8.graph.DexValue$a:
-    com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo classNameComputationInfo -> c
-    boolean $assertionsDisabled -> d
+    com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo classNameComputationInfo -> a
+    boolean $assertionsDisabled -> b
     1:1:void <clinit>():759:759 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexReference):763:763 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo):768:769 -> <init>
@@ -16010,8 +15733,8 @@
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
     1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):453:453 -> a
     2:2:com.android.tools.r8.ir.code.Instruction asConstInstruction(boolean,com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.InternalOptions):482:482 -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueInt create(int):439:439 -> d
-    2:2:java.lang.Object asAsmEncodedObject():458:458 -> d
+    1:1:com.android.tools.r8.graph.DexValue$DexValueInt create(int):439:439 -> c
+    1:1:java.lang.Object asAsmEncodedObject():458:458 -> d
     1:1:boolean equals(java.lang.Object):471:471 -> equals
     1:1:java.lang.Object getBoxedValue():448:448 -> g
     1:1:int getValue():443:443 -> getValue
@@ -16188,6 +15911,7 @@
     1:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):72:73 -> definitionFor
     1:1:java.util.Collection allClasses():58:58 -> e
     1:1:java.util.Collection libraryClasses():67:67 -> f
+com.android.tools.r8.graph.DirectMappedDexApplication$1 -> com.android.tools.r8.graph.z:
 com.android.tools.r8.graph.DirectMappedDexApplication$Builder -> com.android.tools.r8.graph.DirectMappedDexApplication$a:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathClasses -> l
@@ -16262,6 +15986,7 @@
     1:6:java.util.Set lookupMethodInAllContexts(com.android.tools.r8.graph.DexMethod):420:425 -> e
     com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod) -> f
     1:1:com.android.tools.r8.graph.GraphLense getIdentityLense():458:458 -> getIdentityLense
+com.android.tools.r8.graph.GraphLense$1 -> com.android.tools.r8.graph.A:
 com.android.tools.r8.graph.GraphLense$Builder -> com.android.tools.r8.graph.GraphLense$a:
     java.util.Map typeMap -> a
     java.util.Map methodMap -> b
@@ -16354,12 +16079,13 @@
     1:4:void <init>(int,boolean,com.android.tools.r8.graph.DexType):110:113 -> <init>
     5:8:void <init>(int,boolean,com.android.tools.r8.graph.DexType):110:113 -> <init>
     5:8:void <init>(int,boolean,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense$1):76 -> <init>
-    1:1:int getArgumentIndex():121:121 -> a
+    1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder builder():117:117 -> a
     2:3:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo withArgumentIndex(int):137:138 -> a
-    1:1:com.android.tools.r8.graph.DexType getType():125:125 -> b
-    1:1:boolean isAlwaysNull():129:129 -> c
-    1:1:boolean isNeverUsed():133:133 -> d
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> com.android.tools.r8.graph.v:
+    1:1:int getArgumentIndex():121:121 -> b
+    1:1:com.android.tools.r8.graph.DexType getType():125:125 -> c
+    1:1:boolean isAlwaysNull():129:129 -> d
+    1:1:boolean isNeverUsed():133:133 -> e
+com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> com.android.tools.r8.graph.GraphLense$e$a$a:
     com.android.tools.r8.graph.DexType type -> c
     boolean isAlwaysNull -> b
     boolean $assertionsDisabled -> d
@@ -16386,41 +16112,36 @@
     1:3:java.util.ListIterator iterator():172:174 -> c
     1:1:int numberOfRemovedArguments():193:193 -> d
 com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.graph.IndexedDexItem:
-    int sortedIndex -> b
-    boolean $assertionsDisabled -> c
+    boolean $assertionsDisabled -> b
+    int sortedIndex -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:4:void <init>():12:15 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
     int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping) -> a
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):24:24 -> a
-    1:3:void setSortedIndex(int):33:35 -> c
-    1:3:int sortedCompareTo(int):45:47 -> d
+    1:3:void setSortedIndex(int):33:35 -> b
+    1:3:int sortedCompareTo(int):45:47 -> c
     1:1:int getSortedIndex():40:40 -> e
     1:1:void resetSortedIndex():57:57 -> f
     1:2:void flushCachedValues():52:53 -> flushCachedValues
-com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.graph.w:
+com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.graph.B:
     com.android.tools.r8.graph.DexString innerName -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType outer -> c
     com.android.tools.r8.graph.DexType inner -> b
     int access -> a
-    1:1:void <clinit>():13:13 -> <clinit>
-    1:6:void <init>(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):33:38 -> <init>
-    1:1:int getAccess():50:50 -> a
-    2:2:com.android.tools.r8.graph.DexType getOuter():58:58 -> a
-    2:2:com.android.tools.r8.graph.DexType getLiveContext(com.android.tools.r8.shaking.AppInfoWithLiveness):85 -> a
-    3:3:com.android.tools.r8.graph.DexType getInner():54:54 -> a
-    3:3:com.android.tools.r8.graph.DexType getLiveContext(com.android.tools.r8.shaking.AppInfoWithLiveness):87 -> a
-    4:16:com.android.tools.r8.graph.DexType getLiveContext(com.android.tools.r8.shaking.AppInfoWithLiveness):87:99 -> a
-    17:21:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):66:70 -> a
-    22:22:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):67:67 -> a
-    23:28:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):75:80 -> a
-    1:1:com.android.tools.r8.graph.DexType getInner():54:54 -> b
-    1:1:com.android.tools.r8.graph.DexString getInnerName():62:62 -> c
-    1:1:com.android.tools.r8.graph.DexType getOuter():58:58 -> d
-    1:1:boolean isAnonymous():46:46 -> e
-    1:1:boolean isNamed():42:42 -> f
-com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.graph.x:
+    1:1:void <clinit>():12:12 -> <clinit>
+    1:6:void <init>(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):32:37 -> <init>
+    1:1:int getAccess():49:49 -> a
+    2:6:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):65:69 -> a
+    7:7:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):66:66 -> a
+    8:13:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):74:79 -> a
+    1:1:com.android.tools.r8.graph.DexType getInner():53:53 -> b
+    1:1:com.android.tools.r8.graph.DexString getInnerName():61:61 -> c
+    1:1:com.android.tools.r8.graph.DexType getOuter():57:57 -> d
+    1:1:boolean isAnonymous():45:45 -> e
+    1:1:boolean isNamed():41:41 -> f
+com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.graph.C:
     java.util.concurrent.ConcurrentHashMap stringCache -> d
     com.android.tools.r8.utils.InternalOptions options -> a
     java.util.concurrent.ConcurrentHashMap asmTypeCache -> c
@@ -16434,107 +16155,105 @@
     3:10:com.android.tools.r8.graph.DexTypeList getTypeListFromNames(java.lang.String[]):62:69 -> a
     11:11:com.android.tools.r8.graph.DexField getField(java.lang.String,java.lang.String,java.lang.String):84:84 -> a
     12:12:com.android.tools.r8.graph.DexField getField(com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String):88:88 -> a
-    13:15:int getArgumentCount(java.lang.String):157:159 -> a
+    13:15:int getArgumentCount(java.lang.String):156:158 -> a
     1:1:com.android.tools.r8.graph.DexMethod getMethod(java.lang.String,java.lang.String,java.lang.String):92:92 -> b
     2:2:com.android.tools.r8.graph.DexMethod getMethod(com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String):96:96 -> b
-    3:7:com.android.tools.r8.org.objectweb.asm.Type[] getArgumentTypes(java.lang.String):169:173 -> b
+    3:7:com.android.tools.r8.org.objectweb.asm.Type[] getArgumentTypes(java.lang.String):168:172 -> b
     1:1:com.android.tools.r8.org.objectweb.asm.Type getAsmObjectType(java.lang.String):32:32 -> c
     1:1:com.android.tools.r8.org.objectweb.asm.Type getAsmType(java.lang.String):36:36 -> d
-    1:1:com.android.tools.r8.graph.DexProto getProto(java.lang.String):113:113 -> e
-    2:2:boolean isValidDescriptor(java.lang.String):137:137 -> e
-    2:2:com.android.tools.r8.graph.DexProto getProto(java.lang.String):113 -> e
-    3:13:com.android.tools.r8.graph.DexProto getProto(java.lang.String):113:123 -> e
+    1:1:com.android.tools.r8.graph.DexProto getProto(java.lang.String):112:112 -> e
+    2:2:boolean isValidDescriptor(java.lang.String):136:136 -> e
+    2:2:com.android.tools.r8.graph.DexProto getProto(java.lang.String):112 -> e
+    3:13:com.android.tools.r8.graph.DexProto getProto(java.lang.String):112:122 -> e
     14:21:com.android.tools.r8.graph.DexTypeList getTypeListFromDescriptors(java.lang.String[]):73:80 -> e
-    14:21:com.android.tools.r8.graph.DexProto getProto(java.lang.String):124 -> e
-    22:22:com.android.tools.r8.graph.DexProto getProto(java.lang.String):121:121 -> e
-    1:1:com.android.tools.r8.org.objectweb.asm.Type getReturnType(java.lang.String):145:145 -> f
+    14:21:com.android.tools.r8.graph.DexProto getProto(java.lang.String):123 -> e
+    22:22:com.android.tools.r8.graph.DexProto getProto(java.lang.String):120:120 -> e
+    1:1:com.android.tools.r8.org.objectweb.asm.Type getReturnType(java.lang.String):144:144 -> f
     1:1:com.android.tools.r8.graph.DexString getString(java.lang.String):44:44 -> g
     1:1:com.android.tools.r8.graph.DexType getTypeFromDescriptor(java.lang.String):57:57 -> h
-    2:2:boolean isValidDescriptor(java.lang.String):137:137 -> h
+    2:2:boolean isValidDescriptor(java.lang.String):136:136 -> h
     2:2:com.android.tools.r8.graph.DexType getTypeFromDescriptor(java.lang.String):57 -> h
     3:4:com.android.tools.r8.graph.DexType getTypeFromDescriptor(java.lang.String):57:58 -> h
     1:1:com.android.tools.r8.graph.DexType getTypeFromName(java.lang.String):52:52 -> i
-    2:2:boolean isValidInternalName(java.lang.String):141:141 -> i
+    2:2:boolean isValidInternalName(java.lang.String):140:140 -> i
     2:2:com.android.tools.r8.graph.DexType getTypeFromName(java.lang.String):52 -> i
     3:4:com.android.tools.r8.graph.DexType getTypeFromName(java.lang.String):52:53 -> i
-    1:35:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):179:213 -> j
-    36:41:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):200:205 -> j
-    42:65:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):187:210 -> j
-    66:66:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):196:196 -> j
-    1:2:java.lang.String getReturnTypeDescriptor(java.lang.String):149:150 -> k
-    1:4:java.lang.String getShortyDescriptor(java.lang.String):129:132 -> l
+    1:35:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):178:212 -> j
+    36:41:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):199:204 -> j
+    42:65:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):186:209 -> j
+    66:66:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):195:195 -> j
+    1:2:java.lang.String getReturnTypeDescriptor(java.lang.String):148:149 -> k
+    1:4:java.lang.String getShortyDescriptor(java.lang.String):128:131 -> l
     1:1:com.android.tools.r8.org.objectweb.asm.Type lambda$getAsmObjectType$0(java.lang.String):32:32 -> m
     1:1:com.android.tools.r8.org.objectweb.asm.Type lambda$getAsmType$1(java.lang.String):36:36 -> n
-com.android.tools.r8.graph.JarClassFileReader -> com.android.tools.r8.graph.C:
+com.android.tools.r8.graph.JarClassFileReader -> com.android.tools.r8.graph.D:
     java.util.function.Consumer classConsumer -> b
     com.android.tools.r8.graph.JarApplicationReader application -> a
     byte[] CLASSFILE_HEADER -> c
     boolean $assertionsDisabled -> d
     1:3:void <clinit>():63:65 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):74:76 -> <init>
-    1:1:int access$000(int):63:63 -> a
-    2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor access$100(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):63:63 -> a
-    3:3:com.android.tools.r8.graph.DexEncodedAnnotation access$1700(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):63:63 -> a
-    4:13:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):80:89 -> a
-    14:14:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):29:29 -> a
-    14:14:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):89 -> a
-    15:24:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):89:98 -> a
-    25:33:byte[] com.android.tools.r8.org.objectweb.asm.ClassReader.readStream(java.io.InputStream,boolean):312:320 -> a
-    25:33:void com.android.tools.r8.org.objectweb.asm.ClassReader.<init>(java.io.InputStream):283 -> a
-    25:33:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):98 -> a
-    34:34:void com.android.tools.r8.org.objectweb.asm.ClassReader.<init>(java.io.InputStream):283:283 -> a
-    34:34:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):98 -> a
-    35:42:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):104:111 -> a
-    43:43:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400:400 -> a
-    43:43:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):111 -> a
-    44:50:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):116:122 -> a
-    51:55:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):120:124 -> a
-    56:68:byte[] com.android.tools.r8.org.objectweb.asm.ClassReader.readStream(java.io.InputStream,boolean):312:324 -> a
-    56:68:void com.android.tools.r8.org.objectweb.asm.ClassReader.<init>(java.io.InputStream):283 -> a
-    56:68:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):98 -> a
-    69:69:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):94:94 -> a
-    70:70:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):29:29 -> a
-    70:70:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):94 -> a
-    71:71:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):94:94 -> a
-    72:74:com.android.tools.r8.graph.MethodAccessFlags createMethodAccessFlags(java.lang.String,int):143:145 -> a
-    75:76:void lambda$createAnnotationVisitor$0(java.util.List,int,java.lang.String,com.android.tools.r8.graph.JarApplicationReader,java.util.List,java.util.List):154:155 -> a
-    77:77:void lambda$createAnnotationVisitor$0(java.util.List,int,java.lang.String,com.android.tools.r8.graph.JarApplicationReader,java.util.List,java.util.List):154:154 -> a
-    78:88:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):435:445 -> a
-    78:88:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):63 -> a
-    89:89:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):436:436 -> a
-    89:89:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):63 -> a
-    1:1:com.android.tools.r8.graph.FieldAccessFlags createFieldAccessFlags(int):138:138 -> b
-    2:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):151:153 -> b
-    5:6:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):160:161 -> b
-    7:13:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):160:166 -> b
-    int cleanAccessFlags(int) -> c
-com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> com.android.tools.r8.graph.y:
+    int access$000(int) -> a
+    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor access$100(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):63:63 -> a
+    2:2:com.android.tools.r8.graph.DexEncodedAnnotation access$1700(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):63:63 -> a
+    3:12:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):80:89 -> a
+    13:13:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):29:29 -> a
+    13:13:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):89 -> a
+    14:23:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):89:98 -> a
+    24:31:byte[] com.android.tools.r8.org.objectweb.asm.ClassReader.readStream(java.io.InputStream,boolean):303:310 -> a
+    24:31:void com.android.tools.r8.org.objectweb.asm.ClassReader.<init>(java.io.InputStream):273 -> a
+    24:31:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):98 -> a
+    32:32:void com.android.tools.r8.org.objectweb.asm.ClassReader.<init>(java.io.InputStream):273:273 -> a
+    32:32:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):98 -> a
+    33:40:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):104:111 -> a
+    41:41:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391:391 -> a
+    41:41:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):111 -> a
+    42:48:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):116:122 -> a
+    49:53:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):120:124 -> a
+    54:54:byte[] com.android.tools.r8.org.objectweb.asm.ClassReader.readStream(java.io.InputStream,boolean):315:315 -> a
+    54:54:void com.android.tools.r8.org.objectweb.asm.ClassReader.<init>(java.io.InputStream):273 -> a
+    54:54:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):98 -> a
+    55:55:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):94:94 -> a
+    56:56:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):29:29 -> a
+    56:56:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):94 -> a
+    57:57:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):94:94 -> a
+    58:60:com.android.tools.r8.graph.MethodAccessFlags createMethodAccessFlags(java.lang.String,int):139:141 -> a
+    61:62:void lambda$createAnnotationVisitor$0(java.util.List,int,java.lang.String,com.android.tools.r8.graph.JarApplicationReader,java.util.List,java.util.List):150:151 -> a
+    63:63:void lambda$createAnnotationVisitor$0(java.util.List,int,java.lang.String,com.android.tools.r8.graph.JarApplicationReader,java.util.List,java.util.List):150:150 -> a
+    64:66:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List):417:419 -> a
+    64:66:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List):63 -> a
+    67:67:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List):418:418 -> a
+    67:67:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List):63 -> a
+    1:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):147:149 -> b
+    4:5:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):156:157 -> b
+    6:12:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):156:162 -> b
+com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> com.android.tools.r8.graph.D$a:
     java.util.List values -> e
     java.util.List names -> d
     com.android.tools.r8.graph.JarApplicationReader application -> b
     boolean $assertionsDisabled -> f
     java.util.function.BiConsumer onVisitEnd -> c
-    1:1:void <clinit>():760:760 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):769:769 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):764:771 -> <init>
-    1:2:void visitEnum(java.lang.String,java.lang.String,java.lang.String):781:782 -> a
-    3:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):787:787 -> a
-    4:5:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):788:789 -> a
-    6:6:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):788:788 -> a
-    7:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):794:794 -> a
-    8:9:void lambda$visitArray$1(java.lang.String,java.util.List,java.util.List):795:796 -> a
-    10:10:void visitEnd():802:802 -> a
-    11:16:void addElement(java.lang.String,com.android.tools.r8.graph.DexValue):807:812 -> a
-    17:38:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):878:899 -> a
-    17:38:void visit(java.lang.String,java.lang.Object):776 -> a
-    39:94:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):816:871 -> a
-    39:94:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):901 -> a
-    39:94:void visit(java.lang.String,java.lang.Object):776 -> a
-    95:95:void visit(java.lang.String,java.lang.Object):776:776 -> a
-    96:96:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):873:873 -> a
-    96:96:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):901 -> a
-    96:96:void visit(java.lang.String,java.lang.Object):776 -> a
-com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> com.android.tools.r8.graph.z:
+    1:1:void <clinit>():732:732 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):741:741 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):736:743 -> <init>
+    1:2:void visitEnum(java.lang.String,java.lang.String,java.lang.String):753:754 -> a
+    3:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):759:759 -> a
+    4:5:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):760:761 -> a
+    6:6:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):760:760 -> a
+    7:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):766:766 -> a
+    8:9:void lambda$visitArray$1(java.lang.String,java.util.List,java.util.List):767:768 -> a
+    10:10:void visitEnd():774:774 -> a
+    11:16:void addElement(java.lang.String,com.android.tools.r8.graph.DexValue):779:784 -> a
+    17:38:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):850:871 -> a
+    17:38:void visit(java.lang.String,java.lang.Object):748 -> a
+    39:94:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):788:843 -> a
+    39:94:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):873 -> a
+    39:94:void visit(java.lang.String,java.lang.Object):748 -> a
+    95:95:void visit(java.lang.String,java.lang.Object):748:748 -> a
+    96:96:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):845:845 -> a
+    96:96:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):873 -> a
+    96:96:void visit(java.lang.String,java.lang.Object):748 -> a
+com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> com.android.tools.r8.graph.D$b:
     com.android.tools.r8.graph.ClassKind classKind -> d
     java.util.List staticFields -> r
     java.util.Set methodSignatures -> w
@@ -16558,67 +16277,67 @@
     java.util.function.Consumer classConsumer -> f
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> g
     com.android.tools.r8.graph.DexString sourceFile -> m
-    1:1:void <clinit>():169:169 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[],com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):202:202 -> <init>
-    2:34:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[],com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):175:207 -> <init>
+    1:1:void <clinit>():165:165 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[],com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):198:198 -> <init>
+    2:34:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[],com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):171:203 -> <init>
     void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute) -> a
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
-    1:1:com.android.tools.r8.graph.JarClassFileReader$ReparseContext access$1000(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> a
-    2:2:boolean access$1376(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int):169:169 -> a
-    3:8:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):212:217 -> a
-    9:9:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):212:212 -> a
-    10:15:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):223:228 -> a
-    16:16:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):244:244 -> a
-    17:18:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):232:233 -> a
-    17:18:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):244 -> a
-    19:19:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):244:244 -> a
-    20:20:java.lang.String illegalClassFilePostfix(int):239:239 -> a
-    20:20:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):246 -> a
-    21:21:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):246:246 -> a
-    22:27:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):252:257 -> a
-    28:28:int getMajorVersion():425:425 -> a
-    28:28:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):257 -> a
-    29:43:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):257:271 -> a
-    44:52:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):270:278 -> a
-    53:53:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):414:414 -> a
-    53:53:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):278 -> a
-    54:56:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):258:260 -> a
-    57:57:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):259:259 -> a
-    58:63:void visitSource(java.lang.String,java.lang.String):285:290 -> a
+    1:1:com.android.tools.r8.graph.JarClassFileReader$ReparseContext access$1000(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> a
+    2:2:boolean access$1376(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int):165:165 -> a
+    3:8:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):208:213 -> a
+    9:9:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):208:208 -> a
+    10:15:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):219:224 -> a
+    16:16:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):240:240 -> a
+    17:18:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):228:229 -> a
+    17:18:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):240 -> a
+    19:19:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):240:240 -> a
+    20:20:java.lang.String illegalClassFilePostfix(int):235:235 -> a
+    20:20:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):242 -> a
+    21:21:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):242:242 -> a
+    22:27:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):248:253 -> a
+    28:28:int getMajorVersion():408:408 -> a
+    28:28:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):253 -> a
+    29:43:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):253:267 -> a
+    44:52:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):266:274 -> a
+    53:53:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):397:397 -> a
+    53:53:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):274 -> a
+    54:56:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):254:256 -> a
+    57:57:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):255:255 -> a
+    58:63:void visitSource(java.lang.String,java.lang.String):281:286 -> a
     64:67:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createSourceDebugExtensionAnnotation(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexItemFactory):175:178 -> a
-    64:67:void visitSource(java.lang.String,java.lang.String):289 -> a
-    68:68:void visitSource(java.lang.String,java.lang.String):288:288 -> a
-    69:76:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):297:304 -> a
-    77:83:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):310:316 -> a
-    84:84:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):321:321 -> a
-    85:87:void visitEnd():338:340 -> a
-    88:88:void visitEnd():339:339 -> a
-    89:89:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):414:414 -> a
-    89:89:void visitEnd():339 -> a
-    90:90:void checkReachabilitySensitivity():371:371 -> a
-    90:90:void visitEnd():342 -> a
-    91:101:boolean hasReachabilitySensitiveField():388:398 -> a
-    91:101:void checkReachabilitySensitivity():371 -> a
-    91:101:void visitEnd():342 -> a
-    102:111:void checkReachabilitySensitivity():372:381 -> a
-    102:111:void visitEnd():342 -> a
-    112:128:void visitEnd():343:359 -> a
-    129:149:void visitEnd():344:364 -> a
-    150:153:void addDefaultAnnotation(java.lang.String,com.android.tools.r8.graph.DexValue):407:410 -> a
-    150:153:void access$1600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):169 -> a
-    1:1:int access$1100(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> b
-    2:5:java.util.List getAnnotations():418:421 -> b
-    1:1:java.util.Set access$1200(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> c
-    1:1:java.util.List access$1400(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> d
-    1:1:java.util.List access$1500(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> e
-    1:1:com.android.tools.r8.graph.JarApplicationReader access$300(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> f
-    1:1:com.android.tools.r8.graph.DexType access$400(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> g
-    1:1:java.util.Set access$500(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> h
-    1:1:java.util.List access$600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> i
-    1:1:java.util.List access$700(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> j
-    1:1:com.android.tools.r8.graph.ClassKind access$800(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> k
-    1:1:com.android.tools.r8.origin.Origin access$900(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):169:169 -> l
-com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> com.android.tools.r8.graph.A:
+    64:67:void visitSource(java.lang.String,java.lang.String):285 -> a
+    68:68:void visitSource(java.lang.String,java.lang.String):284:284 -> a
+    69:69:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):293:293 -> a
+    70:70:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):299:299 -> a
+    71:71:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):304:304 -> a
+    72:74:void visitEnd():321:323 -> a
+    75:75:void visitEnd():322:322 -> a
+    76:76:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):397:397 -> a
+    76:76:void visitEnd():322 -> a
+    77:77:void checkReachabilitySensitivity():354:354 -> a
+    77:77:void visitEnd():325 -> a
+    78:88:boolean hasReachabilitySensitiveField():371:381 -> a
+    78:88:void checkReachabilitySensitivity():354 -> a
+    78:88:void visitEnd():325 -> a
+    89:98:void checkReachabilitySensitivity():355:364 -> a
+    89:98:void visitEnd():325 -> a
+    99:115:void visitEnd():326:342 -> a
+    116:136:void visitEnd():327:347 -> a
+    137:140:void addDefaultAnnotation(java.lang.String,com.android.tools.r8.graph.DexValue):390:393 -> a
+    137:140:void access$1600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):165 -> a
+    1:1:int access$1100(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> b
+    2:5:java.util.List getAnnotations():401:404 -> b
+    1:1:java.util.Set access$1200(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> c
+    1:1:java.util.List access$1400(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> d
+    1:1:java.util.List access$1500(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> e
+    1:1:com.android.tools.r8.graph.JarApplicationReader access$300(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> f
+    1:1:com.android.tools.r8.graph.DexType access$400(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> g
+    1:1:java.util.Set access$500(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> h
+    1:1:java.util.List access$600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> i
+    1:1:java.util.List access$700(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> j
+    1:1:com.android.tools.r8.graph.ClassKind access$800(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> k
+    1:1:com.android.tools.r8.origin.Origin access$900(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):165:165 -> l
+com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> com.android.tools.r8.graph.D$c:
     com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor parent -> b
     java.lang.Object value -> f
     boolean $assertionsDisabled -> h
@@ -16626,86 +16345,86 @@
     int access -> c
     java.lang.String desc -> e
     java.lang.String name -> d
-    1:1:void <clinit>():448:448 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):459:459 -> <init>
-    2:14:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):455:467 -> <init>
-    15:15:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):466:466 -> <init>
-    16:16:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):543:543 -> <init>
-    16:16:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):466 -> <init>
+    1:1:void <clinit>():422:422 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):433:433 -> <init>
+    2:14:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):429:441 -> <init>
+    15:15:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):440:440 -> <init>
+    16:16:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):516:516 -> <init>
+    16:16:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):440 -> <init>
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
-    1:7:void visitEnd():485:491 -> a
-    8:38:com.android.tools.r8.graph.DexValue getStaticValue(java.lang.Object,com.android.tools.r8.graph.DexType):509:539 -> a
-    8:38:void visitEnd():491 -> a
-    39:48:void visitEnd():492:501 -> a
-    49:49:void visitEnd():499:499 -> a
-    50:53:java.util.List getAnnotations():547:550 -> a
-    50:53:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):473 -> a
-    54:54:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):473:473 -> a
-    1:4:java.util.List getAnnotations():547:550 -> b
-com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android.tools.r8.graph.B:
-    java.util.List parameterFlags -> r
-    int annotableParameterCount -> o
-    java.util.List parameterNames -> q
-    com.android.tools.r8.graph.Code code -> u
-    int parameterCount -> l
-    java.util.List parameterAnnotationsLists -> p
-    com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor parent -> k
-    java.lang.String name -> j
-    com.android.tools.r8.graph.DexValue defaultAnnotation -> n
-    boolean $assertionsDisabled -> v
-    com.android.tools.r8.graph.MethodAccessFlags flags -> t
-    com.android.tools.r8.graph.DexMethod method -> s
-    java.util.List annotations -> m
-    1:1:void <clinit>():554:554 -> <clinit>
-    1:1:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):571:571 -> <init>
-    2:26:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):559:583 -> <init>
-    27:27:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):582:582 -> <init>
-    28:28:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):756:756 -> <init>
-    28:28:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):582 -> <init>
-    29:31:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):585:587 -> <init>
-    32:32:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):586:586 -> <init>
-    33:33:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):756:756 -> <init>
-    33:33:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):586 -> <init>
+    1:6:void visitEnd():459:464 -> a
+    7:37:com.android.tools.r8.graph.DexValue getStaticValue(java.lang.Object,com.android.tools.r8.graph.DexType):482:512 -> a
+    7:37:void visitEnd():464 -> a
+    38:47:void visitEnd():465:474 -> a
+    48:48:void visitEnd():472:472 -> a
+    49:52:java.util.List getAnnotations():520:523 -> a
+    49:52:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):447 -> a
+    53:53:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):447:447 -> a
+    1:4:java.util.List getAnnotations():520:523 -> b
+com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android.tools.r8.graph.D$d:
+    boolean $assertionsDisabled -> o
+    com.android.tools.r8.graph.DexMethod method -> l
+    com.android.tools.r8.graph.MethodAccessFlags flags -> m
+    int annotableParameterCount -> h
+    com.android.tools.r8.graph.Code code -> n
+    int parameterCount -> e
+    com.android.tools.r8.graph.DexValue defaultAnnotation -> g
+    com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor parent -> d
+    java.util.List annotations -> f
+    java.util.List parameterNames -> j
+    java.util.List parameterAnnotationsLists -> i
+    java.lang.String name -> c
+    java.util.List parameterFlags -> k
+    1:1:void <clinit>():527:527 -> <clinit>
+    1:1:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):544:544 -> <init>
+    2:26:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):532:556 -> <init>
+    27:27:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):555:555 -> <init>
+    28:28:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):728:728 -> <init>
+    28:28:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):555 -> <init>
+    29:31:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):558:560 -> <init>
+    32:32:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):559:559 -> <init>
+    33:33:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):728:728 -> <init>
+    33:33:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):559 -> <init>
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean) -> a
-    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):593:593 -> a
-    2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():598:598 -> a
-    3:4:void lambda$visitAnnotationDefault$0(java.util.List,java.util.List):599:600 -> a
-    5:11:void visitAnnotableParameterCount(int,boolean):613:619 -> a
-    12:23:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):624:635 -> a
-    24:24:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):634:634 -> a
+    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):566:566 -> a
+    2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():571:571 -> a
+    3:4:void lambda$visitAnnotationDefault$0(java.util.List,java.util.List):572:573 -> a
+    5:11:void visitAnnotableParameterCount(int,boolean):586:592 -> a
+    12:23:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):597:608 -> a
+    24:24:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):607:607 -> a
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> b
-    1:8:void visitParameter(java.lang.String,int):661:668 -> b
-    9:9:void visitCode():673:673 -> b
+    1:8:void visitParameter(java.lang.String,int):634:641 -> b
+    9:9:void visitCode():646:646 -> b
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> c
-    1:17:void visitEnd():678:694 -> c
-    18:18:void com.android.tools.r8.graph.ParameterAnnotationsList.<init>(com.android.tools.r8.graph.DexAnnotationSet[]):54:54 -> c
-    18:18:void visitEnd():694 -> c
-    19:24:void visitEnd():696:701 -> c
-    25:31:void visitEnd():700:706 -> c
-    32:40:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createMethodParametersAnnotation(com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexItemFactory):184:192 -> c
-    32:40:void visitEnd():703 -> c
-    41:56:void visitEnd():703:718 -> c
-    57:59:boolean isReachabilitySensitive():739:741 -> c
-    57:59:void visitEnd():718 -> c
-    60:64:void visitEnd():718:722 -> c
-    65:75:void visitEnd():720:730 -> c
-    76:76:void visitEnd():727:727 -> c
-    77:85:void visitEnd():725:733 -> c
-    1:4:java.util.List getAnnotations():749:752 -> d
-com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.graph.C$a:
+    1:16:void visitEnd():651:666 -> c
+    17:17:void com.android.tools.r8.graph.ParameterAnnotationsList.<init>(com.android.tools.r8.graph.DexAnnotationSet[]):54:54 -> c
+    17:17:void visitEnd():666 -> c
+    18:23:void visitEnd():668:673 -> c
+    24:30:void visitEnd():672:678 -> c
+    31:39:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createMethodParametersAnnotation(com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexItemFactory):184:192 -> c
+    31:39:void visitEnd():675 -> c
+    40:55:void visitEnd():675:690 -> c
+    56:58:boolean isReachabilitySensitive():711:713 -> c
+    56:58:void visitEnd():690 -> c
+    59:63:void visitEnd():690:694 -> c
+    64:74:void visitEnd():692:702 -> c
+    75:75:void visitEnd():699:699 -> c
+    76:84:void visitEnd():697:705 -> c
+    1:4:java.util.List getAnnotations():721:724 -> d
+com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.graph.E:
     byte[] classCache -> a
     com.android.tools.r8.graph.DexProgramClass owner -> b
     java.util.List codeList -> c
-    1:8:void <init>():905:912 -> <init>
+    1:8:void <init>():877:884 -> <init>
 com.android.tools.r8.graph.JarCode -> com.android.tools.r8.graph.JarCode:
-    com.android.tools.r8.org.objectweb.asm.tree.MethodNode node -> e
-    com.android.tools.r8.graph.JarApplicationReader application -> g
-    com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> f
-    boolean $assertionsDisabled -> i
-    com.android.tools.r8.origin.Origin origin -> d
-    boolean reachabilitySensitive -> h
-    com.android.tools.r8.graph.DexMethod method -> c
+    com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> e
+    com.android.tools.r8.graph.JarApplicationReader application -> f
+    com.android.tools.r8.origin.Origin origin -> c
+    boolean reachabilitySensitive -> g
+    boolean $assertionsDisabled -> h
+    com.android.tools.r8.graph.DexMethod method -> b
+    com.android.tools.r8.org.objectweb.asm.tree.MethodNode node -> d
     1:1:void <clinit>():42:42 -> <clinit>
     1:1: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):57:57 -> <init>
     2:10: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):54:62 -> <init>
@@ -16713,26 +16432,26 @@
     2:2:com.android.tools.r8.org.objectweb.asm.tree.MethodNode access$202(com.android.tools.r8.graph.JarCode,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):42:42 -> a
     3:6:boolean keepLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.InternalOptions):177:180 -> a
     7:16:com.android.tools.r8.ir.code.IRCode internalBuild(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position):192:201 -> a
-    17:29:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):298:310 -> a
-    30:30:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400:400 -> a
-    30:30:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):310 -> a
-    31:32:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):312:313 -> a
-    33:33:java.util.function.BiFunction createCodeLocator(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):318:318 -> a
+    17:29:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):296:308 -> a
+    30:30:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391:391 -> a
+    30:30:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):308 -> a
+    31:32:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):310:311 -> a
+    33:33:java.util.function.BiFunction createCodeLocator(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):316:316 -> a
     1:9:boolean computeEquals(java.lang.Object):95:103 -> b
     10:15:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position):150:155 -> b
     16:20:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position):168:172 -> b
     16:20:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position):157 -> b
-    21:22:boolean hasJsr(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):322:323 -> b
-    23:25:boolean hasJsr(com.android.tools.r8.org.objectweb.asm.tree.MethodNode):331:333 -> b
-    23:25:boolean hasJsr(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):323 -> b
+    21:22:boolean hasJsr(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):320:321 -> b
+    23:25:boolean hasJsr(com.android.tools.r8.org.objectweb.asm.tree.MethodNode):329:331 -> b
+    23:25:boolean hasJsr(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):321 -> b
     1:1:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):128:128 -> buildIR
     1:2:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):139:140 -> buildInliningIR
-    1:31:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):229:259 -> computeInliningConstraint
+    1:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):229:257 -> computeInliningConstraint
     1:2:int computeHashCode():89:90 -> d
-    1:9:void triggerDelayedParsingIfNeccessary():278:286 -> e
-    10:22:boolean verifyNoReparseContext(com.android.tools.r8.graph.DexProgramClass):394:406 -> e
-    10:22:void triggerDelayedParsingIfNeccessary():286 -> e
-    23:23:void triggerDelayedParsingIfNeccessary():286:286 -> e
+    1:9:void triggerDelayedParsingIfNeccessary():276:284 -> e
+    10:22:boolean verifyNoReparseContext(com.android.tools.r8.graph.DexProgramClass):392:404 -> e
+    10:22:void triggerDelayedParsingIfNeccessary():284 -> e
+    23:23:void triggerDelayedParsingIfNeccessary():284:284 -> e
     1:2:com.android.tools.r8.org.objectweb.asm.tree.MethodNode getNode():73:74 -> getNode
     1:1:boolean hasLocalVariableTable():122:122 -> hasLocalVariableTable
     1:3:boolean isEmptyVoidMethod():110:112 -> isEmptyVoidMethod
@@ -16740,44 +16459,45 @@
     1:2:void registerArgumentReferences(com.android.tools.r8.graph.ArgumentUse):220:221 -> registerArgumentReferences
     1:8:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):206:213 -> registerCodeReferences
     9:9:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):212:212 -> registerCodeReferences
-    1:6:java.lang.String toString():264:269 -> toString
-    7:7:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):274:274 -> toString
+    1:6:java.lang.String toString():262:267 -> toString
+    7:7:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):272:272 -> toString
     1:1:void writeTo(com.android.tools.r8.org.objectweb.asm.MethodVisitor):46:46 -> writeTo
+com.android.tools.r8.graph.JarCode$1 -> com.android.tools.r8.graph.F:
 com.android.tools.r8.graph.JarCode$DefaultCodeLocator -> com.android.tools.r8.graph.JarCode$a:
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> a
     com.android.tools.r8.graph.JarApplicationReader application -> b
     int methodIndex -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():341:341 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):346:346 -> <init>
-    1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.JarCode$1):341 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):344:348 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.JarCode$1):341 -> <init>
-    1:1:java.lang.Object apply(java.lang.Object,java.lang.Object):341:341 -> apply
-    2:3:com.android.tools.r8.graph.JarCode apply(java.lang.String,java.lang.String):353:354 -> apply
-    2:3:java.lang.Object apply(java.lang.Object,java.lang.Object):341 -> apply
+    1:1:void <clinit>():339:339 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):344:344 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.JarCode$1):339 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):342:346 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.JarCode$1):339 -> <init>
+    1:1:java.lang.Object apply(java.lang.Object,java.lang.Object):339:339 -> apply
+    2:3:com.android.tools.r8.graph.JarCode apply(java.lang.String,java.lang.String):351:352 -> apply
+    2:3:java.lang.Object apply(java.lang.Object,java.lang.Object):339 -> apply
 com.android.tools.r8.graph.JarCode$SecondVisitor -> com.android.tools.r8.graph.JarCode$b:
     java.util.function.BiFunction codeLocator -> c
     boolean useJsrInliner -> d
-    1:3:void <init>(java.util.function.BiFunction,boolean):367:369 -> <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[]):376:386 -> a
-com.android.tools.r8.graph.KeyedDexItem -> com.android.tools.r8.graph.D:
+    1:3:void <init>(java.util.function.BiFunction,boolean):365:367 -> <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[]):374:384 -> a
+com.android.tools.r8.graph.KeyedDexItem -> com.android.tools.r8.graph.G:
     1:1:void <init>():6:6 -> <init>
     1:1:boolean equals(java.lang.Object):15:15 -> equals
     1:1:int hashCode():20:20 -> hashCode
     com.android.tools.r8.graph.PresortedComparable getKey() -> l
-com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.graph.H:
-    com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> f
-    com.android.tools.r8.graph.JarApplicationReader application -> d
-    com.android.tools.r8.graph.CfCode code -> e
-    boolean $assertionsDisabled -> g
-    com.android.tools.r8.graph.DexMethod method -> c
+com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.graph.J:
+    com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> e
+    com.android.tools.r8.graph.JarApplicationReader application -> c
+    com.android.tools.r8.graph.CfCode code -> d
+    boolean $assertionsDisabled -> f
+    com.android.tools.r8.graph.DexMethod method -> b
     1:1:void <clinit>():78:78 -> <clinit>
     1:6: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):87:92 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod access$000(com.android.tools.r8.graph.LazyCfCode):78:78 -> a
     2:2:void access$100(com.android.tools.r8.graph.LazyCfCode,com.android.tools.r8.graph.CfCode):78:78 -> a
     3:4:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):138:139 -> a
-    5:5:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400:400 -> a
+    5:5:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):391:391 -> a
     5:5:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):139 -> a
     6:11:void setCode(com.android.tools.r8.graph.CfCode):143:148 -> a
     1:19:com.android.tools.r8.graph.CfCode asCfCode():113:131 -> asCfCode
@@ -16794,7 +16514,7 @@
     1:1:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):199:199 -> registerCodeReferences
     1:1:java.lang.String toString():204:204 -> toString
     2:2:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):209:209 -> toString
-com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.graph.E:
+com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.graph.H:
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> c
     com.android.tools.r8.graph.JarApplicationReader application -> d
     boolean usrJsrInliner -> f
@@ -16804,21 +16524,21 @@
     1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader,boolean):221:221 -> <init>
     2:10:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader,boolean):216:224 -> <init>
     1:10:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):230:239 -> a
-com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> com.android.tools.r8.graph.F:
+com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> com.android.tools.r8.graph.I:
     1:1:void <init>(java.lang.String):82:82 -> <init>
-com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> com.android.tools.r8.graph.G:
-    java.util.Map canonicalDebugLocalInfo -> q
-    java.util.Map labelMap -> r
-    int maxStack -> l
-    java.util.List localVariables -> p
-    int maxLocals -> m
-    java.util.List tryCatchRanges -> o
-    com.android.tools.r8.graph.LazyCfCode code -> s
-    boolean $assertionsDisabled -> u
-    com.android.tools.r8.graph.DexItemFactory factory -> k
-    com.android.tools.r8.graph.DexMethod method -> t
-    java.util.List instructions -> n
-    com.android.tools.r8.graph.JarApplicationReader application -> j
+com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> com.android.tools.r8.graph.J$a:
+    boolean $assertionsDisabled -> n
+    com.android.tools.r8.graph.DexItemFactory factory -> d
+    com.android.tools.r8.graph.DexMethod method -> m
+    com.android.tools.r8.graph.JarApplicationReader application -> c
+    int maxLocals -> f
+    java.util.List localVariables -> i
+    java.util.Map canonicalDebugLocalInfo -> j
+    java.util.List tryCatchRanges -> h
+    java.util.Map labelMap -> k
+    int maxStack -> e
+    java.util.List instructions -> g
+    com.android.tools.r8.graph.LazyCfCode code -> l
     1:1:void <clinit>():245:245 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.LazyCfCode):259:259 -> <init>
     2:12:void <init>(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.LazyCfCode):253:263 -> <init>
@@ -16966,6 +16686,7 @@
     1:1:com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses loadAllClasses():171:171 -> e
     1:1:com.android.tools.r8.graph.DirectMappedDexApplication toDirect():232:232 -> toDirect
     1:1:java.lang.String toString():237:237 -> toString
+com.android.tools.r8.graph.LazyLoadedDexApplication$1 -> com.android.tools.r8.graph.K:
 com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> com.android.tools.r8.graph.LazyLoadedDexApplication$a:
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathClasses -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList programClasses -> a
@@ -17118,38 +16839,37 @@
     1:2:void initializeProtos(int):28:29 -> l
     1:2:void initializeStrings(int):43:44 -> m
     1:2:void initializeTypes(int):38:39 -> n
-com.android.tools.r8.graph.OptimizationInfo -> com.android.tools.r8.graph.J:
-    boolean isInitializerEnablingJavaAssertions() -> A
-    com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo() -> B
-    java.util.BitSet getNonNullParamOrThrow() -> C
-    com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage getParameterUsages(int) -> a
+com.android.tools.r8.graph.OptimizationInfo -> com.android.tools.r8.graph.M:
+    boolean returnsConstantNumber() -> A
+    long getReturnedConstantNumber() -> B
     com.android.tools.r8.graph.UpdatableOptimizationInfo mutableCopy() -> a
-    java.util.BitSet getNonNullParamOnNormalExits() -> b
-    boolean checksNullReceiverBeforeAnySideEffect() -> c
-    int getReturnedArgument() -> e
-    com.android.tools.r8.graph.DexString getReturnedConstantString() -> f
-    boolean neverInline() -> g
-    boolean neverReturnsNormally() -> h
-    boolean returnsConstant() -> i
-    boolean returnsConstantString() -> k
-    boolean useIdentifierNameString() -> n
-    boolean triggersClassInitBeforeAnySideEffect() -> o
-    boolean returnsConstantNumber() -> p
-    boolean returnsArgument() -> q
-    boolean neverReturnsNull() -> r
-    boolean isReachabilitySensitive() -> s
-    boolean forceInline() -> t
-    boolean mayHaveSideEffects() -> w
-    long getReturnedConstantNumber() -> x
-    com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility() -> y
-    java.util.Set getInitializedClassesOnNormalExit() -> z
-com.android.tools.r8.graph.OptimizationInfo$InlinePreference -> com.android.tools.r8.graph.I:
+    com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage getParameterUsages(int) -> b
+    com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo() -> d
+    boolean returnsConstantString() -> e
+    boolean triggersClassInitBeforeAnySideEffect() -> g
+    java.util.BitSet getNonNullParamOrThrow() -> h
+    boolean returnsArgument() -> j
+    boolean isInitializerEnablingJavaAssertions() -> k
+    boolean checksNullReceiverBeforeAnySideEffect() -> l
+    boolean forceInline() -> n
+    boolean mayHaveSideEffects() -> o
+    boolean neverInline() -> p
+    com.android.tools.r8.graph.DexString getReturnedConstantString() -> r
+    boolean useIdentifierNameString() -> s
+    boolean isReachabilitySensitive() -> t
+    boolean neverReturnsNull() -> u
+    com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility() -> v
+    int getReturnedArgument() -> w
+    boolean returnsConstant() -> x
+    java.util.BitSet getNonNullParamOnNormalExits() -> y
+    boolean neverReturnsNormally() -> z
+com.android.tools.r8.graph.OptimizationInfo$InlinePreference -> com.android.tools.r8.graph.L:
     com.android.tools.r8.graph.OptimizationInfo$InlinePreference ForceInline -> b
     com.android.tools.r8.graph.OptimizationInfo$InlinePreference NeverInline -> a
     com.android.tools.r8.graph.OptimizationInfo$InlinePreference Default -> c
-    1:3:void <clinit>():16:18 -> <clinit>
-    4:4:void <clinit>():15:15 -> <clinit>
-    1:1:void <init>(java.lang.String,int):15:15 -> <init>
+    1:3:void <clinit>():15:17 -> <clinit>
+    4:4:void <clinit>():14:14 -> <clinit>
+    1:1:void <init>(java.lang.String,int):14:14 -> <init>
 com.android.tools.r8.graph.ParameterAnnotationsList -> com.android.tools.r8.graph.ParameterAnnotationsList:
     com.android.tools.r8.graph.ParameterAnnotationsList EMPTY_PARAMETER_ANNOTATIONS_LIST -> c
     com.android.tools.r8.graph.DexAnnotationSet[] values -> a
@@ -17165,17 +16885,17 @@
     13:13:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):192 -> a
     14:14:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):194:194 -> a
     1:3:void forEachAnnotation(java.util.function.Consumer):102:104 -> b
+    1:2:boolean isMissing(int):132:133 -> c
     1:1:int countNonMissing():122:122 -> d
-    2:6:com.android.tools.r8.graph.DexAnnotationSet get(int):145:149 -> d
+    2:14:com.android.tools.r8.graph.ParameterAnnotationsList withParameterCount(int):154:166 -> d
     1:1:int getAnnotableParameterCount():64:64 -> e
-    2:3:boolean isMissing(int):132:133 -> e
     1:1:com.android.tools.r8.graph.ParameterAnnotationsList empty():45:45 -> empty
     1:2:boolean equals(java.lang.Object):77:78 -> equals
-    1:13:com.android.tools.r8.graph.ParameterAnnotationsList withParameterCount(int):154:166 -> f
+    1:5:com.android.tools.r8.graph.DexAnnotationSet get(int):145:149 -> get
     1:1:int hashCode():69:69 -> hashCode
     1:1:boolean isEmpty():97:97 -> isEmpty
     1:1:int size():114:114 -> size
-com.android.tools.r8.graph.ParameterUsagesInfo -> com.android.tools.r8.graph.K:
+com.android.tools.r8.graph.ParameterUsagesInfo -> com.android.tools.r8.graph.N:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList parametersUsages -> a
     1:1:void <clinit>():26:26 -> <clinit>
@@ -17183,7 +16903,7 @@
     6:6:void <init>(java.util.List):32:32 -> <init>
     1:1:java.lang.Integer lambda$new$0(com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage):33:33 -> a
     2:3:com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage getParameterUsage(int):37:38 -> a
-com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage -> com.android.tools.r8.graph.K$a:
+com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage -> com.android.tools.r8.graph.N$a:
     java.util.List callsReceiver -> c
     boolean hasFieldRead -> e
     boolean isAssignedToField -> f
@@ -17193,7 +16913,7 @@
     boolean hasFieldAssignment -> d
     1:10:void <init>(int,java.util.Set,java.util.List,boolean,boolean,boolean,boolean):70:79 -> <init>
     1:1:boolean notUsed():83:83 -> a
-com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsageBuilder -> com.android.tools.r8.graph.K$b:
+com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsageBuilder -> com.android.tools.r8.graph.N$b:
     boolean $assertionsDisabled -> i
     java.util.Set ifZeroTestTypes -> c
     java.util.List callsOnReceiver -> d
@@ -17224,16 +16944,16 @@
     31:32:boolean note(com.android.tools.r8.ir.code.Return):184:185 -> a
     31:32:boolean note(com.android.tools.r8.ir.code.Instruction):124 -> a
     33:33:com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage build():130:130 -> a
-com.android.tools.r8.graph.Presorted -> com.android.tools.r8.graph.L:
-    void setSortedIndex(int) -> c
-com.android.tools.r8.graph.PresortedComparable -> com.android.tools.r8.graph.M:
+com.android.tools.r8.graph.Presorted -> com.android.tools.r8.graph.O:
+    void setSortedIndex(int) -> b
+com.android.tools.r8.graph.PresortedComparable -> com.android.tools.r8.graph.P:
     int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens) -> a
     int slowCompareTo(java.lang.Object) -> a
     1:1:boolean isSorted(java.util.List):15:15 -> a
     2:2:boolean isSorted(java.lang.Object[],java.util.function.Function):19:19 -> a
     3:5:boolean isSorted(java.util.List,java.util.function.Function):25:27 -> a
     6:6:int slowCompare(com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):44:44 -> a
-com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.graph.N:
+com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.graph.Q:
     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>
@@ -17255,17 +16975,11 @@
     1:13:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):47:59 -> b
     1:11:java.lang.String smali(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):27:37 -> smali
     12:19:java.lang.String smali(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):28:35 -> smali
-com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.graph.O:
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):12:12 -> <init>
-    com.android.tools.r8.graph.ClassHierarchyTraversal self() -> a
-    1:1:void visit(java.lang.Iterable,java.util.function.Consumer):7:7 -> a
-    2:2:com.android.tools.r8.graph.TopDownClassHierarchyTraversal forAllClasses(com.android.tools.r8.graph.AppView):21:21 -> a
-    3:29:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):43:69 -> a
-    1:1:com.android.tools.r8.graph.TopDownClassHierarchyTraversal forProgramClasses(com.android.tools.r8.graph.AppView):30:30 -> b
-    2:3:com.android.tools.r8.graph.ClassHierarchyTraversal com.android.tools.r8.graph.ClassHierarchyTraversal.excludeInterfaces():38:39 -> b
-    2:3:com.android.tools.r8.graph.ClassHierarchyTraversal excludeInterfaces():0 -> b
+com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.graph.S:
+    1:19:void visit(com.android.tools.r8.graph.AppView,java.lang.Iterable,java.util.function.Consumer):20:38 -> a
+    20:38:void addAncestorsToWorklist(com.android.tools.r8.graph.DexProgramClass,java.util.Deque,java.util.Set,com.android.tools.r8.graph.AppView):48:66 -> a
 com.android.tools.r8.graph.UpdatableOptimizationInfo -> com.android.tools.r8.graph.UpdatableOptimizationInfo:
-    void markInitializesClassesOnNormalExit(java.util.Set) -> a
+    void markReturnsArgument(int) -> a
     void markReturnsConstantNumber(long) -> a
     void markReturnsConstantString(com.android.tools.r8.graph.DexString) -> a
     void markTriggerClassInitBeforeAnySideEffect(boolean) -> a
@@ -17273,17 +16987,16 @@
     void setNonNullParamOrThrow(java.util.BitSet) -> a
     void setParameterUsages(com.android.tools.r8.graph.ParameterUsagesInfo) -> a
     void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer) -> a
-    void markCheckNullReceiverBeforeAnySideEffect(boolean) -> b
-    void markReturnsArgument(int) -> b
+    void markNeverReturnsNull() -> b
     void setNonNullParamOnNormalExits(java.util.BitSet) -> b
-    void setReachabilitySensitive(boolean) -> c
-    void setInitializerEnablingJavaAssertions() -> d
-    void markMayNotHaveSideEffects() -> j
-    void markNeverReturnsNormally() -> l
-    void markUseIdentifierNameString() -> m
-    void markNeverReturnsNull() -> u
-    void markNeverInline() -> v
-com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.graph.Q:
+    void setReachabilitySensitive(boolean) -> b
+    void markCheckNullReceiverBeforeAnySideEffect(boolean) -> c
+    void markNeverInline() -> c
+    void markUseIdentifierNameString() -> f
+    void setInitializerEnablingJavaAssertions() -> i
+    void markNeverReturnsNormally() -> m
+    void markMayNotHaveSideEffects() -> q
+com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.graph.U:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexItemFactory factory -> a
     1:1:void <clinit>():15:15 -> <clinit>
@@ -17314,13 +17027,13 @@
     boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> d
     boolean registerTypeReference(com.android.tools.r8.graph.DexType) -> d
     boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> e
-com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.graph.P:
+com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.graph.T:
     com.android.tools.r8.graph.UseRegistry$MethodHandleUse ARGUMENT_TO_LAMBDA_METAFACTORY -> a
     com.android.tools.r8.graph.UseRegistry$MethodHandleUse NOT_ARGUMENT_TO_LAMBDA_METAFACTORY -> b
     1:2:void <clinit>():20:21 -> <clinit>
     3:3:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(java.lang.String,int):19:19 -> <init>
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.ir.analysis.b:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.ir.analysis.c:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.code.DominatorTree dominatorTree -> d
@@ -17328,58 +17041,54 @@
     boolean $assertionsDisabled -> g
     com.android.tools.r8.ir.code.IRCode code -> b
     int markingColor -> e
-    1:13:void <clinit>():49:61 -> <clinit>
-    1:1:void <init>():78:78 -> <init>
-    1:1:void <init>(com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1):49 -> <init>
-    2:8:void <init>():75:81 -> <init>
-    2:8:void <init>(com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1):49 -> <init>
-    9:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):84:84 -> <init>
-    10:22:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):75:87 -> <init>
-    1:26:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):96:121 -> a
-    27:76:com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption getAssumptionForDominator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):180:229 -> a
-    27:76:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):122 -> a
-    77:88:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):123:134 -> a
-    89:89:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):133:133 -> a
-    90:92:void returnMarkingColor():248:250 -> a
-    90:92:void finish():244 -> a
-    1:1:void notifyCodeHasChanged():238:238 -> b
-    2:4:void returnMarkingColor():248:250 -> b
-    2:4:void notifyCodeHasChanged():239 -> b
-    1:1:com.android.tools.r8.ir.analysis.ClassInitializationAnalysis trivial():92:92 -> c
+    1:13:void <clinit>():40:52 -> <clinit>
+    1:1:void <init>():69:69 -> <init>
+    1:1:void <init>(com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1):40 -> <init>
+    2:8:void <init>():66:72 -> <init>
+    2:8:void <init>(com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1):40 -> <init>
+    9:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):75:75 -> <init>
+    10:22:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):66:78 -> <init>
+    1:24:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):87:110 -> a
+    25:73:com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption getAssumptionForDominator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):169:217 -> a
+    25:73:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):111 -> a
+    74:85:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):112:123 -> a
+    86:86:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):122:122 -> a
+    87:89:void returnMarkingColor():236:238 -> a
+    87:89:void finish():232 -> a
+    1:1:void notifyCodeHasChanged():226:226 -> b
+    2:4:void returnMarkingColor():236:238 -> b
+    2:4:void notifyCodeHasChanged():227 -> b
+    1:1:com.android.tools.r8.ir.analysis.ClassInitializationAnalysis trivial():83:83 -> c
 com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1 -> com.android.tools.r8.ir.analysis.a:
-    1:1:void <init>():62:62 -> <init>
+    1:1:void <init>():53:53 -> <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.ir.analysis.b$a:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption -> com.android.tools.r8.ir.analysis.b:
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption NONE -> b
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption INSTRUCTION_DOES_NOT_THROW -> a
-    1:2:void <clinit>():52:53 -> <clinit>
-    3:3:void <clinit>():51:51 -> <clinit>
-    1:1:void <init>(java.lang.String,int):51:51 -> <init>
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils -> com.android.tools.r8.ir.analysis.b$b:
+    1:2:void <clinit>():43:44 -> <clinit>
+    3:3:void <clinit>():42:42 -> <clinit>
+    1:1:void <init>(java.lang.String,int):42:42 -> <init>
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils -> com.android.tools.r8.ir.analysis.c$a:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():254:254 -> <clinit>
-    1:1:boolean forInstanceGet(com.android.tools.r8.ir.code.InstanceGet,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):262:262 -> a
-    2:2:boolean forInstancePut(com.android.tools.r8.ir.code.InstancePut,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):271:271 -> a
-    3:15:boolean forInstanceGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):280:292 -> a
-    16:23:boolean forInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,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):301:308 -> a
-    24:50:boolean forInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):318:344 -> a
-    51:56:boolean forInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,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):353:358 -> a
-    57:91:boolean forInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):368:402 -> a
-    92:118:boolean forInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):412:438 -> a
-    119:124:boolean forNewInstance(com.android.tools.r8.ir.code.NewInstance,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):447:452 -> a
-    125:125:boolean forStaticGet(com.android.tools.r8.ir.code.StaticGet,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):461:461 -> a
-    126:126:boolean forStaticPut(com.android.tools.r8.ir.code.StaticPut,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):470:470 -> a
-    127:170:boolean isTypeInitializedBy(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):493:536 -> a
-    171:171:boolean isTypeInitializedBy(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
-    172:173:void enqueue(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Deque):545:546 -> a
-    174:175:void enqueueInitializedClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set,java.util.Deque):552:553 -> a
-    1:7:boolean forStaticGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):479:485 -> b
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> com.android.tools.r8.ir.analysis.b$c:
+    1:1:void <clinit>():242:242 -> <clinit>
+    1:1:boolean forInstanceGet(com.android.tools.r8.ir.code.InstanceGet,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):250:250 -> a
+    2:2:boolean forInstancePut(com.android.tools.r8.ir.code.InstancePut,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):259:259 -> a
+    3:14:boolean forInstanceGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):268:279 -> a
+    15:21:boolean forInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,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):288:294 -> a
+    22:26:boolean forInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,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):303:307 -> a
+    27:53:boolean forInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,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):316:342 -> a
+    54:72:boolean forInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,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):351:369 -> a
+    73:73:boolean forNewInstance(com.android.tools.r8.ir.code.NewInstance,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):378:378 -> a
+    74:74:boolean forStaticGet(com.android.tools.r8.ir.code.StaticGet,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):387:387 -> a
+    75:75:boolean forStaticPut(com.android.tools.r8.ir.code.StaticPut,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):396:396 -> a
+    76:79:boolean isTypeInitializedBy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):418:421 -> a
+    1:6:boolean forStaticGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):405:410 -> b
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> com.android.tools.r8.ir.analysis.d:
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query DIRECTLY_OR_INDIRECTLY -> b
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query DIRECTLY -> a
-    1:2:void <clinit>():57:58 -> <clinit>
-    3:3:void <clinit>():56:56 -> <clinit>
-    1:1:void <init>(java.lang.String,int):56:56 -> <init>
+    1:2:void <clinit>():48:49 -> <clinit>
+    3:3:void <clinit>():47:47 -> <clinit>
+    1:1:void <init>(java.lang.String,int):47:47 -> <init>
 com.android.tools.r8.ir.analysis.EscapeAnalysis -> com.android.tools.r8.ir.analysis.EscapeAnalysis:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():26:26 -> <clinit>
@@ -17390,46 +17099,25 @@
     62:67:com.android.tools.r8.ir.code.Value getPropagatedSubject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):117:122 -> escape
     62:67:java.util.Set escape(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):72 -> escape
     68:72:java.util.Set escape(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):74:78 -> escape
-com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis -> com.android.tools.r8.ir.analysis.d:
-    1:15:java.util.Set computeInitializedClassesOnNormalExit(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):38:52 -> a
-com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor -> com.android.tools.r8.ir.analysis.c:
-    com.android.tools.r8.graph.AppView appView -> a
-    java.util.Set initializedClassesOnNormalExit -> c
-    com.android.tools.r8.graph.DexType context -> b
-    boolean $assertionsDisabled -> d
-    1:1:void <clinit>():55:55 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):61:61 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):59:63 -> <init>
-    1:1:void markInitializedOnNormalExit(java.lang.Iterable):71:71 -> a
-    2:37:void markInitializedOnNormalExit(com.android.tools.r8.graph.DexType):75:110 -> a
-    38:43:java.lang.Void handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction):116:121 -> a
-    38:43:java.lang.Object handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction):55 -> a
-    44:52:java.lang.Void handleInvoke(com.android.tools.r8.ir.code.Invoke):129:137 -> a
-    44:52:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):55 -> a
-    53:56:java.lang.Void handleInvoke(com.android.tools.r8.ir.code.Invoke):136:139 -> a
-    53:56:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):55 -> a
-    57:57:java.lang.Void visit(com.android.tools.r8.ir.code.NewInstance):148:148 -> a
-    57:57:java.lang.Object visit(com.android.tools.r8.ir.code.NewInstance):55 -> a
-    1:1:java.util.Set build():67:67 -> ba
 com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.ir.analysis.e:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():32:32 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.AppView):36:37 -> <init>
-    1:5:boolean check(com.android.tools.r8.ir.code.IRCode):41:45 -> a
-    6:6:boolean check(com.android.tools.r8.ir.code.InstancePut):62:62 -> a
-    6:6:boolean check(com.android.tools.r8.ir.code.IRCode):45 -> a
-    7:8:boolean check(com.android.tools.r8.ir.code.IRCode):48:49 -> a
-    9:9:boolean check(com.android.tools.r8.ir.code.StaticPut):66:66 -> a
-    9:9:boolean check(com.android.tools.r8.ir.code.IRCode):49 -> a
-    10:11:boolean check(com.android.tools.r8.ir.code.IRCode):52:53 -> a
-    12:15:boolean check(com.android.tools.r8.ir.code.Throw):94:97 -> a
-    12:15:boolean check(com.android.tools.r8.ir.code.IRCode):53 -> a
-    16:18:boolean check(com.android.tools.r8.ir.code.Throw):96:98 -> a
-    16:18:boolean check(com.android.tools.r8.ir.code.IRCode):53 -> a
-    19:27:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):70:78 -> a
-    28:38:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):77:87 -> a
-    39:41:boolean isSubtypeOf(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):103:105 -> a
+    1:1:void <clinit>():31:31 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AppView):35:36 -> <init>
+    1:5:boolean check(com.android.tools.r8.ir.code.IRCode):40:44 -> a
+    6:6:boolean check(com.android.tools.r8.ir.code.InstancePut):61:61 -> a
+    6:6:boolean check(com.android.tools.r8.ir.code.IRCode):44 -> a
+    7:8:boolean check(com.android.tools.r8.ir.code.IRCode):47:48 -> a
+    9:9:boolean check(com.android.tools.r8.ir.code.StaticPut):65:65 -> a
+    9:9:boolean check(com.android.tools.r8.ir.code.IRCode):48 -> a
+    10:11:boolean check(com.android.tools.r8.ir.code.IRCode):51:52 -> a
+    12:15:boolean check(com.android.tools.r8.ir.code.Throw):93:96 -> a
+    12:15:boolean check(com.android.tools.r8.ir.code.IRCode):52 -> a
+    16:18:boolean check(com.android.tools.r8.ir.code.Throw):95:97 -> a
+    16:18:boolean check(com.android.tools.r8.ir.code.IRCode):52 -> a
+    19:27:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):69:77 -> a
+    28:38:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):76:86 -> a
+    39:41:boolean isSubtypeOf(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):102:104 -> a
 com.android.tools.r8.ir.analysis.constant.Bottom -> com.android.tools.r8.ir.analysis.a.a:
     com.android.tools.r8.ir.analysis.constant.Bottom INSTANCE -> a
     1:1:void <clinit>():7:7 -> <clinit>
@@ -17514,220 +17202,195 @@
     boolean isTop() -> e
     1:1:com.android.tools.r8.ir.analysis.constant.Top getInstance():13:13 -> g
 com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement:
-    boolean $assertionsDisabled -> k
-    com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> j
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement memberTypeLattice -> i
-    1:1:void <clinit>():14:14 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):32:35 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement create(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.Nullability):23:23 -> a
-    2:2:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement lambda$create$0(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):25:25 -> a
-    3:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayBaseTypeLattice():69:71 -> a
-    3:5:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):39 -> a
-    6:12:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):41:47 -> a
-    13:14:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):78:79 -> a
-    15:15:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):93:93 -> a
-    16:27:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.AppView):132:143 -> a
-    28:38:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):153:163 -> a
-    39:51:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):159:171 -> a
-    52:54:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.objectArrayType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):306:308 -> a
-    52:54:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):174 -> a
-    55:57:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.objectArrayType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):307:309 -> a
-    55:57:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):174 -> a
-    58:59:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):301:302 -> a
-    58:59:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):172 -> a
-    1:8:boolean equals(java.lang.Object):116:123 -> equals
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():61:61 -> getArrayMemberTypeAsMemberType
-    1:4:int getNesting():52:55 -> getNesting
-    1:5:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):84:88 -> getOrCreateVariant
-    1:1:int hashCode():128:128 -> hashCode
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsValueType():65:65 -> t
-    1:1:java.lang.String toString():108:108 -> toString
+    boolean $assertionsDisabled -> m
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement memberTypeLattice -> l
+    1:1:void <clinit>():13:13 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.Nullability):19:20 -> <init>
+    1:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayBaseTypeLattice():54:56 -> a
+    1:3:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):24 -> a
+    4:10:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):26:32 -> a
+    11:14:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability):63:66 -> a
+    15:15:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNonNullable():76:76 -> a
+    16:16:boolean isBasedOnMissingClass(com.android.tools.r8.graph.DexDefinitionSupplier):81:81 -> a
+    17:38:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):124:145 -> a
+    39:41:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.objectArrayType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.analysis.type.Nullability):294:296 -> a
+    39:41:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):148 -> a
+    42:44:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.objectArrayType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.analysis.type.Nullability):295:297 -> a
+    42:44:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):148 -> a
+    45:46:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.objectClassType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.analysis.type.Nullability):288:289 -> a
+    45:46:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):146 -> a
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNullable():71:71 -> asNullable
+    1:11:boolean equals(java.lang.Object):104:114 -> equals
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():46:46 -> getArrayMemberTypeAsMemberType
+    1:4:int getNesting():37:40 -> getNesting
+    1:1:int hashCode():119:119 -> hashCode
+    1:1:java.lang.String toString():96:96 -> toString
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsValueType():50:50 -> u
 com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.a:
     com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement INSTANCE -> g
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
-    boolean isBoolean() -> b
+    boolean isBoolean() -> c
     1:1:int hashCode():30:30 -> hashCode
-    1:1:com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement getInstance():10:10 -> r
+    1:1:com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement getInstance():10:10 -> t
 com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement:
     com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement INSTANCE -> f
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>():9:9 -> <init>
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkCast(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> a
-    boolean isBottom() -> c
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkCast(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType) -> a
+    boolean isBottom() -> d
     1:1:int hashCode():43:43 -> hashCode
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():14:14 -> nullability
-    1:1:com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement getInstance():18:18 -> r
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():14:14 -> r
+    1:1:com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement getInstance():18:18 -> t
 com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.b:
     com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement INSTANCE -> g
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
-    boolean isByte() -> d
+    boolean isByte() -> e
     1:1:int hashCode():30:30 -> hashCode
-    1:1:com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement getInstance():10:10 -> r
+    1:1:com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement getInstance():10:10 -> t
 com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.c:
     com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement INSTANCE -> g
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
-    boolean isChar() -> e
+    boolean isChar() -> f
     1:1:int hashCode():30:30 -> hashCode
-    1:1:com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement getInstance():10:10 -> r
+    1:1:com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement getInstance():10:10 -> t
 com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement:
-    boolean $assertionsDisabled -> m
-    com.android.tools.r8.graph.DexType type -> l
-    java.util.Set lazyInterfaces -> i
-    com.android.tools.r8.graph.AppView appViewForLazyInterfacesComputation -> j
-    com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> k
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set,com.android.tools.r8.ir.analysis.type.NullabilityVariants,com.android.tools.r8.graph.AppView):53:58 -> <init>
-    1:2:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set):32:33 -> a
-    3:3:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement lambda$create$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set,com.android.tools.r8.ir.analysis.type.NullabilityVariants):36:36 -> a
-    4:5:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):41:42 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement lambda$create$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.NullabilityVariants):44:44 -> a
-    7:8:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):83:84 -> a
-    9:11:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):100:102 -> a
-    12:21:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.AppView):137:146 -> a
-    22:43:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.AppView):141:162 -> a
-    44:44:java.util.Set lambda$computeLeastUpperBoundOfInterfaces$3(com.android.tools.r8.graph.DexType):205:205 -> a
-    1:1:boolean lambda$isBasedOnMissingClass$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):102:102 -> b
-    2:2:java.util.Set lambda$computeLeastUpperBoundOfInterfaces$4(com.android.tools.r8.graph.DexType):221:221 -> b
-    1:78:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):182:259 -> computeLeastUpperBoundOfInterfaces
-    79:79:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):183:183 -> computeLeastUpperBoundOfInterfaces
-    1:19:boolean equals(java.lang.Object):269:287 -> equals
-    1:1:com.android.tools.r8.graph.DexType getClassType():62:62 -> getClassType
-    1:5:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):90:94 -> getOrCreateVariant
-    1:1:int hashCode():133:133 -> hashCode
-    1:13:java.util.Set getInterfaces():66:78 -> t
-    14:14:java.util.Set getInterfaces():77:77 -> t
-    1:11:java.lang.String toString():117:127 -> toString
+    boolean $assertionsDisabled -> n
+    com.android.tools.r8.graph.DexDefinitionSupplier definitionsForLazyInterfacesComputation -> m
+    java.util.Set lazyInterfaces -> l
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set):28:28 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier):33:33 -> <init>
+    3:6:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set,com.android.tools.r8.graph.DexDefinitionSupplier):41:44 -> <init>
+    1:4:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability):69:72 -> a
+    5:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNonNullable():83:83 -> a
+    6:8:boolean isBasedOnMissingClass(com.android.tools.r8.graph.DexDefinitionSupplier):88:90 -> a
+    9:20:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):122:133 -> a
+    21:21:java.util.Set lambda$computeLeastUpperBoundOfInterfaces$1(com.android.tools.r8.graph.DexType):173:173 -> a
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNullable():78:78 -> asNullable
+    1:1:boolean lambda$isBasedOnMissingClass$0(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):90:90 -> b
+    2:2:java.util.Set lambda$computeLeastUpperBoundOfInterfaces$2(com.android.tools.r8.graph.DexType):189:189 -> b
+    1:75:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Set,java.util.Set):153:227 -> computeLeastUpperBoundOfInterfaces
+    1:1:com.android.tools.r8.graph.DexType getClassType():48:48 -> getClassType
+    1:1:int hashCode():117:117 -> hashCode
+    1:12:java.util.Set getInterfaces():53:64 -> t
+    13:13:java.util.Set getInterfaces():63:63 -> t
+    1:1:java.lang.String toString():105:105 -> toString
+    2:2:java.lang.String com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.toString():111:111 -> toString
+    2:2:java.lang.String toString():106 -> toString
+    3:6:java.lang.String toString():106:109 -> toString
+    7:10:java.lang.String toString():108:111 -> toString
 com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker -> com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$a:
     com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker RIGHT -> b
     com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker LEFT -> a
-    1:2:void <clinit>():166:167 -> <clinit>
-    3:3:void <clinit>():165:165 -> <clinit>
-    1:1:void <init>(java.lang.String,int):165:165 -> <init>
+    1:2:void <clinit>():137:138 -> <clinit>
+    3:3:void <clinit>():136:136 -> <clinit>
+    1:1:void <init>(java.lang.String,int):136:136 -> <init>
 com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceWithMarker -> com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$b:
     com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker marker -> b
     com.android.tools.r8.graph.DexType itf -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker):174:176 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker):145:147 -> <init>
 com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement:
     com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement INSTANCE -> h
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
-    boolean isDouble() -> g
+    boolean isDouble() -> h
     1:1:int hashCode():25:25 -> hashCode
-    1:1:com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement getInstance():10:10 -> r
+    1:1:com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement getInstance():10:10 -> t
 com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement:
     com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement INSTANCE -> h
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:int hashCode():25:25 -> hashCode
-    boolean isFloat() -> i
-    1:1:com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement getInstance():10:10 -> r
+    boolean isFloat() -> j
+    1:1:com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement getInstance():10:10 -> t
 com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement:
     com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement INSTANCE -> h
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:int hashCode():25:25 -> hashCode
-    1:1:com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement getInstance():10:10 -> r
+    1:1:com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement getInstance():10:10 -> t
 com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement:
     com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement INSTANCE -> h
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:int hashCode():25:25 -> hashCode
-    boolean isLong() -> j
-    1:1:com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement getInstance():10:10 -> r
+    boolean isLong() -> k
+    1:1:com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement getInstance():10:10 -> t
 com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.ir.analysis.type.Nullability:
     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
     com.android.tools.r8.ir.analysis.type.Nullability DEFINITELY_NOT_NULL -> b
-    1:4:void <clinit>():25:28 -> <clinit>
-    1:1:void <init>():30:30 -> <init>
-    1:1:boolean isDefinitelyNotNull():37:37 -> a
-    2:11:com.android.tools.r8.ir.analysis.type.Nullability join(com.android.tools.r8.ir.analysis.type.Nullability):49:58 -> a
-    1:1:boolean isDefinitelyNull():33:33 -> b
-    2:2:boolean lessThanOrEqual(com.android.tools.r8.ir.analysis.type.Nullability):62:62 -> b
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability bottom():78:78 -> bottom
-    1:1:boolean isMaybeNull():41:41 -> c
-    1:1:boolean isNullable():45:45 -> d
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability definitelyNotNull():70:70 -> definitelyNotNull
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability definitelyNull():66:66 -> definitelyNull
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability maybeNull():74:74 -> maybeNull
-    1:13:java.lang.String toString():83:95 -> toString
-com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r8.ir.analysis.type.d:
-    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement definitelyNotNullVariant -> c
-    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement definitelyNullVariant -> b
-    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement maybeNullVariant -> a
-    boolean $assertionsDisabled -> d
-    1:1:void <clinit>():10:10 -> <clinit>
-    1:1:void <init>():10:10 -> <init>
-    1:3:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement create(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.Function):18:20 -> a
-    4:10:void set(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement):25:31 -> a
-    11:17:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement get(com.android.tools.r8.ir.analysis.type.Nullability):36:42 -> a
-    18:31:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateElement(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.BiFunction):48:61 -> a
-com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.e:
+    1:3:void <clinit>():21:23 -> <clinit>
+    1:1:void <init>():25:25 -> <init>
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability join(com.android.tools.r8.ir.analysis.type.Nullability):43:43 -> a
+    2:2:com.android.tools.r8.ir.analysis.type.Nullability definitelyNull():55:55 -> a
+    1:1:boolean isDefinitelyNotNull():32:32 -> b
+    2:2:boolean lessThanOrEqual(com.android.tools.r8.ir.analysis.type.Nullability):47:47 -> b
+    1:1:boolean isDefinitelyNull():28:28 -> c
+    1:1:boolean isMaybeNull():36:36 -> d
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability definitelyNotNull():59:59 -> definitelyNotNull
+    1:1:boolean isNullable():51:51 -> e
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability maybeNull():63:63 -> maybeNull
+    1:10:java.lang.String toString():68:77 -> toString
+com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.d:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():15:15 -> <init>
-    com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement asPrimitiveTypeLatticeElement() -> a
     1:25:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.DexItemFactory):38:62 -> a
     26:39:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):104:117 -> a
     40:40:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):115:115 -> a
     41:43:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):111:113 -> a
     44:44:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):109:109 -> a
     45:57:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement):125:137 -> a
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():19:19 -> nullability
+    com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement asPrimitiveTypeLatticeElement() -> b
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():19:19 -> r
 com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement:
-    com.android.tools.r8.ir.analysis.type.Nullability nullability -> f
-    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement NULL_INSTANCE -> g
-    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement NULL_BOTTOM_INSTANCE -> h
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement.create():23:23 -> <clinit>
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement.access$200():11 -> <clinit>
-    1:1:void <clinit>():57 -> <clinit>
-    2:2:void <clinit>():57:57 -> <clinit>
-    3:3:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement.createBottom():27:27 -> <clinit>
-    3:3:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement.access$300():11 -> <clinit>
-    3:3:void <clinit>():59 -> <clinit>
-    4:4:void <clinit>():59:59 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.analysis.type.Nullability):63:64 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNotNull():79:79 -> asNotNull
-    1:1:boolean equals(java.lang.Object):94:94 -> equals
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getNullTypeLatticeElement():73:73 -> getNullTypeLatticeElement
-    1:1:int hashCode():99:99 -> hashCode
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():69:69 -> nullability
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement access$000():9:9 -> r
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement access$100():9:9 -> s
-com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement -> com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$a:
-    1:1:void <init>(com.android.tools.r8.ir.analysis.type.Nullability):14:14 -> <init>
-    1:1:boolean equals(java.lang.Object):50:50 -> equals
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):19:19 -> getOrCreateVariant
-    1:1:int hashCode():42:42 -> hashCode
-    boolean isNullType() -> k
-    1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.f:
+    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement NULL_INSTANCE -> j
+    com.android.tools.r8.ir.analysis.type.Nullability nullability -> g
+    boolean $assertionsDisabled -> k
+    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement nonNullVariant -> i
+    com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement primaryOrNullVariant -> h
+    com.android.tools.r8.graph.DexType type -> f
+    1:4:void <clinit>():12:15 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):27:29 -> <init>
+    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability):62:62 -> a
+    2:11:void linkVariant(com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement,com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement):67:76 -> a
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNullable():100:100 -> asNullable
+    1:26:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):33:58 -> b
+    27:27:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):44:44 -> b
+    1:16:boolean equals(java.lang.Object):119:134 -> equals
+    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getNullTypeLatticeElement():86:86 -> getNullTypeLatticeElement
+    1:2:int hashCode():139:140 -> hashCode
+    1:1:boolean isNullType():95:95 -> l
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():82:82 -> r
+    1:1:java.util.Set getInterfaces():90:90 -> t
+    1:1:java.lang.String toString():111:111 -> toString
+com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.e:
     com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement INSTANCE -> g
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:int hashCode():30:30 -> hashCode
-    boolean isShort() -> m
-    1:1:com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement getInstance():10:10 -> r
+    boolean isShort() -> n
+    1:1:com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement getInstance():10:10 -> t
 com.android.tools.r8.ir.analysis.type.SingleTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.SingleTypeLatticeElement:
     com.android.tools.r8.ir.analysis.type.SingleTypeLatticeElement SINGLE_INSTANCE -> g
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>():13:13 -> <init>
     1:1:int hashCode():37:37 -> hashCode
-    boolean isSingle() -> n
-    1:1:com.android.tools.r8.ir.analysis.type.SingleTypeLatticeElement getInstance():17:17 -> r
+    boolean isSingle() -> o
+    1:1:com.android.tools.r8.ir.analysis.type.SingleTypeLatticeElement getInstance():17:17 -> t
 com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement:
     com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement INSTANCE -> f
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>():9:9 -> <init>
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkCast(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> a
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkCast(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType) -> a
     1:1:int hashCode():43:43 -> hashCode
-    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():14:14 -> nullability
-    boolean isTop() -> o
-    1:1:com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement getInstance():18:18 -> r
+    boolean isTop() -> p
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():14:14 -> r
+    1:1:com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement getInstance():18:18 -> t
 com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.ir.analysis.type.TypeAnalysis:
     com.android.tools.r8.graph.AppView appView -> c
     java.util.Deque worklist -> e
@@ -17747,7 +17410,7 @@
     18:33:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):96:111 -> a
     34:54:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):108:128 -> a
     55:81:void updateTypeOfValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):142:168 -> a
-    82:86:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):174:178 -> a
+    82:86:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):174:178 -> a
     1:1:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):66:66 -> b
     2:5:void widening(java.lang.Iterable):71:74 -> b
     1:4:void widening(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):64:67 -> widening
@@ -17764,141 +17427,138 @@
     com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement CHAR -> d
     com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement SHORT -> c
     boolean $assertionsDisabled -> e
-    1:15:void <clinit>():17:31 -> <clinit>
-    1:1:void <init>():17:17 -> <init>
-    com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement asPrimitiveTypeLatticeElement() -> a
-    boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView) -> a
-    1:29:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):50:78 -> a
-    30:31:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):301:302 -> a
-    30:31:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):79 -> a
-    32:40:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):82:90 -> a
-    41:41:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):57:57 -> a
-    42:50:boolean equalUpToNullability(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):140:148 -> a
-    51:52:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):314:315 -> a
-    53:57:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):331:335 -> a
-    58:59:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):33:34 -> a
-    58:59:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):336 -> a
-    60:60:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):99:99 -> a
-    60:60:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
-    60:60:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):336 -> a
-    61:88:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):70:97 -> a
-    61:88:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
-    61:88:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):336 -> a
-    89:89:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):93:93 -> a
-    89:89:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
-    89:89:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):336 -> a
-    90:94:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):91:95 -> a
-    90:94:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
-    90:94:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):336 -> a
-    95:109:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):75:89 -> a
-    95:109:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
-    95:109:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):336 -> a
-    110:110:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):338:338 -> a
-    111:112:com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkCast(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):348:349 -> a
-    boolean isBoolean() -> b
-    1:2:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):301:302 -> b
-    3:5:boolean isValueTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):342:344 -> b
-    boolean isBottom() -> c
-    boolean isByte() -> d
-    boolean isChar() -> e
-    1:1:boolean isDefinitelyNull():287:287 -> f
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):326:326 -> fromDexType
-    boolean isDouble() -> g
-    1:4:boolean isFineGrainedType():263:266 -> h
-    boolean isFloat() -> i
-    1:1:boolean isNullable():34:34 -> isNullable
-    boolean isLong() -> j
-    1:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(java.lang.Iterable,com.android.tools.r8.graph.AppView):95:97 -> join
-    boolean isNullType() -> k
-    1:8:boolean isPreciseType():252:259 -> l
-    1:1:boolean lessThanOrEqual(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):127:127 -> lessThanOrEqual
-    boolean isShort() -> m
-    boolean isSingle() -> n
-    boolean isTop() -> o
-    boolean isWide() -> p
-    1:2:int requiredRegisters():295:296 -> q
-    1:5:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.AppView):111:115 -> strictlyLessThan
-    1:2:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):320:321 -> stringClassType
+    1:15:void <clinit>():15:29 -> <clinit>
+    1:1:void <init>():15:15 -> <init>
+    boolean isBasedOnMissingClass(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNonNullable():52:52 -> a
+    2:30:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):66:94 -> a
+    31:32:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement objectClassType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.analysis.type.Nullability):288:289 -> a
+    31:32:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):94 -> a
+    33:43:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):97:107 -> a
+    44:44:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):73:73 -> a
+    45:46:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement classClassType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.analysis.type.Nullability):302:303 -> a
+    47:51:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):322:326 -> a
+    52:53:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):33:34 -> a
+    52:53:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):327 -> a
+    54:54:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):99:99 -> a
+    54:54:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
+    54:54:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):327 -> a
+    55:82:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):70:97 -> a
+    55:82:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
+    55:82:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):327 -> a
+    83:83:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):93:93 -> a
+    83:83:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
+    83:83:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):327 -> a
+    84:88:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):91:95 -> a
+    84:88:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
+    84:88:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):327 -> a
+    89:103:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromTypeDescriptorChar(char,boolean):75:89 -> a
+    89:103:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):34 -> a
+    89:103:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):327 -> a
+    104:105:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier,boolean):330:331 -> a
+    106:108:boolean isValueTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):335:337 -> a
+    109:110:com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkCast(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):341:342 -> a
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asNullable():43:43 -> asNullable
+    com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement asPrimitiveTypeLatticeElement() -> b
+    1:2:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement objectClassType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.analysis.type.Nullability):288:289 -> b
+    boolean isBoolean() -> c
+    boolean isBottom() -> d
+    boolean isByte() -> e
+    boolean isChar() -> f
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexDefinitionSupplier):314:314 -> fromDexType
+    1:1:boolean isDefinitelyNull():278:278 -> g
+    boolean isDouble() -> h
+    1:4:boolean isFineGrainedType():254:257 -> i
+    1:1:boolean isNullable():32:32 -> isNullable
+    boolean isFloat() -> j
+    1:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement join(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):112:114 -> join
+    boolean isLong() -> k
+    boolean isNullType() -> l
+    1:1:boolean lessThanOrEqual(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):144:144 -> lessThanOrEqual
+    1:8:boolean isPreciseType():243:250 -> m
+    boolean isShort() -> n
+    boolean isSingle() -> o
+    boolean isTop() -> p
+    boolean isWide() -> q
+    com.android.tools.r8.ir.analysis.type.Nullability nullability() -> r
+    1:2:int requiredRegisters():282:283 -> s
+    1:5:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexDefinitionSupplier):128:132 -> strictlyLessThan
+    1:2:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement stringClassType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.analysis.type.Nullability):308:309 -> stringClassType
 com.android.tools.r8.ir.analysis.type.WideTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.WideTypeLatticeElement:
     com.android.tools.r8.ir.analysis.type.WideTypeLatticeElement WIDE_INSTANCE -> g
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>():13:13 -> <init>
     1:1:int hashCode():37:37 -> hashCode
-    boolean isWide() -> p
-    1:1:com.android.tools.r8.ir.analysis.type.WideTypeLatticeElement getInstance():17:17 -> r
+    boolean isWide() -> q
+    1:1:com.android.tools.r8.ir.analysis.type.WideTypeLatticeElement getInstance():17:17 -> t
 com.android.tools.r8.ir.code.Add -> com.android.tools.r8.ir.code.Add:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
     boolean isCommutative() -> Db
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():122:122 -> Hb
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():117:117 -> Hb
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):27:27 -> a
-    2:2:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):52:52 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):47:47 -> a
     com.android.tools.r8.ir.code.Add asAdd() -> b
-    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):47:47 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):72:72 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):87:87 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):37:37 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):67:67 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):57:57 -> d
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):82:82 -> d
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):62:62 -> e
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):77:77 -> e
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):42:42 -> f
+    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):42:42 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):67:67 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):82:82 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):32:32 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):62:62 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):52:52 -> d
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):77:77 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):57:57 -> e
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):72:72 -> e
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):37:37 -> f
 com.android.tools.r8.ir.code.AlwaysMaterializingDefinition -> com.android.tools.r8.ir.code.a:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):19:19 -> <init>
     int maxOutValueRegister() -> Ab
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):24:24 -> a
-    2:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):35:37 -> a
-    5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):36:36 -> a
-    6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):42:42 -> a
-    7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):62:62 -> a
+    1:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):30:32 -> a
+    4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):31:31 -> a
+    5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):37:37 -> a
+    6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):57:57 -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> b
-    1:1:int maxInValueRegister():52:52 -> zb
+    1:1:int maxInValueRegister():47:47 -> zb
 com.android.tools.r8.ir.code.AlwaysMaterializingNop -> com.android.tools.r8.ir.code.b:
     1:1:void <init>():20:20 -> <init>
-    1:1:int maxOutValueRegister():55:55 -> Ab
+    1:1:int maxOutValueRegister():50:50 -> Ab
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):25:25 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):35:35 -> a
-    3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):40:40 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):61:61 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):45:45 -> b
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):30:30 -> a
+    2:2:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):35:35 -> a
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):56:56 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):40:40 -> b
     boolean hasInvariantOutType() -> qa
-    1:1:int maxInValueRegister():50:50 -> zb
+    1:1:int maxInValueRegister():45:45 -> zb
 com.android.tools.r8.ir.code.AlwaysMaterializingUser -> com.android.tools.r8.ir.code.c:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):19:19 -> <init>
-    1:1:int maxOutValueRegister():56:56 -> Ab
+    1:1:int maxOutValueRegister():51:51 -> Ab
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):24:24 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):35:35 -> a
-    3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):40:40 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):62:62 -> a
-    5:5:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):67:67 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):30:30 -> a
+    2:2:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):35:35 -> a
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):57:57 -> a
+    4:4:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):62:62 -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> b
     boolean hasInvariantOutType() -> qa
-    1:2:int maxInValueRegister():50:51 -> zb
+    1:2:int maxInValueRegister():45:46 -> zb
 com.android.tools.r8.ir.code.And -> com.android.tools.r8.ir.code.d:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
     boolean isCommutative() -> Db
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():88:88 -> Hb
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():83:83 -> Hb
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):23:23 -> a
-    2:2:com.android.tools.r8.code.Instruction CreateInt(int,int,int):43:43 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):53:53 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):68:68 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):73:73 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):38:38 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):48:48 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):63:63 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):68:68 -> b
     com.android.tools.r8.ir.code.And asAnd() -> c
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):58:58 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):63:63 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):48:48 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):53:53 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):58:58 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):43:43 -> d
     boolean isAnd() -> ua
 com.android.tools.r8.ir.code.Argument -> com.android.tools.r8.ir.code.Argument:
     boolean $assertionsDisabled -> h
@@ -17907,16 +17567,15 @@
     int maxOutValueRegister() -> Ab
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):31:31 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:55 -> a
-    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):76:76 -> a
-    4:4:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):87:87 -> a
-    5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):92:92 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):97:97 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):60:60 -> b
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):50:50 -> a
+    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):71:71 -> a
+    3:3:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):82:82 -> a
+    4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):87:87 -> a
+    5:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):92:92 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):55:55 -> b
     com.android.tools.r8.ir.code.Argument asArgument() -> d
     boolean hasInvariantOutType() -> qa
-    1:1:int maxInValueRegister():44:44 -> zb
+    1:1:int maxInValueRegister():39:39 -> zb
 com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.ir.code.e:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
@@ -17948,59 +17607,57 @@
     1:1:void <clinit>():33:33 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):38:39 -> <init>
     int maxOutValueRegister() -> Ab
-    1:1:com.android.tools.r8.ir.code.Value index():56:56 -> Cb
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):44:44 -> a
-    2:2:com.android.tools.r8.ir.code.MemberType getMemberType():61:61 -> a
-    3:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:100 -> a
-    38:38:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):98:98 -> a
-    39:41:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:79 -> a
-    42:63:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):73:94 -> a
-    64:64:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):91:91 -> a
-    65:65:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):88:88 -> a
-    66:66:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):85:85 -> a
-    67:87:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:102 -> a
-    88:88:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):147:147 -> a
-    89:95:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):159:165 -> a
-    96:97:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):170:171 -> a
-    98:98:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):176:176 -> a
-    99:142:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):181:224 -> a
-    143:144:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):220:221 -> a
-    145:147:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):220:222 -> a
-    148:149:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):216:217 -> a
-    150:152:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):216:218 -> a
-    153:154:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):212:213 -> a
-    155:157:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):212:214 -> a
-    158:159:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):208:209 -> a
-    160:162:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):208:210 -> a
-    163:164:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):204:205 -> a
-    165:167:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):204:206 -> a
-    168:169:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):200:201 -> a
-    170:172:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):200:202 -> a
-    173:175:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):191:193 -> a
-    176:180:com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkConstraint(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):229:233 -> a
-    181:181:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):239:239 -> a
-    182:182:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):244:244 -> a
-    183:183:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):244:244 -> a
-    1:1:com.android.tools.r8.ir.code.Value array():52:52 -> array
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):115:115 -> b
-    1:1:com.android.tools.r8.ir.code.Value dest():48:48 -> dest
+    1:1:com.android.tools.r8.ir.code.Value index():51:51 -> Cb
+    1:1:com.android.tools.r8.ir.code.MemberType getMemberType():56:56 -> a
+    2:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61:95 -> a
+    37:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):93:93 -> a
+    38:40:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:74 -> a
+    41:62:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:89 -> a
+    63:63:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86:86 -> a
+    64:64:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83:83 -> a
+    65:65:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):80:80 -> a
+    66:86:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:97 -> a
+    87:87:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):142:142 -> a
+    88:94:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):154:160 -> a
+    95:96:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):165:166 -> a
+    97:97:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):171:171 -> a
+    98:141:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):176:219 -> a
+    142:143:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):215:216 -> a
+    144:146:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):215:217 -> a
+    147:148:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):211:212 -> a
+    149:151:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):211:213 -> a
+    152:153:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):207:208 -> a
+    154:156:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):207:209 -> a
+    157:158:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):203:204 -> a
+    159:161:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):203:205 -> a
+    162:163:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):199:200 -> a
+    164:166:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):199:201 -> a
+    167:168:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):195:196 -> a
+    169:171:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):195:197 -> a
+    172:174:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):186:188 -> a
+    175:179:com.android.tools.r8.ir.analysis.type.TypeLatticeElement checkConstraint(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):224:228 -> a
+    180:180:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):234:234 -> a
+    181:181:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):239:239 -> a
+    182:182:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):239:239 -> a
+    1:1:com.android.tools.r8.ir.code.Value array():47:47 -> array
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):110:110 -> b
+    1:1:com.android.tools.r8.ir.code.Value dest():43:43 -> dest
     boolean hasInvariantOutType() -> qa
     int maxInValueRegister() -> zb
 com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.ir.code.ArrayLength:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
     int maxOutValueRegister() -> Ab
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):29:29 -> a
-    2:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52:54 -> a
-    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):94:94 -> a
-    6:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):99:100 -> a
-    8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):105:105 -> a
-    9:9:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):110:110 -> a
-    10:10:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):120:120 -> a
-    1:1:com.android.tools.r8.ir.code.Value array():37:37 -> array
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):88:88 -> b
-    1:1:com.android.tools.r8.ir.code.Value dest():33:33 -> dest
+    1:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47:49 -> a
+    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):89:89 -> a
+    5:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):94:95 -> a
+    7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):100:100 -> a
+    8:8:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):105:105 -> a
+    9:9:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):115:115 -> a
+    1:1:com.android.tools.r8.ir.code.Value array():32:32 -> array
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> b
+    1:1:com.android.tools.r8.ir.code.Value dest():28:28 -> dest
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> f
-    1:8:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):74:81 -> identicalAfterRegisterAllocation
+    1:8:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):69:76 -> identicalAfterRegisterAllocation
     boolean hasInvariantOutType() -> qa
     boolean isArrayLength() -> wa
     int maxInValueRegister() -> zb
@@ -18009,30 +17666,29 @@
     com.android.tools.r8.ir.code.MemberType type -> h
     1:1:void <clinit>():29:29 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):39:43 -> <init>
-    1:1:int maxOutValueRegister():114:114 -> Ab
-    1:1:com.android.tools.r8.ir.code.Value index():56:56 -> Cb
+    1:1:int maxOutValueRegister():109:109 -> Ab
+    1:1:com.android.tools.r8.ir.code.Value index():51:51 -> Cb
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):48:48 -> a
-    2:2:com.android.tools.r8.ir.code.MemberType getMemberType():65:65 -> a
-    3:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:102 -> a
-    36:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):100:100 -> a
-    37:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81:81 -> a
-    38:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:96 -> a
-    58:58:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):93:93 -> a
-    59:59:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):90:90 -> a
-    60:60:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):87:87 -> a
-    61:81:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):84:104 -> a
-    82:82:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):168:168 -> a
-    83:83:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):173:173 -> a
-    84:84:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):183:183 -> a
-    85:85:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):188:188 -> a
-    86:86:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):193:193 -> a
-    87:87:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):193:193 -> a
-    1:1:com.android.tools.r8.ir.code.Value array():52:52 -> array
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):152:152 -> b
+    1:1:com.android.tools.r8.ir.code.MemberType getMemberType():60:60 -> a
+    2:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:97 -> a
+    35:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):95:95 -> a
+    36:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:76 -> a
+    37:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:91 -> a
+    57:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):88:88 -> a
+    58:58:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):85:85 -> a
+    59:59:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:82 -> a
+    60:80:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79:99 -> a
+    81:81:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):163:163 -> a
+    82:82:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):168:168 -> a
+    83:83:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):178:178 -> a
+    84:84:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):183:183 -> a
+    85:85:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):188:188 -> a
+    86:86:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):188:188 -> a
+    1:1:com.android.tools.r8.ir.code.Value array():47:47 -> array
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):147:147 -> b
     boolean hasInvariantOutType() -> qa
-    1:5:boolean instructionInstanceCanThrow():125:129 -> ta
-    1:1:com.android.tools.r8.ir.code.Value value():60:60 -> value
+    1:5:boolean instructionInstanceCanThrow():120:124 -> ta
+    1:1:com.android.tools.r8.ir.code.Value value():55:55 -> value
     int maxInValueRegister() -> zb
 com.android.tools.r8.ir.code.BasicBlock -> com.android.tools.r8.ir.code.BasicBlock:
     int color -> n
@@ -18198,6 +17854,7 @@
     1:1:boolean isFilled():494:494 -> x
     1:1:boolean isSealed():1004:1004 -> y
     1:11:boolean isSimpleAlwaysThrowingPath():1354:1364 -> z
+com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.ir.code.f:
 com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.ir.code.BasicBlock$a:
 com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.ir.code.BasicBlock$b:
     com.android.tools.r8.ir.code.BasicBlock$EdgeType NORMAL -> b
@@ -18224,83 +17881,117 @@
     3:3:void <clinit>():102:102 -> <clinit>
     1:1:void <init>(java.lang.String,int):102:102 -> <init>
     1:1:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):107:107 -> a
-com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.ir.code.f:
+com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.ir.code.g:
     java.util.ListIterator listIterator -> b
     com.android.tools.r8.ir.code.Instruction current -> c
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.code.Position position -> d
     com.android.tools.r8.ir.code.BasicBlock block -> a
-    1:1:void <clinit>():27:27 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.BasicBlock):34:34 -> <init>
-    2:6:void <init>(com.android.tools.r8.ir.code.BasicBlock):32:36 -> <init>
-    7:7:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):39:39 -> <init>
-    8:17:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):32:41 -> <init>
-    18:19:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):45:46 -> <init>
-    boolean lambda$inlineInvoke$2(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.BasicBlock):33:33 -> <init>
+    2:6:void <init>(com.android.tools.r8.ir.code.BasicBlock):31:35 -> <init>
+    7:7:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):38:38 -> <init>
+    8:17:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):31:40 -> <init>
+    18:19:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):44:45 -> <init>
+    boolean lambda$inlineInvoke$1(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
     boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    1:1:void setInsertionPosition(com.android.tools.r8.ir.code.Position):83:83 -> a
-    2:7:void add(com.android.tools.r8.ir.code.Instruction):96:101 -> a
-    8:17: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,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.BasicBlock):232:241 -> a
-    18:50: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):328:360 -> a
-    51:56:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):398:403 -> a
-    57:89:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):595:627 -> a
-    90:90:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):45:45 -> a
-    90:90:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):627 -> a
-    91:109:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):627:645 -> a
-    1:1:void add(java.lang.Object):27:27 -> add
-    1:1:boolean hasNext():51:51 -> hasNext
-    1:1:boolean hasPrevious():67:67 -> hasPrevious
-    1:1:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):414:414 -> inlineInvoke
-    2:4:boolean canThrow(com.android.tools.r8.ir.code.IRCode):308:310 -> inlineInvoke
-    2:4:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):415 -> inlineInvoke
-    5:12:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):295:302 -> inlineInvoke
-    5:12:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):420 -> inlineInvoke
-    13:39:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):421:447 -> inlineInvoke
-    40:91:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):446:497 -> inlineInvoke
-    92:92:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):45:45 -> inlineInvoke
-    92:92:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):497 -> inlineInvoke
-    93:112:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):497:516 -> inlineInvoke
-    113:113:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):45:45 -> inlineInvoke
-    113:113:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):516 -> inlineInvoke
-    114:114:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):519:519 -> inlineInvoke
-    115:115:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> inlineInvoke
-    115:115:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):518 -> inlineInvoke
-    116:165:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):517:566 -> inlineInvoke
-    166:182:void appendCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):375:391 -> inlineInvoke
-    166:182:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):567 -> inlineInvoke
-    183:196:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):574:587 -> inlineInvoke
-    197:197:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):586:586 -> inlineInvoke
-    1:1:java.lang.Object next():27:27 -> next
-    2:3:com.android.tools.r8.ir.code.Instruction next():56:57 -> next
-    1:1:int nextIndex():62:62 -> nextIndex
-    1:1:java.lang.Object previous():27:27 -> previous
-    2:3:com.android.tools.r8.ir.code.Instruction previous():72:73 -> previous
-    1:1:int previousIndex():78:78 -> previousIndex
-    1:21:void remove():130:150 -> remove
-    22:22:void remove():131:131 -> remove
-    1:7:void removeOrReplaceByDebugLocalRead():155:161 -> removeOrReplaceByDebugLocalRead
-    8:8:void removeOrReplaceByDebugLocalRead():156:156 -> removeOrReplaceByDebugLocalRead
-    1:16:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):167:182 -> replaceCurrentInstruction
-    17:17:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):168:168 -> replaceCurrentInstruction
-    1:21:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set):191:211 -> replaceCurrentInstructionWithThrowNull
-    22:42:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set):210:230 -> replaceCurrentInstructionWithThrowNull
-    43:43:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set):192:192 -> replaceCurrentInstructionWithThrowNull
-    1:1:void set(java.lang.Object):27:27 -> set
-    2:4:void set(com.android.tools.r8.ir.code.Instruction):114:116 -> set
-    2:4:void set(java.lang.Object):27 -> set
-    1:8:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):249:256 -> split
-    9:9:boolean hasNext():51:51 -> split
-    9:9:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):256 -> split
-    10:13:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):256:259 -> split
-    14:14:boolean hasPrevious():67:67 -> split
-    14:14:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):263 -> split
-    15:38:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):263:286 -> split
-    39:46:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):295:302 -> split
-com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.ir.code.g:
+    1:1:void setInsertionPosition(com.android.tools.r8.ir.code.Position):82:82 -> a
+    2:34:void splitBlockAndCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):261:293 -> a
+    35:40:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):327:332 -> a
+    41:73:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):524:556 -> a
+    74:74:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):45:45 -> a
+    74:74:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):556 -> a
+    75:93:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):556:574 -> a
+    1:1:void add(java.lang.Object):26:26 -> add
+    2:7:void add(com.android.tools.r8.ir.code.Instruction):95:100 -> add
+    2:7:void add(java.lang.Object):26 -> add
+    1:1:boolean hasNext():50:50 -> hasNext
+    1:1:boolean hasPrevious():66:66 -> hasPrevious
+    1:1:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):343:343 -> inlineInvoke
+    2:4:boolean canThrow(com.android.tools.r8.ir.code.IRCode):245:247 -> inlineInvoke
+    2:4:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):344 -> inlineInvoke
+    5:12:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):186:193 -> inlineInvoke
+    5:12:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> inlineInvoke
+    5:12:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):349 -> inlineInvoke
+    13:13:boolean hasNext():50:50 -> inlineInvoke
+    13:13:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):193 -> inlineInvoke
+    13:13:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> inlineInvoke
+    13:13:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):349 -> inlineInvoke
+    14:17:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):193:196 -> inlineInvoke
+    14:17:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> inlineInvoke
+    14:17:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):349 -> inlineInvoke
+    18:18:boolean hasPrevious():66:66 -> inlineInvoke
+    18:18:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):200 -> inlineInvoke
+    18:18:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> inlineInvoke
+    18:18:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):349 -> inlineInvoke
+    19:42:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):200:223 -> inlineInvoke
+    19:42:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> inlineInvoke
+    19:42:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):349 -> inlineInvoke
+    43:49:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):233:239 -> inlineInvoke
+    43:49:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):349 -> inlineInvoke
+    50:76:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):350:376 -> inlineInvoke
+    77:128:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):375:426 -> inlineInvoke
+    129:129:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):45:45 -> inlineInvoke
+    129:129:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):426 -> inlineInvoke
+    130:149:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):426:445 -> inlineInvoke
+    150:150:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):45:45 -> inlineInvoke
+    150:150:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):445 -> inlineInvoke
+    151:151:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):448:448 -> inlineInvoke
+    152:152:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> inlineInvoke
+    152:152:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):447 -> inlineInvoke
+    153:202:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):446:495 -> inlineInvoke
+    203:219:void appendCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):304:320 -> inlineInvoke
+    203:219:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):496 -> inlineInvoke
+    220:233:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):503:516 -> inlineInvoke
+    234:234:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):515:515 -> inlineInvoke
+    1:2:com.android.tools.r8.ir.code.Instruction next():55:56 -> next
+    1:2:java.lang.Object next():26 -> next
+    1:1:int nextIndex():61:61 -> nextIndex
+    1:2:com.android.tools.r8.ir.code.Instruction previous():71:72 -> previous
+    1:2:java.lang.Object previous():26 -> previous
+    1:1:int previousIndex():77:77 -> previousIndex
+    1:21:void remove():129:149 -> remove
+    22:22:void remove():130:130 -> remove
+    1:4:void removeOrReplaceByDebugLocalRead():154:157 -> removeOrReplaceByDebugLocalRead
+    5:25:void remove():129:149 -> removeOrReplaceByDebugLocalRead
+    5:25:void removeOrReplaceByDebugLocalRead():158 -> removeOrReplaceByDebugLocalRead
+    26:26:void remove():130:130 -> removeOrReplaceByDebugLocalRead
+    26:26:void removeOrReplaceByDebugLocalRead():158 -> removeOrReplaceByDebugLocalRead
+    27:27:void removeOrReplaceByDebugLocalRead():160:160 -> removeOrReplaceByDebugLocalRead
+    28:43:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):166:181 -> removeOrReplaceByDebugLocalRead
+    28:43:void removeOrReplaceByDebugLocalRead():160 -> removeOrReplaceByDebugLocalRead
+    44:44:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):167:167 -> removeOrReplaceByDebugLocalRead
+    44:44:void removeOrReplaceByDebugLocalRead():160 -> removeOrReplaceByDebugLocalRead
+    45:45:void removeOrReplaceByDebugLocalRead():155:155 -> removeOrReplaceByDebugLocalRead
+    1:16:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):166:181 -> replaceCurrentInstruction
+    17:17:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):167:167 -> replaceCurrentInstruction
+    1:1:void set(java.lang.Object):26:26 -> set
+    2:4:void set(com.android.tools.r8.ir.code.Instruction):113:115 -> set
+    2:4:void set(java.lang.Object):26 -> set
+    1:8:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):186:193 -> split
+    1:8:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> split
+    9:9:boolean hasNext():50:50 -> split
+    9:9:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):193 -> split
+    9:9:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> split
+    10:13:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):193:196 -> split
+    10:13:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> split
+    14:14:boolean hasPrevious():66:66 -> split
+    14:14:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):200 -> split
+    14:14:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> split
+    15:38:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):200:223 -> split
+    15:38:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):232 -> split
+    39:45:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):233:239 -> split
+    46:53:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):186:193 -> split
+    54:54:boolean hasNext():50:50 -> split
+    54:54:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):193 -> split
+    55:58:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):193:196 -> split
+    59:59:boolean hasPrevious():66:66 -> split
+    59:59:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):200 -> split
+    60:83:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):200:223 -> split
+com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.ir.code.h:
     java.util.ListIterator listIterator -> a
     com.android.tools.r8.ir.code.BasicBlock current -> b
     1:3:void <init>(com.android.tools.r8.ir.code.IRCode):16:18 -> <init>
-    4:6:void <init>(com.android.tools.r8.ir.code.IRCode,int):21:23 -> <init>
     1:1:void add(java.lang.Object):10:10 -> add
     2:2:void add(com.android.tools.r8.ir.code.BasicBlock):60:60 -> add
     2:2:void add(java.lang.Object):10 -> add
@@ -18317,7 +18008,7 @@
     1:1:void set(java.lang.Object):10:10 -> set
     2:2:void set(com.android.tools.r8.ir.code.BasicBlock):65:65 -> set
     2:2:void set(java.lang.Object):10 -> set
-com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.ir.code.h:
+com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.ir.code.i:
     com.android.tools.r8.ir.code.NumericType type -> h
     1:8:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):25:32 -> <init>
     1:1:int maxOutValueRegister():96:96 -> Ab
@@ -18341,7 +18032,7 @@
     boolean hasInvariantOutType() -> qa
     boolean isBinop() -> xa
     1:1:int maxInValueRegister():91:91 -> zb
-com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.ir.code.i:
+com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.ir.code.j:
     java.util.Map canonicalPositions -> b
     com.android.tools.r8.ir.code.Position callerPosition -> a
     com.android.tools.r8.ir.code.Position preamblePosition -> c
@@ -18370,7 +18061,7 @@
     14:15:void lambda$removeGuard$0(com.android.tools.r8.graph.DexType,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.Object):85:86 -> a
     16:17:void forEach(java.util.function.BiConsumer):93:94 -> a
     1:1:java.util.List access$100(com.android.tools.r8.ir.code.CatchHandlers):17:17 -> b
-    1:1:java.util.List getAllTargets():64:64 -> d
+    1:1:java.util.List getAllTargets():64:64 -> c
     1:1:java.util.List getGuards():60:60 -> e
     1:5:boolean equals(java.lang.Object):124:128 -> equals
     1:4:java.util.Set getUniqueTargets():68:71 -> g
@@ -18378,7 +18069,7 @@
     1:1:boolean isEmpty():51:51 -> isEmpty
     1:1:java.util.Iterator iterator():100:100 -> iterator
     1:2:int size():55:56 -> size
-com.android.tools.r8.ir.code.CatchHandlers$1 -> com.android.tools.r8.ir.code.CatchHandlers$1:
+com.android.tools.r8.ir.code.CatchHandlers$1 -> com.android.tools.r8.ir.code.k:
     com.android.tools.r8.ir.code.CatchHandlers this$0 -> b
     int nextIndex -> a
     1:3:void <init>(com.android.tools.r8.ir.code.CatchHandlers):100:102 -> <init>
@@ -18395,20 +18086,19 @@
     1:1:void <clinit>():22:22 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):31:32 -> <init>
     int maxOutValueRegister() -> Ab
-    1:1:com.android.tools.r8.graph.DexType getType():41:41 -> Cb
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):37:37 -> a
-    2:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:66 -> a
-    16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):110:110 -> a
-    17:17:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):115:115 -> a
-    18:19:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):160:161 -> a
-    20:20:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):173:173 -> a
-    21:21:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):178:178 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):74:74 -> b
-    2:30:boolean verifyTypes(com.android.tools.r8.graph.AppView):120:148 -> b
+    1:1:com.android.tools.r8.graph.DexType getType():36:36 -> Cb
+    1:14:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):48:61 -> a
+    15:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):105:105 -> a
+    16:16:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):110:110 -> a
+    17:18:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):155:156 -> a
+    19:19:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):168:168 -> a
+    20:20:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):173:173 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):69:69 -> b
+    2:30:boolean verifyTypes(com.android.tools.r8.graph.AppView):115:143 -> b
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> h
-    1:1:com.android.tools.r8.ir.code.Value object():45:45 -> object
+    1:1:com.android.tools.r8.ir.code.Value object():40:40 -> object
     boolean hasInvariantOutType() -> qa
-    1:1:java.lang.String toString():104:104 -> toString
+    1:1:java.lang.String toString():99:99 -> toString
     boolean isCheckCast() -> ya
     int maxInValueRegister() -> zb
 com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.ir.code.Cmp:
@@ -18418,23 +18108,22 @@
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):36:37 -> <init>
     int maxOutValueRegister() -> Ab
     boolean isCommutative() -> Db
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):42:42 -> a
-    2:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:80 -> a
-    30:54:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:82 -> a
-    55:63:java.lang.String biasToString(com.android.tools.r8.ir.code.Cmp$Bias):86:94 -> a
-    64:78:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):159:173 -> a
-    79:90:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):171:182 -> a
-    91:103:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):180:192 -> a
-    104:110:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):191:197 -> a
-    111:117:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):196:202 -> a
-    118:121:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):201:204 -> a
-    122:128:com.android.tools.r8.ir.analysis.constant.LatticeElement buildLatticeResult(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.LongInterval,com.android.tools.r8.utils.LongInterval):209:215 -> a
-    129:129:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):230:230 -> a
-    130:130:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):235:235 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):132:132 -> b
+    1:28:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):48:75 -> a
+    29:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:77 -> a
+    54:62:java.lang.String biasToString(com.android.tools.r8.ir.code.Cmp$Bias):81:89 -> a
+    63:77:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):154:168 -> a
+    78:89:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):166:177 -> a
+    90:102:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):175:187 -> a
+    103:109:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):186:192 -> a
+    110:116:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):191:197 -> a
+    117:120:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):196:199 -> a
+    121:127:com.android.tools.r8.ir.analysis.constant.LatticeElement buildLatticeResult(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.LongInterval,com.android.tools.r8.utils.LongInterval):204:210 -> a
+    128:128:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):225:225 -> a
+    129:129:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):230:230 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):127:127 -> b
     com.android.tools.r8.ir.code.Cmp asCmp() -> i
-    1:17:java.lang.String toString():100:116 -> toString
-    18:40:java.lang.String toString():105:127 -> toString
+    1:17:java.lang.String toString():95:111 -> toString
+    18:40:java.lang.String toString():100:122 -> toString
     boolean isCmp() -> za
     int maxInValueRegister() -> zb
 com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.ir.code.Cmp$Bias:
@@ -18443,154 +18132,149 @@
     2:2:void <clinit>():29:29 -> <clinit>
     1:1:void <init>(java.lang.String,int):29:29 -> <init>
     1:1:com.android.tools.r8.ir.code.Cmp$Bias[] values():29:29 -> values
-com.android.tools.r8.ir.code.ConstClass -> com.android.tools.r8.ir.code.j:
+com.android.tools.r8.ir.code.ConstClass -> com.android.tools.r8.ir.code.l:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexType clazz -> h
     1:1:void <clinit>():22:22 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):27:28 -> <init>
     boolean isConstClass() -> Aa
     int maxOutValueRegister() -> Ab
-    1:1:com.android.tools.r8.graph.DexType getValue():54:54 -> Cb
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):33:33 -> a
-    2:7:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstClass):37:42 -> a
-    8:8:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstClass):46:46 -> a
-    9:9:com.android.tools.r8.graph.DexType getValue():54:54 -> a
-    9:9:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstClass):46 -> a
-    10:10:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstClass):46:46 -> a
-    11:11:com.android.tools.r8.ir.code.Value dest():50:50 -> a
-    11:11:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59 -> a
-    12:13:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:60 -> a
-    14:14:com.android.tools.r8.graph.DexType getValue():54:54 -> a
-    14:14:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93 -> a
-    15:22:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93:100 -> a
-    23:23:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):114:114 -> a
-    24:24:com.android.tools.r8.graph.DexType getValue():54:54 -> a
-    24:24:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93 -> a
-    24:24:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):114 -> a
-    25:32:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93:100 -> a
-    25:32:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):114 -> a
-    33:33:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):140:140 -> a
-    34:34:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):145:145 -> a
-    35:35:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):151:151 -> a
-    36:36:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):156:156 -> a
-    37:37:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):161:161 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):124:124 -> b
+    1:1:com.android.tools.r8.graph.DexType getValue():49:49 -> Cb
+    1:1:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstClass):41:41 -> a
+    2:2:com.android.tools.r8.graph.DexType getValue():49:49 -> a
+    2:2:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstClass):41 -> a
+    3:3:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstClass):41:41 -> a
+    4:4:com.android.tools.r8.ir.code.Value dest():45:45 -> a
+    4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54 -> a
+    5:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:55 -> a
+    7:7:com.android.tools.r8.graph.DexType getValue():49:49 -> a
+    7:7:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):88 -> a
+    8:15:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):88:95 -> a
+    16:16:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):109:109 -> a
+    17:17:com.android.tools.r8.graph.DexType getValue():49:49 -> a
+    17:17:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):88 -> a
+    17:17:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):109 -> a
+    18:25:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):88:95 -> a
+    18:25:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):109 -> a
+    26:26:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):135:135 -> a
+    27:27:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):140:140 -> a
+    28:28:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):146:146 -> a
+    29:29:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):151:151 -> a
+    30:30:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):156:156 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):119:119 -> b
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> j
     boolean isOutConstant() -> mb
     boolean instructionInstanceCanThrow() -> ta
-    1:1:java.lang.String toString():76:76 -> toString
-    1:1:int maxInValueRegister():65:65 -> zb
-com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.ir.code.k:
+    1:1:java.lang.String toString():71:71 -> toString
+    1:1:int maxInValueRegister():60:60 -> zb
+com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.ir.code.m:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):32:32 -> <init>
     boolean isConstInstruction() -> Ba
     1:6:com.android.tools.r8.ir.code.ConstInstruction copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstInstruction):14:19 -> a
-    7:7:com.android.tools.r8.ir.code.ConstMethodType com.android.tools.r8.ir.code.ConstMethodType.copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodType):43:43 -> a
+    7:7:com.android.tools.r8.ir.code.ConstMethodType com.android.tools.r8.ir.code.ConstMethodType.copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodType):38:38 -> a
     7:7:com.android.tools.r8.ir.code.ConstInstruction copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstInstruction):19 -> a
     8:9:com.android.tools.r8.ir.code.ConstInstruction copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstInstruction):20:21 -> a
-    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.ConstNumber.copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstNumber):59:59 -> a
+    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.ConstNumber.copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstNumber):54:54 -> a
     10:10:com.android.tools.r8.ir.code.ConstInstruction copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstInstruction):21 -> a
     11:16:com.android.tools.r8.ir.code.ConstInstruction copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstInstruction):22:27 -> a
     17:17:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):53:53 -> a
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> k
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> la
     boolean hasInvariantOutType() -> qa
-com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.ir.code.l:
+com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.ir.code.n:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethodHandle methodHandle -> h
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethodHandle):26:27 -> <init>
     int maxOutValueRegister() -> Ab
     boolean isConstMethodHandle() -> Ca
-    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():53:53 -> Cb
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):32:32 -> a
-    2:2:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):45:45 -> a
-    3:3:com.android.tools.r8.graph.DexMethodHandle getValue():53:53 -> a
-    3:3:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):45 -> a
-    4:4:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):45:45 -> a
-    5:5:com.android.tools.r8.ir.code.Value dest():49:49 -> a
-    5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58 -> a
-    6:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:59 -> a
-    8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):64:64 -> a
-    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):81:81 -> a
-    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):117:117 -> a
-    11:11:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):116:116 -> a
-    12:12:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):123:123 -> a
-    13:13:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):128:128 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):69:69 -> b
+    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():48:48 -> Cb
+    1:1:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):40:40 -> a
+    2:2:com.android.tools.r8.graph.DexMethodHandle getValue():48:48 -> a
+    2:2:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):40 -> a
+    3:3:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):40:40 -> a
+    4:4:com.android.tools.r8.ir.code.Value dest():44:44 -> a
+    4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53 -> a
+    5:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:54 -> a
+    7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):59:59 -> a
+    8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):76:76 -> a
+    9:9:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):112:112 -> a
+    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):111:111 -> a
+    11:11:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):118:118 -> a
+    12:12:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):123:123 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):64:64 -> b
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> l
     boolean isOutConstant() -> mb
-    1:1:java.lang.String toString():91:91 -> toString
-    1:1:int maxInValueRegister():74:74 -> zb
-com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.ir.code.m:
+    1:1:java.lang.String toString():86:86 -> toString
+    1:1:int maxInValueRegister():69:69 -> zb
+com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.ir.code.o:
     com.android.tools.r8.graph.DexProto methodType -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():19:19 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProto):24:25 -> <init>
     int maxOutValueRegister() -> Ab
-    1:1:com.android.tools.r8.graph.DexProto getValue():51:51 -> Cb
+    1:1:com.android.tools.r8.graph.DexProto getValue():46:46 -> Cb
     boolean isConstMethodType() -> Da
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):30:30 -> a
-    2:2:com.android.tools.r8.ir.code.Value dest():47:47 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56 -> a
-    3:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56:57 -> a
-    5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):62:62 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):109:109 -> a
-    7:7:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):108:108 -> a
-    8:8:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):115:115 -> a
-    9:9:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):120:120 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67:67 -> b
+    1:1:com.android.tools.r8.ir.code.Value dest():42:42 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):51 -> a
+    2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):51:52 -> a
+    4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):57:57 -> a
+    5:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):104:104 -> a
+    6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):103:103 -> a
+    7:7:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):110:110 -> a
+    8:8:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):115:115 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):62:62 -> b
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> m
     boolean isOutConstant() -> mb
-    1:1:java.lang.String toString():83:83 -> toString
-    1:1:int maxInValueRegister():72:72 -> zb
+    1:1:java.lang.String toString():78:78 -> toString
+    1:1:int maxInValueRegister():67:67 -> zb
 com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.ir.code.ConstNumber:
     boolean $assertionsDisabled -> i
     long value -> h
     1:1:void <clinit>():32:32 -> <clinit>
     1:6:void <init>(com.android.tools.r8.ir.code.Value,long):37:42 -> <init>
     int maxOutValueRegister() -> Ab
-    1:1:boolean getBooleanValue():67:67 -> Cb
-    1:2:double getDoubleValue():87:88 -> Db
-    1:2:float getFloatValue():82:83 -> Eb
-    1:2:int getIntValue():71:72 -> Fb
-    3:5:int getIntValue():71:73 -> Fb
-    1:2:long getLongValue():77:78 -> Gb
-    1:1:boolean is16Bit():268:268 -> Hb
-    1:1:boolean is8Bit():260:260 -> Ib
-    1:1:boolean isIntegerOne():104:104 -> Jb
-    1:1:boolean isIntegerZero():100:100 -> Kb
-    1:1:boolean isZero():96:96 -> Lb
-    1:1:boolean negativeIs16Bit():272:272 -> Mb
-    1:1:boolean negativeIs8Bit():264:264 -> Nb
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):47:47 -> a
-    2:5:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):51:54 -> a
-    6:6:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstNumber):59:59 -> a
-    6:6:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):55 -> a
-    7:11:boolean isIntegerNegativeOne(com.android.tools.r8.ir.code.NumericType):108:112 -> a
-    12:38:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):117:143 -> a
-    39:47:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):124:132 -> a
-    48:48:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):150:150 -> a
-    49:52:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):155:158 -> a
-    53:53:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):164:164 -> a
-    54:71:int estimatedDexSize(com.android.tools.r8.ir.code.ValueType,long):202:219 -> a
-    54:71:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):164 -> a
-    72:102:int estimatedCfSize(com.android.tools.r8.ir.code.ValueType,long):168:198 -> a
-    72:102:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):164 -> a
-    103:103:int estimatedCfSize(com.android.tools.r8.ir.code.ValueType,long):191:191 -> a
-    103:103:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):164 -> a
-    104:104:int estimatedCfSize(com.android.tools.r8.ir.code.ValueType,long):185:185 -> a
-    104:104:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):164 -> a
-    105:106:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):293:294 -> a
-    107:110:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):299:302 -> a
-    111:111:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):307:307 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):252:256 -> b
-    6:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):312:315 -> b
-    10:10:boolean verifyTypes(com.android.tools.r8.graph.AppView):313:313 -> b
-    1:1:com.android.tools.r8.ir.code.Value dest():63:63 -> dest
-    1:1:long getRawValue():92:92 -> getRawValue
+    1:1:boolean getBooleanValue():62:62 -> Cb
+    1:2:double getDoubleValue():82:83 -> Db
+    1:2:float getFloatValue():77:78 -> Eb
+    1:2:int getIntValue():66:67 -> Fb
+    3:5:int getIntValue():66:68 -> Fb
+    1:2:long getLongValue():72:73 -> Gb
+    1:1:boolean is16Bit():259:259 -> Hb
+    1:1:boolean is8Bit():251:251 -> Ib
+    1:1:boolean isIntegerOne():99:99 -> Jb
+    1:1:boolean isIntegerZero():95:95 -> Kb
+    1:1:boolean isZero():91:91 -> Lb
+    1:1:boolean negativeIs16Bit():263:263 -> Mb
+    1:1:boolean negativeIs8Bit():255:255 -> Nb
+    1:4:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):46:49 -> a
+    5:5:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstNumber):54:54 -> a
+    5:5:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):50 -> a
+    6:10:boolean isIntegerNegativeOne(com.android.tools.r8.ir.code.NumericType):103:107 -> a
+    11:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):112:138 -> a
+    38:46:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):119:127 -> a
+    47:47:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):145:145 -> a
+    48:51:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):150:153 -> a
+    52:52:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):159:159 -> a
+    53:70:int estimatedDexSize(com.android.tools.r8.ir.code.ValueType,long):197:214 -> a
+    53:70:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):159 -> a
+    71:101:int estimatedCfSize(com.android.tools.r8.ir.code.ValueType,long):163:193 -> a
+    71:101:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):159 -> a
+    102:102:int estimatedCfSize(com.android.tools.r8.ir.code.ValueType,long):186:186 -> a
+    102:102:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):159 -> a
+    103:103:int estimatedCfSize(com.android.tools.r8.ir.code.ValueType,long):180:180 -> a
+    103:103:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):159 -> a
+    104:105:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):284:285 -> a
+    106:109:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):290:293 -> a
+    110:110:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):298:298 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):243:247 -> b
+    6:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):303:306 -> b
+    10:10:boolean verifyTypes(com.android.tools.r8.graph.AppView):304:304 -> b
+    1:1:com.android.tools.r8.ir.code.Value dest():58:58 -> dest
+    1:1:long getRawValue():87:87 -> getRawValue
     boolean isOutConstant() -> mb
-    1:4:java.lang.String toString():240:243 -> toString
-    1:1:int maxInValueRegister():229:229 -> zb
+    1:1:java.lang.String toString():235:235 -> toString
+    1:1:int maxInValueRegister():224:224 -> zb
 com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.ir.code.ConstString:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexString value -> h
@@ -18598,164 +18282,88 @@
     1:1:void <clinit>():21:21 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):27:29 -> <init>
     int maxOutValueRegister() -> Ab
-    1:1:com.android.tools.r8.graph.DexString getValue():54:54 -> Cb
+    1:1:com.android.tools.r8.graph.DexString getValue():49:49 -> Cb
     boolean isConstString() -> Ea
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):34:34 -> a
-    2:6:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):38:42 -> a
-    7:7:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):46:46 -> a
-    8:9:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:60 -> a
-    10:10:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):125:125 -> a
-    11:11:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):130:130 -> a
-    12:12:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):135:135 -> a
-    13:13:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):141:141 -> a
-    14:14:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):146:146 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):65:65 -> b
-    1:1:com.android.tools.r8.ir.code.Value dest():50:50 -> dest
-    1:1:boolean instructionTypeCanThrow():86:86 -> instructionTypeCanThrow
+    1:5:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):33:37 -> a
+    6:6:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):41:41 -> a
+    7:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:55 -> a
+    9:9:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):120:120 -> a
+    10:10:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):125:125 -> a
+    11:11:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):130:130 -> a
+    12:12:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):136:136 -> a
+    13:13:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):141:141 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):60:60 -> b
+    1:1:com.android.tools.r8.ir.code.Value dest():45:45 -> dest
+    1:1:boolean instructionTypeCanThrow():81:81 -> instructionTypeCanThrow
     boolean isOutConstant() -> mb
     com.android.tools.r8.ir.code.ConstString asConstString() -> n
-    1:11:boolean instructionInstanceCanThrow():106:116 -> ta
-    1:1:java.lang.String toString():81:81 -> toString
-    1:1:int maxInValueRegister():70:70 -> zb
-com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.ir.code.n:
-    boolean $assertionsDisabled -> a
-    1:1:void <clinit>():12:12 -> <clinit>
-    1:13:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):20:32 -> a
-    14:14:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):41:41 -> a
-    15:15:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    15:15:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):42 -> a
-    16:16:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):42:42 -> a
-    17:17:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    17:17:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):43 -> a
-    18:22:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):43:47 -> a
-    23:31:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):46:54 -> a
-com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.ir.code.o:
+    1:11:boolean instructionInstanceCanThrow():101:111 -> ta
+    1:1:java.lang.String toString():76:76 -> toString
+    1:1:int maxInValueRegister():65:65 -> zb
+com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.ir.code.p:
     1:1:void <init>():20:20 -> <init>
-    1:1:int maxOutValueRegister():60:60 -> Ab
+    1:1:int maxOutValueRegister():55:55 -> Ab
     boolean isDebugLocalRead() -> Ha
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):25:25 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):40:40 -> a
-    3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):45:45 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):66:66 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):50:50 -> b
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):35:35 -> a
+    2:2:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):40:40 -> a
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):61:61 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):45:45 -> b
     boolean hasInvariantOutType() -> qa
-    1:1:int maxInValueRegister():55:55 -> zb
-com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.ir.code.p:
+    1:1:int maxInValueRegister():50:50 -> zb
+com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.ir.code.q:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
     boolean isDebugLocalUninitialized() -> Ia
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):26:26 -> a
-com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.ir.code.q:
+com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.ir.code.r:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():27:27 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):30:31 -> <init>
     boolean isDebugLocalWrite() -> Ja
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
-    2:2:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):62:62 -> a
-    3:3:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):67:67 -> a
-    4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):73:73 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):56:56 -> b
+    1:1:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):57:57 -> a
+    2:2:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):62:62 -> a
+    3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):68:68 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):51:51 -> b
     boolean isOutConstant() -> mb
     com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite() -> o
-com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.ir.code.r:
+com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.ir.code.s:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap starting -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap ending -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):27:30 -> <init>
-    1:1:int maxOutValueRegister():78:78 -> Ab
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():39:39 -> Cb
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():43:43 -> Db
+    1:1:int maxOutValueRegister():73:73 -> Ab
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():34:34 -> Cb
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():38:38 -> Db
     boolean isDebugLocalsChange() -> Ka
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):35:35 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:58 -> a
-    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):99:99 -> a
-    4:13:boolean apply(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):104:113 -> a
-    14:14:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):120:120 -> a
-    15:15:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):130:130 -> a
-    1:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):63:68 -> b
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:53 -> a
+    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):94:94 -> a
+    3:12:boolean apply(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):99:108 -> a
+    13:13:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):115:115 -> a
+    14:14:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):125:125 -> a
+    1:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):58:63 -> b
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> p
     boolean hasInvariantOutType() -> qa
-    1:6:java.lang.String toString():88:93 -> toString
-    1:1:int maxInValueRegister():73:73 -> zb
-com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.ir.code.s:
+    1:6:java.lang.String toString():83:88 -> toString
+    1:1:int maxInValueRegister():68:68 -> zb
+com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.ir.code.t:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():20:20 -> <init>
-    1:1:int maxOutValueRegister():56:56 -> Ab
+    1:1:int maxOutValueRegister():51:51 -> Ab
     boolean isDebugPosition() -> La
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):25:25 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):40:40 -> a
-    3:3:void com.android.tools.r8.ir.conversion.DexBuilder.addDebugPosition(com.android.tools.r8.ir.code.DebugPosition):609:609 -> a
-    3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):41 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):62:62 -> a
-    5:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):82:84 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):46:46 -> b
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):35:35 -> a
+    2:2:void com.android.tools.r8.ir.conversion.DexBuilder.addDebugPosition(com.android.tools.r8.ir.code.DebugPosition):585:585 -> a
+    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):36 -> a
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):57:57 -> a
+    4:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):77:79 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):41:41 -> b
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> q
     boolean hasInvariantOutType() -> qa
-    1:1:int maxInValueRegister():51:51 -> zb
-com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.ir.code.t:
-    1:1:void <init>():7:7 -> <init>
-    java.lang.Object visit(com.android.tools.r8.ir.code.MoveException) -> A
-    java.lang.Object visit(com.android.tools.r8.ir.code.Mul) -> B
-    java.lang.Object visit(com.android.tools.r8.ir.code.Neg) -> C
-    java.lang.Object visit(com.android.tools.r8.ir.code.NewArrayEmpty) -> D
-    java.lang.Object visit(com.android.tools.r8.ir.code.NewArrayFilledData) -> E
-    java.lang.Object visit(com.android.tools.r8.ir.code.NonNull) -> F
-    java.lang.Object visit(com.android.tools.r8.ir.code.Not) -> G
-    java.lang.Object visit(com.android.tools.r8.ir.code.NumberConversion) -> H
-    java.lang.Object visit(com.android.tools.r8.ir.code.And) -> I
-    java.lang.Object visit(com.android.tools.r8.ir.code.Or) -> J
-    java.lang.Object visit(com.android.tools.r8.ir.code.Pop) -> K
-    java.lang.Object visit(com.android.tools.r8.ir.code.Rem) -> L
-    java.lang.Object visit(com.android.tools.r8.ir.code.Return) -> M
-    java.lang.Object visit(com.android.tools.r8.ir.code.Shl) -> N
-    java.lang.Object visit(com.android.tools.r8.ir.code.Shr) -> O
-    java.lang.Object visit(com.android.tools.r8.ir.code.Store) -> P
-    java.lang.Object visit(com.android.tools.r8.ir.code.Sub) -> Q
-    java.lang.Object visit(com.android.tools.r8.ir.code.Swap) -> R
-    java.lang.Object visit(com.android.tools.r8.ir.code.Switch) -> S
-    java.lang.Object visit(com.android.tools.r8.ir.code.Argument) -> T
-    java.lang.Object visit(com.android.tools.r8.ir.code.Throw) -> U
-    java.lang.Object visit(com.android.tools.r8.ir.code.Ushr) -> V
-    java.lang.Object visit(com.android.tools.r8.ir.code.Xor) -> W
-    java.lang.Object visit(com.android.tools.r8.ir.code.ArrayGet) -> X
-    java.lang.Object visit(com.android.tools.r8.ir.code.ArrayLength) -> Y
-    java.lang.Object visit(com.android.tools.r8.ir.code.ArrayPut) -> Z
-    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 visit(com.android.tools.r8.ir.code.Add) -> a
-    java.lang.Object com.android.tools.r8.ir.code.InstructionVisitor.visit(com.android.tools.r8.ir.code.NewInstance) -> a
-    java.lang.Object visit(com.android.tools.r8.ir.code.CheckCast) -> aa
-    java.lang.Object visit(com.android.tools.r8.ir.code.AlwaysMaterializingDefinition) -> b
-    java.lang.Object visit(com.android.tools.r8.ir.code.Cmp) -> c
-    java.lang.Object visit(com.android.tools.r8.ir.code.ConstClass) -> d
-    java.lang.Object visit(com.android.tools.r8.ir.code.ConstMethodHandle) -> e
-    java.lang.Object visit(com.android.tools.r8.ir.code.ConstMethodType) -> f
-    java.lang.Object visit(com.android.tools.r8.ir.code.ConstNumber) -> g
-    java.lang.Object visit(com.android.tools.r8.ir.code.ConstString) -> h
-    java.lang.Object visit(com.android.tools.r8.ir.code.DebugLocalRead) -> i
-    java.lang.Object visit(com.android.tools.r8.ir.code.DebugLocalsChange) -> j
-    java.lang.Object visit(com.android.tools.r8.ir.code.DebugLocalUninitialized) -> k
-    java.lang.Object visit(com.android.tools.r8.ir.code.DebugLocalWrite) -> l
-    java.lang.Object visit(com.android.tools.r8.ir.code.AlwaysMaterializingNop) -> m
-    java.lang.Object visit(com.android.tools.r8.ir.code.DebugPosition) -> n
-    java.lang.Object visit(com.android.tools.r8.ir.code.DexItemBasedConstString) -> o
-    java.lang.Object visit(com.android.tools.r8.ir.code.Div) -> p
-    java.lang.Object visit(com.android.tools.r8.ir.code.Dup) -> q
-    java.lang.Object visit(com.android.tools.r8.ir.code.Dup2) -> r
-    java.lang.Object visit(com.android.tools.r8.ir.code.Goto) -> s
-    java.lang.Object visit(com.android.tools.r8.ir.code.If) -> t
-    java.lang.Object visit(com.android.tools.r8.ir.code.Inc) -> u
-    java.lang.Object visit(com.android.tools.r8.ir.code.InstanceOf) -> v
-    java.lang.Object visit(com.android.tools.r8.ir.code.Load) -> w
-    java.lang.Object visit(com.android.tools.r8.ir.code.AlwaysMaterializingUser) -> x
-    java.lang.Object visit(com.android.tools.r8.ir.code.Monitor) -> y
-    java.lang.Object visit(com.android.tools.r8.ir.code.Move) -> z
+    1:1:int maxInValueRegister():46:46 -> zb
 com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.ir.code.u:
     com.android.tools.r8.graph.DexReference item -> h
     boolean $assertionsDisabled -> k
@@ -18765,52 +18373,50 @@
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexReference,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):28:28 -> <init>
     2:5:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexReference,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo):36:39 -> <init>
     int maxOutValueRegister() -> Ab
-    1:1:com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo getClassNameComputationInfo():57:57 -> Cb
-    1:1:com.android.tools.r8.graph.DexReference getItem():53:53 -> Db
+    1:1:com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo getClassNameComputationInfo():52:52 -> Cb
+    1:1:com.android.tools.r8.graph.DexReference getItem():48:48 -> Db
     boolean isDexItemBasedConstString() -> Ma
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):44:44 -> a
-    2:2:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):48:48 -> a
-    3:3:com.android.tools.r8.graph.DexReference getItem():53:53 -> a
-    3:3:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):49 -> a
-    4:4:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):49:49 -> a
-    5:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:73 -> a
-    7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):125:125 -> a
-    8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):130:130 -> a
-    9:9:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):136:136 -> a
-    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):141:141 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):81:81 -> b
-    1:1:boolean instructionTypeCanThrow():102:102 -> instructionTypeCanThrow
+    1:1:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):43:43 -> a
+    2:2:com.android.tools.r8.graph.DexReference getItem():48:48 -> a
+    2:2:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):44 -> a
+    3:3:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):44:44 -> a
+    4:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:68 -> a
+    6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):120:120 -> a
+    7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):125:125 -> a
+    8:8:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):131:131 -> a
+    9:9:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):136:136 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):76:76 -> b
+    1:1:boolean instructionTypeCanThrow():97:97 -> instructionTypeCanThrow
     boolean isOutConstant() -> mb
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> r
     boolean instructionInstanceCanThrow() -> ta
-    1:1:java.lang.String toString():97:97 -> toString
-    1:1:int maxInValueRegister():86:86 -> zb
+    1:1:java.lang.String toString():92:92 -> toString
+    1:1:int maxInValueRegister():81:81 -> zb
 com.android.tools.r8.ir.code.Div -> com.android.tools.r8.ir.code.Div:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
     boolean isCommutative() -> Db
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():143:143 -> Hb
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():138:138 -> Hb
     boolean isDiv() -> Na
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):29:29 -> a
-    2:2:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):64:64 -> a
-    3:3:int foldIntegers(int,int):109:109 -> a
-    4:4:long foldLongs(long,long):114:114 -> a
-    5:9:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):134:138 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):59:59 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):84:84 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):99:99 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):49:49 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):79:79 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):69:69 -> d
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):94:94 -> d
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):74:74 -> e
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):89:89 -> e
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):54:54 -> f
-    1:1:boolean instructionTypeCanThrow():129:129 -> instructionTypeCanThrow
+    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):59:59 -> a
+    2:2:int foldIntegers(int,int):104:104 -> a
+    3:3:long foldLongs(long,long):109:109 -> a
+    4:8:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):129:133 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):54:54 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):79:79 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:94 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):44:44 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):74:74 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):64:64 -> d
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):89:89 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):69:69 -> e
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):84:84 -> e
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):49:49 -> f
+    1:1:boolean instructionTypeCanThrow():124:124 -> instructionTypeCanThrow
     com.android.tools.r8.ir.code.Div asDiv() -> s
-com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.ir.code.w:
+com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.ir.code.y:
     com.android.tools.r8.ir.code.BasicBlock[] sorted -> a
     com.android.tools.r8.ir.code.BasicBlock[] doms -> b
     boolean obsolete -> e
@@ -18821,46 +18427,45 @@
     1:1:void <init>(com.android.tools.r8.ir.code.IRCode):37:37 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):40:40 -> <init>
     3:50:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):30:77 -> <init>
-    51:52:void numberBlocks():220:221 -> <init>
+    51:52:void numberBlocks():222:223 -> <init>
     51:52:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):79 -> <init>
-    53:82:void build():236:265 -> <init>
+    53:82:void build():238:267 -> <init>
     53:82:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):80 -> <init>
     83:83:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):84:84 -> <init>
-    84:85:boolean recordChangesToControlFlowEdges(java.util.List):300:301 -> <init>
+    84:85:boolean recordChangesToControlFlowEdges(java.util.List):302:303 -> <init>
     84:85:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):84 -> <init>
     1:1:boolean dominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):103:103 -> a
     2:8:boolean strictlyDominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):118:124 -> a
     2:8:boolean dominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):107 -> a
     9:16:com.android.tools.r8.ir.code.BasicBlock closestDominator(java.util.Collection):141:148 -> a
     17:22:java.util.List dominatedBlocks(com.android.tools.r8.ir.code.BasicBlock):155:160 -> a
-    23:24:java.lang.Iterable dominatorBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree$Inclusive):173:174 -> a
-    25:25:com.android.tools.r8.ir.code.BasicBlock[] getSortedBlocks():216:216 -> a
+    23:24:java.lang.Iterable dominatorBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree$Inclusive):177:178 -> a
+    25:25:com.android.tools.r8.ir.code.BasicBlock[] getSortedBlocks():218:218 -> a
     1:2:com.android.tools.r8.ir.code.BasicBlock immediateDominator(com.android.tools.r8.ir.code.BasicBlock):91:92 -> b
-    3:30:java.util.Iterator lambda$dominatorBlocks$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree$Inclusive):175:202 -> b
-    31:34:java.lang.Iterable normalExitDominatorBlocks():209:212 -> b
-    35:35:boolean postorderCompareLess(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):227:227 -> b
-    35:35:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):276 -> b
-    36:36:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):277:277 -> b
-    37:37:boolean postorderCompareLess(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):227:227 -> b
-    37:37:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):279 -> b
-    38:38:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):280:280 -> b
-    1:1:void onPredecessorsMayChange(com.android.tools.r8.ir.code.BasicBlock):313:313 -> c
-    1:1:void onSuccessorsMayChange(com.android.tools.r8.ir.code.BasicBlock):308:308 -> d
-    1:9:java.lang.String toString():288:296 -> toString
+    3:30:java.util.Iterator lambda$dominatorBlocks$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree$Inclusive):179:206 -> b
+    31:31:boolean postorderCompareLess(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):229:229 -> b
+    31:31:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):278 -> b
+    32:32:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):279:279 -> b
+    33:33:boolean postorderCompareLess(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):229:229 -> b
+    33:33:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):281 -> b
+    34:34:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):282:282 -> b
+    1:1:void onPredecessorsMayChange(com.android.tools.r8.ir.code.BasicBlock):315:315 -> c
+    1:1:void onSuccessorsMayChange(com.android.tools.r8.ir.code.BasicBlock):310:310 -> d
+    1:9:java.lang.String toString():290:298 -> toString
 com.android.tools.r8.ir.code.DominatorTree$1 -> com.android.tools.r8.ir.code.v:
     com.android.tools.r8.ir.code.DominatorTree this$0 -> c
     com.android.tools.r8.ir.code.BasicBlock val$dominated -> b
     boolean $assertionsDisabled -> d
     com.android.tools.r8.ir.code.BasicBlock current -> a
-    1:1:void <clinit>():176:176 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.code.DominatorTree,com.android.tools.r8.ir.code.BasicBlock):176:177 -> <init>
-    1:1:boolean hasNext():181:181 -> hasNext
-    1:1:boolean hasNext():181:181 -> next
-    1:1:com.android.tools.r8.ir.code.BasicBlock next():186 -> next
-    1:1:java.lang.Object next():176 -> next
-    2:7:com.android.tools.r8.ir.code.BasicBlock next():189:194 -> next
-    2:7:java.lang.Object next():176 -> next
-com.android.tools.r8.ir.code.DominatorTree$Assumption -> com.android.tools.r8.ir.code.w$a:
+    1:1:void <clinit>():180:180 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.code.DominatorTree,com.android.tools.r8.ir.code.BasicBlock):180:181 -> <init>
+    1:1:boolean hasNext():185:185 -> hasNext
+    1:1:boolean hasNext():185:185 -> next
+    1:1:com.android.tools.r8.ir.code.BasicBlock next():190 -> next
+    1:1:java.lang.Object next():180 -> next
+    2:7:com.android.tools.r8.ir.code.BasicBlock next():193:198 -> next
+    2:7:java.lang.Object next():180 -> next
+com.android.tools.r8.ir.code.DominatorTree$Assumption -> com.android.tools.r8.ir.code.w:
     com.android.tools.r8.ir.code.DominatorTree$Assumption MAY_HAVE_UNREACHABLE_BLOCKS -> b
     com.android.tools.r8.ir.code.DominatorTree$Assumption NO_UNREACHABLE_BLOCKS -> a
     1:2:void <clinit>():19:20 -> <clinit>
@@ -18872,49 +18477,47 @@
     1:2:void <clinit>():24:25 -> <clinit>
     3:3:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(java.lang.String,int):23:23 -> <init>
-com.android.tools.r8.ir.code.Dup -> com.android.tools.r8.ir.code.z:
+com.android.tools.r8.ir.code.Dup -> com.android.tools.r8.ir.code.A:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():17:17 -> <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):20:20 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.Value):24:25 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):20 -> <init>
-    1:1:int maxOutValueRegister():86:86 -> Ab
-    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():45:45 -> Cb
-    1:1:com.android.tools.r8.ir.code.StackValue outBottom():49 -> Cb
-    2:2:com.android.tools.r8.ir.code.StackValue outBottom():49:49 -> Cb
-    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():45:45 -> Db
-    1:1:com.android.tools.r8.ir.code.StackValue outTop():53 -> Db
-    2:2:com.android.tools.r8.ir.code.StackValue outTop():53:53 -> Db
+    1:1:int maxOutValueRegister():81:81 -> Ab
+    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():40:40 -> Cb
+    1:1:com.android.tools.r8.ir.code.StackValue outBottom():44 -> Cb
+    2:2:com.android.tools.r8.ir.code.StackValue outBottom():44:44 -> Cb
+    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():40:40 -> Db
+    1:1:com.android.tools.r8.ir.code.StackValue outTop():48 -> Db
+    2:2:com.android.tools.r8.ir.code.StackValue outTop():48:48 -> Db
     boolean isDup() -> Oa
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):30:30 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:62 -> a
-    3:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):67:70 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):92:92 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):76:76 -> b
-    1:6:void setOutValue(com.android.tools.r8.ir.code.Value):35:40 -> e
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:57 -> a
+    2:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):62:65 -> a
+    6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):87:87 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:71 -> b
+    1:6:void setOutValue(com.android.tools.r8.ir.code.Value):30:35 -> e
     boolean hasInvariantOutType() -> qa
-    1:1:com.android.tools.r8.ir.code.StackValue src():57:57 -> src
+    1:1:com.android.tools.r8.ir.code.StackValue src():52:52 -> src
     com.android.tools.r8.ir.code.Dup asDup() -> t
     int maxInValueRegister() -> zb
-com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.ir.code.y:
+com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.ir.code.z:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):27:27 -> <init>
     2:7:void <init>(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):34:39 -> <init>
     2:7: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):27 -> <init>
-    1:1:int maxOutValueRegister():100:100 -> Ab
+    1:1:int maxOutValueRegister():95:95 -> Ab
     boolean isDup2() -> Pa
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):44:44 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):80:80 -> a
-    3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):85:85 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):106:106 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):90:90 -> b
-    1:6:void setOutValue(com.android.tools.r8.ir.code.Value):49:54 -> e
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
+    2:2:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80:80 -> a
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):101:101 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85:85 -> b
+    1:6:void setOutValue(com.android.tools.r8.ir.code.Value):44:49 -> e
     boolean hasInvariantOutType() -> qa
     int maxInValueRegister() -> zb
-com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.ir.code.A:
+com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.ir.code.B:
     com.android.tools.r8.graph.DexField field -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.MemberType type -> h
@@ -18944,18 +18547,17 @@
     2:2:void <init>():17:17 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):21 -> <init>
     3:3:void <init>(com.android.tools.r8.ir.code.BasicBlock):22:22 -> <init>
-    1:1:int maxOutValueRegister():60:60 -> Ab
-    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():31:34 -> Cb
+    1:1:int maxOutValueRegister():55:55 -> Ab
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():26:29 -> Cb
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):27:27 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):49:49 -> a
-    3:4:void print(com.android.tools.r8.utils.CfgPrinter):74:75 -> a
-    5:10:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):99:104 -> a
-    11:11:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):112:112 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:80 -> b
-    1:4:java.lang.String toString():66:69 -> toString
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):44:44 -> a
+    2:3:void print(com.android.tools.r8.utils.CfgPrinter):69:70 -> a
+    4:9:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):94:99 -> a
+    10:10:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):107:107 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> b
+    1:4:java.lang.String toString():61:64 -> toString
     com.android.tools.r8.ir.code.Goto asGoto() -> v
-    1:1:int maxInValueRegister():54:54 -> zb
+    1:1:int maxInValueRegister():49:49 -> zb
 com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.ir.code.IRCode:
     boolean $assertionsDisabled -> k
     com.android.tools.r8.ir.code.ValueNumberGenerator valueNumberGenerator -> a
@@ -19014,13 +18616,12 @@
     1:7:java.util.List computeNormalExitBlocks():727:733 -> computeNormalExitBlocks
     1:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():822:823 -> d
     3:3:boolean isMarkingColorInUse(int):897:897 -> d
-    1:1:java.util.ListIterator listIterator(int):741:741 -> e
-    2:2:boolean doAllThrowingInstructionsHavePositions():832:832 -> e
+    1:1:boolean doAllThrowingInstructionsHavePositions():832:832 -> e
+    2:4:void returnMarkingColor(int):891:893 -> e
     1:1:com.android.tools.r8.ir.code.BasicBlock entryBlock():139:139 -> entryBlock
-    1:1:int getHighestBlockNumber():818:818 -> f
-    2:4:void returnMarkingColor(int):891:893 -> f
-    1:2:boolean verifyNoBlocksMarked(int):394:395 -> g
-    3:3:int getNextInstructionNumber():765:765 -> g
+    1:2:boolean verifyNoBlocksMarked(int):394:395 -> f
+    3:3:int getHighestBlockNumber():818:818 -> f
+    1:1:int getNextInstructionNumber():765:765 -> g
     1:7:com.android.tools.r8.ir.code.Value getThis():790:796 -> h
     1:9:java.util.Set getUnreachableBlocks():914:922 -> i
     1:1:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():723:723 -> instructionIterator
@@ -19085,7 +18686,7 @@
     1:5:void <init>(java.util.Set,java.util.Set,java.util.Deque):53:57 -> <init>
     1:2:boolean equals(java.lang.Object):67:68 -> equals
     1:1:int hashCode():62:62 -> hashCode
-com.android.tools.r8.ir.code.IRCodeInstructionsIterator -> com.android.tools.r8.ir.code.B:
+com.android.tools.r8.ir.code.IRCodeInstructionsIterator -> com.android.tools.r8.ir.code.C:
     java.util.ListIterator blockIterator -> a
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> b
     boolean $assertionsDisabled -> c
@@ -19118,33 +18719,32 @@
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.Value):73:74 -> <init>
     3:4:void <init>(com.android.tools.r8.ir.code.If$Type,java.util.List):78:79 -> <init>
-    1:1:int maxOutValueRegister():165:165 -> Ab
-    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():103:106 -> Cb
-    1:1:com.android.tools.r8.ir.code.If$Type getType():92:92 -> Db
-    1:4:void invert():96:99 -> Eb
-    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():200:202 -> Fb
+    1:1:int maxOutValueRegister():160:160 -> Ab
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():98:101 -> Cb
+    1:1:com.android.tools.r8.ir.code.If$Type getType():87:87 -> Db
+    1:4:void invert():91:94 -> Eb
+    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():195:197 -> Fb
     1:3:boolean verifyTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.If$Type):65:67 -> a
-    4:4:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):84:84 -> a
-    5:6:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):126:127 -> a
-    7:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):132:132 -> a
-    8:8:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode):137:137 -> a
-    9:10:void print(com.android.tools.r8.utils.CfgPrinter):171:172 -> a
-    11:13:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber):187:189 -> a
-    14:17:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.ConstNumber):193:196 -> a
-    18:18:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):236:236 -> a
-    19:26:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):241:248 -> a
-    1:4:void setTrueTarget(com.android.tools.r8.ir.code.BasicBlock):110:113 -> b
-    5:10:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):177:182 -> b
-    11:26:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):206:221 -> b
-    27:35:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):211:219 -> b
-    36:36:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):217:217 -> b
-    37:37:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):215:215 -> b
-    38:38:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):213:213 -> b
-    39:39:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):209:209 -> b
-    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():118:121 -> fallthroughBlock
-    1:1:boolean isZeroTest():88:88 -> isZeroTest
-    1:8:java.lang.String toString():147:154 -> toString
-    1:1:int maxInValueRegister():160:160 -> zb
+    4:5:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):121:122 -> a
+    6:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):127:127 -> a
+    7:7:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode):132:132 -> a
+    8:9:void print(com.android.tools.r8.utils.CfgPrinter):166:167 -> a
+    10:12:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber):182:184 -> a
+    13:16:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.ConstNumber):188:191 -> a
+    17:17:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):231:231 -> a
+    18:25:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):236:243 -> a
+    1:4:void setTrueTarget(com.android.tools.r8.ir.code.BasicBlock):105:108 -> b
+    5:10:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):172:177 -> b
+    11:26:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):201:216 -> b
+    27:35:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):206:214 -> b
+    36:36:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):212:212 -> b
+    37:37:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):210:210 -> b
+    38:38:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):208:208 -> b
+    39:39:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):204:204 -> b
+    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():113:116 -> fallthroughBlock
+    1:1:boolean isZeroTest():83:83 -> isZeroTest
+    1:8:java.lang.String toString():142:149 -> toString
+    1:1:int maxInValueRegister():155:155 -> zb
 com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.ir.code.If$Type:
     com.android.tools.r8.ir.code.If$Type[] $VALUES -> a
     1:1:void <clinit>():23:23 -> <clinit>
@@ -19162,23 +18762,22 @@
     19:27:com.android.tools.r8.ir.code.If$Type inverted():49:57 -> b
     28:28:com.android.tools.r8.ir.code.If$Type inverted():47:47 -> b
     1:1:com.android.tools.r8.ir.code.If$Type[] values():22:22 -> values
-com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> com.android.tools.r8.ir.code.C:
+com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> com.android.tools.r8.ir.code.D:
     void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver) -> a
     com.android.tools.r8.ir.code.MemberType getMemberType() -> a
-com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.ir.code.D:
-    boolean $assertionsDisabled -> i
-    int increment -> h
+com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.ir.code.E:
+    boolean $assertionsDisabled -> b
+    int increment -> a
     1:1:void <clinit>():20:20 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,int):25:27 -> <init>
     int maxOutValueRegister() -> Ab
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):32:32 -> a
-    2:2:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):65:65 -> a
-    3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:70 -> a
-    4:4:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):76:76 -> a
-    5:15:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):81:91 -> a
-    1:2:void addInValue(com.android.tools.r8.ir.code.Value):38:39 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49:49 -> b
-    1:1:java.lang.String toString():97:97 -> toString
+    1:1:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):60:60 -> a
+    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:65 -> a
+    3:3:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):71:71 -> a
+    4:14:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):76:86 -> a
+    1:2:void addInValue(com.android.tools.r8.ir.code.Value):33:34 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):44:44 -> b
+    1:1:java.lang.String toString():92:92 -> toString
     int maxInValueRegister() -> zb
 com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.ir.code.InstanceGet:
     boolean $assertionsDisabled -> k
@@ -19186,76 +18785,70 @@
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):41:41 -> <init>
     int maxOutValueRegister() -> Ab
     boolean isInstanceGet() -> Sa
-    1:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:97 -> a
-    34:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):95:95 -> a
-    35:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:76 -> a
-    36:55:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:91 -> a
-    56:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):88:88 -> a
-    57:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):85:85 -> a
-    58:58:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:82 -> a
-    59:79:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79:99 -> a
-    80:101:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):110:131 -> a
-    102:102:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):156:156 -> a
-    103:103:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InstanceGet):159:159 -> a
-    103:103:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):46 -> a
-    104:104:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):176:176 -> a
-    105:105:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):182:182 -> a
-    106:107:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):187:188 -> a
-    108:109:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):193:194 -> a
-    110:110:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):193:193 -> a
-    111:111:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):199:199 -> a
-    112:112:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):209:209 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):146:150 -> b
-    1:1:com.android.tools.r8.ir.code.Value dest():50:50 -> dest
+    1:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60:92 -> a
+    34:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):90:90 -> a
+    35:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:71 -> a
+    36:55:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:86 -> a
+    56:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83:83 -> a
+    57:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):80:80 -> a
+    58:58:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:77 -> a
+    59:79:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74:94 -> a
+    80:101:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):105:126 -> a
+    102:102:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):151:151 -> a
+    103:103:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):171:171 -> a
+    104:104:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):177:177 -> a
+    105:106:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):182:183 -> a
+    107:108:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):188:189 -> a
+    109:109:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):188:188 -> a
+    110:110:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):194:194 -> a
+    111:111:boolean definitelyTriggersClassInitialization(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):203:203 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):141:145 -> b
+    1:1:com.android.tools.r8.ir.code.Value dest():45:45 -> dest
     boolean couldIntroduceAnAlias() -> fa
-    1:2:com.android.tools.r8.ir.code.Value object():54:55 -> object
-    1:1:java.lang.String toString():171:171 -> toString
+    1:2:com.android.tools.r8.ir.code.Value object():49:50 -> object
+    1:1:java.lang.String toString():166:166 -> toString
     com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> w
     int maxInValueRegister() -> zb
 com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.ir.code.InstanceOf:
     com.android.tools.r8.graph.DexType type -> h
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):24:25 -> <init>
     int maxOutValueRegister() -> Ab
-    1:1:com.android.tools.r8.graph.DexType type():34:34 -> Cb
+    1:1:com.android.tools.r8.graph.DexType type():29:29 -> Cb
     boolean isInstanceOf() -> Ta
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):30:30 -> a
-    2:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47:49 -> a
-    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):85:85 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):90:90 -> a
-    7:8:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):100:101 -> a
-    9:9:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):106:106 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):69:69 -> b
-    1:1:com.android.tools.r8.ir.code.Value dest():38:38 -> dest
+    1:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):42:44 -> a
+    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):80:80 -> a
+    5:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):85:85 -> a
+    6:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):95:96 -> a
+    8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):101:101 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):64:64 -> b
+    1:1:com.android.tools.r8.ir.code.Value dest():33:33 -> dest
     boolean hasInvariantOutType() -> qa
-    1:1:com.android.tools.r8.ir.code.Value value():42:42 -> value
+    1:1:com.android.tools.r8.ir.code.Value value():37:37 -> value
     com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> x
     int maxInValueRegister() -> zb
 com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.ir.code.InstancePut:
     boolean $assertionsDisabled -> k
-    1:1:void <clinit>():34:34 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):37:39 -> <init>
-    1:1:int maxOutValueRegister():135:135 -> Ab
-    1:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:89 -> a
-    33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):87:87 -> a
-    34:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:68 -> a
-    35:54:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:83 -> a
-    55:55:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):80:80 -> a
-    56:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:77 -> a
-    57:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74:74 -> a
-    58:78:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:91 -> a
-    79:79:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):142:142 -> a
-    80:80:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):162:162 -> a
-    81:82:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):167:168 -> a
-    83:83:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):167:167 -> a
-    84:84:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InstancePut):169:169 -> a
-    84:84:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):44 -> a
-    85:85:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):173:173 -> a
-    86:86:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):183:183 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):121:125 -> b
-    1:11:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):101:111 -> identicalAfterRegisterAllocation
-    1:1:com.android.tools.r8.ir.code.Value object():48:48 -> object
-    1:1:java.lang.String toString():157:157 -> toString
-    1:1:com.android.tools.r8.ir.code.Value value():52:52 -> value
+    1:1:void <clinit>():33:33 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):36:38 -> <init>
+    1:1:int maxOutValueRegister():109:109 -> Ab
+    1:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52:83 -> a
+    33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81:81 -> a
+    34:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:62 -> a
+    35:54:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:77 -> a
+    55:55:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74:74 -> a
+    56:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:71 -> a
+    57:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:68 -> a
+    58:78:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:85 -> a
+    79:79:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):116:116 -> a
+    80:80:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):136:136 -> a
+    81:82:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):141:142 -> a
+    83:83:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):141:141 -> a
+    84:84:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):147:147 -> a
+    85:85:boolean definitelyTriggersClassInitialization(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):156:156 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):95:99 -> b
+    1:1:com.android.tools.r8.ir.code.Value object():42:42 -> object
+    1:1:java.lang.String toString():131:131 -> toString
+    1:1:com.android.tools.r8.ir.code.Value value():46:46 -> value
     int maxInValueRegister() -> zb
 com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.ir.code.Instruction:
     java.util.List inValues -> b
@@ -19277,7 +18870,7 @@
     int maxOutValueRegister() -> Ab
     com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> B
     boolean isConstInstruction() -> Ba
-    1:1:void removeOrReplaceByDebugLocalRead():266:266 -> Bb
+    1:1:void removeOrReplaceByDebugLocalRead():264:264 -> Bb
     com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> C
     boolean isConstMethodHandle() -> Ca
     com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> D
@@ -19285,9 +18878,9 @@
     com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> E
     boolean isConstString() -> Ea
     com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> F
-    1:5:boolean isCreatingInstanceOrArray():1187:1191 -> Fa
+    1:5:boolean isCreatingInstanceOrArray():1185:1189 -> Fa
     com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> G
-    1:4:boolean isDebugInstruction():996:999 -> Ga
+    1:4:boolean isDebugInstruction():994:997 -> Ga
     com.android.tools.r8.ir.code.Load asLoad() -> H
     boolean isDebugLocalRead() -> Ha
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> I
@@ -19309,7 +18902,7 @@
     com.android.tools.r8.ir.code.Not asNot() -> Q
     boolean isFieldInstruction() -> Qa
     com.android.tools.r8.ir.code.Or asOr() -> R
-    1:1:boolean isFieldPut():768:768 -> Ra
+    1:1:boolean isFieldPut():766:766 -> Ra
     com.android.tools.r8.ir.code.Rem asRem() -> S
     boolean isInstanceGet() -> Sa
     com.android.tools.r8.ir.code.Shl asShl() -> T
@@ -19327,116 +18920,115 @@
     com.android.tools.r8.ir.code.Switch asSwitch() -> Z
     boolean isInvokePolymorphic() -> Za
     boolean isInvokeSuper() -> _a
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
     void buildDex(com.android.tools.r8.ir.conversion.DexBuilder) -> a
-    boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption) -> a
+    boolean definitelyTriggersClassInitialization(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) -> a
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
     boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator) -> a
     boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory) -> a
-    1:6:void addDebugValue(com.android.tools.r8.ir.code.Value):130:135 -> a
-    7:13:void clearUserInfo(com.android.tools.r8.ir.code.Instruction):140:146 -> a
-    14:17:void replaceValue(int,com.android.tools.r8.ir.code.Value):168:171 -> a
-    18:27:void replaceDebugValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):175:184 -> a
-    28:34:com.android.tools.r8.ir.code.Value removeDebugValue(com.android.tools.r8.graph.DebugLocalInfo):218:224 -> a
-    35:49:void print(com.android.tools.r8.utils.CfgPrinter):305:319 -> a
-    50:51:void setNumber(int):334:335 -> a
-    52:52:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):483:483 -> a
-    53:59:boolean identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):487:493 -> a
-    60:60:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):513:513 -> a
-    61:61:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):518:518 -> a
-    62:63:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):1206:1207 -> a
-    64:67:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):1213:1216 -> a
-    68:70:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):1221:1223 -> a
-    71:73:boolean verifyValidPositionInfo(boolean):1275:1277 -> a
+    1:6:void addDebugValue(com.android.tools.r8.ir.code.Value):128:133 -> a
+    7:13:void clearUserInfo(com.android.tools.r8.ir.code.Instruction):138:144 -> a
+    14:17:void replaceValue(int,com.android.tools.r8.ir.code.Value):166:169 -> a
+    18:27:void replaceDebugValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):173:182 -> a
+    28:34:com.android.tools.r8.ir.code.Value removeDebugValue(com.android.tools.r8.graph.DebugLocalInfo):216:222 -> a
+    35:49:void print(com.android.tools.r8.utils.CfgPrinter):303:317 -> a
+    50:51:void setNumber(int):332:333 -> a
+    52:52:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):481:481 -> a
+    53:59:boolean identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):485:491 -> a
+    60:60:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):511:511 -> a
+    61:61:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):516:516 -> a
+    62:63:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):1204:1205 -> a
+    64:67:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):1211:1214 -> a
+    68:70:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):1219:1221 -> a
+    71:73:boolean verifyValidPositionInfo(boolean):1272:1274 -> a
     com.android.tools.r8.ir.code.Throw asThrow() -> aa
     boolean isJumpInstruction() -> ab
     com.android.tools.r8.ir.code.Add asAdd() -> b
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> b
-    1:4:void addInValue(com.android.tools.r8.ir.code.Value):86:89 -> b
-    5:8:void replaceValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):159:162 -> b
-    9:9:void printLIR(com.android.tools.r8.utils.CfgPrinter):326:326 -> b
-    10:21:boolean verifyTypes(com.android.tools.r8.graph.AppView):1228:1239 -> b
+    1:4:void addInValue(com.android.tools.r8.ir.code.Value):84:87 -> b
+    5:8:void replaceValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):157:160 -> b
+    9:9:void printLIR(com.android.tools.r8.utils.CfgPrinter):324:324 -> b
+    10:21:boolean verifyTypes(com.android.tools.r8.graph.AppView):1226:1237 -> b
     com.android.tools.r8.ir.code.Ushr asUshr() -> ba
     boolean isLoad() -> bb
     com.android.tools.r8.ir.code.And asAnd() -> c
     boolean needsValueInRegister(com.android.tools.r8.ir.code.Value) -> c
-    1:2:boolean identicalNonValueParts(com.android.tools.r8.ir.code.Instruction):344:345 -> c
+    1:2:boolean identicalNonValueParts(com.android.tools.r8.ir.code.Instruction):342:343 -> c
     com.android.tools.r8.ir.code.Xor asXor() -> ca
     boolean isLogicalBinop() -> cb
     com.android.tools.r8.ir.code.Argument asArgument() -> d
-    1:7:void moveDebugValues(com.android.tools.r8.ir.code.Instruction):190:196 -> d
-    8:16:void removeDebugValue(com.android.tools.r8.ir.code.Value):206:214 -> d
-    1:2:void clearBlock():261:262 -> da
+    1:7:void moveDebugValues(com.android.tools.r8.ir.code.Instruction):188:194 -> d
+    8:16:void removeDebugValue(com.android.tools.r8.ir.code.Value):204:212 -> d
+    1:2:void clearBlock():259:260 -> da
     boolean isMonitor() -> db
     com.android.tools.r8.ir.code.ArithmeticBinop asArithmeticBinop() -> e
-    1:4:void setOutValue(com.android.tools.r8.ir.code.Value):112:115 -> e
-    5:5:void replace(com.android.tools.r8.ir.code.Instruction):270:270 -> e
-    1:5:void clearDebugValues():233:237 -> ea
+    1:4:void setOutValue(com.android.tools.r8.ir.code.Value):110:113 -> e
+    5:5:void replace(com.android.tools.r8.ir.code.Instruction):268:268 -> e
+    1:5:void clearDebugValues():231:235 -> ea
     boolean isMove() -> eb
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> f
-    1:5:com.android.tools.r8.ir.code.Value swapOutValue(com.android.tools.r8.ir.code.Value):120:124 -> f
+    1:5:com.android.tools.r8.ir.code.Value swapOutValue(com.android.tools.r8.ir.code.Value):118:122 -> f
     boolean couldIntroduceAnAlias() -> fa
     boolean isMoveException() -> fb
     com.android.tools.r8.ir.code.Binop asBinop() -> g
-    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():1182:1182 -> ga
+    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():1180:1180 -> ga
     boolean isMul() -> gb
-    1:2:com.android.tools.r8.ir.code.BasicBlock getBlock():245:246 -> getBlock
+    1:2:com.android.tools.r8.ir.code.BasicBlock getBlock():243:244 -> getBlock
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> h
-    1:1:java.util.Set getDebugValues():559:559 -> ha
+    1:1:java.util.Set getDebugValues():557:557 -> ha
     boolean isNeg() -> hb
     com.android.tools.r8.ir.code.Cmp asCmp() -> i
-    1:1:java.lang.String getInstructionName():281:281 -> ia
+    1:1:java.lang.String getInstructionName():279:279 -> ia
     boolean isNewArrayEmpty() -> ib
-    1:10:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):436:445 -> identicalAfterRegisterAllocation
-    11:25:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):442:456 -> identicalAfterRegisterAllocation
-    26:58:boolean identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):400:432 -> identicalAfterRegisterAllocation
-    26:58:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):455 -> identicalAfterRegisterAllocation
-    59:69:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):459:469 -> identicalAfterRegisterAllocation
-    70:105:boolean identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):355:390 -> identicalAfterRegisterAllocation
-    70:105:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):469 -> identicalAfterRegisterAllocation
-    106:122:boolean identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):379:395 -> identicalAfterRegisterAllocation
-    106:122:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):469 -> identicalAfterRegisterAllocation
-    123:124:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):475:476 -> identicalAfterRegisterAllocation
+    1:10:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):434:443 -> identicalAfterRegisterAllocation
+    11:25:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):440:454 -> identicalAfterRegisterAllocation
+    26:58:boolean identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):398:430 -> identicalAfterRegisterAllocation
+    26:58:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):453 -> identicalAfterRegisterAllocation
+    59:69:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):457:467 -> identicalAfterRegisterAllocation
+    70:105:boolean identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):353:388 -> identicalAfterRegisterAllocation
+    70:105:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):467 -> identicalAfterRegisterAllocation
+    106:122:boolean identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):377:393 -> identicalAfterRegisterAllocation
+    106:122:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):467 -> identicalAfterRegisterAllocation
+    123:124:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):473:474 -> identicalAfterRegisterAllocation
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> j
-    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():555:555 -> ja
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():553:553 -> ja
     boolean isNewArrayFilledData() -> jb
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> k
-    1:1:int getNumber():330:330 -> ka
+    1:1:int getNumber():328:328 -> ka
     boolean isNot() -> kb
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> l
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> la
     boolean isOr() -> lb
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> m
-    1:2:com.android.tools.r8.ir.code.Position getPosition():67:68 -> ma
+    1:2:com.android.tools.r8.ir.code.Position getPosition():65:66 -> ma
     boolean isOutConstant() -> mb
     com.android.tools.r8.ir.code.ConstString asConstString() -> n
-    1:1:java.lang.String getPositionAsString():77:77 -> na
+    1:1:java.lang.String getPositionAsString():75:75 -> na
     boolean isPop() -> nb
     com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite() -> o
-    1:1:boolean hasBlock():277:277 -> oa
+    1:1:boolean hasBlock():275:275 -> oa
     boolean isRem() -> ob
-    1:1:com.android.tools.r8.ir.code.ValueType outType():151:151 -> outType
-    1:1:com.android.tools.r8.ir.code.Value outValue():108:108 -> outValue
+    1:1:com.android.tools.r8.ir.code.ValueType outType():149:149 -> outType
+    1:1:com.android.tools.r8.ir.code.Value outValue():106:106 -> outValue
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> p
-    1:2:boolean hasInValueWithLocalInfo():95:96 -> pa
+    1:2:boolean hasInValueWithLocalInfo():93:94 -> pa
     boolean isShl() -> pb
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> q
     boolean hasInvariantOutType() -> qa
     boolean isShr() -> qb
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> r
-    1:1:boolean hasOutValue():104:104 -> ra
+    1:1:boolean hasOutValue():102:102 -> ra
     boolean isStaticGet() -> rb
     com.android.tools.r8.ir.code.Div asDiv() -> s
-    1:1:java.util.List inValues():81:81 -> sa
+    1:1:java.util.List inValues():79:79 -> sa
     boolean isStore() -> sb
-    1:2:void setBlock(com.android.tools.r8.ir.code.BasicBlock):253:254 -> setBlock
-    1:2:void setPosition(com.android.tools.r8.ir.code.Position):72:73 -> setPosition
+    1:2:void setBlock(com.android.tools.r8.ir.code.BasicBlock):251:252 -> setBlock
+    1:2:void setPosition(com.android.tools.r8.ir.code.Position):70:71 -> setPosition
     com.android.tools.r8.ir.code.Dup asDup() -> t
-    1:1:boolean instructionInstanceCanThrow():508:508 -> ta
+    1:1:boolean instructionInstanceCanThrow():506:506 -> ta
     boolean isSub() -> tb
-    1:14:java.lang.String toString():286:299 -> toString
+    1:14:java.lang.String toString():284:297 -> toString
     com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> u
     boolean isAnd() -> ua
     boolean isSwap() -> ub
@@ -19457,13 +19049,13 @@
     int maxInValueRegister() -> zb
 com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.ir.code.InstructionListIterator:
     void setInsertionPosition(com.android.tools.r8.ir.code.Position) -> a
-    1:3:com.android.tools.r8.ir.code.Instruction peekNext():42:44 -> a
-    1:3:com.android.tools.r8.ir.code.Instruction peekPrevious():27:29 -> b
-    1:3:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode):165:167 -> inlineInvoke
-    1:1:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode):90:90 -> split
-    2:2:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int):117:117 -> split
-com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.ir.code.E:
-com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.ir.code.F:
+    1:3:com.android.tools.r8.ir.code.Instruction peekPrevious():25:27 -> a
+    1:3:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode):145:147 -> inlineInvoke
+    1:3:com.android.tools.r8.ir.code.Instruction peekNext():40:42 -> peekNext
+    1:1:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode):70:70 -> split
+    2:2:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int):97:97 -> split
+com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.ir.code.F:
+com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.ir.code.H:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):61:61 -> <init>
@@ -19497,7 +19089,7 @@
     1:1:java.lang.String getInstructionName():252:252 -> ia
     com.android.tools.r8.ir.code.Invoke asInvoke() -> y
     1:3:int maxInValueRegister():196:198 -> zb
-com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.ir.code.F$a:
+com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.ir.code.G:
     com.android.tools.r8.ir.code.Invoke$Type NEW_ARRAY -> f
     com.android.tools.r8.ir.code.Invoke$Type MULTI_NEW_ARRAY -> g
     com.android.tools.r8.ir.code.Invoke$Type[] $VALUES -> j
@@ -19516,94 +19108,83 @@
     19:29:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):42:52 -> a
     30:40:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):40:50 -> a
     41:44:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):44:47 -> a
-com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.ir.code.G:
+com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.ir.code.I:
     com.android.tools.r8.graph.DexCallSite callSite -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():20:20 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.ir.code.Value,java.util.List):25:27 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getReturnType():37:37 -> Db
+    1:1:com.android.tools.r8.graph.DexType getReturnType():32:32 -> Db
     java.lang.String getTypeString() -> Fb
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():41:41 -> Hb
+    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():36:36 -> Hb
     boolean isInvokeCustom() -> Va
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():41:41 -> a
-    1:1:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):133 -> a
-    2:2:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):133:133 -> a
-    3:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:67 -> a
-    9:9:com.android.tools.r8.graph.DexCallSite getCallSite():41:41 -> a
-    9:9:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67 -> a
-    10:14:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:71 -> a
-    15:15:com.android.tools.r8.graph.DexCallSite getCallSite():41:41 -> a
-    15:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):73 -> a
-    16:23:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):73:80 -> a
-    24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):85:85 -> a
-    25:25:com.android.tools.r8.graph.DexCallSite getCallSite():41:41 -> a
-    25:25:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):85 -> a
-    26:26:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):85:85 -> a
-    27:27:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):106:106 -> a
-    28:28:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):113:113 -> a
-    29:29:com.android.tools.r8.graph.DexCallSite getCallSite():41:41 -> a
-    29:29:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):114 -> a
-    30:33:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):114:117 -> a
-    34:34:com.android.tools.r8.graph.DexCallSite getCallSite():41:41 -> a
-    34:34:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):118 -> a
-    35:38:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):118:121 -> a
-    39:39:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeCustom):174:174 -> a
-    39:39:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):32 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):90:90 -> b
+    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():36:36 -> a
+    1:1:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):128 -> a
+    2:2:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):128:128 -> a
+    3:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:62 -> a
+    9:9:com.android.tools.r8.graph.DexCallSite getCallSite():36:36 -> a
+    9:9:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62 -> a
+    10:14:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:66 -> a
+    15:15:com.android.tools.r8.graph.DexCallSite getCallSite():36:36 -> a
+    15:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68 -> a
+    16:23:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:75 -> a
+    24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80:80 -> a
+    25:25:com.android.tools.r8.graph.DexCallSite getCallSite():36:36 -> a
+    25:25:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80 -> a
+    26:26:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80:80 -> a
+    27:27:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):101:101 -> a
+    28:28:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):108:108 -> a
+    29:29:com.android.tools.r8.graph.DexCallSite getCallSite():36:36 -> a
+    29:29:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):109 -> a
+    30:33:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):109:112 -> a
+    34:34:com.android.tools.r8.graph.DexCallSite getCallSite():36:36 -> a
+    34:34:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):113 -> a
+    35:38:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):113:116 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85:85 -> b
     boolean hasInvariantOutType() -> qa
-    1:1:java.lang.String toString():56:56 -> toString
+    1:1:java.lang.String toString():51:51 -> toString
     com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom() -> z
 com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.ir.code.InvokeDirect:
     boolean $assertionsDisabled -> m
     boolean itf -> l
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):42:45 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():56:56 -> Eb
+    1:1:void <clinit>():28:28 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):33:33 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):37:40 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():46:46 -> Eb
     java.lang.String getTypeString() -> Fb
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:85 -> a
-    20:23:boolean sameConstructorReceiverValue(com.android.tools.r8.ir.code.Invoke):94:97 -> a
-    24:24:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):118:118 -> a
-    25:25:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):131:131 -> a
-    26:26:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):136:136 -> a
-    27:27:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):146:146 -> a
-    28:71:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):153:196 -> a
-    72:72:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeDirect):179:179 -> a
-    72:72:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):51 -> a
-    73:114:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):212:253 -> a
-    115:115:boolean lambda$canBeDeadCode$0(java.util.List,com.android.tools.r8.ir.code.Instruction):247:247 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):102:102 -> b
-com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.ir.code.H:
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:75 -> a
+    20:23:boolean sameConstructorReceiverValue(com.android.tools.r8.ir.code.Invoke):84:87 -> a
+    24:24:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexType):108:108 -> a
+    25:25:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):121:121 -> a
+    26:26:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):126:126 -> a
+    27:27:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):135:135 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92:92 -> b
+com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.ir.code.J:
     boolean $assertionsDisabled -> l
-    1:1:void <clinit>():27:27 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):30:30 -> <init>
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):25:25 -> <init>
     com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface() -> A
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():40:40 -> Eb
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():30:30 -> Eb
     java.lang.String getTypeString() -> Fb
     boolean isInvokeInterface() -> Wa
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):51:69 -> a
-    20:22:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):90:92 -> a
-    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):104:104 -> a
-    24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):109:109 -> a
-    25:25:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):119:119 -> a
-    26:26:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeInterface):184:184 -> a
-    26:26:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):35 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):74:74 -> b
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):41:59 -> a
+    20:22:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexType):80:82 -> a
+    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):94:94 -> a
+    24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):99:99 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):64:64 -> b
 com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.ir.code.InvokeMethod:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexMethod method -> i
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):27:28 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getReturnType():33:33 -> Db
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):26:27 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getReturnType():32:32 -> Db
     com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis) -> a
-    com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType) -> a
-    1:9:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):98:106 -> a
-    10:10:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):118:118 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):42:42 -> b
-    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():37:37 -> getInvokedMethod
-    1:13:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):75:87 -> identicalAfterRegisterAllocation
+    com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexType) -> a
+    1:9:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):74:82 -> a
+    10:10:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):94:94 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):41:41 -> b
+    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():36:36 -> getInvokedMethod
     boolean hasInvariantOutType() -> qa
-    1:1:java.lang.String toString():47:47 -> toString
+    1:1:java.lang.String toString():46:46 -> toString
 com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.ir.code.InvokeMethodWithReceiver:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():17:17 -> <clinit>
@@ -19612,27 +19193,25 @@
     2:2:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):47:47 -> a
     1:4:boolean verifyTypes(com.android.tools.r8.graph.AppView):52:55 -> b
     1:1:com.android.tools.r8.ir.code.Value getReceiver():34:34 -> getReceiver
-com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.ir.code.I:
+com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.ir.code.K:
     com.android.tools.r8.graph.DexType type -> i
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,java.util.List):26:27 -> <init>
     com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> B
-    1:1:com.android.tools.r8.graph.DexType getArrayType():51:51 -> Db
-    1:1:com.android.tools.r8.graph.DexType getReturnType():56 -> Db
+    1:1:com.android.tools.r8.graph.DexType getArrayType():46:46 -> Db
+    1:1:com.android.tools.r8.graph.DexType getReturnType():51 -> Db
     java.lang.String getTypeString() -> Fb
-    1:1:com.android.tools.r8.graph.DexType getArrayType():51:51 -> Hb
+    1:1:com.android.tools.r8.graph.DexType getArrayType():46:46 -> Hb
     boolean isInvokeMultiNewArray() -> Xa
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):72:72 -> a
-    2:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):77:77 -> a
-    3:3:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):88:88 -> a
-    4:5:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):93:94 -> a
-    6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):99:99 -> a
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):67:67 -> a
+    2:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):72:72 -> a
+    3:3:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):83:83 -> a
+    4:5:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):88:89 -> a
+    6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):94:94 -> a
     7:7:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):99 -> a
-    8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):99:99 -> a
-    9:9:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):104:104 -> a
-    10:10:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeMultiNewArray):189:189 -> a
-    10:10:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):32 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> b
+    7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):94 -> a
+    8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):94:94 -> a
+    9:9:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):99:99 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):61:61 -> b
     boolean hasInvariantOutType() -> qa
 com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.ir.code.InvokeNewArray:
     com.android.tools.r8.graph.DexType type -> i
@@ -19640,108 +19219,98 @@
     1:1:void <clinit>():22:22 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,java.util.List):27:28 -> <init>
     com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> C
-    1:1:com.android.tools.r8.graph.DexType getReturnType():38:38 -> Db
+    1:1:com.android.tools.r8.graph.DexType getReturnType():33:33 -> Db
     java.lang.String getTypeString() -> Fb
-    1:1:com.android.tools.r8.graph.DexType getArrayType():42:42 -> Hb
-    1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():132:132 -> Ib
+    1:1:com.android.tools.r8.graph.DexType getArrayType():37:37 -> Hb
+    1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():127:127 -> Ib
     boolean isInvokeNewArray() -> Ya
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:81 -> a
-    20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):102:102 -> a
-    21:21:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):107:107 -> a
-    22:22:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):118:118 -> a
-    23:23:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):123:123 -> a
-    24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):128:128 -> a
-    25:25:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeNewArray):194:194 -> a
-    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):33 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):86:86 -> b
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:76 -> a
+    20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):97:97 -> a
+    21:21:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):102:102 -> a
+    22:22:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):113:113 -> a
+    23:23:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):118:118 -> a
+    24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):123:123 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):81:81 -> b
     boolean hasInvariantOutType() -> qa
-    1:1:java.lang.String toString():57:57 -> toString
-com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.ir.code.J:
+    1:1:java.lang.String toString():52:52 -> toString
+com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.ir.code.L:
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexProto proto -> k
     1:1:void <clinit>():26:26 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):31:32 -> <init>
     com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> D
-    1:1:com.android.tools.r8.graph.DexType getReturnType():42:42 -> Db
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():47:47 -> Eb
+    1:1:com.android.tools.r8.graph.DexType getReturnType():37:37 -> Db
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():42:42 -> Eb
     java.lang.String getTypeString() -> Fb
-    1:1:com.android.tools.r8.graph.DexProto getProto():56:56 -> Hb
+    1:1:com.android.tools.r8.graph.DexProto getProto():51:51 -> Hb
     boolean isInvokePolymorphic() -> Za
-    com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType) -> a
-    1:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:68 -> a
-    8:8:com.android.tools.r8.graph.DexProto getProto():56:56 -> a
-    8:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68 -> a
-    9:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:74 -> a
-    16:16:com.android.tools.r8.graph.DexProto getProto():56:56 -> a
-    16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75 -> a
-    17:24:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:82 -> a
-    25:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):87:93 -> a
-    32:32:com.android.tools.r8.graph.DexProto getProto():56:56 -> a
-    32:32:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):93 -> a
-    33:34:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):93:94 -> a
-    35:35:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):131:131 -> a
-    36:36:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):139:139 -> a
-    37:37:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokePolymorphic):199:199 -> a
-    37:37:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):37 -> a
-    1:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):99:101 -> b
-com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.ir.code.K:
+    com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexType) -> a
+    1:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:63 -> a
+    8:8:com.android.tools.r8.graph.DexProto getProto():51:51 -> a
+    8:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63 -> a
+    9:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:69 -> a
+    16:16:com.android.tools.r8.graph.DexProto getProto():51:51 -> a
+    16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70 -> a
+    17:24:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:77 -> a
+    25:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):82:88 -> a
+    32:32:com.android.tools.r8.graph.DexProto getProto():51:51 -> a
+    32:32:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):88 -> a
+    33:34:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):88:89 -> a
+    35:35:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):126:126 -> a
+    36:36:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):134:134 -> a
+    1:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:96 -> b
+com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.ir.code.M:
     boolean itf -> k
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():31:31 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):36:37 -> <init>
     3:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):41:42 -> <init>
     com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> E
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():52:52 -> Eb
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():47:47 -> Eb
     java.lang.String getTypeString() -> Fb
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:81 -> a
-    20:21:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):102:103 -> a
-    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):116:116 -> a
-    23:23:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):124:124 -> a
-    24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):129:129 -> a
-    25:25:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):139:139 -> a
-    26:36:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):146:156 -> a
-    37:38:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):102:103 -> a
-    37:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):157 -> a
-    39:54:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):163:178 -> a
-    55:55:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):177:177 -> a
-    56:56:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):180:180 -> a
-    57:57:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):188:188 -> a
-    58:58:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):204:204 -> a
-    58:58:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):47 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):86:86 -> b
-com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.ir.code.L:
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:76 -> a
+    20:21:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexType):97:98 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):111:111 -> a
+    23:23:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):119:119 -> a
+    24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):124:124 -> a
+    25:25:boolean definitelyTriggersClassInitialization(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):133:133 -> a
+    26:36:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):140:150 -> a
+    37:38:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexType):97:98 -> a
+    37:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):151 -> a
+    39:54:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):157:172 -> a
+    55:55:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):171:171 -> a
+    56:56:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):174:174 -> a
+    57:57:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):182:182 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):81:81 -> b
+com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.ir.code.N:
     boolean $assertionsDisabled -> m
     boolean itf -> l
     1:1:void <clinit>():27:27 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):32:33 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():43:43 -> Eb
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():38:38 -> Eb
     com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> F
     java.lang.String getTypeString() -> Fb
     boolean isInvokeSuper() -> _a
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:72 -> a
-    20:20:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):77:77 -> a
-    21:24:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):101:104 -> a
-    25:25:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):118:118 -> a
-    26:26:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):128:128 -> a
-    27:27:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeSuper):209:209 -> a
-    27:27:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):38 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):82:82 -> b
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):49:67 -> a
+    20:20:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):72:72 -> a
+    21:24:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexType):96:99 -> a
+    25:25:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):113:113 -> a
+    26:26:boolean definitelyTriggersClassInitialization(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):122:122 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):77:77 -> b
 com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.ir.code.InvokeVirtual:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():27:27 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):30:30 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():40:40 -> Eb
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():35:35 -> Eb
     java.lang.String getTypeString() -> Fb
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):51:69 -> a
-    20:22:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):90:92 -> a
-    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):104:104 -> a
-    24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):109:109 -> a
-    25:25:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):119:119 -> a
-    26:37:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):126:137 -> a
-    38:38:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):146:146 -> a
-    39:39:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeVirtual):214:214 -> a
-    39:39:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):35 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):74:74 -> b
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):46:64 -> a
+    20:22:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexType):85:87 -> a
+    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):99:99 -> a
+    24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):104:104 -> a
+    25:25:boolean definitelyTriggersClassInitialization(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):113:113 -> a
+    26:41:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120:135 -> a
+    42:42:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):144:144 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):69:69 -> b
 com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.ir.code.JumpInstruction:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():13:13 -> <clinit>
@@ -19758,47 +19327,45 @@
     com.android.tools.r8.ir.code.InstructionListIterator currentBlockIterator -> b
     boolean $assertionsDisabled -> c
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> a
-    1:1:void <clinit>():15:15 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.BasicBlock):21:21 -> <init>
-    2:9:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):24:31 -> <init>
-    1:1:void add(com.android.tools.r8.ir.code.Instruction):74:74 -> a
-    2:5:boolean isLinearEdge(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):83:86 -> a
-    6:16:com.android.tools.r8.ir.code.BasicBlock getBeginningOfTrivialLinearGotoChain(com.android.tools.r8.ir.code.BasicBlock):117:127 -> a
-    1:1:void add(java.lang.Object):15:15 -> add
-    1:1:void set(com.android.tools.r8.ir.code.Instruction):172:172 -> b
-    1:1:boolean hasNext():91:91 -> hasNext
-    1:4:boolean hasPrevious():132:135 -> hasPrevious
-    1:1:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):68:68 -> inlineInvoke
-    1:1:java.lang.Object next():15:15 -> next
-    2:19:com.android.tools.r8.ir.code.Instruction next():96:113 -> next
-    1:1:int nextIndex():157:157 -> nextIndex
-    1:1:java.lang.Object previous():15:15 -> previous
-    2:14:com.android.tools.r8.ir.code.Instruction previous():140:152 -> previous
-    1:1:int previousIndex():162:162 -> previousIndex
-    1:1:void remove():167:167 -> remove
-    1:1:void removeOrReplaceByDebugLocalRead():79:79 -> removeOrReplaceByDebugLocalRead
-    1:1:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):37:37 -> replaceCurrentInstruction
-    1:1:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set):46:46 -> replaceCurrentInstructionWithThrowNull
-    1:1:void set(java.lang.Object):15:15 -> set
-    1:1:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):52:52 -> split
-    2:2:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):57:57 -> split
-com.android.tools.r8.ir.code.Load -> com.android.tools.r8.ir.code.M:
+    1:1:void <clinit>():13:13 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.BasicBlock):19:19 -> <init>
+    2:9:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):22:29 -> <init>
+    1:1:void add(com.android.tools.r8.ir.code.Instruction):62:62 -> a
+    2:5:boolean isLinearEdge(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):71:74 -> a
+    6:16:com.android.tools.r8.ir.code.BasicBlock getBeginningOfTrivialLinearGotoChain(com.android.tools.r8.ir.code.BasicBlock):105:115 -> a
+    1:1:void add(java.lang.Object):13:13 -> add
+    1:1:void set(com.android.tools.r8.ir.code.Instruction):160:160 -> b
+    1:1:boolean hasNext():79:79 -> hasNext
+    1:4:boolean hasPrevious():120:123 -> hasPrevious
+    1:1:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.List,com.android.tools.r8.graph.DexType):56:56 -> inlineInvoke
+    1:1:java.lang.Object next():13:13 -> next
+    2:19:com.android.tools.r8.ir.code.Instruction next():84:101 -> next
+    1:1:int nextIndex():145:145 -> nextIndex
+    1:1:java.lang.Object previous():13:13 -> previous
+    2:14:com.android.tools.r8.ir.code.Instruction previous():128:140 -> previous
+    1:1:int previousIndex():150:150 -> previousIndex
+    1:1:void remove():155:155 -> remove
+    1:1:void removeOrReplaceByDebugLocalRead():67:67 -> removeOrReplaceByDebugLocalRead
+    1:1:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):35:35 -> replaceCurrentInstruction
+    1:1:void set(java.lang.Object):13:13 -> set
+    1:1:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):40:40 -> split
+    2:2:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):45:45 -> split
+com.android.tools.r8.ir.code.Load -> com.android.tools.r8.ir.code.O:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):23:23 -> <init>
-    1:1:int maxOutValueRegister():57:57 -> Ab
+    1:1:int maxOutValueRegister():52:52 -> Ab
     com.android.tools.r8.ir.code.Load asLoad() -> H
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):28:28 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):63:63 -> a
-    3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:68 -> a
-    4:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):73:74 -> a
-    6:6:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):80:80 -> a
-    7:7:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):90:90 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):47:47 -> b
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):58:58 -> a
+    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:63 -> a
+    3:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):68:69 -> a
+    5:5:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):75:75 -> a
+    6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):85:85 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):42:42 -> b
     boolean isLoad() -> bb
     boolean hasInvariantOutType() -> qa
-    1:1:com.android.tools.r8.ir.code.Value src():32:32 -> src
+    1:1:com.android.tools.r8.ir.code.Value src():27:27 -> src
     int maxInValueRegister() -> zb
-com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.ir.code.N:
+com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.ir.code.P:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):20:20 -> <init>
@@ -19821,7 +19388,7 @@
     1:5:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):44:48 -> c
     boolean isLogicalBinop() -> cb
     com.android.tools.r8.code.Instruction CreateLong(int,int,int) -> d
-com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.ir.code.O:
+com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.ir.code.Q:
     com.android.tools.r8.ir.code.MemberType BYTE -> c
     com.android.tools.r8.ir.code.MemberType BOOLEAN -> b
     com.android.tools.r8.ir.code.MemberType SHORT -> e
@@ -19868,19 +19435,18 @@
     com.android.tools.r8.ir.code.Monitor$Type type -> h
     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:1:int maxOutValueRegister():81:81 -> Ab
-    1:1:boolean isEnter():44:44 -> Cb
+    1:1:int maxOutValueRegister():76:76 -> Ab
+    1:1:boolean isEnter():39:39 -> Cb
     com.android.tools.r8.ir.code.Monitor asMonitor() -> J
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
-    2:9:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:65 -> a
-    10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):103:103 -> a
-    11:11:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):125:125 -> a
-    12:12:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):130:130 -> a
-    13:13:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):135:135 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:71 -> b
+    1:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:60 -> a
+    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):98:98 -> a
+    10:10:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):120:120 -> a
+    11:11:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):125:125 -> a
+    12:12:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):130:130 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> b
     boolean isMonitor() -> db
-    1:7:java.lang.String getInstructionName():108:114 -> ia
-    1:1:com.android.tools.r8.ir.code.Value object():40:40 -> object
+    1:7:java.lang.String getInstructionName():103:109 -> ia
+    1:1:com.android.tools.r8.ir.code.Value object():35:35 -> object
     boolean hasInvariantOutType() -> qa
     int maxInValueRegister() -> zb
 com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.ir.code.Monitor$Type:
@@ -19893,84 +19459,80 @@
     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>
     int maxOutValueRegister() -> Ab
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):29:29 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47:47 -> a
-    3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):52:52 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):99:99 -> a
-    5:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):104:104 -> a
-    6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):114:114 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67:67 -> b
-    1:1:com.android.tools.r8.ir.code.Value dest():33:33 -> dest
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):42:42 -> a
+    2:2:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):47:47 -> a
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):94:94 -> a
+    4:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):99:99 -> a
+    5:5:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):109:109 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):62:62 -> b
+    1:1:com.android.tools.r8.ir.code.Value dest():28:28 -> dest
     boolean isMove() -> eb
     boolean couldIntroduceAnAlias() -> fa
-    1:2:com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction():82:83 -> la
-    1:1:boolean isOutConstant():77:77 -> mb
+    1:2:com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction():77:78 -> la
+    1:1:boolean isOutConstant():72:72 -> mb
     boolean hasInvariantOutType() -> qa
-    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> src
-    1:1:java.lang.String toString():72:72 -> toString
+    1:1:com.android.tools.r8.ir.code.Value src():32:32 -> src
+    1:1:java.lang.String toString():67:67 -> toString
     int maxInValueRegister() -> zb
-com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.ir.code.P:
+com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.ir.code.S:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType exceptionType -> h
     com.android.tools.r8.utils.InternalOptions options -> i
     1:1:void <clinit>():20:20 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):25:27 -> <init>
     int maxOutValueRegister() -> Ab
-    1:1:com.android.tools.r8.graph.DexType getExceptionType():116:116 -> Cb
+    1:1:com.android.tools.r8.graph.DexType getExceptionType():111:111 -> Cb
     com.android.tools.r8.ir.code.MoveException asMoveException() -> K
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):32:32 -> a
-    2:2:com.android.tools.r8.ir.code.Value dest():36:36 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):41 -> a
-    3:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):41:42 -> a
-    5:6:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):79:80 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):86:86 -> a
-    8:8:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):91:91 -> a
-    9:9:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):107:107 -> a
-    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):112:112 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):58:62 -> b
+    1:1:com.android.tools.r8.ir.code.Value dest():31:31 -> a
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):36 -> a
+    2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):36:37 -> a
+    4:5:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):74:75 -> a
+    6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):81:81 -> a
+    7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):86:86 -> a
+    8:8:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):102:102 -> a
+    9:9:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):107:107 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):53:57 -> b
     boolean isMoveException() -> fb
     boolean hasInvariantOutType() -> qa
-    1:1:int maxInValueRegister():47:47 -> zb
-com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.ir.code.Q:
+    1:1:int maxInValueRegister():42:42 -> zb
+com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.ir.code.T:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
     boolean isCommutative() -> Db
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():134:134 -> Hb
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():129:129 -> Hb
     com.android.tools.r8.ir.code.Mul asMul() -> L
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):27:27 -> a
-    2:2:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):64:64 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):56:56 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):84:84 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):99:99 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):40:40 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):79:79 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):69:69 -> d
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):94:94 -> d
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):74:74 -> e
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):89:89 -> e
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):48:48 -> f
+    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):59:59 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):51:51 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):79:79 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:94 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):35:35 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):74:74 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):64:64 -> d
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):89:89 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):69:69 -> e
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):84:84 -> e
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):43:43 -> f
     boolean isMul() -> gb
-com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.ir.code.S:
-    com.android.tools.r8.ir.code.NumericType type -> h
-    boolean $assertionsDisabled -> i
+com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.ir.code.U:
+    com.android.tools.r8.ir.code.NumericType type -> a
+    boolean $assertionsDisabled -> b
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):26:27 -> <init>
     com.android.tools.r8.ir.code.Neg asNeg() -> M
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.dest():22:22 -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):50 -> a
-    2:18:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):50:66 -> a
-    19:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:63 -> a
-    20:20:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60:60 -> a
-    21:21:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:57 -> a
-    22:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:68 -> a
-    37:37:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):32:32 -> a
-    38:56:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):83:101 -> a
-    57:57:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):106:106 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):44:44 -> b
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45 -> a
+    2:18:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:61 -> a
+    19:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:58 -> a
+    20:20:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:55 -> a
+    21:21:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52:52 -> a
+    22:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):49:63 -> a
+    37:55:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):78:96 -> a
+    56:56:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):101:101 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):39:39 -> b
     boolean isNeg() -> hb
 com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.ir.code.NewArrayEmpty:
     boolean $assertionsDisabled -> i
@@ -19978,72 +19540,65 @@
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):26:27 -> <init>
     int maxOutValueRegister() -> Ab
-    1:1:com.android.tools.r8.ir.code.Value size():45:45 -> Cb
+    1:1:com.android.tools.r8.ir.code.Value size():40:40 -> Cb
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> N
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):32:32 -> a
-    2:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):50:52 -> a
-    5:10:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):81:86 -> a
-    11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):107:107 -> a
-    12:12:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):118:118 -> a
-    13:14:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):123:124 -> a
-    15:16:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):129:130 -> a
-    17:17:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):135:135 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):91:91 -> b
-    1:1:com.android.tools.r8.ir.code.Value dest():41:41 -> dest
+    1:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:47 -> a
+    4:9:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):76:81 -> a
+    10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):102:102 -> a
+    11:11:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):113:113 -> a
+    12:13:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):118:119 -> a
+    14:15:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):124:125 -> a
+    16:16:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):130:130 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):86:86 -> b
+    1:1:com.android.tools.r8.ir.code.Value dest():36:36 -> dest
     boolean isNewArrayEmpty() -> ib
     boolean hasInvariantOutType() -> qa
-    1:4:boolean instructionInstanceCanThrow():73:76 -> ta
-    1:1:java.lang.String toString():37:37 -> toString
+    1:4:boolean instructionInstanceCanThrow():68:71 -> ta
+    1:1:java.lang.String toString():32:32 -> toString
     int maxInValueRegister() -> zb
-com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.ir.code.T:
+com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.ir.code.V:
     long size -> i
     short[] data -> j
     boolean $assertionsDisabled -> k
     int element_width -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.code.Value,int,long,short[]):30:33 -> <init>
-    1:1:int maxOutValueRegister():78:78 -> Ab
-    1:1:com.android.tools.r8.code.FillArrayDataPayload createPayload():46:46 -> Cb
+    1:1:int maxOutValueRegister():73:73 -> Ab
+    1:1:com.android.tools.r8.code.FillArrayDataPayload createPayload():41:41 -> Cb
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> O
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):38:38 -> a
-    2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):51:52 -> a
-    4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):57:57 -> a
-    5:10:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):84:89 -> a
-    11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):113:113 -> a
-    12:12:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):118:118 -> a
-    1:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):62:68 -> b
+    1:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):46:47 -> a
+    3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):52:52 -> a
+    4:9:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):79:84 -> a
+    10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):108:108 -> a
+    11:11:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):113:113 -> a
+    1:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):57:63 -> b
     boolean isNewArrayFilledData() -> jb
     boolean hasInvariantOutType() -> qa
-    1:1:com.android.tools.r8.ir.code.Value src():42:42 -> src
+    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> src
     int maxInValueRegister() -> zb
 com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.ir.code.NewInstance:
     boolean allowSpilling -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType clazz -> h
-    1:1:void <clinit>():26:26 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):32:32 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):29:34 -> <init>
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):29:29 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):26:31 -> <init>
     int maxOutValueRegister() -> Ab
-    1:1:boolean isSpillingAllowed():182:182 -> Cb
-    1:1:void markNoSpilling():178:178 -> Db
+    1:1:boolean isSpillingAllowed():128:128 -> Cb
+    1:1:void markNoSpilling():124:124 -> Db
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> P
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):39:39 -> a
-    2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):48:49 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):92:92 -> a
-    5:5:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):102:102 -> a
-    6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):107:107 -> a
-    7:7:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):113:113 -> a
-    8:8:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):118:118 -> a
-    9:9:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):128:128 -> a
-    10:37:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):135:162 -> a
-    38:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):140:140 -> a
-    39:39:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):165:165 -> a
-    40:40:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):174:174 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):59:59 -> b
-    1:1:com.android.tools.r8.ir.code.Value dest():43:43 -> dest
+    1:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):40:41 -> a
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):84:84 -> a
+    4:4:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):94:94 -> a
+    5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):99:99 -> a
+    6:6:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):105:105 -> a
+    7:7:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):110:110 -> a
+    8:8:boolean definitelyTriggersClassInitialization(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):119:119 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):51:51 -> b
+    1:1:com.android.tools.r8.ir.code.Value dest():35:35 -> dest
     boolean hasInvariantOutType() -> qa
-    1:1:java.lang.String toString():54:54 -> toString
-    1:1:int maxInValueRegister():64:64 -> zb
+    1:1:java.lang.String toString():46:46 -> toString
+    1:1:int maxInValueRegister():56:56 -> zb
 com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.ir.code.NextUntilIterator:
     1:3:java.lang.Object nextUntil(java.util.function.Predicate):18:20 -> nextUntil
 com.android.tools.r8.ir.code.NonNull -> com.android.tools.r8.ir.code.NonNull:
@@ -20051,65 +19606,62 @@
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):23:25 -> <init>
-    1:1:int maxOutValueRegister():87:87 -> Ab
-    1:1:com.android.tools.r8.ir.code.Instruction origin():42:42 -> Cb
+    1:1:int maxOutValueRegister():82:82 -> Ab
+    1:1:com.android.tools.r8.ir.code.Instruction origin():37:37 -> Cb
     boolean isIntroducingAnAlias() -> Ua
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):30:30 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:72 -> a
-    3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):77:77 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):103:103 -> a
-    5:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):108:109 -> a
-    7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):119:119 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):97:97 -> b
-    1:1:com.android.tools.r8.ir.code.Value dest():34:34 -> dest
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:67 -> a
+    2:2:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):72:72 -> a
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):98:98 -> a
+    4:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):103:103 -> a
+    5:5:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):113:113 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92:92 -> b
+    1:1:com.android.tools.r8.ir.code.Value dest():29:29 -> dest
     boolean couldIntroduceAnAlias() -> fa
-    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():67:67 -> ga
+    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():62:62 -> ga
     boolean isOutConstant() -> mb
     boolean hasInvariantOutType() -> qa
-    1:1:com.android.tools.r8.ir.code.Value src():38:38 -> src
-    1:1:int maxInValueRegister():82:82 -> zb
-com.android.tools.r8.ir.code.Not -> com.android.tools.r8.ir.code.U:
-    com.android.tools.r8.ir.code.NumericType type -> h
-    boolean $assertionsDisabled -> i
+    1:1:com.android.tools.r8.ir.code.Value src():33:33 -> src
+    1:1:int maxInValueRegister():77:77 -> zb
+com.android.tools.r8.ir.code.Not -> com.android.tools.r8.ir.code.W:
+    com.android.tools.r8.ir.code.NumericType type -> a
+    boolean $assertionsDisabled -> b
     1:1:void <clinit>():19:19 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:25 -> <init>
     com.android.tools.r8.ir.code.Not asNot() -> Q
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):30:30 -> a
-    2:16:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):40:54 -> a
-    17:17:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:59 -> a
-    18:18:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.dest():22:22 -> a
-    18:18:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61 -> a
-    19:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61:71 -> a
-    30:38:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:73 -> a
-    39:39:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):94:94 -> a
-    40:40:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):100:100 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> b
+    1:15:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):35:49 -> a
+    16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:54 -> a
+    17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.dest():22:22 -> a
+    17:17:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56 -> a
+    18:28:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56:66 -> a
+    29:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60:68 -> a
+    38:38:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):89:89 -> a
+    39:39:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):95:95 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):73:73 -> b
     boolean isNot() -> kb
 com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.ir.code.NumberConversion:
-    com.android.tools.r8.ir.code.NumericType from -> h
+    com.android.tools.r8.ir.code.NumericType from -> a
     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>
-    1:1:boolean isLongToIntConversion():47:47 -> Db
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43:43 -> a
-    2:75:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:126 -> a
-    76:87:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):111:122 -> a
-    88:88:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):116:116 -> a
-    89:89:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):113:113 -> a
-    90:101:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):96:107 -> a
-    102:102:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):101:101 -> a
-    103:103:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):98:98 -> a
-    104:115:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81:92 -> a
-    116:116:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86:86 -> a
-    117:117:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83:83 -> a
-    118:138:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:77 -> a
-    139:139:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74:74 -> a
-    140:140:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:71 -> a
-    141:141:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:68 -> a
-    142:142:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:65 -> a
-    143:143:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:62 -> a
-    144:213:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:128 -> a
-    214:214:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):152:152 -> a
-    215:215:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):157:157 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):133:137 -> b
+    1:1:boolean isLongToIntConversion():42:42 -> Db
+    1:74:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):48:121 -> a
+    75:86:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):106:117 -> a
+    87:87:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):111:111 -> a
+    88:88:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):108:108 -> a
+    89:100:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):91:102 -> a
+    101:101:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):96:96 -> a
+    102:102:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):93:93 -> a
+    103:114:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:87 -> a
+    115:115:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81:81 -> a
+    116:116:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:78 -> a
+    117:137:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52:72 -> a
+    138:138:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:69 -> a
+    139:139:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:66 -> a
+    140:140:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:63 -> a
+    141:141:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60:60 -> a
+    142:142:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:57 -> a
+    143:212:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:123 -> a
+    213:213:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):147:147 -> a
+    214:214:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):152:152 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):128:132 -> b
 com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.ir.code.NumericType:
     com.android.tools.r8.ir.code.NumericType DOUBLE -> e
     com.android.tools.r8.ir.code.NumericType FLOAT -> d
@@ -20134,21 +19686,20 @@
     52:52:com.android.tools.r8.ir.code.NumericType fromDexType(com.android.tools.r8.graph.DexType):49:49 -> a
     53:59:com.android.tools.r8.ir.code.NumericType fromDexType(com.android.tools.r8.graph.DexType):45:51 -> a
     1:1:boolean isWide():62:62 -> isWide
-com.android.tools.r8.ir.code.Or -> com.android.tools.r8.ir.code.V:
+com.android.tools.r8.ir.code.Or -> com.android.tools.r8.ir.code.X:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     boolean isCommutative() -> Db
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():87:87 -> Hb
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():82:82 -> Hb
     com.android.tools.r8.ir.code.Or asOr() -> R
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):22:22 -> a
-    2:2:com.android.tools.r8.code.Instruction CreateInt(int,int,int):42:42 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):52:52 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):67:67 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):72:72 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):57:57 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):62:62 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):47:47 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):37:37 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):47:47 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):62:62 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67:67 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):52:52 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):57:57 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):42:42 -> d
     boolean isOr() -> lb
 com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.ir.code.Phi:
     com.android.tools.r8.ir.code.Phi$RegisterReadType readType -> t
@@ -20191,13 +19742,13 @@
     178:179:boolean verifyIsStackPhi(java.util.Set):379:380 -> a
     180:183:void lambda$verifyIsStackPhi$0(java.util.Set,com.android.tools.r8.ir.code.Value):382:385 -> a
     184:192:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):401:409 -> a
+    193:195:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.DexDefinitionSupplier):414:416 -> a
     1:1:boolean isTrivialPhi():216:216 -> aa
     com.android.tools.r8.ir.code.Phi asPhi() -> b
     1:2:void removeOperand(int):179:180 -> b
     3:14:void removeOperandsByIndex(java.util.List):184:195 -> b
     15:15:void removeDefinitionsUser(java.util.Map):321:321 -> b
     16:16:void setIsStackPhi(boolean):375:375 -> b
-    17:19:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):414:416 -> b
     1:10:java.lang.String printPhi():292:301 -> ba
     1:1:boolean usesValueOneTime(com.android.tools.r8.ir.code.Value):397:397 -> c
     1:1:void removeTrivialPhi():231:231 -> ca
@@ -20210,26 +19761,25 @@
     1:3:void <clinit>():29:31 -> <clinit>
     4:4:void <clinit>():28:28 -> <clinit>
     1:1:void <init>(java.lang.String,int):28:28 -> <init>
-com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.ir.code.W:
+com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.ir.code.Y:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue):20:20 -> <init>
-    1:1:int maxOutValueRegister():60:60 -> Ab
+    1:1:int maxOutValueRegister():55:55 -> Ab
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):25:25 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):66:66 -> a
-    3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:71 -> a
-    4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):76:76 -> a
-    5:5:com.android.tools.r8.cf.code.CfStackInstruction com.android.tools.r8.cf.code.CfStackInstruction.popType(com.android.tools.r8.ir.code.ValueType):66:66 -> a
-    5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):76 -> a
-    6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):76:76 -> a
-    7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):81:81 -> a
-    1:1:void addInValue(com.android.tools.r8.ir.code.Value):30:30 -> b
-    2:5:void com.android.tools.r8.ir.code.Instruction.addInValue(com.android.tools.r8.ir.code.Value):86:89 -> b
-    2:5:void addInValue(com.android.tools.r8.ir.code.Value):31 -> b
-    6:6:void addInValue(com.android.tools.r8.ir.code.Value):34:34 -> b
-    7:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):50:50 -> b
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):61:61 -> a
+    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:66 -> a
+    3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):71:71 -> a
+    4:4:com.android.tools.r8.cf.code.CfStackInstruction com.android.tools.r8.cf.code.CfStackInstruction.popType(com.android.tools.r8.ir.code.ValueType):66:66 -> a
+    4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):71 -> a
+    5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):71:71 -> a
+    6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):76:76 -> a
+    1:1:void addInValue(com.android.tools.r8.ir.code.Value):25:25 -> b
+    2:5:void com.android.tools.r8.ir.code.Instruction.addInValue(com.android.tools.r8.ir.code.Value):84:87 -> b
+    2:5:void addInValue(com.android.tools.r8.ir.code.Value):26 -> b
+    6:6:void addInValue(com.android.tools.r8.ir.code.Value):29:29 -> b
+    7:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):45:45 -> b
     boolean isPop() -> nb
     boolean hasInvariantOutType() -> qa
-    1:1:int maxInValueRegister():55:55 -> zb
+    1:1:int maxInValueRegister():50:50 -> zb
 com.android.tools.r8.ir.code.Position -> com.android.tools.r8.ir.code.Position:
     com.android.tools.r8.ir.code.Position TESTING_POSITION -> g
     com.android.tools.r8.graph.DexString file -> a
@@ -20255,85 +19805,81 @@
     1:1:com.android.tools.r8.ir.code.Position testingPosition():68:68 -> testingPosition
     1:19:java.lang.String toString(boolean):127:145 -> toString
     1:19:java.lang.String toString():150 -> toString
-com.android.tools.r8.ir.code.PreviousUntilIterator -> com.android.tools.r8.ir.code.X:
+com.android.tools.r8.ir.code.PreviousUntilIterator -> com.android.tools.r8.ir.code.Z:
     1:3:java.lang.Object previousUntil(java.util.function.Predicate):18:20 -> a
-com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.ir.code.Y:
+com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.ir.code.aa:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
     boolean isCommutative() -> Db
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():143:143 -> Hb
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():138:138 -> Hb
     com.android.tools.r8.ir.code.Rem asRem() -> S
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):29:29 -> a
-    2:2:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):64:64 -> a
-    3:3:int foldIntegers(int,int):109:109 -> a
-    4:4:long foldLongs(long,long):114:114 -> a
-    5:9:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):134:138 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):59:59 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):84:84 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):99:99 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):49:49 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):79:79 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):69:69 -> d
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):94:94 -> d
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):74:74 -> e
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):89:89 -> e
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):54:54 -> f
-    1:1:boolean instructionTypeCanThrow():129:129 -> instructionTypeCanThrow
+    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):59:59 -> a
+    2:2:int foldIntegers(int,int):104:104 -> a
+    3:3:long foldLongs(long,long):109:109 -> a
+    4:8:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):129:133 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):54:54 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):79:79 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:94 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):44:44 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):74:74 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):64:64 -> d
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):89:89 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):69:69 -> e
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):84:84 -> e
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):49:49 -> f
+    1:1:boolean instructionTypeCanThrow():124:124 -> instructionTypeCanThrow
     boolean isRem() -> ob
 com.android.tools.r8.ir.code.Return -> com.android.tools.r8.ir.code.Return:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():24:24 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.Value):28:28 -> <init>
-    1:1:int maxOutValueRegister():92:92 -> Ab
-    1:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getReturnType():41:42 -> Cb
-    1:1:boolean isReturnVoid():37:37 -> Db
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):33:33 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:70 -> a
-    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):109:109 -> a
-    4:5:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):114:115 -> a
-    6:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):122:124 -> a
-    9:9:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):121:121 -> a
-    1:15:com.android.tools.r8.code.Instruction createDexInstruction(com.android.tools.r8.ir.conversion.DexBuilder):51:65 -> b
-    16:23:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:82 -> b
-    1:2:com.android.tools.r8.ir.code.Value returnValue():46:47 -> returnValue
+    1:1:int maxOutValueRegister():87:87 -> Ab
+    1:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getReturnType():36:37 -> Cb
+    1:1:boolean isReturnVoid():32:32 -> Db
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:65 -> a
+    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):104:104 -> a
+    3:4:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):109:110 -> a
+    5:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):117:119 -> a
+    8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):116:116 -> a
+    1:15:com.android.tools.r8.code.Instruction createDexInstruction(com.android.tools.r8.ir.conversion.DexBuilder):46:60 -> b
+    16:23:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):70:77 -> b
+    1:2:com.android.tools.r8.ir.code.Value returnValue():41:42 -> returnValue
     int maxInValueRegister() -> zb
-com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.ir.code.Z:
+com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.ir.code.ba:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     boolean isCommutative() -> Db
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> Hb
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():88:88 -> Hb
     com.android.tools.r8.ir.code.Shl asShl() -> T
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):22:22 -> a
-    2:2:com.android.tools.r8.code.Instruction CreateInt(int,int,int):48:48 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):58:58 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):73:73 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):63:63 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
-    1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):28:28 -> g
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):43:43 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):53:53 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):68:68 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):73:73 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):58:58 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):63:63 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):48:48 -> d
+    1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):23:23 -> g
     boolean isShl() -> pb
-com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.ir.code.aa:
+com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.ir.code.ca:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     boolean isCommutative() -> Db
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> Hb
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():88:88 -> Hb
     com.android.tools.r8.ir.code.Shr asShr() -> U
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):22:22 -> a
-    2:2:com.android.tools.r8.code.Instruction CreateInt(int,int,int):48:48 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):58:58 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):73:73 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):63:63 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
-    1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):28:28 -> g
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):43:43 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):53:53 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):68:68 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):73:73 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):58:58 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):63:63 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):48:48 -> d
+    1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):23:23 -> g
     boolean isShr() -> qb
-com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.ir.code.ba:
+com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.ir.code.da:
     int height -> r
     com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo typeInfo -> s
     boolean $assertionsDisabled -> t
@@ -20346,7 +19892,7 @@
     4:4:com.android.tools.r8.ir.code.StackValue duplicate(int):41:41 -> a
     1:1:void setNeedsRegister(boolean):56:56 -> setNeedsRegister
     1:1:java.lang.String toString():61:61 -> toString
-com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.ir.code.ca:
+com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.ir.code.ea:
     com.android.tools.r8.ir.code.StackValue[] stackValues -> r
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():14:14 -> <clinit>
@@ -20360,224 +19906,214 @@
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):39:39 -> <init>
     int maxOutValueRegister() -> Ab
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> V
-    1:31:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:89 -> a
-    32:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):87:87 -> a
-    33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:68 -> a
-    34:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:83 -> a
-    54:54:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):80:80 -> a
-    55:55:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:77 -> a
-    56:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74:74 -> a
-    57:77:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:91 -> a
-    78:102:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):103:127 -> a
-    103:103:boolean lambda$canBeDeadCode$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):130:130 -> a
-    104:104:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):155:155 -> a
-    105:105:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):175:175 -> a
-    106:107:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):180:181 -> a
-    108:108:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):180:180 -> a
-    109:109:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):187:187 -> a
-    110:110:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):192:192 -> a
-    111:111:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):202:202 -> a
-    112:112:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.StaticGet):309:309 -> a
-    112:112:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):44 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):145:149 -> b
-    1:1:com.android.tools.r8.ir.code.Value dest():48:48 -> dest
+    1:31:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:84 -> a
+    32:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:82 -> a
+    33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:63 -> a
+    34:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:78 -> a
+    54:54:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
+    55:55:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:72 -> a
+    56:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:69 -> a
+    57:77:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:86 -> a
+    78:100:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):98:120 -> a
+    101:101:boolean lambda$canBeDeadCode$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):123:123 -> a
+    102:102:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):148:148 -> a
+    103:103:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):168:168 -> a
+    104:105:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):173:174 -> a
+    106:106:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):173:173 -> a
+    107:107:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):180:180 -> a
+    108:108:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):185:185 -> a
+    109:109:boolean definitelyTriggersClassInitialization(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):194:194 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):138:142 -> b
+    1:1:com.android.tools.r8.ir.code.Value dest():43:43 -> dest
     boolean couldIntroduceAnAlias() -> fa
     boolean isStaticGet() -> rb
-    1:1:java.lang.String toString():160:160 -> toString
+    1:1:java.lang.String toString():153:153 -> toString
     int maxInValueRegister() -> zb
-com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.ir.code.da:
+com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.ir.code.fa:
     boolean $assertionsDisabled -> k
-    1:1:void <clinit>():31:31 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):34:34 -> <init>
-    1:1:int maxOutValueRegister():98:98 -> Ab
-    1:2:com.android.tools.r8.ir.code.Value inValue():43:44 -> Eb
+    1:1:void <clinit>():30:30 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):33:33 -> <init>
+    1:1:int maxOutValueRegister():92:92 -> Ab
+    1:2:com.android.tools.r8.ir.code.Value inValue():37:38 -> Eb
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> W
-    1:31:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):50:80 -> a
-    32:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:78 -> a
-    33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:59 -> a
-    34:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:74 -> a
-    54:54:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:71 -> a
-    55:55:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:68 -> a
-    56:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:65 -> a
-    57:77:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:82 -> a
-    78:78:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):134:134 -> a
-    79:79:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):154:154 -> a
-    80:81:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):159:160 -> a
-    82:82:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):159:159 -> a
-    83:83:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):170:170 -> a
-    84:84:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.StaticPut):314:314 -> a
-    84:84:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):39 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):124:128 -> b
-    1:11:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):104:114 -> identicalAfterRegisterAllocation
-    1:1:java.lang.String toString():139:139 -> toString
+    1:31:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):44:74 -> a
+    32:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:72 -> a
+    33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:53 -> a
+    34:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):49:68 -> a
+    54:54:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:65 -> a
+    55:55:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:62 -> a
+    56:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:59 -> a
+    57:77:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56:76 -> a
+    78:78:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):108:108 -> a
+    79:79:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):128:128 -> a
+    80:81:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):133:134 -> a
+    82:82:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):133:133 -> a
+    83:83:boolean definitelyTriggersClassInitialization(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):143:143 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):98:102 -> b
+    1:1:java.lang.String toString():113:113 -> toString
     int maxInValueRegister() -> zb
-com.android.tools.r8.ir.code.Store -> com.android.tools.r8.ir.code.ea:
+com.android.tools.r8.ir.code.Store -> com.android.tools.r8.ir.code.ga:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.StackValue):24:24 -> <init>
     int maxOutValueRegister() -> Ab
     com.android.tools.r8.ir.code.Store asStore() -> X
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):29:29 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):64:64 -> a
-    3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:69 -> a
-    4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):74:74 -> a
-    5:5:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):80:80 -> a
-    6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):85:85 -> a
-    7:7:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):90:90 -> a
-    8:8:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):100:100 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):48:48 -> b
-    1:2:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):105:106 -> c
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):59:59 -> a
+    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:64 -> a
+    3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):69:69 -> a
+    4:4:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):75:75 -> a
+    5:5:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):80:80 -> a
+    6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):85:85 -> a
+    7:7:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):95:95 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):43:43 -> b
+    1:2:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):100:101 -> c
     boolean hasInvariantOutType() -> qa
     boolean isStore() -> sb
-    1:1:com.android.tools.r8.ir.code.Value src():33:33 -> src
-    1:1:int maxInValueRegister():53:53 -> zb
-com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.ir.code.fa:
+    1:1:com.android.tools.r8.ir.code.Value src():28:28 -> src
+    1:1:int maxInValueRegister():48:48 -> zb
+com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.ir.code.ha:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):27:27 -> <init>
     boolean isCommutative() -> Db
-    1:2:int maxInOutValueRegisterSize():126:127 -> Fb
+    1:2:int maxInOutValueRegisterSize():121:122 -> Fb
     3:3:boolean com.android.tools.r8.ir.code.Binop.fitsInDexInstruction(com.android.tools.r8.ir.code.Value):65:65 -> Fb
-    3:3:int maxInOutValueRegisterSize():127 -> Fb
-    4:10:int maxInOutValueRegisterSize():127:133 -> Fb
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():212:212 -> Hb
+    3:3:int maxInOutValueRegisterSize():122 -> Fb
+    4:10:int maxInOutValueRegisterSize():122:128 -> Fb
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():207:207 -> Hb
     com.android.tools.r8.ir.code.Sub asSub() -> Y
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):32:32 -> a
-    2:2:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):57:57 -> a
-    3:11:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):159:167 -> a
-    12:12:boolean com.android.tools.r8.ir.code.Binop.fitsInDexInstruction(com.android.tools.r8.ir.code.Value):65:65 -> a
-    12:12:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):167 -> a
-    13:40:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):167:194 -> a
-    41:41:com.android.tools.r8.code.Instruction CreateInt(int,int,int):42:42 -> a
-    41:41:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):195 -> a
-    42:42:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):197:197 -> a
-    43:67:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:89 -> a
-    43:67:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):160 -> a
-    68:77:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:86 -> a
-    68:77:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):160 -> a
-    78:94:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83:99 -> a
-    78:94:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):160 -> a
-    95:116:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):96:117 -> a
-    95:116:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):160 -> a
-    117:126:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):105:114 -> a
-    117:126:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):160 -> a
-    127:136:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):111:120 -> a
-    127:136:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):160 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):52:52 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):77:77 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:94 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):42:42 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):72:72 -> c
-    3:7:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):140:144 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):52:52 -> a
+    2:10:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):154:162 -> a
+    11:11:boolean com.android.tools.r8.ir.code.Binop.fitsInDexInstruction(com.android.tools.r8.ir.code.Value):65:65 -> a
+    11:11:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):162 -> a
+    12:39:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):162:189 -> a
+    40:40:com.android.tools.r8.code.Instruction CreateInt(int,int,int):37:37 -> a
+    40:40:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):190 -> a
+    41:41:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):192:192 -> a
+    42:66:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:89 -> a
+    42:66:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):155 -> a
+    67:76:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:86 -> a
+    67:76:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):155 -> a
+    77:93:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83:99 -> a
+    77:93:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):155 -> a
+    94:115:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):96:117 -> a
+    94:115:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):155 -> a
+    116:125:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):105:114 -> a
+    116:125:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):155 -> a
+    126:135:void com.android.tools.r8.ir.code.ArithmeticBinop.buildDex(com.android.tools.r8.ir.conversion.DexBuilder):111:120 -> a
+    126:135:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):155 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):47:47 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):72:72 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):89:89 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):37:37 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int):67:67 -> c
+    3:7:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):135:139 -> c
     8:8:boolean com.android.tools.r8.ir.code.Binop.fitsInDexInstruction(com.android.tools.r8.ir.code.Value):65:65 -> c
-    8:8:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):147 -> c
-    9:12:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):149:152 -> c
+    8:8:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):142 -> c
+    9:12:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):144:147 -> c
     13:13:boolean com.android.tools.r8.ir.code.Binop.fitsInDexInstruction(com.android.tools.r8.ir.code.Value):65:65 -> c
-    13:13:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):152 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):62:62 -> d
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):89:89 -> d
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):67:67 -> e
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):83:83 -> e
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):47:47 -> f
-    1:3:boolean negativeFitsInDexInstruction(com.android.tools.r8.ir.code.Value):118:120 -> j
+    13:13:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):147 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):57:57 -> d
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):84:84 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):62:62 -> e
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):78:78 -> e
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):42:42 -> f
+    1:3:boolean negativeFitsInDexInstruction(com.android.tools.r8.ir.code.Value):113:115 -> j
     boolean isSub() -> tb
-com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.ir.code.ga:
+com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.ir.code.ia:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):21:21 -> <init>
     2:5:void <init>(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):25:28 -> <init>
     2:5: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):21 -> <init>
-    1:1:int maxOutValueRegister():81:81 -> Ab
+    1:1:int maxOutValueRegister():76:76 -> Ab
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):33:33 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61:61 -> a
-    3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):66:66 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):87:87 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:71 -> b
-    1:6:void setOutValue(com.android.tools.r8.ir.code.Value):38:43 -> e
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56:56 -> a
+    2:2:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):61:61 -> a
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):82:82 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> b
+    1:6:void setOutValue(com.android.tools.r8.ir.code.Value):33:38 -> e
     boolean hasInvariantOutType() -> qa
     boolean isSwap() -> ub
     int maxInValueRegister() -> zb
-com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.ir.code.ha:
+com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.ir.code.ja:
     int[] keys -> i
     int fallthroughBlockIndex -> k
     boolean $assertionsDisabled -> l
     int[] targetBlockIndices -> j
     1:1:void <clinit>():26:26 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.code.Value,int[],int[],int):37:41 -> <init>
-    6:13:boolean valid():50:57 -> <init>
+    6:13:boolean valid():45:52 -> <init>
     6:13:void <init>(com.android.tools.r8.ir.code.Value,int[],int[],int):41 -> <init>
     int maxOutValueRegister() -> Ab
-    1:1:int getFallthroughBlockIndex():235:235 -> Cb
-    1:1:int getFirstKey():176:176 -> Db
-    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():222:224 -> Eb
-    1:1:int[] getKeys():214:214 -> Fb
-    1:1:int numberOfKeys():206:206 -> Gb
-    1:1:int[] targetBlockIndices():218:218 -> Hb
+    1:1:int getFallthroughBlockIndex():230:230 -> Cb
+    1:1:int getFirstKey():171:171 -> Db
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():217:219 -> Eb
+    1:1:int[] getKeys():209:209 -> Fb
+    1:1:int numberOfKeys():201:201 -> Gb
+    1:1:int[] targetBlockIndices():213:213 -> Hb
     com.android.tools.r8.ir.code.Switch asSwitch() -> Z
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):46:46 -> a
-    2:2:long numberOfTargetsIfPacked(int[]):67:67 -> a
-    3:3:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):72:72 -> a
-    4:4:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode,long):78:78 -> a
-    5:5:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode):158:158 -> a
-    5:5:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):172 -> a
-    6:6:long packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):163:163 -> a
-    6:6:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):172 -> a
-    7:7:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):168:168 -> a
-    7:7:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):172 -> a
-    8:12:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):196:200 -> a
-    13:13:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):248:248 -> a
-    14:40:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):252:278 -> a
-    41:44:void print(com.android.tools.r8.utils.CfgPrinter):309:312 -> a
-    45:45:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):318:318 -> a
-    46:67:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):323:344 -> a
+    1:1:long numberOfTargetsIfPacked(int[]):62:62 -> a
+    2:2:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):67:67 -> a
+    3:3:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode,long):73:73 -> a
+    4:4:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode):153:153 -> a
+    4:4:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):167 -> a
+    5:5:long packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):158:158 -> a
+    5:5:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):167 -> a
+    6:6:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):163:163 -> a
+    6:6:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):167 -> a
+    7:11:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):191:195 -> a
+    12:12:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):243:243 -> a
+    13:39:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):247:273 -> a
+    40:43:void print(com.android.tools.r8.utils.CfgPrinter):304:307 -> a
+    44:44:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):313:313 -> a
+    45:66:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):318:339 -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> b
-    1:1:long estimatedSparseSize(com.android.tools.r8.utils.InternalOutputMode,long):96:96 -> b
-    2:2:int baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):113:113 -> b
-    2:2:long estimatedSparseSize(com.android.tools.r8.utils.InternalOutputMode,long):96 -> b
-    3:3:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142:142 -> b
-    3:3:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):83 -> b
-    4:4:int baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):113:113 -> b
-    4:4:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):83 -> b
-    5:6:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):85:86 -> b
-    7:7:int basePackedSize(com.android.tools.r8.utils.InternalOutputMode):102:102 -> b
-    7:7:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):87 -> b
-    8:8:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):92:92 -> b
-    9:9:int getKey(int):210:210 -> b
-    1:2:long packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):123:124 -> c
-    3:5:long packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):135:137 -> c
-    6:6:void setFallthroughBlockIndex(int):239:239 -> c
-    1:1:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):142:142 -> d
-    2:2:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):147:147 -> d
-    3:3:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):243:243 -> d
-    4:4:int[] targetBlockIndices():218:218 -> d
-    4:4:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):243 -> d
-    5:5:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):243:243 -> d
-    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():231:231 -> fallthroughBlock
-    1:11:java.lang.String toString():294:304 -> toString
-    1:1:com.android.tools.r8.ir.code.Value value():62:62 -> value
+    1:1:long estimatedSparseSize(com.android.tools.r8.utils.InternalOutputMode,long):91:91 -> b
+    2:2:int baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):108:108 -> b
+    2:2:long estimatedSparseSize(com.android.tools.r8.utils.InternalOutputMode,long):91 -> b
+    3:3:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):137:137 -> b
+    3:3:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):78 -> b
+    4:4:int baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):108:108 -> b
+    4:4:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):78 -> b
+    5:6:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):80:81 -> b
+    7:7:int basePackedSize(com.android.tools.r8.utils.InternalOutputMode):97:97 -> b
+    7:7:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):82 -> b
+    8:8:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):87:87 -> b
+    9:9:int getKey(int):205:205 -> b
+    1:2:long packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):118:119 -> c
+    3:5:long packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):130:132 -> c
+    6:6:void setFallthroughBlockIndex(int):234:234 -> c
+    1:1:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):137:137 -> d
+    2:2:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):142:142 -> d
+    3:3:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):238:238 -> d
+    4:4:int[] targetBlockIndices():213:213 -> d
+    4:4:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):238 -> d
+    5:5:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):238:238 -> d
+    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():226:226 -> fallthroughBlock
+    1:11:java.lang.String toString():289:299 -> toString
+    1:1:com.android.tools.r8.ir.code.Value value():57:57 -> value
     boolean isSwitch() -> vb
     int maxInValueRegister() -> zb
 com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.ir.code.Throw:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    1:1:int maxOutValueRegister():44:44 -> Ab
-    1:1:com.android.tools.r8.ir.code.Value exception():29:29 -> Cb
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):25:25 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):34:34 -> a
-    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):71:71 -> a
-    4:4:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):76:76 -> a
-    5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):81:81 -> a
-    6:23:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):86:103 -> a
+    1:1:int maxOutValueRegister():39:39 -> Ab
+    1:1:com.android.tools.r8.ir.code.Value exception():24:24 -> Cb
+    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):29:29 -> a
+    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):66:66 -> a
+    3:3:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):71:71 -> a
+    4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):76:76 -> a
+    5:22:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):81:98 -> a
     com.android.tools.r8.ir.code.Throw asThrow() -> aa
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):55:55 -> b
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):50:50 -> b
     int maxInValueRegister() -> zb
-com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.ir.code.ia:
+com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.ir.code.ka:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
     int maxOutValueRegister() -> Ab
     1:1:com.android.tools.r8.ir.code.Value source():26:26 -> Cb
@@ -20588,22 +20124,21 @@
     boolean hasInvariantOutType() -> qa
     boolean isUnop() -> wb
     int maxInValueRegister() -> zb
-com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.ir.code.ja:
+com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.ir.code.la:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     boolean isCommutative() -> Db
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> Hb
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():88:88 -> Hb
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):22:22 -> a
-    2:2:com.android.tools.r8.code.Instruction CreateInt(int,int,int):48:48 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):58:58 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):73:73 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):43:43 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):53:53 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):68:68 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):73:73 -> b
     com.android.tools.r8.ir.code.Ushr asUshr() -> ba
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):63:63 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
-    1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):28:28 -> g
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):58:58 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):63:63 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):48:48 -> d
+    1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):23:23 -> g
     boolean isUshr() -> xb
 com.android.tools.r8.ir.code.Value -> com.android.tools.r8.ir.code.Value:
     boolean isThis -> j
@@ -20623,133 +20158,131 @@
     com.android.tools.r8.ir.code.Value$DebugData debugData -> n
     com.android.tools.r8.utils.LongInterval valueRange -> m
     java.util.LinkedList users -> b
-    1:164:void <clinit>():35:198 -> <clinit>
-    1:1:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):218:218 -> <init>
-    2:21:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):202:221 -> <init>
-    1:1:boolean isConstant():770:770 -> A
-    1:1:boolean isDexItemBasedConstString():756:756 -> B
-    1:3:boolean isDexItemBasedConstStringThatNeedsToComputeClassName():760:762 -> C
+    1:164:void <clinit>():33:196 -> <clinit>
+    1:1:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):216:216 -> <init>
+    2:21:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):200:219 -> <init>
+    1:1:boolean isConstant():751:751 -> A
+    1:1:boolean isDexItemBasedConstString():737:737 -> B
+    1:3:boolean isDexItemBasedConstStringThatNeedsToComputeClassName():741:743 -> C
     boolean isFixedRegisterValue() -> D
-    1:1:boolean isLinked():369:369 -> E
+    1:1:boolean isLinked():367:367 -> E
     boolean isPhi() -> F
-    1:1:boolean isThis():835:835 -> G
-    1:1:boolean isUninitializedLocal():520:520 -> H
-    1:1:boolean isUsed():445:445 -> I
+    1:1:boolean isThis():816:816 -> G
+    1:1:boolean isUninitializedLocal():501:501 -> H
+    1:1:boolean isUsed():443:443 -> I
     boolean isValueOnStack() -> J
-    1:3:boolean isZero():932:934 -> K
-    1:8:boolean knownToBeBoolean():810:817 -> L
-    1:3:void markAsArgument():796:798 -> M
-    1:3:void markAsThis():824:826 -> N
-    1:1:void markNonDebugLocalRead():131:131 -> O
-    1:1:int numberOfAllNonDebugUsers():433:433 -> P
-    1:1:int numberOfDebugUsers():437:437 -> Q
-    1:5:int numberOfPhiUsers():425:429 -> R
-    1:5:int numberOfUsers():417:421 -> S
-    1:1:com.android.tools.r8.ir.code.ValueType outType():739:739 -> T
-    1:1:int requiredRegisters():272:272 -> U
-    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():396:397 -> V
-    1:4:java.util.Set uniquePhiUsers():406:409 -> W
-    1:2:boolean usedInMonitorOperation():466:467 -> X
+    1:3:boolean isZero():890:892 -> K
+    1:8:boolean knownToBeBoolean():791:798 -> L
+    1:3:void markAsArgument():777:779 -> M
+    1:3:void markAsThis():805:807 -> N
+    1:1:void markNonDebugLocalRead():129:129 -> O
+    1:1:int numberOfAllNonDebugUsers():431:431 -> P
+    1:1:int numberOfDebugUsers():435:435 -> Q
+    1:5:int numberOfPhiUsers():423:427 -> R
+    1:5:int numberOfUsers():415:419 -> S
+    1:1:com.android.tools.r8.ir.code.ValueType outType():720:720 -> T
+    1:1:int requiredRegisters():270:270 -> U
+    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():394:395 -> V
+    1:4:java.util.Set uniquePhiUsers():404:407 -> W
+    1:2:boolean usedInMonitorOperation():447:448 -> X
     boolean lambda$fullyRemovePhiUser$1(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi) -> 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):39:52 -> a
-    15:15:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):41:41 -> a
-    16:75:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):57:116 -> a
-    76:77:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):111:112 -> a
-    78:79:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):106:107 -> a
-    80:81:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):101:102 -> a
-    82:86:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):93:97 -> a
-    87:88:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):88:89 -> a
-    89:90:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):83:84 -> a
-    91:107:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):62:78 -> a
-    108:112:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):75:79 -> a
-    113:113:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):122:122 -> a
-    114:116:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):284:286 -> a
-    117:120:boolean hasSameOrNoLocal(com.android.tools.r8.ir.code.Value):295:298 -> a
-    121:122:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):338:339 -> a
-    123:124:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):343:344 -> a
-    123:124:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):339 -> a
-    125:133:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():166:174 -> a
-    125:133:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):344 -> a
-    125:133:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):339 -> a
-    134:134:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():172:172 -> a
-    134:134:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):344 -> a
-    134:134:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):339 -> a
-    135:135:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():169:169 -> a
-    135:135:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):344 -> a
-    135:135:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):339 -> a
-    136:136:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):339:339 -> a
-    137:148:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):449:460 -> a
-    149:150:void addPhiUser(com.android.tools.r8.ir.code.Phi):500:501 -> a
-    151:158:java.util.Set affectedValues():551:558 -> a
-    159:186:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):590:617 -> a
-    187:196:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):624:633 -> a
-    197:210:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):179:192 -> a
-    197:210:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):633 -> a
-    211:211:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):180:180 -> a
-    211:211:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):633 -> a
-    212:212:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):633:633 -> a
-    213:221:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):638:646 -> a
-    222:223:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):651:652 -> a
-    224:224:void setKnownToBeBoolean(boolean):806:806 -> a
-    225:225:void setValueRange(com.android.tools.r8.utils.LongInterval):839:839 -> a
-    226:226:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):871:871 -> a
-    227:227:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):877:877 -> a
-    228:255:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):897:924 -> a
-    256:256:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):954:954 -> 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):37:50 -> a
+    15:15:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):39:39 -> a
+    16:75:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):55:114 -> a
+    76:77:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):109:110 -> a
+    78:79:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):104:105 -> a
+    80:81:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):99:100 -> a
+    82:86:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):91:95 -> a
+    87:88:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):86:87 -> a
+    89:90:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):81:82 -> a
+    91:107:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):60:76 -> a
+    108:112:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):73:77 -> a
+    113:113:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):120:120 -> a
+    114:116:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):282:284 -> a
+    117:120:boolean hasSameOrNoLocal(com.android.tools.r8.ir.code.Value):293:296 -> a
+    121:122:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):336:337 -> a
+    123:124:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):341:342 -> a
+    123:124:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):337 -> a
+    125:133:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():164:172 -> a
+    125:133:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):342 -> a
+    125:133:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):337 -> a
+    134:134:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():170:170 -> a
+    134:134:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):342 -> a
+    134:134:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):337 -> a
+    135:135:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():167:167 -> a
+    135:135:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):342 -> a
+    135:135:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):337 -> a
+    136:136:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):337:337 -> a
+    137:138:void addPhiUser(com.android.tools.r8.ir.code.Phi):481:482 -> a
+    139:146:java.util.Set affectedValues():532:539 -> a
+    147:174:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):571:598 -> a
+    175:184:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):605:614 -> a
+    185:198:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):177:190 -> a
+    185:198:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):614 -> a
+    199:199:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):178:178 -> a
+    199:199:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):614 -> a
+    200:200:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):614:614 -> a
+    201:209:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):619:627 -> a
+    210:211:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):632:633 -> a
+    212:212:void setKnownToBeBoolean(boolean):787:787 -> a
+    213:213:void setValueRange(com.android.tools.r8.utils.LongInterval):820:820 -> a
+    214:214:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):852:852 -> a
+    215:239:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.Set):858:882 -> a
+    240:240:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):912:912 -> a
     com.android.tools.r8.ir.code.Phi asPhi() -> b
     boolean lambda$fullyRemoveUser$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> b
-    1:1:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueTypeConstraint):126:126 -> b
-    2:5:void linkTo(com.android.tools.r8.ir.code.Value):348:351 -> b
-    6:7:void removePhiUser(com.android.tools.r8.ir.code.Phi):505:506 -> b
-    8:9:void addDebugUser(com.android.tools.r8.ir.code.Instruction):515:516 -> b
-    10:10:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):944:944 -> b
+    1:1:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueTypeConstraint):124:124 -> b
+    2:5:void linkTo(com.android.tools.r8.ir.code.Value):346:349 -> b
+    6:7:void removePhiUser(com.android.tools.r8.ir.code.Phi):486:487 -> b
+    8:9:void addDebugUser(com.android.tools.r8.ir.code.Instruction):496:497 -> b
+    10:10:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):902:902 -> b
     boolean lambda$replaceSelectiveUsers$2(com.android.tools.r8.ir.code.Value) -> c
-    1:2:void addUser(com.android.tools.r8.ir.code.Instruction):475:476 -> c
-    3:4:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):510:511 -> c
-    5:6:boolean canBeNull():791:792 -> c
-    1:2:void computeNeedsRegister():671:672 -> computeNeedsRegister
-    1:6:void clearUsers():490:495 -> d
-    7:11:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):528:532 -> d
-    1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):480:481 -> e
-    3:8:void clearUsersInfo():540:545 -> e
-    1:1:java.util.Set debugUsers():413:413 -> f
-    2:3:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):485:486 -> f
-    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():401:402 -> g
-    1:1:int getNumber():268:268 -> getNumber
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():958:958 -> getTypeLattice
-    1:17:com.android.tools.r8.ir.code.Value getAliasedValue():247:263 -> h
-    1:1:int hashCode():705:705 -> hashCode
-    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():743:744 -> i
-    1:1:boolean isArgument():802:802 -> isArgument
-    1:3:boolean isNeverNull():785:787 -> isNeverNull
-    1:7:java.util.List getDebugLocalEnds():315:321 -> j
-    1:7:java.util.List getDebugLocalStarts():302:308 -> k
-    1:2:com.android.tools.r8.ir.code.Instruction getDefinition():233:234 -> l
-    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():656:656 -> m
-    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():276:276 -> n
-    1:3:boolean needsRegister():660:662 -> needsRegister
-    1:1:int numberOfAllUsers():441:441 -> numberOfAllUsers
-    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():381:381 -> o
-    1:1:com.android.tools.r8.ir.code.Value getPreviousConsecutive():385:385 -> p
-    1:2:com.android.tools.r8.ir.code.Value getStartOfConsecutive():374:375 -> q
-    1:11:com.android.tools.r8.utils.LongInterval getValueRange():855:865 -> r
-    1:13:void replaceUsers(com.android.tools.r8.ir.code.Value):565:577 -> replaceUsers
-    1:1:boolean hasLocalInfo():280:280 -> s
-    1:2:void setNeedsRegister(boolean):666:667 -> setNeedsRegister
-    1:2:boolean hasRegisterConstraint():691:692 -> t
-    1:26:java.lang.String toString():710:735 -> toString
-    1:1:boolean hasUsersInfo():536:536 -> u
-    1:4:java.util.Set uniqueUsers():389:392 -> uniqueUsers
-    1:1:boolean hasValueRange():843:843 -> v
-    1:8:boolean internalComputeNeedsRegister():676:683 -> w
-    1:1:boolean isConstClass():766:766 -> x
-    1:1:boolean isConstNumber():748:748 -> y
-    1:1:boolean isConstString():752:752 -> z
+    1:2:void addUser(com.android.tools.r8.ir.code.Instruction):456:457 -> c
+    3:4:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):491:492 -> c
+    5:6:boolean canBeNull():772:773 -> c
+    1:2:void computeNeedsRegister():652:653 -> computeNeedsRegister
+    1:6:void clearUsers():471:476 -> d
+    7:11:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):509:513 -> d
+    1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):461:462 -> e
+    3:8:void clearUsersInfo():521:526 -> e
+    1:1:java.util.Set debugUsers():411:411 -> f
+    2:3:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):466:467 -> f
+    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():399:400 -> g
+    1:1:int getNumber():266:266 -> getNumber
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():916:916 -> getTypeLattice
+    1:17:com.android.tools.r8.ir.code.Value getAliasedValue():245:261 -> h
+    1:1:int hashCode():686:686 -> hashCode
+    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():724:725 -> i
+    1:1:boolean isArgument():783:783 -> isArgument
+    1:3:boolean isNeverNull():766:768 -> isNeverNull
+    1:7:java.util.List getDebugLocalEnds():313:319 -> j
+    1:7:java.util.List getDebugLocalStarts():300:306 -> k
+    1:2:com.android.tools.r8.ir.code.Instruction getDefinition():231:232 -> l
+    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():637:637 -> m
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():274:274 -> n
+    1:3:boolean needsRegister():641:643 -> needsRegister
+    1:1:int numberOfAllUsers():439:439 -> numberOfAllUsers
+    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():379:379 -> o
+    1:1:com.android.tools.r8.ir.code.Value getPreviousConsecutive():383:383 -> p
+    1:2:com.android.tools.r8.ir.code.Value getStartOfConsecutive():372:373 -> q
+    1:11:com.android.tools.r8.utils.LongInterval getValueRange():836:846 -> r
+    1:13:void replaceUsers(com.android.tools.r8.ir.code.Value):546:558 -> replaceUsers
+    1:1:boolean hasLocalInfo():278:278 -> s
+    1:2:void setNeedsRegister(boolean):647:648 -> setNeedsRegister
+    1:2:boolean hasRegisterConstraint():672:673 -> t
+    1:26:java.lang.String toString():691:716 -> toString
+    1:1:boolean hasUsersInfo():517:517 -> u
+    1:4:java.util.Set uniqueUsers():387:390 -> uniqueUsers
+    1:1:boolean hasValueRange():824:824 -> v
+    1:8:boolean internalComputeNeedsRegister():657:664 -> w
+    1:1:boolean isConstClass():747:747 -> x
+    1:1:boolean isConstNumber():729:729 -> y
+    1:1:boolean isConstString():733:733 -> z
 com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.ir.code.Value$a:
     java.util.Map users -> b
     com.android.tools.r8.graph.DebugLocalInfo local -> a
-    1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):141:141 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):139:142 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):139:139 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):137:140 -> <init>
 com.android.tools.r8.ir.code.Value$DebugUse -> com.android.tools.r8.ir.code.Value$b:
     com.android.tools.r8.ir.code.Value$DebugUse START -> b
     com.android.tools.r8.ir.code.Value$DebugUse[] $VALUES -> e
@@ -20757,9 +20290,9 @@
     com.android.tools.r8.ir.code.Value$DebugUse LIVE_FINAL -> d
     com.android.tools.r8.ir.code.Value$DebugUse END -> c
     boolean $assertionsDisabled -> f
-    1:2:void <clinit>():149:150 -> <clinit>
-    3:3:void <clinit>():149:149 -> <clinit>
-    1:1:void <init>(java.lang.String,int):149:149 -> <init>
+    1:2:void <clinit>():147:148 -> <clinit>
+    3:3:void <clinit>():147:147 -> <clinit>
+    1:1:void <init>(java.lang.String,int):147:147 -> <init>
 com.android.tools.r8.ir.code.ValueNumberGenerator -> com.android.tools.r8.ir.code.ValueNumberGenerator:
     int nextValueNumber -> a
     1:2:void <init>():6:7 -> <init>
@@ -20803,7 +20336,7 @@
     14:14:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement toPrimitiveTypeLattice():130:130 -> e
     15:15:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement toPrimitiveTypeLattice():128:128 -> e
     1:1:com.android.tools.r8.ir.code.ValueType[] values():13:13 -> f
-com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.ir.code.ka:
+com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.ir.code.ma:
     com.android.tools.r8.ir.code.ValueTypeConstraint FLOAT -> c
     com.android.tools.r8.ir.code.ValueTypeConstraint INT -> b
     com.android.tools.r8.ir.code.ValueTypeConstraint OBJECT -> a
@@ -20843,21 +20376,20 @@
     126:126:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):138:138 -> a
     1:1:boolean isWide():32:32 -> b
     1:1:int requiredRegisters():42:42 -> c
-com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.ir.code.la:
+com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.ir.code.na:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     boolean isCommutative() -> Db
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():87:87 -> Hb
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():82:82 -> Hb
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):22:22 -> a
-    2:2:com.android.tools.r8.code.Instruction CreateInt(int,int,int):42:42 -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):52:52 -> b
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):67:67 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):72:72 -> b
-    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):57:57 -> c
-    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):62:62 -> c
+    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):37:37 -> a
+    1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):47:47 -> b
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):62:62 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67:67 -> b
+    1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):52:52 -> c
+    2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):57:57 -> c
     com.android.tools.r8.ir.code.Xor asXor() -> ca
-    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):47:47 -> d
+    1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):42:42 -> d
     boolean isXor() -> yb
 com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver -> com.android.tools.r8.ir.conversion.c:
     java.util.Map unresolvedPayload -> a
@@ -20890,7 +20422,7 @@
     1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$600(com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.graph.DexEncodedMethod):64:64 -> a
     2:2:void access$700(com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):64:64 -> a
     3:21:com.android.tools.r8.ir.conversion.CallGraph build(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):156:174 -> a
-    22:29:void fillCallSiteSets(com.android.tools.r8.shaking.AppInfoWithLiveness):195:202 -> a
+    22:29:void fillCallSiteSets(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness):195:202 -> a
     22:29:com.android.tools.r8.ir.conversion.CallGraph build(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):174 -> a
     30:30:int lambda$build$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):158:158 -> a
     31:31:boolean hasDoubleCallSite(com.android.tools.r8.graph.DexMethod):191:191 -> a
@@ -20950,8 +20482,8 @@
     1:3:void <init>(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):250:252 -> <init>
     1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$300(com.android.tools.r8.ir.conversion.CallGraph$CycleEliminator$CallEdge):245:245 -> a
     1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$400(com.android.tools.r8.ir.conversion.CallGraph$CycleEliminator$CallEdge):245:245 -> b
-com.android.tools.r8.ir.conversion.CallGraph$InvokeExtractor -> com.android.tools.r8.ir.conversion.d:
-    com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> c
+com.android.tools.r8.ir.conversion.CallGraph$InvokeExtractor -> com.android.tools.r8.ir.conversion.CallGraph$a:
+    com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness appInfo -> c
     com.android.tools.r8.graph.GraphLense graphLense -> d
     com.android.tools.r8.ir.conversion.CallGraph graph -> f
     boolean $assertionsDisabled -> g
@@ -20997,19 +20529,19 @@
     1:1:boolean hasCallee(com.android.tools.r8.ir.conversion.CallGraph$Node):96:96 -> hasCallee
     1:1:boolean isLeaf():104:104 -> isLeaf
     1:33:java.lang.String toString():109:141 -> toString
-com.android.tools.r8.ir.conversion.CallSiteInformation -> com.android.tools.r8.ir.conversion.f:
+com.android.tools.r8.ir.conversion.CallSiteInformation -> com.android.tools.r8.ir.conversion.e:
     1:1:void <init>():8:8 -> <init>
     boolean hasDoubleCallSite(com.android.tools.r8.graph.DexMethod) -> a
     1:1:com.android.tools.r8.ir.conversion.CallSiteInformation empty():21:21 -> a
     boolean hasSingleCallSite(com.android.tools.r8.graph.DexMethod) -> b
-com.android.tools.r8.ir.conversion.CallSiteInformation$EmptyCallSiteInformation -> com.android.tools.r8.ir.conversion.e:
+com.android.tools.r8.ir.conversion.CallSiteInformation$EmptyCallSiteInformation -> com.android.tools.r8.ir.conversion.d:
     com.android.tools.r8.ir.conversion.CallSiteInformation$EmptyCallSiteInformation EMPTY_INFO -> a
     1:1:void <clinit>():26:26 -> <clinit>
     1:1:void <init>():24:24 -> <init>
     boolean hasDoubleCallSite(com.android.tools.r8.graph.DexMethod) -> a
     boolean hasSingleCallSite(com.android.tools.r8.graph.DexMethod) -> b
     1:1:com.android.tools.r8.ir.conversion.CallSiteInformation$EmptyCallSiteInformation access$000():24:24 -> b
-com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.ir.conversion.i:
+com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.ir.conversion.h:
     com.android.tools.r8.ir.code.Position currentPosition -> h
     java.util.Map newInstanceLabels -> q
     java.util.List thisInitializers -> p
@@ -21028,115 +20560,115 @@
     java.util.Set emittedLabels -> e
     com.android.tools.r8.graph.DexEncodedMethod method -> b
     java.util.List localVariablesTable -> m
-    1:1:void <clinit>():71:71 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):127:127 -> <init>
-    2:46:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):86:130 -> <init>
+    1:1:void <clinit>():72:72 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):128:128 -> <init>
+    2:46:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):87:131 -> <init>
     void addArgument(com.android.tools.r8.ir.code.Argument) -> a
-    1:2:com.android.tools.r8.graph.DexField resolveField(com.android.tools.r8.graph.DexField):185:186 -> a
-    3:20:void computeInitializers():190:207 -> a
-    3:20:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):134 -> a
-    21:23:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):135:137 -> a
-    24:45:void rewriteNots():224:245 -> a
-    24:45:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):138 -> a
-    46:46:void rewriteNots():244:244 -> a
-    46:46:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):138 -> a
-    47:67:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):139:159 -> a
-    68:124:void rewriteIincPatterns():355:411 -> a
-    68:124:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):162 -> a
-    125:125:void rewriteIincPatterns():389:389 -> a
-    125:125:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):162 -> a
-    126:126:void rewriteIincPatterns():384:384 -> a
-    126:126:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):162 -> a
-    127:128:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):164:165 -> a
-    129:148:com.android.tools.r8.graph.CfCode buildCfCode():260:279 -> a
-    129:148:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    149:176:com.android.tools.r8.graph.CfCode buildCfCode():278:305 -> a
-    149:176:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    177:179:int stackHeightAtBlockEntry(com.android.tools.r8.ir.code.BasicBlock):252:254 -> a
-    177:179:com.android.tools.r8.graph.CfCode buildCfCode():308 -> a
-    177:179:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    180:181:void com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.setHeight(int):122:123 -> a
-    180:181:com.android.tools.r8.graph.CfCode buildCfCode():308 -> a
-    180:181:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    182:182:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):418:418 -> a
-    182:182:com.android.tools.r8.graph.CfCode buildCfCode():309 -> a
-    182:182:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    183:183:boolean hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):346:346 -> a
-    183:183:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):419 -> a
-    183:183:com.android.tools.r8.graph.CfCode buildCfCode():309 -> a
-    183:183:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    184:188:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):335:339 -> a
-    184:188:boolean hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):347 -> a
-    184:188:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):419 -> a
-    184:188:com.android.tools.r8.graph.CfCode buildCfCode():309 -> a
-    184:188:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    189:191:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):423:425 -> a
-    189:191:com.android.tools.r8.graph.CfCode buildCfCode():309 -> a
-    189:191:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    192:225:void addFrame(com.android.tools.r8.ir.code.BasicBlock):539:572 -> a
-    192:225:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):425 -> a
-    192:225:com.android.tools.r8.graph.CfCode buildCfCode():309 -> a
-    192:225:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    226:258:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):426:458 -> a
-    226:258:com.android.tools.r8.graph.CfCode buildCfCode():309 -> a
-    226:258:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    259:276:void updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):467:484 -> a
-    259:276:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):460 -> a
-    259:276:com.android.tools.r8.graph.CfCode buildCfCode():309 -> a
-    259:276:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    277:277:void add(com.android.tools.r8.cf.code.CfInstruction):641:641 -> a
-    277:277:void updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):484 -> a
-    277:277:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):460 -> a
-    277:277:com.android.tools.r8.graph.CfCode buildCfCode():309 -> a
-    277:277:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    278:278:void updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):485:485 -> a
-    278:278:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):460 -> a
-    278:278:com.android.tools.r8.graph.CfCode buildCfCode():309 -> a
-    278:278:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    279:279:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):461:461 -> a
-    279:279:com.android.tools.r8.graph.CfCode buildCfCode():309 -> a
-    279:279:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    280:280:com.android.tools.r8.graph.CfCode buildCfCode():311:311 -> a
-    280:280:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    281:281:boolean com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.isEmpty():107:107 -> a
-    281:281:com.android.tools.r8.graph.CfCode buildCfCode():311 -> a
-    281:281:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    282:298:com.android.tools.r8.graph.CfCode buildCfCode():311:327 -> a
-    282:298:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):166 -> a
-    299:299:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167:167 -> a
-    300:305:boolean verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexDefinitionSupplier):172:177 -> a
-    300:305:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
-    306:307:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):576:577 -> a
-    308:338:com.android.tools.r8.cf.code.CfFrame$FrameType findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):586:616 -> a
-    308:338:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):579 -> a
-    339:339:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):580:580 -> a
-    340:340:com.android.tools.r8.cf.code.CfFrame$FrameType findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):593:593 -> a
-    340:340:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):579 -> a
-    341:343:void emitLabel(com.android.tools.r8.cf.code.CfLabel):624:626 -> a
-    344:344:com.android.tools.r8.cf.code.CfLabel getLabel(com.android.tools.r8.ir.code.BasicBlock):633:633 -> a
-    345:345:int getLocalRegister(com.android.tools.r8.ir.code.Value):637:637 -> a
-    346:346:void add(com.android.tools.r8.cf.code.CfInstruction):641:641 -> a
-    1:7:java.util.List computeInitializers(com.android.tools.r8.ir.code.Value):211:217 -> b
-    8:27:void updateLocals(com.android.tools.r8.cf.code.CfLabel):490:509 -> b
-    28:33:void updateLocals(com.android.tools.r8.cf.code.CfLabel):508:513 -> b
-    34:34:com.android.tools.r8.cf.code.CfInstruction getLastInstruction():535:535 -> b
-    34:34:com.android.tools.r8.cf.code.CfLabel ensureLabel():525 -> b
-    35:38:com.android.tools.r8.cf.code.CfLabel ensureLabel():526:529 -> b
-    39:39:void add(com.android.tools.r8.cf.code.CfInstruction):641:641 -> b
-    39:39:com.android.tools.r8.cf.code.CfLabel ensureLabel():530 -> b
-    40:40:com.android.tools.r8.cf.code.CfLabel lambda$getLabel$0(com.android.tools.r8.ir.code.BasicBlock):633:633 -> b
-    1:5:boolean localsChanged():517:521 -> c
-com.android.tools.r8.ir.conversion.CfBuilder$1 -> com.android.tools.r8.ir.conversion.g:
-com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.ir.conversion.h:
+    1:2:com.android.tools.r8.graph.DexField resolveField(com.android.tools.r8.graph.DexField):186:187 -> a
+    3:20:void computeInitializers():191:208 -> a
+    3:20:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):135 -> a
+    21:23:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136:138 -> a
+    24:45:void rewriteNots():225:246 -> a
+    24:45:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):139 -> a
+    46:46:void rewriteNots():245:245 -> a
+    46:46:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):139 -> a
+    47:67:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):140:160 -> a
+    68:124:void rewriteIincPatterns():356:412 -> a
+    68:124:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):163 -> a
+    125:125:void rewriteIincPatterns():390:390 -> a
+    125:125:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):163 -> a
+    126:126:void rewriteIincPatterns():385:385 -> a
+    126:126:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):163 -> a
+    127:128:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):165:166 -> a
+    129:148:com.android.tools.r8.graph.CfCode buildCfCode():261:280 -> a
+    129:148:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    149:176:com.android.tools.r8.graph.CfCode buildCfCode():279:306 -> a
+    149:176:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    177:179:int stackHeightAtBlockEntry(com.android.tools.r8.ir.code.BasicBlock):253:255 -> a
+    177:179:com.android.tools.r8.graph.CfCode buildCfCode():309 -> a
+    177:179:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    180:181:void com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.setHeight(int):123:124 -> a
+    180:181:com.android.tools.r8.graph.CfCode buildCfCode():309 -> a
+    180:181:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    182:182:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):419:419 -> a
+    182:182:com.android.tools.r8.graph.CfCode buildCfCode():310 -> a
+    182:182:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    183:183:boolean hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):347:347 -> a
+    183:183:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):420 -> a
+    183:183:com.android.tools.r8.graph.CfCode buildCfCode():310 -> a
+    183:183:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    184:188:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):336:340 -> a
+    184:188:boolean hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):348 -> a
+    184:188:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):420 -> a
+    184:188:com.android.tools.r8.graph.CfCode buildCfCode():310 -> a
+    184:188:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    189:191:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):424:426 -> a
+    189:191:com.android.tools.r8.graph.CfCode buildCfCode():310 -> a
+    189:191:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    192:225:void addFrame(com.android.tools.r8.ir.code.BasicBlock):540:573 -> a
+    192:225:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):426 -> a
+    192:225:com.android.tools.r8.graph.CfCode buildCfCode():310 -> a
+    192:225:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    226:258:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):427:459 -> a
+    226:258:com.android.tools.r8.graph.CfCode buildCfCode():310 -> a
+    226:258:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    259:276:void updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):468:485 -> a
+    259:276:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):461 -> a
+    259:276:com.android.tools.r8.graph.CfCode buildCfCode():310 -> a
+    259:276:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    277:277:void add(com.android.tools.r8.cf.code.CfInstruction):642:642 -> a
+    277:277:void updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):485 -> a
+    277:277:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):461 -> a
+    277:277:com.android.tools.r8.graph.CfCode buildCfCode():310 -> a
+    277:277:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    278:278:void updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):486:486 -> a
+    278:278:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):461 -> a
+    278:278:com.android.tools.r8.graph.CfCode buildCfCode():310 -> a
+    278:278:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    279:279:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):462:462 -> a
+    279:279:com.android.tools.r8.graph.CfCode buildCfCode():310 -> a
+    279:279:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    280:280:com.android.tools.r8.graph.CfCode buildCfCode():312:312 -> a
+    280:280:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    281:281:boolean com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.isEmpty():108:108 -> a
+    281:281:com.android.tools.r8.graph.CfCode buildCfCode():312 -> a
+    281:281:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    282:298:com.android.tools.r8.graph.CfCode buildCfCode():312:328 -> a
+    282:298:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):167 -> a
+    299:299:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):168:168 -> a
+    300:305:boolean verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexDefinitionSupplier):173:178 -> a
+    300:305:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):168 -> a
+    306:306:com.android.tools.r8.cf.code.CfInstruction getLastInstruction():536:536 -> a
+    306:306:com.android.tools.r8.cf.code.CfLabel ensureLabel():526 -> a
+    307:310:com.android.tools.r8.cf.code.CfLabel ensureLabel():527:530 -> a
+    311:311:void add(com.android.tools.r8.cf.code.CfInstruction):642:642 -> a
+    311:311:com.android.tools.r8.cf.code.CfLabel ensureLabel():531 -> a
+    312:313:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):577:578 -> a
+    314:344:com.android.tools.r8.cf.code.CfFrame$FrameType findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):587:617 -> a
+    314:344:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):580 -> a
+    345:345:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):581:581 -> a
+    346:346:com.android.tools.r8.cf.code.CfFrame$FrameType findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):594:594 -> a
+    346:346:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):580 -> a
+    347:349:void emitLabel(com.android.tools.r8.cf.code.CfLabel):625:627 -> a
+    350:350:com.android.tools.r8.cf.code.CfLabel getLabel(com.android.tools.r8.ir.code.BasicBlock):634:634 -> a
+    351:351:int getLocalRegister(com.android.tools.r8.ir.code.Value):638:638 -> a
+    352:352:void add(com.android.tools.r8.cf.code.CfInstruction):642:642 -> a
+    1:7:java.util.List computeInitializers(com.android.tools.r8.ir.code.Value):212:218 -> b
+    8:27:void updateLocals(com.android.tools.r8.cf.code.CfLabel):491:510 -> b
+    28:33:void updateLocals(com.android.tools.r8.cf.code.CfLabel):509:514 -> b
+    34:38:boolean localsChanged():518:522 -> b
+    39:39:com.android.tools.r8.cf.code.CfLabel lambda$getLabel$0(com.android.tools.r8.ir.code.BasicBlock):634:634 -> b
+com.android.tools.r8.ir.conversion.CfBuilder$1 -> com.android.tools.r8.ir.conversion.f:
+com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.ir.conversion.g:
     int height -> b
     boolean $assertionsDisabled -> c
     int maxHeight -> a
-    1:1:void <clinit>():102:102 -> <clinit>
-    1:3:void <init>():102:104 -> <init>
-    1:3:void <init>(com.android.tools.r8.ir.conversion.CfBuilder$1):102 -> <init>
-    1:2:void pop(com.android.tools.r8.ir.code.Value):117:118 -> a
-    1:3:void push(com.android.tools.r8.ir.code.Value):111:113 -> b
-com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.ir.conversion.l:
+    1:1:void <clinit>():103:103 -> <clinit>
+    1:3:void <init>():103:105 -> <init>
+    1:3:void <init>(com.android.tools.r8.ir.conversion.CfBuilder$1):103 -> <init>
+    1:2:void pop(com.android.tools.r8.ir.code.Value):118:119 -> a
+    1:3:void push(com.android.tools.r8.ir.code.Value):112:114 -> b
+com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.ir.conversion.i:
     com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList cachedTryHandlerList -> h
     com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo currentBlockInfo -> a
     int currentInstructionIndex -> j
@@ -21226,7 +20758,7 @@
     1:4:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):269:272 -> traceInstruction
     5:31:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):271:297 -> traceInstruction
     1:1:boolean verifyCurrentInstructionCanThrow():647:647 -> verifyCurrentInstructionCanThrow
-com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList -> com.android.tools.r8.ir.conversion.j:
+com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList -> com.android.tools.r8.ir.conversion.i$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap locals -> c
     int endOffset -> b
     int startOffset -> a
@@ -21239,7 +20771,7 @@
     19:19:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps.emptyMap():198:198 -> a
     19:19:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList compute(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):159 -> a
     20:20:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList compute(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):159:159 -> a
-com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.tools.r8.ir.conversion.k:
+com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.tools.r8.ir.conversion.j:
     java.util.List guards -> c
     boolean $assertionsDisabled -> e
     int endOffset -> b
@@ -21249,7 +20781,7 @@
     1:5:void <init>(int,int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):65:69 -> <init>
     1:2:boolean isEmpty():77:78 -> a
     3:31:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList computeTryHandlers(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.graph.DexItemFactory):88:116 -> a
-com.android.tools.r8.ir.conversion.CfState -> com.android.tools.r8.ir.conversion.r:
+com.android.tools.r8.ir.conversion.CfState -> com.android.tools.r8.ir.conversion.v:
     com.android.tools.r8.ir.conversion.CfState$Snapshot current -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():12:12 -> <clinit>
@@ -21285,8 +20817,8 @@
     1:1:java.lang.String toString():222:222 -> toString
     2:17:java.lang.String com.android.tools.r8.ir.conversion.CfState$BaseSnapshot.toString():401:416 -> toString
     2:17:java.lang.String toString():222 -> toString
-com.android.tools.r8.ir.conversion.CfState$1 -> com.android.tools.r8.ir.conversion.m:
-com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.ir.conversion.n:
+com.android.tools.r8.ir.conversion.CfState$1 -> com.android.tools.r8.ir.conversion.k:
+com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.ir.conversion.l:
     com.android.tools.r8.ir.conversion.CfState$SlotType[] locals -> c
     com.android.tools.r8.ir.conversion.CfState$SlotType[] stack -> d
     boolean $assertionsDisabled -> f
@@ -21312,7 +20844,7 @@
     5:5:com.android.tools.r8.ir.conversion.CfState$Slot peek():371 -> d
     1:1:int stackHeight():355:355 -> e
     1:16:java.lang.String toString():401:416 -> toString
-com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.ir.conversion.o:
+com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.ir.conversion.m:
     int stackHeight -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():459:459 -> <clinit>
@@ -21321,7 +20853,7 @@
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():482:482 -> d
     1:1:int stackHeight():471:471 -> e
     1:1:java.lang.String toString():487:487 -> toString
-com.android.tools.r8.ir.conversion.CfState$Push -> com.android.tools.r8.ir.conversion.p:
+com.android.tools.r8.ir.conversion.CfState$Push -> com.android.tools.r8.ir.conversion.n:
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():420:420 -> <clinit>
@@ -21334,12 +20866,12 @@
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():442:442 -> d
     1:1:int stackHeight():432:432 -> e
     1:1:java.lang.String toString():455:455 -> toString
-com.android.tools.r8.ir.conversion.CfState$SetPosition -> com.android.tools.r8.ir.conversion.q:
+com.android.tools.r8.ir.conversion.CfState$SetPosition -> com.android.tools.r8.ir.conversion.o:
     com.android.tools.r8.ir.code.Position position -> c
     1:2:void <init>(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.code.Position):528:529 -> <init>
     1:1:com.android.tools.r8.ir.code.Position getPosition():534:534 -> b
     1:1:java.lang.String toString():539:539 -> toString
-com.android.tools.r8.ir.conversion.CfState$Slot -> com.android.tools.r8.ir.conversion.r$a:
+com.android.tools.r8.ir.conversion.CfState$Slot -> com.android.tools.r8.ir.conversion.p:
     com.android.tools.r8.ir.conversion.CfState$SlotType slotType -> d
     com.android.tools.r8.ir.code.ValueType type -> b
     boolean $assertionsDisabled -> e
@@ -21354,24 +20886,24 @@
     3:4:int stackPosition():249:250 -> a
     1:1:int access$500(com.android.tools.r8.ir.conversion.CfState$Slot):225:225 -> b
     1:3:java.lang.String toString():255:257 -> toString
-com.android.tools.r8.ir.conversion.CfState$SlotType -> com.android.tools.r8.ir.conversion.u:
+com.android.tools.r8.ir.conversion.CfState$SlotType -> com.android.tools.r8.ir.conversion.s:
     1:1:void <init>():14:14 -> <init>
     1:1:void <init>(com.android.tools.r8.ir.conversion.CfState$1):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.ir.conversion.s:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Imprecise -> com.android.tools.r8.ir.conversion.q:
     com.android.tools.r8.ir.code.ValueType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.ValueType):47:48 -> <init>
     1:1:com.android.tools.r8.ir.code.ValueType getImprecise():58:58 -> a
     com.android.tools.r8.graph.DexType getPrecise() -> b
     1:1:java.lang.String toString():63:63 -> toString
-com.android.tools.r8.ir.conversion.CfState$SlotType$Precise -> com.android.tools.r8.ir.conversion.t:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Precise -> com.android.tools.r8.ir.conversion.r:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):23:24 -> <init>
     1:1:com.android.tools.r8.ir.code.ValueType getImprecise():34:34 -> a
     1:1:com.android.tools.r8.graph.DexType getPrecise():29:29 -> b
     1:1:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.ir.conversion.v:
+com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.ir.conversion.t:
     com.android.tools.r8.ir.conversion.CfState$Snapshot parent -> a
     int updates -> b
     1:3:void <init>(com.android.tools.r8.ir.conversion.CfState$Snapshot,int):265:267 -> <init>
@@ -21385,7 +20917,7 @@
     1:1:int maxLocal():275:275 -> c
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():283:283 -> d
     1:1:int stackHeight():271:271 -> e
-com.android.tools.r8.ir.conversion.CfState$Write -> com.android.tools.r8.ir.conversion.w:
+com.android.tools.r8.ir.conversion.CfState$Write -> com.android.tools.r8.ir.conversion.u:
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():491:491 -> <clinit>
@@ -21394,7 +20926,7 @@
     2:3:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):513:514 -> a
     1:1:int maxLocal():503:503 -> c
     1:1:java.lang.String toString():519:519 -> toString
-com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.ir.conversion.H:
+com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.ir.conversion.A:
     boolean hasBackwardsBranch -> m
     boolean $assertionsDisabled -> o
     int outRegisterCount -> l
@@ -21410,294 +20942,294 @@
     java.util.List switchPayloadInfos -> d
     com.android.tools.r8.ir.regalloc.RegisterAllocator registerAllocator -> b
     java.util.Set ifsNeedingRewrite -> f
-    1:1:void <clinit>():82:82 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):124:125 -> <init>
-    3:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions):128:128 -> <init>
-    4:43:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions):94:133 -> <init>
-    1:1:com.android.tools.r8.ir.conversion.DexBuilder$Info access$000(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):82:82 -> a
-    2:2:boolean access$202(com.android.tools.r8.ir.conversion.DexBuilder,boolean):82:82 -> a
-    3:6:boolean identicalInstructionsAfterBuildingDexCode(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):141:144 -> a
-    7:9:com.android.tools.r8.ir.conversion.DexBuilder$Info buildInfoForComparison(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):149:151 -> a
-    10:38:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):339:367 -> a
-    39:41:boolean isTrivialFallthroughTarget(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):329:331 -> a
-    39:41:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):368 -> a
-    42:104:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):370:432 -> a
-    105:106:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):589:590 -> a
-    105:106:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):433 -> a
-    107:109:boolean isNonMaterializingConstNumber(com.android.tools.r8.ir.code.Instruction):597:599 -> a
-    107:109:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):591 -> a
-    107:109:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):433 -> a
-    110:110:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):592:592 -> a
-    110:110:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):433 -> a
-    111:156:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):435:480 -> a
-    157:170:void rewriteIfs():496:509 -> a
-    157:170:com.android.tools.r8.graph.DexCode build():183 -> a
-    171:179:void reset():159:167 -> a
-    171:179:com.android.tools.r8.graph.DexCode build():186 -> a
-    180:275:com.android.tools.r8.graph.DexCode build():190:285 -> a
-    276:287:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):717:728 -> a
-    276:287:com.android.tools.r8.graph.DexCode build():288 -> a
-    288:288:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):672:672 -> a
-    288:288:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):728 -> a
-    288:288:com.android.tools.r8.graph.DexCode build():288 -> a
-    289:295:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):728:734 -> a
-    289:295:com.android.tools.r8.graph.DexCode build():288 -> a
-    296:296:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):672:672 -> a
-    296:296:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):734 -> a
-    296:296:com.android.tools.r8.graph.DexCode build():288 -> a
-    297:299:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):734:736 -> a
-    297:299:com.android.tools.r8.graph.DexCode build():288 -> a
-    300:316:com.android.tools.r8.graph.DexCode build():289:305 -> a
-    317:317:int com.android.tools.r8.code.FillArrayDataPayload.getSize():75:75 -> a
-    317:317:com.android.tools.r8.graph.DexCode build():306 -> a
-    318:318:com.android.tools.r8.graph.DexCode build():307:307 -> a
-    319:321:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():743:745 -> a
-    319:321:com.android.tools.r8.graph.DexCode build():311 -> a
-    322:327:com.android.tools.r8.graph.DexCode$Try[] getDexTryItems(java.util.List,java.util.Map):846:851 -> a
-    322:327:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():747 -> a
-    322:327:com.android.tools.r8.graph.DexCode build():311 -> a
-    328:328:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():748:748 -> a
-    328:328:com.android.tools.r8.graph.DexCode build():311 -> a
-    329:346:com.android.tools.r8.graph.DexCode$TryHandler[] getDexTryHandlers(java.util.Map):857:874 -> a
-    329:346:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():748 -> a
-    329:346:com.android.tools.r8.graph.DexCode build():311 -> a
-    347:355:com.android.tools.r8.graph.DexCode build():314:322 -> a
-    356:356:int allocatedRegister(com.android.tools.r8.ir.code.Value,int):525:525 -> a
-    357:360:void addGoto(com.android.tools.r8.ir.code.Goto):535:538 -> a
-    361:375:boolean needsNopBetweenMoveAndInstanceOf(com.android.tools.r8.code.InstanceOf):543:557 -> a
-    361:375:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.code.InstanceOf):567 -> a
-    376:378:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.code.InstanceOf):568:570 -> a
-    379:380:void addIf(com.android.tools.r8.ir.code.If):575:576 -> a
-    381:381:void addMove(com.android.tools.r8.ir.code.Move):580:580 -> a
-    382:382:void addNop(com.android.tools.r8.ir.code.Instruction):603:603 -> a
-    383:386:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):613:616 -> a
-    387:390:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):614:617 -> a
-    391:392:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction[]):621:622 -> a
-    393:395:void addSwitch(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.code.Format31t):626:628 -> a
-    396:397:void addFillArrayData(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.code.FillArrayData):632:633 -> a
-    398:399:void addArgument(com.android.tools.r8.ir.code.Argument):637:638 -> a
-    400:404:void addReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.code.Instruction):642:646 -> a
-    405:405:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):651:651 -> a
-    406:407:void setSingleInfo(com.android.tools.r8.ir.conversion.DexBuilder$Info):683:684 -> a
-    406:407:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):653 -> a
-    408:410:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):656:658 -> a
-    411:411:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):672:672 -> a
-    411:411:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):658 -> a
-    412:416:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):658:662 -> a
-    417:420:void setInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):676:679 -> a
-    417:420:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):663 -> a
-    421:421:int instructionNumberToIndex(int):667:667 -> a
-    422:422:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):672:672 -> a
-    422:422:com.android.tools.r8.ir.conversion.DexBuilder$Info access$100(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.Instruction):82 -> a
-    423:434:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):688:699 -> a
-    435:435:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):672:672 -> a
-    435:435:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):699 -> a
-    436:436:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):699:699 -> a
-    437:442:com.android.tools.r8.ir.code.BasicBlock computeNextBlock(com.android.tools.r8.ir.code.BasicBlock):707:712 -> a
-    437:442:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):700 -> a
-    443:446:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):700:703 -> a
-    447:503:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):754:810 -> a
-    504:504:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):672:672 -> a
-    504:504:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):811 -> a
-    505:522:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):811:828 -> a
-    1:1:void needsIfRewriting(com.android.tools.r8.ir.code.BasicBlock):515:515 -> b
-    1:1:void access$300(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):82 -> b
-    2:3:void requestOutgoingRegisters(int):519:520 -> b
-    4:4:int argumentOrAllocateRegister(com.android.tools.r8.ir.code.Value,int):531:531 -> b
-    5:5:void addNothing(com.android.tools.r8.ir.code.Instruction):584:584 -> b
-    6:8:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):834:836 -> b
-    9:9:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):672:672 -> b
-    9:9:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):837 -> b
-    10:13:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):838:841 -> b
-    14:14:com.android.tools.r8.utils.InternalOptions getOptions():880:880 -> b
-    1:1:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):672:672 -> c
-    2:2:com.android.tools.r8.ir.regalloc.RegisterAllocator getRegisterAllocator():884:884 -> c
-    1:1:boolean isBuildingForComparison():155:155 -> d
-com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.ir.conversion.x:
-    1:1:void <init>(com.android.tools.r8.ir.code.Instruction):1053:1053 -> <init>
+    1:1:void <clinit>():83:83 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):125:127 -> <init>
+    4:4:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions):130:130 -> <init>
+    5:45:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions):95:135 -> <init>
+    1:1:com.android.tools.r8.ir.conversion.DexBuilder$Info access$000(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):83:83 -> a
+    2:2:boolean access$202(com.android.tools.r8.ir.conversion.DexBuilder,boolean):83:83 -> a
+    3:6:boolean identicalInstructionsAfterBuildingDexCode(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):143:146 -> a
+    7:9:com.android.tools.r8.ir.conversion.DexBuilder$Info buildInfoForComparison(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):151:153 -> a
+    10:38:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):315:343 -> a
+    39:41:boolean isTrivialFallthroughTarget(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):305:307 -> a
+    39:41:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):344 -> a
+    42:104:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):346:408 -> a
+    105:106:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):565:566 -> a
+    105:106:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):409 -> a
+    107:109:boolean isNonMaterializingConstNumber(com.android.tools.r8.ir.code.Instruction):573:575 -> a
+    107:109:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):567 -> a
+    107:109:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):409 -> a
+    110:110:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):568:568 -> a
+    110:110:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):409 -> a
+    111:156:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):411:456 -> a
+    157:170:void rewriteIfs():472:485 -> a
+    157:170:com.android.tools.r8.graph.DexCode build():185 -> a
+    171:179:void reset():161:169 -> a
+    171:179:com.android.tools.r8.graph.DexCode build():188 -> a
+    180:249:com.android.tools.r8.graph.DexCode build():192:261 -> a
+    250:261:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):693:704 -> a
+    250:261:com.android.tools.r8.graph.DexCode build():264 -> a
+    262:262:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):648:648 -> a
+    262:262:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):704 -> a
+    262:262:com.android.tools.r8.graph.DexCode build():264 -> a
+    263:269:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):704:710 -> a
+    263:269:com.android.tools.r8.graph.DexCode build():264 -> a
+    270:270:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):648:648 -> a
+    270:270:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):710 -> a
+    270:270:com.android.tools.r8.graph.DexCode build():264 -> a
+    271:273:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):710:712 -> a
+    271:273:com.android.tools.r8.graph.DexCode build():264 -> a
+    274:290:com.android.tools.r8.graph.DexCode build():265:281 -> a
+    291:291:int com.android.tools.r8.code.FillArrayDataPayload.getSize():75:75 -> a
+    291:291:com.android.tools.r8.graph.DexCode build():282 -> a
+    292:292:com.android.tools.r8.graph.DexCode build():283:283 -> a
+    293:295:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():719:721 -> a
+    293:295:com.android.tools.r8.graph.DexCode build():287 -> a
+    296:301:com.android.tools.r8.graph.DexCode$Try[] getDexTryItems(java.util.List,java.util.Map):822:827 -> a
+    296:301:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():723 -> a
+    296:301:com.android.tools.r8.graph.DexCode build():287 -> a
+    302:302:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():724:724 -> a
+    302:302:com.android.tools.r8.graph.DexCode build():287 -> a
+    303:320:com.android.tools.r8.graph.DexCode$TryHandler[] getDexTryHandlers(java.util.Map):833:850 -> a
+    303:320:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():724 -> a
+    303:320:com.android.tools.r8.graph.DexCode build():287 -> a
+    321:329:com.android.tools.r8.graph.DexCode build():290:298 -> a
+    330:330:int allocatedRegister(com.android.tools.r8.ir.code.Value,int):501:501 -> a
+    331:334:void addGoto(com.android.tools.r8.ir.code.Goto):511:514 -> a
+    335:349:boolean needsNopBetweenMoveAndInstanceOf(com.android.tools.r8.code.InstanceOf):519:533 -> a
+    335:349:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.code.InstanceOf):543 -> a
+    350:352:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.code.InstanceOf):544:546 -> a
+    353:354:void addIf(com.android.tools.r8.ir.code.If):551:552 -> a
+    355:355:void addMove(com.android.tools.r8.ir.code.Move):556:556 -> a
+    356:356:void addNop(com.android.tools.r8.ir.code.Instruction):579:579 -> a
+    357:360:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):589:592 -> a
+    361:364:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):590:593 -> a
+    365:366:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction[]):597:598 -> a
+    367:369:void addSwitch(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.code.Format31t):602:604 -> a
+    370:371:void addFillArrayData(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.code.FillArrayData):608:609 -> a
+    372:373:void addArgument(com.android.tools.r8.ir.code.Argument):613:614 -> a
+    374:378:void addReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.code.Instruction):618:622 -> a
+    379:379:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):627:627 -> a
+    380:381:void setSingleInfo(com.android.tools.r8.ir.conversion.DexBuilder$Info):659:660 -> a
+    380:381:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):629 -> a
+    382:384:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):632:634 -> a
+    385:385:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):648:648 -> a
+    385:385:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):634 -> a
+    386:390:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):634:638 -> a
+    391:394:void setInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):652:655 -> a
+    391:394:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):639 -> a
+    395:395:int instructionNumberToIndex(int):643:643 -> a
+    396:396:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):648:648 -> a
+    396:396:com.android.tools.r8.ir.conversion.DexBuilder$Info access$100(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.Instruction):83 -> a
+    397:408:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):664:675 -> a
+    409:409:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):648:648 -> a
+    409:409:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):675 -> a
+    410:410:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):675:675 -> a
+    411:416:com.android.tools.r8.ir.code.BasicBlock computeNextBlock(com.android.tools.r8.ir.code.BasicBlock):683:688 -> a
+    411:416:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):676 -> a
+    417:420:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):676:679 -> a
+    421:477:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):730:786 -> a
+    478:478:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):648:648 -> a
+    478:478:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):787 -> a
+    479:496:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):787:804 -> a
+    1:1:void needsIfRewriting(com.android.tools.r8.ir.code.BasicBlock):491:491 -> b
+    1:1:void access$300(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):83 -> b
+    2:3:void requestOutgoingRegisters(int):495:496 -> b
+    4:4:int argumentOrAllocateRegister(com.android.tools.r8.ir.code.Value,int):507:507 -> b
+    5:5:void addNothing(com.android.tools.r8.ir.code.Instruction):560:560 -> b
+    6:8:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):810:812 -> b
+    9:9:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):648:648 -> b
+    9:9:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):813 -> b
+    10:13:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):814:817 -> b
+    14:14:com.android.tools.r8.utils.InternalOptions getOptions():856:856 -> b
+    1:1:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):648:648 -> c
+    2:2:com.android.tools.r8.ir.regalloc.RegisterAllocator getRegisterAllocator():860:860 -> c
+    1:1:boolean isBuildingForComparison():157:157 -> d
+com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.ir.conversion.w:
+    1:1:void <init>(com.android.tools.r8.ir.code.Instruction):1029:1029 -> <init>
     void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List) -> a
     int computeSize(com.android.tools.r8.ir.conversion.DexBuilder) -> a
-    1:1:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1082:1082 -> a
+    1:1:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1058:1058 -> a
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.ir.conversion.y:
+com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.ir.conversion.x:
     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):1528:1530 -> <init>
-com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.ir.conversion.z:
+    1:3:void <init>(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.code.FillArrayData):1504:1506 -> <init>
+com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.ir.conversion.y:
     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):960:961 -> <init>
-    1:2:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):981:982 -> a
-    3:3:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):987:987 -> a
-    4:5:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):992:993 -> a
-    1:1:int getSize():966:966 -> d
-    1:1:int maxSize():976:976 -> e
-    1:1:int minSize():971:971 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.ir.conversion.A:
+    1:2:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):936:937 -> <init>
+    1:2:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):957:958 -> a
+    3:3:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):963:963 -> a
+    4:5:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):968:969 -> a
+    1:1:int getSize():942:942 -> d
+    1:1:int maxSize():952:952 -> e
+    1:1:int minSize():947:947 -> f
+com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.ir.conversion.z:
     boolean $assertionsDisabled -> f
     int size -> e
-    1:1:void <clinit>():1086:1086 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Goto):1091:1091 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Goto):1088:1088 -> <init>
-    1:1:com.android.tools.r8.ir.code.Goto getJump():1095:1095 -> a
-    1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1159 -> a
-    2:46:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1160:1204 -> a
-    47:51:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1193:1197 -> a
-    52:71:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1188:1207 -> a
-    72:72:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1118:1118 -> a
-    73:73:com.android.tools.r8.ir.code.Goto getJump():1095:1095 -> a
-    73:73:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1119 -> a
-    74:108:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1120:1154 -> a
-    109:109:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1213:1213 -> a
-    1:2:int getSize():1100:1101 -> d
-    1:1:int maxSize():1112:1112 -> e
-    1:1:int minSize():1106:1106 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.ir.conversion.B:
+    1:1:void <clinit>():1062:1062 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Goto):1067:1067 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Goto):1064:1064 -> <init>
+    1:1:com.android.tools.r8.ir.code.Goto getJump():1071:1071 -> a
+    1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1135 -> a
+    2:46:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1136:1180 -> a
+    47:51:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1169:1173 -> a
+    52:71:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1164:1183 -> a
+    72:72:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1094:1094 -> a
+    73:73:com.android.tools.r8.ir.code.Goto getJump():1071:1071 -> a
+    73:73:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1095 -> a
+    74:108:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1096:1130 -> a
+    109:109:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1189:1189 -> a
+    1:2:int getSize():1076:1077 -> d
+    1:1:int maxSize():1088:1088 -> e
+    1:1:int minSize():1082:1082 -> f
+com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.ir.conversion.A$a:
     boolean $assertionsDisabled -> f
     int size -> e
-    1:1:void <clinit>():1217:1217 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.If):1222:1222 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.If):1219:1219 -> <init>
-    1:1:com.android.tools.r8.ir.code.Instruction getIR():1217:1217 -> a
-    2:2:void setMaxOffset(int):1217:1217 -> a
-    3:4:int getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1226:1227 -> a
-    5:5:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1248:1248 -> a
-    5:5:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331 -> a
-    6:6:int getMaxOffset():1217:1217 -> a
-    6:6:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1249 -> a
-    6:6:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331 -> a
-    7:7:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1250:1250 -> a
-    7:7:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331 -> a
-    8:8:int getOffset():1217:1217 -> a
-    8:8:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1252 -> a
-    8:8:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331 -> a
-    9:9:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1252:1252 -> a
-    9:9:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331 -> a
-    10:10:int getOffset():1217:1217 -> a
-    10:10:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1257 -> a
-    10:10:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331 -> a
-    11:11:int getOffset():1217:1217 -> a
-    11:11:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1258 -> a
-    11:11:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1331 -> a
-    12:15:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1332:1335 -> a
-    16:52:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1263:1299 -> a
-    53:53:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1296:1296 -> a
-    54:54:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1293:1293 -> a
-    55:55:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1290:1290 -> a
-    56:56:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1287:1287 -> a
-    57:94:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1284:1321 -> a
-    95:95:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1318:1318 -> a
-    96:96:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1315:1315 -> a
-    97:97:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1312:1312 -> a
-    98:98:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1309:1309 -> a
-    99:99:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1306:1306 -> a
-    100:100:int getOffset():1217:1217 -> a
-    100:100:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1325 -> a
-    101:102:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1325:1326 -> a
-    103:108:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1355:1360 -> a
-    1:1:void com.android.tools.r8.ir.conversion.DexBuilder$Info.setMinOffset(int):934:934 -> b
-    1:1:void setMinOffset(int):1217 -> b
-    2:2:int getMaxOffset():1217:1217 -> b
-    3:5:boolean branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1242:1244 -> b
-    1:1:int getOffset():1217:1217 -> c
-    2:2:void setOffset(int):1217:1217 -> c
-    3:6:int[] getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1231:1234 -> c
-    1:1:int getSize():1350:1350 -> d
+    1:1:void <clinit>():1193:1193 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.If):1198:1198 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.If):1195:1195 -> <init>
+    1:1:com.android.tools.r8.ir.code.Instruction getIR():1193:1193 -> a
+    2:2:void setMaxOffset(int):1193:1193 -> a
+    3:4:int getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1202:1203 -> a
+    5:5:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1224:1224 -> a
+    5:5:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    6:6:int getMaxOffset():1193:1193 -> a
+    6:6:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1225 -> a
+    6:6:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    7:7:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1226:1226 -> a
+    7:7:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    8:8:int getOffset():1193:1193 -> a
+    8:8:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1228 -> a
+    8:8:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    9:9:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1228:1228 -> a
+    9:9:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    10:10:int getOffset():1193:1193 -> a
+    10:10:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1233 -> a
+    10:10:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    11:11:int getOffset():1193:1193 -> a
+    11:11:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1234 -> a
+    11:11:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    12:15:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1308:1311 -> a
+    16:52:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1239:1275 -> a
+    53:53:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1272:1272 -> a
+    54:54:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1269:1269 -> a
+    55:55:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1266:1266 -> a
+    56:56:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1263:1263 -> a
+    57:94:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1260:1297 -> a
+    95:95:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1294:1294 -> a
+    96:96:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1291:1291 -> a
+    97:97:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1288:1288 -> a
+    98:98:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1285:1285 -> a
+    99:99:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1282:1282 -> a
+    100:100:int getOffset():1193:1193 -> a
+    100:100:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1301 -> a
+    101:102:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1301:1302 -> a
+    103:108:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1331:1336 -> a
+    1:1:void com.android.tools.r8.ir.conversion.DexBuilder$Info.setMinOffset(int):910:910 -> b
+    1:1:void setMinOffset(int):1193 -> b
+    2:2:int getMaxOffset():1193:1193 -> b
+    3:5:boolean branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1218:1220 -> b
+    1:1:int getOffset():1193:1193 -> c
+    2:2:void setOffset(int):1193:1193 -> c
+    3:6:int[] getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1207:1210 -> c
+    1:1:int getSize():1326:1326 -> d
     int maxSize() -> e
     int minSize() -> f
-    1:1:com.android.tools.r8.ir.code.Instruction getIR():1217:1217 -> g
-    1:1:com.android.tools.r8.ir.code.If getBranch():1238 -> g
-    2:2:com.android.tools.r8.ir.code.If getBranch():1238:1238 -> g
-com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.ir.conversion.C:
+    1:1:com.android.tools.r8.ir.code.Instruction getIR():1193:1193 -> g
+    1:1:com.android.tools.r8.ir.code.If getBranch():1214 -> g
+    2:2:com.android.tools.r8.ir.code.If getBranch():1214:1214 -> g
+com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.ir.conversion.B:
     com.android.tools.r8.ir.code.Instruction ir -> a
     int offset -> b
     int maxOffset -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():888:888 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Instruction):897:897 -> <init>
-    2:9:void <init>(com.android.tools.r8.ir.code.Instruction):892:899 -> <init>
+    1:1:void <clinit>():864:864 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Instruction):873:873 -> <init>
+    2:9:void <init>(com.android.tools.r8.ir.code.Instruction):868:875 -> <init>
     void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List) -> a
     int computeSize(com.android.tools.r8.ir.conversion.DexBuilder) -> a
     boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder) -> a
-    1:2:void setMaxOffset(int):944:945 -> a
-    3:3:com.android.tools.r8.ir.code.Instruction getIR():949:949 -> a
-    1:1:void setMinOffset(int):934:934 -> b
-    2:3:int getMaxOffset():939:940 -> b
-    1:2:int getOffset():919:920 -> c
-    3:4:void setOffset(int):924:925 -> c
+    1:2:void setMaxOffset(int):920:921 -> a
+    3:3:com.android.tools.r8.ir.code.Instruction getIR():925:925 -> a
+    1:1:void setMinOffset(int):910:910 -> b
+    2:3:int getMaxOffset():915:916 -> b
+    1:2:int getOffset():895:896 -> c
+    3:4:void setOffset(int):900:901 -> c
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.ir.conversion.D:
+com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.ir.conversion.C:
     boolean $assertionsDisabled -> f
     int size -> e
-    1:1:void <clinit>():1364:1364 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Move):1369:1369 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Move):1366:1366 -> <init>
-    1:1:com.android.tools.r8.ir.code.Instruction getIR():1364:1364 -> a
-    2:2:void setMaxOffset(int):1364:1364 -> a
-    3:3:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1377:1377 -> a
-    3:3:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1396 -> a
-    4:4:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1381:1381 -> a
-    4:4:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1397 -> a
-    5:13:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1399:1407 -> a
-    14:17:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1386:1389 -> a
-    18:18:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1377:1377 -> a
-    18:18:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1390 -> a
-    19:19:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1377:1377 -> a
-    19:19:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1390 -> a
-    20:20:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1381:1381 -> a
-    20:20:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1391 -> a
-    21:21:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1381:1381 -> a
-    21:21:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1391 -> a
-    22:23:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1412:1413 -> a
-    24:24:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1377:1377 -> a
-    24:24:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1414 -> a
-    25:25:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1381:1381 -> a
-    25:25:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1415 -> a
-    26:65:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1417:1456 -> a
-    66:73:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1434:1441 -> a
-    74:82:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1420:1428 -> a
-    83:83:int getOffset():1364:1364 -> a
-    83:83:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1458 -> a
-    84:85:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1458:1459 -> a
-    86:86:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1430:1430 -> a
-    1:1:void com.android.tools.r8.ir.conversion.DexBuilder$Info.setMinOffset(int):934:934 -> b
-    1:1:void setMinOffset(int):1364 -> b
-    2:2:int getMaxOffset():1364:1364 -> b
-    3:3:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1381:1381 -> b
-    1:1:int getOffset():1364:1364 -> c
-    2:2:void setOffset(int):1364:1364 -> c
-    3:3:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1377:1377 -> c
-    1:2:int getSize():1476:1477 -> d
-    1:1:int maxSize():1470:1470 -> e
-    1:1:int minSize():1464:1464 -> f
-    1:1:com.android.tools.r8.ir.code.Instruction getIR():1364:1364 -> g
-    1:1:com.android.tools.r8.ir.code.Move getMove():1373 -> g
-    2:2:com.android.tools.r8.ir.code.Move getMove():1373:1373 -> g
-com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.ir.conversion.E:
+    1:1:void <clinit>():1340:1340 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Move):1345:1345 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Move):1342:1342 -> <init>
+    1:1:com.android.tools.r8.ir.code.Instruction getIR():1340:1340 -> a
+    2:2:void setMaxOffset(int):1340:1340 -> a
+    3:3:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1353:1353 -> a
+    3:3:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1372 -> a
+    4:4:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1357:1357 -> a
+    4:4:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1373 -> a
+    5:13:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1375:1383 -> a
+    14:17:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1362:1365 -> a
+    18:18:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1353:1353 -> a
+    18:18:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1366 -> a
+    19:19:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1353:1353 -> a
+    19:19:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1366 -> a
+    20:20:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1357:1357 -> a
+    20:20:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1367 -> a
+    21:21:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1357:1357 -> a
+    21:21:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1367 -> a
+    22:23:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1388:1389 -> a
+    24:24:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1353:1353 -> a
+    24:24:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1390 -> a
+    25:25:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1357:1357 -> a
+    25:25:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1391 -> a
+    26:65:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1393:1432 -> a
+    66:73:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1410:1417 -> a
+    74:82:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1396:1404 -> a
+    83:83:int getOffset():1340:1340 -> a
+    83:83:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1434 -> a
+    84:85:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1434:1435 -> a
+    86:86:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1406:1406 -> a
+    1:1:void com.android.tools.r8.ir.conversion.DexBuilder$Info.setMinOffset(int):910:910 -> b
+    1:1:void setMinOffset(int):1340 -> b
+    2:2:int getMaxOffset():1340:1340 -> b
+    3:3:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1357:1357 -> b
+    1:1:int getOffset():1340:1340 -> c
+    2:2:void setOffset(int):1340:1340 -> c
+    3:3:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1353:1353 -> c
+    1:2:int getSize():1452:1453 -> d
+    1:1:int maxSize():1446:1446 -> e
+    1:1:int minSize():1440:1440 -> f
+    1:1:com.android.tools.r8.ir.code.Instruction getIR():1340:1340 -> g
+    1:1:com.android.tools.r8.ir.code.Move getMove():1349 -> g
+    2:2:com.android.tools.r8.ir.code.Move getMove():1349:1349 -> g
+com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.ir.conversion.D:
     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[]):1004:1010 -> <init>
-    1:1:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1015:1015 -> a
-    2:6:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1020:1024 -> a
-    7:8:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1045:1046 -> a
-    1:1:int getSize():1040:1040 -> d
-    1:1:int maxSize():1035:1035 -> e
-    1:1:int minSize():1030:1030 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.ir.conversion.F:
+    1:7:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction[]):980:986 -> <init>
+    1:1:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):991:991 -> a
+    2:6:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):996:1000 -> a
+    7:8:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1021:1022 -> a
+    1:1:int getSize():1016:1016 -> d
+    1:1:int maxSize():1011:1011 -> e
+    1:1:int minSize():1006:1006 -> f
+com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.ir.conversion.E:
     com.android.tools.r8.ir.code.Switch ir -> a
     com.android.tools.r8.code.Format31t dex -> b
-    1:3:void <init>(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.code.Format31t):1517:1519 -> <init>
-com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.ir.conversion.G:
+    1:3:void <init>(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.code.Format31t):1493:1495 -> <init>
+com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.ir.conversion.F:
     com.android.tools.r8.ir.code.CatchHandlers handlers -> a
     int start -> b
     int end -> c
-    1:4:void <init>(com.android.tools.r8.ir.code.CatchHandlers,int,int):1500:1503 -> <init>
-    1:1:int compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1508:1508 -> a
-    1:1:int compareTo(java.lang.Object):1494:1494 -> compareTo
-com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.ir.conversion.I:
+    1:4:void <init>(com.android.tools.r8.ir.code.CatchHandlers,int,int):1476:1479 -> <init>
+    1:1:int compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1484:1484 -> a
+    1:1:int compareTo(java.lang.Object):1470:1470 -> compareTo
+com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.ir.conversion.G:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.code.Position currentPosition -> i
     com.android.tools.r8.graph.DexMethod originalMethod -> l
@@ -21711,53 +21243,53 @@
     com.android.tools.r8.graph.DexEncodedMethod method -> b
     com.android.tools.r8.ir.conversion.SwitchPayloadResolver switchPayloadResolver -> d
     java.util.List debugEntries -> k
-    1:1:void <clinit>():59:59 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):83:83 -> <init>
-    2:31:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):65:94 -> <init>
-    1:3:com.android.tools.r8.graph.DexDebugEntry getDebugEntryAtOffset(int):262:264 -> a
-    4:5:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):291:292 -> a
-    6:14:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):291:299 -> a
-    15:15:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):294:294 -> a
-    16:16:boolean isMoveResult(com.android.tools.r8.code.Instruction):354:354 -> a
-    17:26:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexCode$Try):440:449 -> a
-    27:28:void lambda$getCurrentCatchHandlers$0(java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):446:447 -> a
-    29:37:void forEachTryRange(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):454:462 -> a
-    38:39:java.util.List getTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):472:473 -> a
-    40:40:void lambda$getTryHandlerOffsets$1(java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):473:473 -> a
-    1:1:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):431:431 -> b
-    2:2:boolean inTryRange(com.android.tools.r8.graph.DexCode$Try,int):426:426 -> b
-    2:2:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):432 -> b
-    1:1:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):203:203 -> buildInstruction
-    2:10:void updateCurrentCatchHandlers(int,com.android.tools.r8.graph.DexItemFactory):248:256 -> buildInstruction
-    2:10:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):203 -> buildInstruction
-    11:21:void updateDebugPosition(int,com.android.tools.r8.ir.conversion.IRBuilder):274:284 -> buildInstruction
-    11:21:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):204 -> buildInstruction
-    22:23:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):205:206 -> buildInstruction
-    1:32:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):141:172 -> buildPrelude
-    33:42:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):171:180 -> buildPrelude
-    43:51:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):178:186 -> buildPrelude
-    1:2:void clear():304:305 -> clear
-    1:4:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):226:229 -> getCanonicalDebugPositionAtOffset
-    1:1:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):211:211 -> getCurrentCatchHandlers
-    1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():234:234 -> getCurrentPosition
-    1:4:int getMoveExceptionRegister(int):216:219 -> getMoveExceptionRegister
-    1:1:int instructionCount():105:105 -> instructionCount
-    1:1:int instructionIndex(int):310:310 -> instructionIndex
-    1:1:int instructionOffset(int):315:315 -> instructionOffset
-    1:4:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):328:331 -> resolveAndBuildNewArrayFilledData
-    5:5:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):328:328 -> resolveAndBuildNewArrayFilledData
-    1:2:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):321:322 -> resolveAndBuildSwitch
-    3:3:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):321:321 -> resolveAndBuildSwitch
-    1:8:void setUp():126:133 -> setUp
-    1:33:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):361:393 -> traceInstruction
-    34:34:java.util.Set getUniqueTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):468:468 -> traceInstruction
-    34:34:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):393 -> traceInstruction
-    35:40:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):393:398 -> traceInstruction
-    41:41:boolean isInvoke(com.android.tools.r8.code.Instruction):335:335 -> traceInstruction
-    41:41:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):398 -> traceInstruction
-    42:62:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):398:418 -> traceInstruction
-    1:1:boolean verifyCurrentInstructionCanThrow():239:239 -> verifyCurrentInstructionCanThrow
-    1:1:boolean verifyRegister(int):100:100 -> verifyRegister
+    1:1:void <clinit>():57:57 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):81:81 -> <init>
+    2:31:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):63:92 -> <init>
+    1:3:com.android.tools.r8.graph.DexDebugEntry getDebugEntryAtOffset(int):260:262 -> a
+    4:5:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):289:290 -> a
+    6:14:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):289:297 -> a
+    15:15:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):292:292 -> a
+    16:16:boolean isMoveResult(com.android.tools.r8.code.Instruction):350:350 -> a
+    17:26:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexCode$Try):436:445 -> a
+    27:28:void lambda$getCurrentCatchHandlers$0(java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):442:443 -> a
+    29:37:void forEachTryRange(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):450:458 -> a
+    38:39:java.util.List getTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):468:469 -> a
+    40:40:void lambda$getTryHandlerOffsets$1(java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):469:469 -> a
+    1:1:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):427:427 -> b
+    2:2:boolean inTryRange(com.android.tools.r8.graph.DexCode$Try,int):422:422 -> b
+    2:2:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):428 -> b
+    1:1:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):201:201 -> buildInstruction
+    2:10:void updateCurrentCatchHandlers(int,com.android.tools.r8.graph.DexItemFactory):246:254 -> buildInstruction
+    2:10:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):201 -> buildInstruction
+    11:21:void updateDebugPosition(int,com.android.tools.r8.ir.conversion.IRBuilder):272:282 -> buildInstruction
+    11:21:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):202 -> buildInstruction
+    22:23:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):203:204 -> buildInstruction
+    1:32:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):139:170 -> buildPrelude
+    33:42:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):169:178 -> buildPrelude
+    43:51:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):176:184 -> buildPrelude
+    1:2:void clear():302:303 -> clear
+    1:4:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):224:227 -> getCanonicalDebugPositionAtOffset
+    1:1:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):209:209 -> getCurrentCatchHandlers
+    1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():232:232 -> getCurrentPosition
+    1:4:int getMoveExceptionRegister(int):214:217 -> getMoveExceptionRegister
+    1:1:int instructionCount():103:103 -> instructionCount
+    1:1:int instructionIndex(int):308:308 -> instructionIndex
+    1:1:int instructionOffset(int):313:313 -> instructionOffset
+    1:4:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):326:329 -> resolveAndBuildNewArrayFilledData
+    5:5:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):326:326 -> resolveAndBuildNewArrayFilledData
+    1:2:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):319:320 -> resolveAndBuildSwitch
+    3:3:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):319:319 -> resolveAndBuildSwitch
+    1:8:void setUp():124:131 -> setUp
+    1:33:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):357:389 -> traceInstruction
+    34:34:java.util.Set getUniqueTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):464:464 -> traceInstruction
+    34:34:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):389 -> traceInstruction
+    35:40:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):389:394 -> traceInstruction
+    41:41:boolean isInvoke(com.android.tools.r8.code.Instruction):333:333 -> traceInstruction
+    41:41:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):394 -> traceInstruction
+    42:62:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):394:414 -> traceInstruction
+    1:1:boolean verifyCurrentInstructionCanThrow():237:237 -> verifyCurrentInstructionCanThrow
+    1:1:boolean verifyRegister(int):98:98 -> verifyRegister
 com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.ir.conversion.IRBuilder:
     java.util.Queue ssaWorklist -> f
     int currentInstructionOffset -> j
@@ -22271,7 +21803,7 @@
     1:12:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1927:1938 -> v
     13:13:void addInstruction(com.android.tools.r8.ir.code.Instruction):2225:2225 -> v
     13:13:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1939 -> v
-com.android.tools.r8.ir.conversion.IRBuilder$1 -> com.android.tools.r8.ir.conversion.IRBuilder$1:
+com.android.tools.r8.ir.conversion.IRBuilder$1 -> com.android.tools.r8.ir.conversion.H:
     int[] $SwitchMap$com$android$tools$r8$ir$code$MemberType -> a
     1:1:void <clinit>():148:148 -> <clinit>
 com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.ir.conversion.IRBuilder$a:
@@ -22337,205 +21869,202 @@
     1:1:com.android.tools.r8.ir.code.BasicBlock access$100(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):179:179 -> a
     1:1:int access$400(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):179:179 -> b
 com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.ir.conversion.IRConverter:
-    com.android.tools.r8.utils.CfgPrinter printer -> n
     com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet -> b
     com.android.tools.r8.ir.conversion.OptimizationFeedback simpleOptimizationFeedback -> E
-    com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> f
-    com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization classInitializerDefaultsOptimization -> d
-    com.android.tools.r8.ir.desugar.Java8MethodRewriter java8MethodRewriter -> i
+    com.android.tools.r8.ir.optimize.classinliner.ClassInliner classInliner -> l
+    com.android.tools.r8.ir.optimize.Outliner outliner -> d
     com.android.tools.r8.ir.optimize.DeadCodeRemover deadCodeRemover -> B
-    com.android.tools.r8.ir.desugar.StringConcatRewriter stringConcatRewriter -> e
-    com.android.tools.r8.ir.optimize.string.StringOptimizer stringOptimizer -> w
-    com.android.tools.r8.ir.optimize.MemberValuePropagation memberValuePropagation -> p
-    com.android.tools.r8.ir.analysis.TypeChecker typeChecker -> y
-    com.android.tools.r8.utils.InternalOptions options -> m
-    com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> q
-    com.android.tools.r8.ir.desugar.InterfaceMethodRewriter interfaceMethodRewriter -> g
-    com.android.tools.r8.ir.optimize.Inliner inliner -> s
-    com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> t
     com.android.tools.r8.ir.conversion.OptimizationFeedbackDelayed delayedOptimizationFeedback -> C
-    com.android.tools.r8.utils.Timing timing -> b
-    com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization uninstantiatedTypeOptimization -> x
-    com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> o
+    com.android.tools.r8.ir.optimize.NonNullTracker nonNullTracker -> s
+    com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter twrCloseResourceRewriter -> i
+    com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer idempotentFunctionCallCanonicalizer -> A
+    com.android.tools.r8.ir.optimize.lambda.LambdaMerger lambdaMerger -> k
     java.util.List onWaveDoneActions -> G
-    com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> l
-    com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer covariantReturnTypeAnnotationTransformer -> v
-    com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer idempotentFunctionCallCanonicalizer -> z
+    com.android.tools.r8.ir.optimize.Devirtualizer devirtualizer -> v
     com.android.tools.r8.ir.conversion.OptimizationFeedback ignoreOptimizationFeedback -> D
-    com.android.tools.r8.ir.optimize.ServiceLoaderRewriter serviceLoaderRewriter -> A
-    com.android.tools.r8.ir.optimize.classinliner.ClassInliner classInliner -> k
-    com.android.tools.r8.ir.optimize.Outliner outliner -> c
+    com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> g
+    com.android.tools.r8.utils.CfgPrinter printer -> o
+    com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization classInitializerDefaultsOptimization -> e
+    com.android.tools.r8.ir.desugar.StringConcatRewriter stringConcatRewriter -> f
+    com.android.tools.r8.ir.optimize.string.StringOptimizer stringOptimizer -> x
+    com.android.tools.r8.ir.desugar.Java8MethodRewriter java8MethodRewriter -> j
+    com.android.tools.r8.ir.optimize.MemberValuePropagation memberValuePropagation -> q
+    com.android.tools.r8.utils.InternalOptions options -> n
+    com.android.tools.r8.ir.desugar.InterfaceMethodRewriter interfaceMethodRewriter -> h
+    com.android.tools.r8.utils.Timing timing -> c
+    com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> r
+    com.android.tools.r8.ir.optimize.Inliner inliner -> t
     com.android.tools.r8.graph.DexString highestSortingString -> F
-    com.android.tools.r8.ir.optimize.NonNullTracker nonNullTracker -> r
-    com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter twrCloseResourceRewriter -> h
+    com.android.tools.r8.ir.analysis.TypeChecker typeChecker -> z
+    com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization uninstantiatedTypeOptimization -> y
+    com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> p
+    com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> u
     boolean $assertionsDisabled -> H
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger lambdaMerger -> j
-    com.android.tools.r8.ir.optimize.Devirtualizer devirtualizer -> u
+    com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> m
+    com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer covariantReturnTypeAnnotationTransformer -> w
     1:1:void <clinit>():107:107 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):159:159 -> <init>
-    2:37:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):143:178 -> <init>
-    38:38:boolean enableTwrCloseResourceDesugaring():261:261 -> <init>
-    38:38:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):178 -> <init>
-    39:97:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):179:237 -> <init>
-    98:98:void <init>(com.android.tools.r8.graph.AppView):250:250 -> <init>
-    99:99:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):257:257 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.shaking.RootSetBuilder$RootSet):160:160 -> <init>
+    2:39:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.shaking.RootSetBuilder$RootSet):143:180 -> <init>
+    40:40:boolean enableTwrCloseResourceDesugaring():264:264 -> <init>
+    40:40:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.shaking.RootSetBuilder$RootSet):180 -> <init>
+    41:100:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.shaking.RootSetBuilder$RootSet):181:240 -> <init>
+    101:101:void <init>(com.android.tools.r8.graph.AppView):253:253 -> <init>
+    102:102:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):260:260 -> <init>
     boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$16(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    1:4:java.util.Set getDesugaredCallSites():241:244 -> a
-    5:12:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):336:343 -> a
-    13:15:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):283:285 -> a
-    13:15:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):345 -> a
-    16:16:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):346:346 -> a
-    17:18:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):307:308 -> a
-    17:18:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):346 -> a
-    19:20:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):316:317 -> a
-    19:20:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):347 -> a
-    21:22:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):323:324 -> a
-    21:22:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):348 -> a
-    23:24:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):329:330 -> a
-    23:24:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):349 -> a
-    25:28:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):351:354 -> a
-    29:35:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):358:364 -> a
-    36:38:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):389:391 -> a
-    36:38:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):365 -> a
-    39:43:void convertClassesToDex(java.lang.Iterable,java.util.concurrent.ExecutorService):427:431 -> a
-    44:46:void lambda$convertMethodsToDex$3(boolean,com.android.tools.r8.graph.DexEncodedMethod):446:448 -> a
-    47:47:void lambda$optimize$5(com.android.tools.r8.ir.conversion.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.CallGraph,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):509:509 -> a
-    48:49:void lambda$optimize$6(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):557:558 -> a
-    50:56:void addWaveDoneAction(com.android.tools.r8.utils.Action):609:615 -> a
-    57:57:void addWaveDoneAction(com.android.tools.r8.utils.Action):613:613 -> a
-    58:58:void addWaveDoneAction(com.android.tools.r8.utils.Action):610:610 -> a
-    59:59:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):623:623 -> a
-    60:65:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):633:638 -> a
-    66:83:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):637:654 -> a
-    84:94:java.lang.Object lambda$forEachSelectedOutliningMethod$10(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):640:650 -> a
-    95:95:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):680:680 -> a
-    96:99:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):724:727 -> a
-    100:105:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):733:738 -> a
-    106:111:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):742:747 -> a
-    112:112:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():21:21 -> a
-    112:112:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):748 -> a
-    113:113:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):748:748 -> a
-    114:114:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):744:744 -> a
-    115:115:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$11(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):761:761 -> a
-    116:116:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():21:21 -> a
-    116:116:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$11(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):765 -> a
-    117:117:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$11(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):765:765 -> a
-    118:118:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$11(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):761:761 -> a
-    119:125:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):783:789 -> a
-    126:126:com.android.tools.r8.ir.optimize.InliningOracle lambda$rewriteCode$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):1016:1016 -> a
-    127:132:void computeMayHaveSideEffects(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1185:1190 -> a
-    133:141:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):1205:1213 -> a
-    133:141:void computeMayHaveSideEffects(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1191 -> a
-    142:147:void computeMayHaveSideEffects(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1192:1197 -> a
-    148:148:boolean lambda$computeMayHaveSideEffects$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1195:1195 -> a
-    149:150:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1227:1228 -> a
-    151:155:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1247:1251 -> a
-    151:155:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1229 -> a
-    156:156:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1231:1231 -> a
-    157:167:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1256:1266 -> a
-    157:167:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1232 -> a
-    168:182:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1366:1380 -> a
-    183:185:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1426:1428 -> a
-    183:185:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1381 -> a
-    186:186:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1384:1384 -> a
-    187:188:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1433:1434 -> a
-    187:188:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1385 -> a
-    189:190:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1438:1439 -> a
-    189:190:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1388 -> a
-    191:192:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1391:1392 -> a
-    193:197:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1412:1416 -> a
-    193:197:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1393 -> a
-    198:203:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1394:1399 -> a
-    204:215:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1448:1459 -> a
-    204:215:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1400 -> a
-    216:217:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$15(com.android.tools.r8.graph.DexItemFactory):1374:1375 -> a
-    218:218:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$15(com.android.tools.r8.graph.DexItemFactory):1373:1373 -> a
-    219:219:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1421:1421 -> a
-    220:221:void printPhase(java.lang.String):1491:1492 -> a
-    222:240:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1497:1515 -> a
-    1:6:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):370:375 -> b
-    7:18:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):373:384 -> b
-    19:28:void convertMethodsToDex(com.android.tools.r8.graph.DexProgramClass):435:444 -> b
-    29:35:void convertMethodToDex(com.android.tools.r8.graph.DexEncodedMethod):454:460 -> b
+    1:4:java.util.Set getDesugaredCallSites():244:247 -> a
+    5:5:java.util.Set libraryMethodsReturningNonNull(com.android.tools.r8.graph.DexItemFactory):288:288 -> a
+    6:13:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):357:364 -> a
+    14:16:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):304:306 -> a
+    14:16:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):366 -> a
+    17:17:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):367:367 -> a
+    18:19:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):328:329 -> a
+    18:19:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):367 -> a
+    20:21:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):337:338 -> a
+    20:21:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):368 -> a
+    22:23:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):344:345 -> a
+    22:23:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):369 -> a
+    24:25:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):350:351 -> a
+    24:25:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):370 -> a
+    26:29:com.android.tools.r8.graph.DexApplication convertToDex(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):372:375 -> a
+    30:36:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):379:385 -> a
+    37:39:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):410:412 -> a
+    37:39:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):386 -> a
+    40:44:void convertClassesToDex(java.lang.Iterable,java.util.concurrent.ExecutorService):448:452 -> a
+    45:47:void lambda$convertMethodsToDex$3(boolean,com.android.tools.r8.graph.DexEncodedMethod):467:469 -> a
+    48:48:void lambda$optimize$5(com.android.tools.r8.ir.conversion.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.CallGraph,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):530:530 -> a
+    49:50:void lambda$optimize$6(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):578:579 -> a
+    51:57:void addWaveDoneAction(com.android.tools.r8.utils.Action):630:636 -> a
+    58:58:void addWaveDoneAction(com.android.tools.r8.utils.Action):634:634 -> a
+    59:59:void addWaveDoneAction(com.android.tools.r8.utils.Action):631:631 -> a
+    60:60:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):644:644 -> a
+    61:66:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):654:659 -> a
+    67:84:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):658:675 -> a
+    85:95:java.lang.Object lambda$forEachSelectedOutliningMethod$10(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):661:671 -> a
+    96:96:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):701:701 -> a
+    97:100:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):745:748 -> a
+    101:106:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):754:759 -> a
+    107:112:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):763:768 -> a
+    113:113:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():21:21 -> a
+    113:113:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):769 -> a
+    114:114:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):769:769 -> a
+    115:115:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):765:765 -> a
+    116:116:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$11(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):782:782 -> a
+    117:117:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():21:21 -> a
+    117:117:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$11(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):786 -> a
+    118:118:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$11(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):786:786 -> a
+    119:119:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$11(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):782:782 -> a
+    120:126:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):804:810 -> a
+    127:127:com.android.tools.r8.ir.optimize.InliningOracle lambda$rewriteCode$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):1032:1032 -> a
+    128:138:void computeMayHaveSideEffects(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1187:1197 -> a
+    139:139:boolean lambda$computeMayHaveSideEffects$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1195:1195 -> a
+    140:141:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1203:1204 -> a
+    142:146:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1223:1227 -> a
+    142:146:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1205 -> a
+    147:147:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1207:1207 -> a
+    148:158:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1232:1242 -> a
+    148:158:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1208 -> a
+    159:173:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1342:1356 -> a
+    174:176:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1402:1404 -> a
+    174:176:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1357 -> a
+    177:177:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1360:1360 -> a
+    178:179:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1409:1410 -> a
+    178:179:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1361 -> a
+    180:181:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1414:1415 -> a
+    180:181:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1364 -> a
+    182:183:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1367:1368 -> a
+    184:188:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1388:1392 -> a
+    184:188:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1369 -> a
+    189:194:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1370:1375 -> a
+    195:206:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1424:1435 -> a
+    195:206:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1376 -> a
+    207:207:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1397:1397 -> a
+    208:209:void printPhase(java.lang.String):1467:1468 -> a
+    210:228:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1473:1491 -> a
+    1:6:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):391:396 -> b
+    7:18:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):394:405 -> b
+    19:28:void convertMethodsToDex(com.android.tools.r8.graph.DexProgramClass):456:465 -> b
+    29:35:void convertMethodToDex(com.android.tools.r8.graph.DexEncodedMethod):475:481 -> b
     36:36:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():21:21 -> b
-    36:36:void convertMethodToDex(com.android.tools.r8.graph.DexEncodedMethod):460 -> b
-    37:40:void convertMethodToDex(com.android.tools.r8.graph.DexEncodedMethod):460:463 -> b
-    41:47:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):479:485 -> b
-    48:49:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):658:659 -> b
-    48:49:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):486 -> b
-    50:51:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):297:298 -> b
-    50:51:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):487 -> b
-    52:85:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):495:528 -> b
-    86:87:void staticizeClasses(com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.concurrent.ExecutorService):291:292 -> b
-    86:87:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):529 -> b
-    88:91:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):533:536 -> b
-    92:94:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):283:285 -> b
-    92:94:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):537 -> b
-    95:96:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):539:540 -> b
-    97:98:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):307:308 -> b
-    97:98:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):540 -> b
-    99:99:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):542:542 -> b
-    100:101:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):316:317 -> b
-    100:101:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):543 -> b
-    102:103:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):323:324 -> b
-    102:103:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):544 -> b
-    104:106:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):545:547 -> b
-    107:108:void finalizeLambdaMerging(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):669:670 -> b
-    107:108:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):548 -> b
-    109:119:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):550:560 -> b
-    120:125:com.android.tools.r8.graph.DexType computeOutlineClassType():712:717 -> b
-    120:125:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):560 -> b
-    126:160:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):560:594 -> b
-    161:168:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):588:595 -> b
-    169:171:void lambda$optimize$7(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):566:568 -> b
-    172:172:boolean isInWave():619:619 -> b
-    173:176:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):756:759 -> b
-    177:189:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):758:770 -> b
-    190:192:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):807:809 -> b
-    193:206:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):808:821 -> b
-    207:212:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1481:1486 -> b
-    207:212:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):828 -> b
-    213:245:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):829:861 -> b
-    246:252:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback):1237:1243 -> b
-    246:252:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):862 -> b
-    253:326:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):870:943 -> b
-    327:343:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):942:958 -> b
-    344:346:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):794:796 -> b
-    344:346:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):959 -> b
-    347:399:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):962:1014 -> b
-    400:467:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1006:1073 -> b
-    468:499:void computeNonNullParamHints(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1123:1154 -> b
-    468:499:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1074 -> b
-    500:513:void computeNonNullParamHints(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1153:1166 -> b
-    500:513:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1074 -> b
-    514:520:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1172:1178 -> b
-    514:520:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1077 -> b
-    521:557:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1078:1114 -> b
-    558:563:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1113:1118 -> b
-    564:569:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1272:1277 -> b
-    570:574:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1275:1279 -> b
-    575:594:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1318:1337 -> b
-    595:607:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1465:1477 -> b
-    595:607:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1346 -> b
-    608:611:boolean lambda$workaroundForwardingInitializerBug$14(com.android.tools.r8.ir.code.Instruction):1338:1341 -> b
-    1:20:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):397:416 -> c
-    21:27:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):415:421 -> c
-    28:29:void lambda$computeReachabilitySensitivity$9(com.android.tools.r8.graph.DexProgramClass):624:625 -> c
-    30:30:void lambda$computeReachabilitySensitivity$8(com.android.tools.r8.graph.DexEncodedMethod):625:625 -> c
-    31:31:void clearDexMethodCompilationState():676:676 -> c
-    32:46:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1295:1309 -> c
+    36:36:void convertMethodToDex(com.android.tools.r8.graph.DexEncodedMethod):481 -> b
+    37:40:void convertMethodToDex(com.android.tools.r8.graph.DexEncodedMethod):481:484 -> b
+    41:47:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):500:506 -> b
+    48:49:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):679:680 -> b
+    48:49:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):507 -> b
+    50:51:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):318:319 -> b
+    50:51:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):508 -> b
+    52:85:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):516:549 -> b
+    86:87:void staticizeClasses(com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.concurrent.ExecutorService):312:313 -> b
+    86:87:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):550 -> b
+    88:91:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):554:557 -> b
+    92:94:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):304:306 -> b
+    92:94:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):558 -> b
+    95:96:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):560:561 -> b
+    97:98:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):328:329 -> b
+    97:98:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):561 -> b
+    99:99:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):563:563 -> b
+    100:101:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):337:338 -> b
+    100:101:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):564 -> b
+    102:103:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):344:345 -> b
+    102:103:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):565 -> b
+    104:106:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):566:568 -> b
+    107:108:void finalizeLambdaMerging(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):690:691 -> b
+    107:108:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):569 -> b
+    109:119:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):571:581 -> b
+    120:125:com.android.tools.r8.graph.DexType computeOutlineClassType():733:738 -> b
+    120:125:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):581 -> b
+    126:160:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):581:615 -> b
+    161:168:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):609:616 -> b
+    169:171:void lambda$optimize$7(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):587:589 -> b
+    172:172:boolean isInWave():640:640 -> b
+    173:176:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):777:780 -> b
+    177:189:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):779:791 -> b
+    190:192:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):828:830 -> b
+    193:206:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):829:842 -> b
+    207:212:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1457:1462 -> b
+    207:212:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):849 -> b
+    213:245:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):850:882 -> b
+    246:252:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback):1213:1219 -> b
+    246:252:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):883 -> b
+    253:321:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):891:959 -> b
+    322:338:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):958:974 -> b
+    339:341:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):815:817 -> b
+    339:341:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):975 -> b
+    342:394:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):978:1030 -> b
+    395:462:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1022:1089 -> b
+    463:494:void computeNonNullParamHints(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1138:1169 -> b
+    463:494:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1090 -> b
+    495:508:void computeNonNullParamHints(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1168:1181 -> b
+    495:508:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1090 -> b
+    509:545:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1093:1129 -> b
+    546:551:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1128:1133 -> b
+    552:557:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1248:1253 -> b
+    558:562:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1251:1255 -> b
+    563:582:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1294:1313 -> b
+    583:595:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1441:1453 -> b
+    583:595:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1322 -> b
+    596:599:boolean lambda$workaroundForwardingInitializerBug$14(com.android.tools.r8.ir.code.Instruction):1314:1317 -> b
+    600:601:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$15(com.android.tools.r8.graph.DexItemFactory):1350:1351 -> b
+    602:602:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$15(com.android.tools.r8.graph.DexItemFactory):1349:1349 -> b
+    1:20:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):418:437 -> c
+    21:27:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):436:442 -> c
+    28:29:void lambda$computeReachabilitySensitivity$9(com.android.tools.r8.graph.DexProgramClass):645:646 -> c
+    30:30:void lambda$computeReachabilitySensitivity$8(com.android.tools.r8.graph.DexEncodedMethod):646:646 -> c
+    31:31:void clearDexMethodCompilationState():697:697 -> c
+    32:46:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1271:1285 -> c
     boolean lambda$convertMethodToDex$4(com.android.tools.r8.graph.DexEncodedMethod) -> d
-    1:7:boolean enableTryWithResourcesDesugaring():265:271 -> d
-    8:8:void lambda$convertClassesToDex$2(com.android.tools.r8.graph.DexProgramClass):429:429 -> d
-    1:2:boolean removeLambdaDeserializationMethods():275:276 -> e
-    3:3:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$0(com.android.tools.r8.graph.DexProgramClass):374:374 -> e
-    4:8:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1283:1287 -> e
-    1:1:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$1(com.android.tools.r8.graph.DexProgramClass):413:413 -> f
-    2:4:void waveDone():603:605 -> f
-    1:1:void waveStart():599:599 -> g
-    1:5:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication):469:473 -> optimize
-    1:4:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):696:699 -> replaceCodeForTesting
-com.android.tools.r8.ir.conversion.JarSourceCode -> com.android.tools.r8.ir.conversion.M:
+    1:7:boolean enableTryWithResourcesDesugaring():268:274 -> d
+    8:8:void lambda$convertClassesToDex$2(com.android.tools.r8.graph.DexProgramClass):450:450 -> d
+    1:4:java.util.Set libraryMethodsReturningReceiver():278:281 -> e
+    5:5:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$0(com.android.tools.r8.graph.DexProgramClass):395:395 -> e
+    6:10:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1259:1263 -> e
+    1:2:boolean removeLambdaDeserializationMethods():296:297 -> f
+    3:3:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$1(com.android.tools.r8.graph.DexProgramClass):434:434 -> f
+    1:3:void waveDone():624:626 -> g
+    1:1:void waveStart():620:620 -> h
+    1:5:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication):490:494 -> optimize
+    1:4:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):717:720 -> replaceCodeForTesting
+com.android.tools.r8.ir.conversion.JarSourceCode -> com.android.tools.r8.ir.conversion.J:
     com.android.tools.r8.ir.code.Position currentPosition -> j
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode currentInstruction -> g
     boolean generatingMethodSynchronization -> i
@@ -23209,12 +22738,12 @@
     2:39:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):749:786 -> traceInstruction
     1:1:boolean verifyCurrentInstructionCanThrow():651:651 -> verifyCurrentInstructionCanThrow
     1:2:boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo):656:657 -> verifyLocalInScope
-com.android.tools.r8.ir.conversion.JarSourceCode$1 -> com.android.tools.r8.ir.conversion.J:
-com.android.tools.r8.ir.conversion.JarSourceCode$JarStateWorklistItem -> com.android.tools.r8.ir.conversion.K:
+com.android.tools.r8.ir.conversion.JarSourceCode$1 -> com.android.tools.r8.ir.conversion.I:
+com.android.tools.r8.ir.conversion.JarSourceCode$JarStateWorklistItem -> com.android.tools.r8.ir.conversion.J$a:
     com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo blockInfo -> a
     int instructionIndex -> b
     1:3:void <init>(com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo,int):128:130 -> <init>
-com.android.tools.r8.ir.conversion.JarSourceCode$TryCatchBlock -> com.android.tools.r8.ir.conversion.L:
+com.android.tools.r8.ir.conversion.JarSourceCode$TryCatchBlock -> com.android.tools.r8.ir.conversion.K:
     int start -> b
     java.lang.String type -> c
     boolean $assertionsDisabled -> d
@@ -23228,7 +22757,7 @@
     1:1:int getStart():108:108 -> b
     1:1:java.lang.String getType():120:120 -> c
     1:1:boolean isCatchAll():104:104 -> d
-com.android.tools.r8.ir.conversion.JarState -> com.android.tools.r8.ir.conversion.W:
+com.android.tools.r8.ir.conversion.JarState -> com.android.tools.r8.ir.conversion.U:
     com.android.tools.r8.org.objectweb.asm.Type OBJECT_TYPE -> o
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap localsAtOffsetTable -> g
     com.android.tools.r8.org.objectweb.asm.Type REFERENCE_TYPE -> n
@@ -23282,7 +22811,7 @@
     129:136:boolean recordStateForTarget(int,com.android.tools.r8.ir.conversion.JarState$Local[],com.android.tools.r8.com.google.common.collect.ImmutableList):812:819 -> a
     137:137:boolean isRefinement(com.android.tools.r8.org.objectweb.asm.Type,com.android.tools.r8.org.objectweb.asm.Type):824:824 -> a
     138:151:java.lang.String localsToString(java.util.Collection):910:923 -> a
-    152:152:java.lang.String com.android.tools.r8.org.objectweb.asm.Type.toString():889:889 -> a
+    152:152:java.lang.String com.android.tools.r8.org.objectweb.asm.Type.toString():904:904 -> a
     152:152:java.lang.String localsToString(java.util.Collection):925 -> a
     153:157:java.lang.String localsToString(java.util.Collection):925:929 -> a
     1:10:void closeLocals():549:558 -> b
@@ -23340,7 +22869,7 @@
     59:59:boolean verifySlots(com.android.tools.r8.ir.conversion.JarState$Slot[],com.android.tools.r8.org.objectweb.asm.Type):877:877 -> b
     59:59:com.android.tools.r8.ir.conversion.JarState$Slot[] popReverse(int,com.android.tools.r8.org.objectweb.asm.Type):763 -> b
     60:63:java.lang.String stackToString(java.util.Collection):890:893 -> b
-    64:64:java.lang.String com.android.tools.r8.org.objectweb.asm.Type.toString():889:889 -> b
+    64:64:java.lang.String com.android.tools.r8.org.objectweb.asm.Type.toString():904:904 -> b
     64:64:java.lang.String stackToString(java.util.Collection):895 -> b
     65:76:java.lang.String stackToString(java.util.Collection):895:906 -> b
     1:7:com.android.tools.r8.com.google.common.collect.ImmutableList getLocals():592:598 -> c
@@ -23374,12 +22903,12 @@
     1:2:com.android.tools.r8.ir.conversion.JarState$LocalsAtOffset getLocalsAtOffset(int):562:563 -> j
     1:11:void getLocalsToOpen(int):510:520 -> k
     1:1:java.lang.String toString():886:886 -> toString
-com.android.tools.r8.ir.conversion.JarState$1 -> com.android.tools.r8.ir.conversion.N:
-com.android.tools.r8.ir.conversion.JarState$Local -> com.android.tools.r8.ir.conversion.O:
+com.android.tools.r8.ir.conversion.JarState$1 -> com.android.tools.r8.ir.conversion.L:
+com.android.tools.r8.ir.conversion.JarState$Local -> com.android.tools.r8.ir.conversion.M:
     com.android.tools.r8.graph.DebugLocalInfo info -> b
     com.android.tools.r8.ir.conversion.JarState$Slot slot -> a
     1:3:void <init>(com.android.tools.r8.ir.conversion.JarState$Slot,com.android.tools.r8.graph.DebugLocalInfo):239:241 -> <init>
-com.android.tools.r8.ir.conversion.JarState$LocalChangeAtOffset -> com.android.tools.r8.ir.conversion.P:
+com.android.tools.r8.ir.conversion.JarState$LocalChangeAtOffset -> com.android.tools.r8.ir.conversion.N:
     com.android.tools.r8.ir.conversion.JarState state -> c
     com.android.tools.r8.ir.conversion.JarState$LocalsAtOffset atExit -> a
     com.android.tools.r8.ir.conversion.JarState$LocalsAtOffset atEntry -> b
@@ -23388,7 +22917,7 @@
     1:5:java.util.List getLocalsToClose():286:290 -> a
     1:5:java.util.List getLocalsToOpen():297:301 -> b
     1:5:java.util.List getLocalsToPreserve():275:279 -> c
-com.android.tools.r8.ir.conversion.JarState$LocalNodeEquivalence -> com.android.tools.r8.ir.conversion.Q:
+com.android.tools.r8.ir.conversion.JarState$LocalNodeEquivalence -> com.android.tools.r8.ir.conversion.O:
     1:1:void <init>():50:50 -> <init>
     1:1:void <init>(com.android.tools.r8.ir.conversion.JarState$1):50 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):50:50 -> a
@@ -23397,12 +22926,12 @@
     7:7:int doHash(java.lang.Object):50:50 -> a
     8:10:int doHash(com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode):63:65 -> a
     8:10:int doHash(java.lang.Object):50 -> a
-com.android.tools.r8.ir.conversion.JarState$LocalNodeInfo -> com.android.tools.r8.ir.conversion.S:
+com.android.tools.r8.ir.conversion.JarState$LocalNodeInfo -> com.android.tools.r8.ir.conversion.P:
     com.android.tools.r8.org.objectweb.asm.Type type -> a
     com.android.tools.r8.graph.DebugLocalInfo info -> c
     com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode node -> b
     1:4:void <init>(com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode,com.android.tools.r8.graph.DebugLocalInfo):75:78 -> <init>
-com.android.tools.r8.ir.conversion.JarState$LocalsAtOffset -> com.android.tools.r8.ir.conversion.T:
+com.android.tools.r8.ir.conversion.JarState$LocalsAtOffset -> com.android.tools.r8.ir.conversion.Q:
     java.util.List starts -> b
     java.util.List live -> a
     java.util.List ends -> c
@@ -23416,7 +22945,7 @@
     11:25:void <init>(com.android.tools.r8.ir.conversion.JarState$LocalsAtOffset):89:103 -> <init>
     1:2:void addLive(com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode,com.android.tools.r8.graph.DebugLocalInfo):115:116 -> a
     3:18:boolean isLive(com.android.tools.r8.ir.conversion.JarState$LocalNodeInfo):120:135 -> a
-com.android.tools.r8.ir.conversion.JarState$Slot -> com.android.tools.r8.ir.conversion.U:
+com.android.tools.r8.ir.conversion.JarState$Slot -> com.android.tools.r8.ir.conversion.S:
     com.android.tools.r8.org.objectweb.asm.Type type -> b
     boolean $assertionsDisabled -> c
     int register -> a
@@ -23434,98 +22963,111 @@
     1:1:boolean isCompatibleWith(com.android.tools.r8.org.objectweb.asm.Type):158:158 -> b
     2:2:boolean isCategory1():162:162 -> b
     1:1:java.lang.String toString():146:146 -> toString
-com.android.tools.r8.ir.conversion.JarState$Snapshot -> com.android.tools.r8.ir.conversion.V:
+com.android.tools.r8.ir.conversion.JarState$Snapshot -> com.android.tools.r8.ir.conversion.T:
     com.android.tools.r8.ir.conversion.JarState$Local[] locals -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList stack -> b
     1:3:void <init>(com.android.tools.r8.ir.conversion.JarState$Local[],com.android.tools.r8.com.google.common.collect.ImmutableList):250:252 -> <init>
     1:2:java.lang.String toString():257:258 -> toString
-com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.ir.conversion.X:
+com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.ir.conversion.V:
     java.util.Map protoFixupCache -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():69:69 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):75:75 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView):73:76 -> <init>
-    1:5:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,java.util.Set):80:84 -> a
-    6:14:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):93:101 -> a
-    15:35:boolean unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):432:452 -> a
-    15:35:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
-    36:56:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):106:126 -> a
-    57:61:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):459:463 -> a
-    57:61:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):127 -> a
-    62:64:com.android.tools.r8.graph.DexValue$DexValueMethodHandle rewriteDexValueMethodHandle(com.android.tools.r8.graph.DexValue$DexValueMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):488:490 -> a
-    62:64:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):463 -> a
-    62:64:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):127 -> a
-    65:81:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):464:480 -> a
-    65:81:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):127 -> a
-    82:125:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):128:171 -> a
-    126:141:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):166:181 -> a
-    142:175:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):387:420 -> a
-    142:175:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):181 -> a
-    176:176:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):411:411 -> a
-    176:176:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):181 -> a
-    177:177:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):410:410 -> a
-    177:177:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):181 -> a
-    178:185:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):183:190 -> a
-    186:214:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):569:597 -> a
-    186:214:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):189 -> a
-    215:251:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):192:228 -> a
-    252:373:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):227:348 -> a
-    374:405:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):344:375 -> a
-    406:453:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):495:542 -> a
-    454:459:com.android.tools.r8.graph.DexValue$DexValueMethodType rewriteDexMethodType(com.android.tools.r8.graph.DexValue$DexValueMethodType):549:554 -> a
-    460:460:boolean canInvokeTargetWithInvokeVirtual(com.android.tools.r8.graph.DexEncodedMethod):601:601 -> a
-    461:478:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):605:622 -> a
-com.android.tools.r8.ir.conversion.OptimizationFeedback -> com.android.tools.r8.ir.conversion.Y:
+    1:1:void <clinit>():70:70 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):76:76 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.AppView):74:77 -> <init>
+    1:5:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,java.util.Set):81:85 -> a
+    6:14:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):94:102 -> a
+    15:35:boolean unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):433:453 -> a
+    15:35:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):104 -> a
+    36:56:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):107:127 -> a
+    57:61:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):460:464 -> a
+    57:61:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):128 -> a
+    62:64:com.android.tools.r8.graph.DexValue$DexValueMethodHandle rewriteDexValueMethodHandle(com.android.tools.r8.graph.DexValue$DexValueMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):489:491 -> a
+    62:64:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):464 -> a
+    62:64:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):128 -> a
+    65:81:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):465:481 -> a
+    65:81:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):128 -> a
+    82:125:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):129:172 -> a
+    126:141:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):167:182 -> a
+    142:175:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):388:421 -> a
+    142:175:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):182 -> a
+    176:176:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):412:412 -> a
+    176:176:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):182 -> a
+    177:177:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):411:411 -> a
+    177:177:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):182 -> a
+    178:185:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):184:191 -> a
+    186:214:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):567:595 -> a
+    186:214:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):190 -> a
+    215:251:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):193:229 -> a
+    252:373:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):228:349 -> a
+    374:405:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):345:376 -> a
+    406:450:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):496:540 -> a
+    451:456:com.android.tools.r8.graph.DexValue$DexValueMethodType rewriteDexMethodType(com.android.tools.r8.graph.DexValue$DexValueMethodType):547:552 -> a
+    457:457:boolean canInvokeTargetWithInvokeVirtual(com.android.tools.r8.graph.DexEncodedMethod):599:599 -> a
+    458:475:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):603:620 -> a
+com.android.tools.r8.ir.conversion.OptimizationFeedback -> com.android.tools.r8.ir.conversion.W:
+    void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
     void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget) -> a
-    void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
-    void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set) -> a
-    void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int) -> a
     void methodReturnsConstantNumber(com.android.tools.r8.graph.DexEncodedMethod,long) -> a
     void methodReturnsConstantString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString) -> a
     void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility) -> a
+    void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet) -> a
     void setParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ParameterUsagesInfo) -> a
     void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer) -> a
-    void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> b
-    void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod) -> b
+    void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> b
+    void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod) -> b
     void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet) -> b
-    void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod) -> c
-    void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod) -> d
-    void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> e
-com.android.tools.r8.ir.conversion.OptimizationFeedbackDelayed -> com.android.tools.r8.ir.conversion.Z:
+    void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod) -> c
+    void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> d
+    void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod) -> e
+com.android.tools.r8.ir.conversion.OptimizationFeedbackDelayed -> com.android.tools.r8.ir.conversion.X:
     java.util.Map optimizationInfos -> a
     java.util.Map processed -> b
-    1:6:void <init>():21:26 -> <init>
-    1:1:void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):42:42 -> a
-    2:2:void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int):47:47 -> a
-    3:3:void methodReturnsConstantNumber(com.android.tools.r8.graph.DexEncodedMethod,long):52:52 -> a
-    4:4:void methodReturnsConstantString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):57:57 -> a
-    5:5:void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod):67:67 -> a
-    6:6:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):77:77 -> a
-    7:7:void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):94:94 -> a
-    8:8:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):100:100 -> a
-    9:9:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):105:105 -> a
-    10:10:void setParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ParameterUsagesInfo):116:116 -> a
-    11:11:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):121:121 -> a
-    12:13:void updateVisibleOptimizationInfo():133:134 -> a
-    14:20:void updateVisibleOptimizationInfo():133:139 -> a
-    21:21:boolean lambda$updateVisibleOptimizationInfo$0(java.util.Map$Entry):134:134 -> a
-    1:1:void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):88:88 -> b
-    2:2:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):110:110 -> b
-    3:3:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):126:126 -> b
-    4:4:boolean lambda$updateVisibleOptimizationInfo$1(java.util.Map$Entry):135:135 -> b
-    1:1:void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod):72:72 -> c
-    1:1:void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod):82:82 -> d
-    1:1:void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod):62:62 -> e
-    1:6:com.android.tools.r8.graph.UpdatableOptimizationInfo getOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedMethod):30:35 -> f
-com.android.tools.r8.ir.conversion.OptimizationFeedbackIgnore -> com.android.tools.r8.ir.conversion.aa:
-    1:1:void <init>():17:17 -> <init>
+    1:6:void <init>():19:24 -> <init>
+    1:1:void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int):39:39 -> a
+    2:2:void methodReturnsConstantNumber(com.android.tools.r8.graph.DexEncodedMethod,long):44:44 -> a
+    3:3:void methodReturnsConstantString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):49:49 -> a
+    4:4:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):69:69 -> a
+    5:5:void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):80:80 -> a
+    6:6:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):92:92 -> a
+    7:7:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):97:97 -> a
+    8:8:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):102:102 -> a
+    9:9:void setParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ParameterUsagesInfo):108:108 -> a
+    10:10:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):113:113 -> a
+    11:12:void updateVisibleOptimizationInfo():125:126 -> a
+    13:19:void updateVisibleOptimizationInfo():125:131 -> a
+    20:20:boolean lambda$updateVisibleOptimizationInfo$0(java.util.Map$Entry):126:126 -> a
+    1:1:void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod):64:64 -> b
+    2:2:void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):86:86 -> b
+    3:3:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):118:118 -> b
+    4:4:boolean lambda$updateVisibleOptimizationInfo$1(java.util.Map$Entry):127:127 -> b
+    1:1:void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod):59:59 -> c
+    1:1:void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod):54:54 -> d
+    1:1:void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod):74:74 -> e
+    1:6:com.android.tools.r8.graph.UpdatableOptimizationInfo getOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedMethod):28:33 -> f
+com.android.tools.r8.ir.conversion.OptimizationFeedbackIgnore -> com.android.tools.r8.ir.conversion.Y:
+    1:1:void <init>():15:15 -> <init>
+    void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
     void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget) -> a
-    void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
-    void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set) -> a
-    void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod) -> a
+    void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int) -> a
+    void methodReturnsConstantNumber(com.android.tools.r8.graph.DexEncodedMethod,long) -> a
+    void methodReturnsConstantString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString) -> a
+    void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility) -> a
+    void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod) -> a
+    void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet) -> a
+    void setParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ParameterUsagesInfo) -> a
+    void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer) -> a
+    void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> b
+    void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod) -> b
+    void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet) -> b
+    void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod) -> c
+    void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> d
+    void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod) -> e
+com.android.tools.r8.ir.conversion.OptimizationFeedbackSimple -> com.android.tools.r8.ir.conversion.Z:
+    1:1:void <init>():15:15 -> <init>
+    void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
     void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int) -> a
     void methodReturnsConstantNumber(com.android.tools.r8.graph.DexEncodedMethod,long) -> a
     void methodReturnsConstantString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString) -> a
@@ -23533,32 +23075,15 @@
     void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet) -> a
     void setParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ParameterUsagesInfo) -> a
     void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer) -> a
-    void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> b
-    void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod) -> b
+    1:1:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):50:50 -> a
+    2:2:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):81:81 -> a
+    void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> b
+    void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod) -> b
     void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet) -> b
-    void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod) -> c
-    void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod) -> d
-    void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> e
-com.android.tools.r8.ir.conversion.OptimizationFeedbackSimple -> com.android.tools.r8.ir.conversion.ba:
-    1:1:void <init>():17:17 -> <init>
-    void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
-    void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set) -> a
-    void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod) -> a
-    void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int) -> a
-    void methodReturnsConstantNumber(com.android.tools.r8.graph.DexEncodedMethod,long) -> a
-    void methodReturnsConstantString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString) -> a
-    void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility) -> a
-    void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet) -> a
-    void setParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ParameterUsagesInfo) -> a
-    void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer) -> a
-    1:1:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):58:58 -> a
-    void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> b
-    void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet) -> b
-    1:1:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):89:89 -> b
-    void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod) -> c
-    1:1:void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod):63:63 -> d
-    void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> e
-com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.ir.conversion.da:
+    void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod) -> c
+    void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> d
+    1:1:void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod):55:55 -> e
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.ir.conversion.ba:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
     boolean $assertionsDisabled -> c
@@ -23570,13 +23095,13 @@
     19:19:void clear():84:84 -> a
     1:6:void addPayloadUser(com.android.tools.r8.code.Instruction):35:40 -> b
     7:7:int[] getKeys(int):72:72 -> b
-com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.ir.conversion.ca:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.ir.conversion.aa:
     int[] absoluteTargets -> b
     int[] keys -> c
     int userOffset -> a
     1:1:void <init>(int):26:26 -> <init>
     2:7:void <init>(int):22:27 -> <init>
-com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.ir.conversion.ea:
+com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.ir.conversion.ca:
     java.util.Map unificationParents -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.IRBuilder builder -> b
@@ -23698,7 +23223,7 @@
     153:153:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):243:243 -> a
     154:154:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):251:251 -> a
     1:1:boolean lambda$updateClass$0(com.android.tools.r8.graph.DexAnnotation):96:96 -> b
-com.android.tools.r8.ir.desugar.DefaultMethodsHelper -> com.android.tools.r8.ir.desugar.e:
+com.android.tools.r8.ir.desugar.DefaultMethodsHelper -> com.android.tools.r8.ir.desugar.f:
     java.util.Set candidates -> a
     java.util.Set hidden -> b
     1:5:void <init>():19:23 -> <init>
@@ -23709,7 +23234,7 @@
     1:8:java.util.List createFullList():123:130 -> b
     1:3:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection wrapInCollection():136:138 -> c
 com.android.tools.r8.ir.desugar.DefaultMethodsHelper$1 -> com.android.tools.r8.ir.desugar.d:
-com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection -> com.android.tools.r8.ir.desugar.e$a:
+com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection -> com.android.tools.r8.ir.desugar.e:
     java.util.List hidden -> b
     java.util.List live -> a
     com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection EMPTY -> c
@@ -23720,7 +23245,7 @@
     1:1:java.util.List access$000(com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection):30:30 -> a
     2:4:com.android.tools.r8.graph.DexMethod getSingleCandidate(com.android.tools.r8.graph.DexMethod):48:50 -> a
     1:1:java.util.List access$100(com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection):30:30 -> b
-com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.ir.desugar.InterfaceMethodRewriter:
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.ir.desugar.h:
     java.util.Set reportedMissing -> h
     com.android.tools.r8.graph.DexItemFactory factory -> d
     com.android.tools.r8.graph.AppView appView -> a
@@ -23733,74 +23258,91 @@
     1:1:void <clinit>():73:73 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):116:116 -> <init>
     2:35:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):88:121 -> <init>
-    1:58:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):127:184 -> a
-    59:69:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):182:192 -> a
+    1:56:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):127:182 -> a
+    57:57:com.android.tools.r8.graph.DexMethod staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):336:336 -> a
+    57:57:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):183 -> a
+    58:58:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):184:184 -> a
+    59:67:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):182:190 -> a
+    68:68:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):331:331 -> a
+    68:68:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):191 -> a
+    69:69:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):192:192 -> a
     70:98:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):190:218 -> a
-    99:100:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):375:376 -> a
+    99:100:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):361:362 -> a
     99:100:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):218 -> a
-    101:103:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):219:221 -> a
-    104:145:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):219:260 -> a
-    146:157:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):258:269 -> a
+    101:101:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):219:219 -> a
+    102:102:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):368:368 -> a
+    102:102:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):220 -> a
+    103:103:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):221:221 -> a
+    104:143:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):219:258 -> a
+    144:144:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):368:368 -> a
+    144:144:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):259 -> a
+    145:145:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):260:260 -> a
+    146:155:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):258:267 -> a
+    156:156:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):374:374 -> a
+    156:156:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):268 -> a
+    157:157:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):269:269 -> a
     158:158:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):267:267 -> a
     159:161:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):240:242 -> a
     162:162:java.util.Set lambda$rewriteMethodReferences$0(com.android.tools.r8.graph.DexLibraryClass):186:186 -> a
     163:172:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):278:287 -> a
-    173:176:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):298:301 -> a
-    177:177:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):305:305 -> a
-    178:187:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):359:368 -> a
-    188:188:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):365:365 -> a
-    189:189:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):383:383 -> a
-    190:190:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):387:387 -> a
-    191:191:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):411:411 -> a
-    192:198:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):462:468 -> a
-    192:198:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):411 -> a
-    199:205:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):411:417 -> a
-    206:219:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):445:458 -> a
-    206:219:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):418 -> a
-    220:224:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):418:422 -> a
-    225:225:boolean isInMainDexList(com.android.tools.r8.graph.DexType):337:337 -> a
-    225:225:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):422 -> a
-    226:230:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):422:426 -> a
-    231:233:void clear():433:435 -> a
-    231:233:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):429 -> a
-    234:235:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):440:441 -> a
-    236:250:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):472:486 -> a
-    251:251:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):479:479 -> a
-    252:266:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):516:530 -> a
-    267:267:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):529:529 -> a
-    268:268:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):546:546 -> a
-    269:307:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):559:597 -> a
-    269:307:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):550 -> a
-    308:308:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):551:551 -> a
-    309:311:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):567:569 -> a
-    309:311:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):550 -> a
-    1:5:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):310:314 -> b
-    6:6:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):329:329 -> b
-    7:7:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):319:319 -> b
-    7:7:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):329 -> b
-    8:11:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):329:332 -> b
-    12:14:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):331:333 -> b
-    15:15:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):397:397 -> b
-    16:16:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):393:393 -> b
-    16:16:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):397 -> b
-    17:34:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):494:511 -> b
-    35:35:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):510:510 -> b
-    1:1:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):343:343 -> c
-    2:2:boolean hasDispatchClassSuffix(com.android.tools.r8.graph.DexType):353:353 -> c
-    1:1:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):319:319 -> d
-    2:2:com.android.tools.r8.graph.DexMethod staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):348:348 -> d
-    1:2:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):534:535 -> e
-    3:3:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):324:324 -> e
-    3:3:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):536 -> e
-    4:5:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):538:539 -> e
-    1:1:java.lang.String getCompanionClassDescriptor(java.lang.String):293:293 -> getCompanionClassDescriptor
-com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$a:
+    173:177:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):294:298 -> a
+    178:186:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String):346:354 -> a
+    187:187:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String):352:352 -> a
+    188:188:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):368:368 -> a
+    189:189:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):388:388 -> a
+    190:196:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):439:445 -> a
+    190:196:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):388 -> a
+    197:203:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):388:394 -> a
+    204:217:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):422:435 -> a
+    204:217:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):395 -> a
+    218:222:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):395:399 -> a
+    223:223:boolean isInMainDexList(com.android.tools.r8.graph.DexType):325:325 -> a
+    223:223:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):399 -> a
+    224:228:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):399:403 -> a
+    229:231:void clear():410:412 -> a
+    229:231:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):406 -> a
+    232:233:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):417:418 -> a
+    234:248:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):449:463 -> a
+    249:249:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):456:456 -> a
+    250:264:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):493:507 -> a
+    265:265:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):506:506 -> a
+    266:266:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):523:523 -> a
+    267:268:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):536:537 -> a
+    267:268:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):527 -> a
+    269:286:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):471:488 -> a
+    269:286:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):539 -> a
+    269:286:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):527 -> a
+    287:287:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):487:487 -> a
+    287:287:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):539 -> a
+    287:287:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):527 -> a
+    288:322:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):540:574 -> a
+    288:322:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):527 -> a
+    323:323:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):528:528 -> a
+    324:326:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):544:546 -> a
+    324:326:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):527 -> a
+    1:5:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):303:307 -> b
+    6:6:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):374:374 -> b
+    1:1:boolean hasDispatchClassSuffix(com.android.tools.r8.graph.DexType):341:341 -> c
+    2:2:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):511:511 -> c
+    3:3:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):312:312 -> c
+    3:3:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):512 -> c
+    4:4:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):317:317 -> c
+    4:4:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):513 -> c
+    5:5:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):312:312 -> c
+    5:5:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):317 -> c
+    5:5:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):513 -> c
+    6:9:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):317:320 -> c
+    6:9:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):513 -> c
+    10:12:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):319:321 -> c
+    10:12:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):513 -> c
+    13:14:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):515:516 -> c
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.ir.desugar.g:
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor ExcludeDexResources -> b
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor IncludeAllResources -> a
     1:5:void <clinit>():109:113 -> <clinit>
     6:6:void <clinit>():105:105 -> <clinit>
     1:1:void <init>(java.lang.String,int):105:105 -> <init>
-com.android.tools.r8.ir.desugar.InterfaceProcessor -> com.android.tools.r8.ir.desugar.f:
+com.android.tools.r8.ir.desugar.InterfaceProcessor -> com.android.tools.r8.ir.desugar.i:
     java.util.Map syntheticClasses -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter rewriter -> b
@@ -23809,27 +23351,33 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):59:59 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):57:61 -> <init>
     1:9:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):65:73 -> a
-    10:21:boolean canMoveToCompanionClass(com.android.tools.r8.graph.DexEncodedMethod):280:291 -> a
+    10:21:boolean canMoveToCompanionClass(com.android.tools.r8.graph.DexEncodedMethod):283:294 -> a
     10:21:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):74 -> a
     22:36:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):80:94 -> a
-    37:44:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):93:100 -> a
-    45:46:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):84:85 -> a
-    47:48:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):75:76 -> a
-    49:74:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):304:329 -> a
-    49:74:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):104 -> a
-    75:94:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):105:124 -> a
-    95:98:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):337:340 -> a
-    95:98:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):125 -> a
-    99:104:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):126:131 -> a
-    105:125:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):130:150 -> a
-    126:131:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):149:154 -> a
-    132:147:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):144:159 -> a
-    148:148:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):338:338 -> a
-    148:148:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):125 -> a
-    149:186:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):163:200 -> a
-    187:231:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):204:248 -> a
-    232:286:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):221:275 -> a
-    287:287:com.android.tools.r8.ir.conversion.SourceCode lambda$process$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):238:238 -> a
+    37:47:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):93:103 -> a
+    48:49:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):84:85 -> a
+    50:51:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):75:76 -> a
+    52:77:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):307:332 -> a
+    52:77:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):107 -> a
+    78:97:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):108:127 -> a
+    98:101:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):340:343 -> a
+    98:101:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):128 -> a
+    102:105:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):129:132 -> a
+    106:106:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):331:331 -> a
+    106:106:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):132 -> a
+    107:108:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):133:134 -> a
+    109:129:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):133:153 -> a
+    130:135:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):152:157 -> a
+    136:151:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):147:162 -> a
+    152:152:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):341:341 -> a
+    152:152:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):128 -> a
+    153:190:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):166:203 -> a
+    191:215:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):207:231 -> a
+    216:216:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):336:336 -> a
+    216:216:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):231 -> a
+    217:236:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):232:251 -> a
+    237:291:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):224:278 -> a
+    292:292:com.android.tools.r8.ir.conversion.SourceCode lambda$process$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):241:241 -> a
 com.android.tools.r8.ir.desugar.Java8MethodRewriter -> com.android.tools.r8.ir.desugar.Java8MethodRewriter:
     com.android.tools.r8.graph.DexItemFactory factory -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -23863,10 +23411,6 @@
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,java.lang.String):163:163 -> <init>
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$ByteMethods hashCodeCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):167:167 -> hashCodeCode
     1:1:int hashCodeImpl(byte):171:171 -> hashCodeImpl
-com.android.tools.r8.ir.desugar.Java8MethodRewriter$CharacterMethods -> com.android.tools.r8.ir.desugar.Java8MethodRewriter$CharacterMethods:
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,java.lang.String):400:400 -> <init>
-    1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$CharacterMethods hashCodeCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):404:404 -> hashCodeCode
-    1:1:int hashCodeImpl(char):408:408 -> hashCodeImpl
 com.android.tools.r8.ir.desugar.Java8MethodRewriter$DoubleMethods -> com.android.tools.r8.ir.desugar.Java8MethodRewriter$DoubleMethods:
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,java.lang.String):230:230 -> <init>
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$DoubleMethods hashCodeCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):234:234 -> hashCodeCode
@@ -23898,37 +23442,28 @@
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$IntegerMethods minCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):204:204 -> minCode
     1:1:int minImpl(int,int):220:220 -> minImpl
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$IntegerMethods sumCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):208:208 -> sumCode
-com.android.tools.r8.ir.desugar.Java8MethodRewriter$LongMethods -> com.android.tools.r8.ir.desugar.Java8MethodRewriter$LongMethods:
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,java.lang.String):362:362 -> <init>
-    1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$LongMethods hashCodeCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):366:366 -> hashCodeCode
-    1:1:int hashCodeImpl(long):382:382 -> hashCodeImpl
-    1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$LongMethods maxCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):370:370 -> maxCode
-    1:1:long maxImpl(long,long):386:386 -> maxImpl
-    1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$LongMethods minCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):374:374 -> minCode
-    1:1:long minImpl(long,long):390:390 -> minImpl
-    1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$LongMethods sumCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):378:378 -> sumCode
-com.android.tools.r8.ir.desugar.Java8MethodRewriter$RewritableMethods -> com.android.tools.r8.ir.desugar.h:
+com.android.tools.r8.ir.desugar.Java8MethodRewriter$RewritableMethods -> com.android.tools.r8.ir.desugar.Java8MethodRewriter$a:
     java.util.Map rewritable -> a
-    1:173:void <init>(com.android.tools.r8.graph.DexItemFactory):417:589 -> <init>
-    1:1:java.util.Map addOrGetClass(com.android.tools.r8.graph.DexString):593:593 -> a
-    2:2:java.util.Map addOrGetMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):598:598 -> a
-    3:7:com.android.tools.r8.ir.desugar.Java8MethodRewriter$RewritableMethods$MethodGenerator getGenerator(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):602:606 -> a
-    1:1:java.util.Map lambda$addOrGetClass$0(com.android.tools.r8.graph.DexString):593:593 -> b
-    1:1:java.util.Map lambda$addOrGetMethod$1(com.android.tools.r8.graph.DexString):598:598 -> c
-com.android.tools.r8.ir.desugar.Java8MethodRewriter$RewritableMethods$MethodGenerator -> com.android.tools.r8.ir.desugar.g:
+    1:137:void <init>(com.android.tools.r8.graph.DexItemFactory):365:501 -> <init>
+    1:1:java.util.Map addOrGetClass(com.android.tools.r8.graph.DexString):505:505 -> a
+    2:2:java.util.Map addOrGetMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):510:510 -> a
+    3:7:com.android.tools.r8.ir.desugar.Java8MethodRewriter$RewritableMethods$MethodGenerator getGenerator(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):514:518 -> a
+    1:1:java.util.Map lambda$addOrGetClass$0(com.android.tools.r8.graph.DexString):505:505 -> b
+    1:1:java.util.Map lambda$addOrGetMethod$1(com.android.tools.r8.graph.DexString):510:510 -> c
+com.android.tools.r8.ir.desugar.Java8MethodRewriter$RewritableMethods$MethodGenerator -> com.android.tools.r8.ir.desugar.j:
     com.android.tools.r8.graph.DexString clazz -> b
     com.android.tools.r8.graph.DexString method -> c
     com.android.tools.r8.graph.DexProto proto -> d
     java.util.function.BiFunction generator -> a
     com.android.tools.r8.graph.DexMethod dexMethod -> e
-    1:5:void <init>(java.util.function.BiFunction,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):621:625 -> <init>
-    1:9:com.android.tools.r8.graph.DexMethod generateMethod(com.android.tools.r8.graph.DexItemFactory):629:637 -> a
-    10:10:com.android.tools.r8.ir.synthetic.TemplateMethodCode generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):641:641 -> a
+    1:5:void <init>(java.util.function.BiFunction,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):533:537 -> <init>
+    1:8:com.android.tools.r8.graph.DexMethod generateMethod(com.android.tools.r8.graph.DexItemFactory):541:548 -> a
+    9:9:com.android.tools.r8.ir.synthetic.TemplateMethodCode generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):552:552 -> a
 com.android.tools.r8.ir.desugar.Java8MethodRewriter$ShortMethods -> com.android.tools.r8.ir.desugar.Java8MethodRewriter$ShortMethods:
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,java.lang.String):178:178 -> <init>
     1:1:com.android.tools.r8.ir.desugar.Java8MethodRewriter$ShortMethods hashCodeCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):182:182 -> hashCodeCode
     1:1:int hashCodeImpl(short):186:186 -> hashCodeImpl
-com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode -> com.android.tools.r8.ir.desugar.i:
+com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode -> com.android.tools.r8.ir.desugar.k:
     com.android.tools.r8.graph.DexMethod mainMethod -> q
     1:1:void com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode.<init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):29:29 -> <init>
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):23 -> <init>
@@ -23938,129 +23473,126 @@
     1:1:void lambda$prepareInstructions$2(int,com.android.tools.r8.ir.conversion.IRBuilder):66:66 -> b
     1:17:void prepareInstructions():29:45 -> f
     18:40:void prepareInstructions():44:66 -> f
-com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.ir.desugar.p:
-    java.util.concurrent.atomic.AtomicBoolean addToMainDexList -> i
-    boolean $assertionsDisabled -> l
-    com.android.tools.r8.graph.DexField instanceField -> g
-    com.android.tools.r8.ir.desugar.LambdaClass$Target target -> h
+com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.ir.desugar.l:
+    java.util.concurrent.atomic.AtomicBoolean addToMainDexList -> h
+    com.android.tools.r8.graph.DexField instanceField -> f
+    com.android.tools.r8.ir.desugar.LambdaClass$Target target -> g
+    boolean $assertionsDisabled -> k
+    java.util.function.Supplier lazyDexClass -> j
     com.android.tools.r8.ir.desugar.LambdaRewriter rewriter -> a
-    java.util.function.Supplier lazyDexClass -> k
-    com.android.tools.r8.graph.DexMethod createInstanceMethod -> f
     com.android.tools.r8.graph.DexType type -> b
     com.android.tools.r8.ir.desugar.LambdaDescriptor descriptor -> c
     com.android.tools.r8.graph.DexMethod classConstructor -> e
     com.android.tools.r8.graph.DexMethod constructor -> d
-    java.util.Collection synthesizedFrom -> j
+    java.util.Collection synthesizedFrom -> i
     1:1:void <clinit>():59:59 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):78:78 -> <init>
-    2:23:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):69:90 -> <init>
-    24:24:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):336:336 -> <init>
-    24:24:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    25:64:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):359:398 -> <init>
-    25:64:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):337 -> <init>
-    25:64:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    65:65:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):397:397 -> <init>
-    65:65:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):337 -> <init>
-    65:65:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    66:66:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):396:396 -> <init>
-    66:66:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):337 -> <init>
-    66:66:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    67:80:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):341:354 -> <init>
-    67:80:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    81:81:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):343:343 -> <init>
-    81:81:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    82:84:com.android.tools.r8.ir.desugar.LambdaClass$Target createInterfaceMethodTarget(com.android.tools.r8.graph.DexType):474:476 -> <init>
-    82:84:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):345 -> <init>
-    82:84:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    85:102:com.android.tools.r8.ir.desugar.LambdaClass$Target createConstructorTarget(com.android.tools.r8.graph.DexType):451:468 -> <init>
-    85:102:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):347 -> <init>
-    85:102:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    103:105:com.android.tools.r8.ir.desugar.LambdaClass$Target createConstructorTarget(com.android.tools.r8.graph.DexType):467:469 -> <init>
-    103:105:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):347 -> <init>
-    103:105:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    106:107:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):405:406 -> <init>
-    106:107:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):352 -> <init>
-    106:107:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    108:129:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):405:426 -> <init>
-    108:129:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):352 -> <init>
-    108:129:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    130:133:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):425:428 -> <init>
-    130:133:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):352 -> <init>
-    130:133:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    134:144:com.android.tools.r8.ir.desugar.LambdaClass$Target createStaticMethodTarget(com.android.tools.r8.graph.DexType):434:444 -> <init>
-    134:144:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):349 -> <init>
-    134:144:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    145:147:com.android.tools.r8.ir.desugar.LambdaClass$Target createStaticMethodTarget(com.android.tools.r8.graph.DexType):443:445 -> <init>
-    145:147:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):349 -> <init>
-    145:147:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93 -> <init>
-    148:160:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):93:105 -> <init>
-    161:167:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):103:109 -> <init>
-    1:21:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):115:135 -> a
-    22:22:com.android.tools.r8.graph.DexProgramClass getOrCreateLambdaClass():139:139 -> a
-    23:24:com.android.tools.r8.graph.DexField getCaptureField(int):184:185 -> a
-    25:25:com.android.tools.r8.graph.DexField getCaptureField(int):184:184 -> a
-    26:33:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):193:200 -> a
-    34:62:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):205:233 -> a
-    63:63:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeVirtualMethods$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):218:218 -> a
-    64:64:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeVirtualMethods$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):236:236 -> a
-    65:65:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeDirectMethods$2(com.android.tools.r8.ir.code.Position):261:261 -> a
-    1:1:boolean isStateless():189:189 -> b
+    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):74:74 -> <init>
+    2:20:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):68:86 -> <init>
+    21:21:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):307:307 -> <init>
+    21:21:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    22:61:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):330:369 -> <init>
+    22:61:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):308 -> <init>
+    22:61:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    62:62:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):368:368 -> <init>
+    62:62:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):308 -> <init>
+    62:62:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    63:63:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):367:367 -> <init>
+    63:63:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):308 -> <init>
+    63:63:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    64:77:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):312:325 -> <init>
+    64:77:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    78:78:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):314:314 -> <init>
+    78:78:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    79:81:com.android.tools.r8.ir.desugar.LambdaClass$Target createInterfaceMethodTarget(com.android.tools.r8.graph.DexType):445:447 -> <init>
+    79:81:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):316 -> <init>
+    79:81:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    82:99:com.android.tools.r8.ir.desugar.LambdaClass$Target createConstructorTarget(com.android.tools.r8.graph.DexType):422:439 -> <init>
+    82:99:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):318 -> <init>
+    82:99:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    100:102:com.android.tools.r8.ir.desugar.LambdaClass$Target createConstructorTarget(com.android.tools.r8.graph.DexType):438:440 -> <init>
+    100:102:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):318 -> <init>
+    100:102:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    103:104:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):376:377 -> <init>
+    103:104:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):323 -> <init>
+    103:104:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    105:126:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):376:397 -> <init>
+    105:126:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):323 -> <init>
+    105:126:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    127:130:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):396:399 -> <init>
+    127:130:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):323 -> <init>
+    127:130:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    131:141:com.android.tools.r8.ir.desugar.LambdaClass$Target createStaticMethodTarget(com.android.tools.r8.graph.DexType):405:415 -> <init>
+    131:141:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):320 -> <init>
+    131:141:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    142:144:com.android.tools.r8.ir.desugar.LambdaClass$Target createStaticMethodTarget(com.android.tools.r8.graph.DexType):414:416 -> <init>
+    142:144:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):320 -> <init>
+    142:144:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89 -> <init>
+    145:154:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):89:98 -> <init>
+    1:21:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):104:124 -> a
+    22:22:com.android.tools.r8.graph.DexProgramClass getLambdaClass():128:128 -> a
+    23:24:com.android.tools.r8.graph.DexField getCaptureField(int):168:169 -> a
+    25:25:com.android.tools.r8.graph.DexField getCaptureField(int):168:168 -> a
+    26:33:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):177:184 -> a
+    34:62:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):189:217 -> a
+    63:63:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeVirtualMethods$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):202:202 -> a
+    64:64:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeVirtualMethods$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):220:220 -> a
+    65:65:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeDirectMethods$2(com.android.tools.r8.ir.code.Position):242:242 -> a
+    1:1:boolean isStateless():173:173 -> b
     2:2:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isStateless():162:162 -> b
-    2:2:boolean isStateless():189 -> b
-    3:3:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeDirectMethods$3(com.android.tools.r8.ir.code.Position):273:273 -> b
-    1:1:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeDirectMethods$4(com.android.tools.r8.ir.code.Position):283:283 -> c
-    2:2:com.android.tools.r8.graph.DexString generateUniqueLambdaMethodName():480:480 -> c
-    1:38:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeDirectMethods():244:281 -> d
-    1:11:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():148:158 -> e
-    12:15:com.android.tools.r8.graph.DexTypeList buildInterfaces():327:330 -> e
-    12:15:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():161 -> e
-    16:20:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():161:165 -> e
-    21:36:com.android.tools.r8.graph.DexEncodedField[] synthesizeStaticFields():305:320 -> e
-    21:36:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():166 -> e
-    37:45:com.android.tools.r8.graph.DexEncodedField[] synthesizeInstanceFields():290:298 -> e
-    37:45:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():167 -> e
-    46:57:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():168:179 -> e
-com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.ir.desugar.j:
+    2:2:boolean isStateless():173 -> b
+    3:3:com.android.tools.r8.ir.conversion.SourceCode lambda$synthesizeDirectMethods$3(com.android.tools.r8.ir.code.Position):254:254 -> b
+    1:1:com.android.tools.r8.graph.DexString generateUniqueLambdaMethodName():451:451 -> c
+    1:25:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeDirectMethods():228:252 -> d
+    1:11:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():132:142 -> e
+    12:15:com.android.tools.r8.graph.DexTypeList buildInterfaces():298:301 -> e
+    12:15:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():145 -> e
+    16:20:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():145:149 -> e
+    21:36:com.android.tools.r8.graph.DexEncodedField[] synthesizeStaticFields():276:291 -> e
+    21:36:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():150 -> e
+    37:45:com.android.tools.r8.graph.DexEncodedField[] synthesizeInstanceFields():261:269 -> e
+    37:45:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():151 -> e
+    46:57:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():152:163 -> e
+com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.ir.desugar.l$a:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
-    1:1:void <clinit>():638:638 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):640:641 -> <init>
-    1:1:boolean ensureAccessibility():647:647 -> a
-    2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.LambdaClass$Target.programDefinitionFor(com.android.tools.r8.graph.DexType):507:507 -> a
-    2:2:boolean ensureAccessibility():647 -> a
-    3:26:boolean ensureAccessibility():648:671 -> a
-    27:27:boolean ensureAccessibility():669:669 -> a
-    28:28:com.android.tools.r8.ir.conversion.SourceCode lambda$ensureAccessibility$0(com.android.tools.r8.ir.code.Position):664:664 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.ir.desugar.k:
+    1:1:void <clinit>():609:609 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):611:612 -> <init>
+    1:1:boolean ensureAccessibility():618:618 -> a
+    2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.LambdaClass$Target.programDefinitionFor(com.android.tools.r8.graph.DexType):478:478 -> a
+    2:2:boolean ensureAccessibility():618 -> a
+    3:26:boolean ensureAccessibility():619:642 -> a
+    27:27:boolean ensureAccessibility():640:640 -> a
+    28:28:com.android.tools.r8.ir.conversion.SourceCode lambda$ensureAccessibility$0(com.android.tools.r8.ir.code.Position):635:635 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.ir.desugar.m:
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):597:598 -> <init>
-    1:24:boolean ensureAccessibility():605:628 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.ir.desugar.l:
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):568:569 -> <init>
+    1:24:boolean ensureAccessibility():576:599 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.ir.desugar.n:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
-    1:1:void <clinit>():546:546 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):548:549 -> <init>
-    1:28:boolean ensureAccessibility():556:583 -> a
-    29:36:boolean ensureAccessibility():582:589 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.ir.desugar.m:
-    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Invoke$Type):515:515 -> <init>
+    1:1:void <clinit>():517:517 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):519:520 -> <init>
+    1:28:boolean ensureAccessibility():527:554 -> a
+    29:36:boolean ensureAccessibility():553:560 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.ir.desugar.o:
+    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Invoke$Type):486:486 -> <init>
     boolean ensureAccessibility() -> a
-com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.ir.desugar.n:
+com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.ir.desugar.p:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
-    1:1:void <clinit>():525:525 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass):527:528 -> <init>
-    1:5:boolean ensureAccessibility():534:538 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.ir.desugar.o:
+    1:1:void <clinit>():496:496 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass):498:499 -> <init>
+    1:5:boolean ensureAccessibility():505:509 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.ir.desugar.q:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> b
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> c
     com.android.tools.r8.graph.DexMethod callTarget -> a
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():487:487 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):492:496 -> <init>
+    1:1:void <clinit>():458:458 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):463:467 -> <init>
     boolean ensureAccessibility() -> a
-    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):503:503 -> a
-com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode -> com.android.tools.r8.ir.desugar.q:
+    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):474:474 -> a
+com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode -> com.android.tools.r8.ir.desugar.r:
     boolean $assertionsDisabled -> q
     1:1:void <clinit>():15:15 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):18:19 -> <init>
@@ -24069,7 +23601,7 @@
     7:7:void lambda$prepareInstructions$1(int,com.android.tools.r8.ir.conversion.IRBuilder):29:29 -> b
     1:1:void lambda$prepareInstructions$2(int,com.android.tools.r8.ir.conversion.IRBuilder):38:38 -> c
     1:17:void prepareInstructions():25:41 -> f
-com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.ir.desugar.r:
+com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.ir.desugar.s:
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):19:19 -> <init>
     1:5:void lambda$prepareInstructions$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder):28:32 -> a
     6:6:void lambda$prepareInstructions$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder):28:28 -> a
@@ -24077,12 +23609,6 @@
     1:8:boolean equals(java.lang.Object):61:68 -> equals
     1:23:void prepareInstructions():25:47 -> f
     1:2:int hashCode():55:56 -> hashCode
-com.android.tools.r8.ir.desugar.LambdaCreateInstanceSourceCode -> com.android.tools.r8.ir.desugar.s:
-    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):18:18 -> <init>
-    1:1:void lambda$prepareInstructions$0(int,com.android.tools.r8.ir.conversion.IRBuilder):25:25 -> a
-    2:2:void lambda$prepareInstructions$1(java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):36:36 -> a
-    1:1:void lambda$prepareInstructions$2(int,com.android.tools.r8.ir.conversion.IRBuilder):43:43 -> b
-    1:20:void prepareInstructions():24:43 -> f
 com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.ir.desugar.t:
     java.util.Set bridges -> g
     com.android.tools.r8.graph.DexString name -> b
@@ -24200,58 +23726,52 @@
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString constructorName -> e
+    boolean $assertionsDisabled -> k
     com.android.tools.r8.graph.DexString classConstructorName -> f
-    boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexString instanceFieldName -> g
-    com.android.tools.r8.graph.DexString createInstanceMethodName -> h
-    java.util.Map knownCallSites -> j
-    java.util.Map knownLambdaClasses -> k
+    java.util.Map knownCallSites -> i
+    java.util.Map knownLambdaClasses -> j
+    com.android.tools.r8.com.google.common.collect.BiMap methodMapping -> h
     com.android.tools.r8.graph.DexMethod objectInitMethod -> d
-    com.android.tools.r8.com.google.common.collect.BiMap methodMapping -> i
     com.android.tools.r8.ir.conversion.IRConverter converter -> b
-    1:1:void <clinit>():50:50 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):88:88 -> <init>
-    2:31:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):70:99 -> <init>
-    1:10:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):108:117 -> a
-    11:15:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):217:221 -> a
-    11:15:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):116 -> a
-    16:16:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):220:220 -> a
-    16:16:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):116 -> a
-    17:17:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118:118 -> a
-    18:28:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):231:241 -> a
-    18:28:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):123 -> a
-    29:29:boolean isInMainDexList(com.android.tools.r8.graph.DexType):225:225 -> a
-    29:29:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):242 -> a
-    29:29:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):123 -> a
-    30:30:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):243:243 -> a
-    30:30:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):123 -> a
-    31:31:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):124:124 -> a
-    32:47:void patchInstruction(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):269:284 -> a
-    32:47:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):129 -> a
-    48:109:void patchInstruction(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):283:344 -> a
-    48:109:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):129 -> a
-    110:111:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():143:144 -> a
-    110:111:void patchInstruction(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):346 -> a
-    110:111:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):129 -> a
-    112:113:void patchInstruction(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):346:347 -> a
-    112:113:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):129 -> a
-    114:125:boolean removeLambdaDeserializationMethods(java.lang.Iterable):137:148 -> a
-    126:132:void adjustAccessibility():167:173 -> a
-    133:133:void adjustAccessibility():172:172 -> a
-    134:135:com.android.tools.r8.graph.DexProgramClass getLambdaClass(com.android.tools.r8.graph.DexType):182:183 -> a
-    136:145:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):189:198 -> a
-    146:146:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):195:195 -> a
-    147:149:java.lang.Object getKnown(java.util.Map,java.lang.Object):249:251 -> a
-    150:157:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):255:262 -> a
-    1:1:boolean hasLambdaClassPrefix(com.android.tools.r8.graph.DexType):85:85 -> b
-    2:4:java.util.Set getDesugaredCallSites():203:205 -> b
+    1:1:void <clinit>():49:49 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):85:85 -> <init>
+    2:30:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):67:95 -> <init>
+    1:10:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):104:113 -> a
+    11:15:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):212:216 -> a
+    11:15:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):112 -> a
+    16:16:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):215:215 -> a
+    16:16:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):112 -> a
+    17:17:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):114:114 -> a
+    18:25:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):226:233 -> a
+    18:25:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):119 -> a
+    26:26:boolean isInMainDexList(com.android.tools.r8.graph.DexType):220:220 -> a
+    26:26:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):234 -> a
+    26:26:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):119 -> a
+    27:27:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):235:235 -> a
+    27:27:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):119 -> a
+    28:28:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):120:120 -> a
+    29:44:void patchInstruction(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):261:276 -> a
+    29:44:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):125 -> a
+    45:95:void patchInstruction(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator):275:325 -> a
+    45:95:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):125 -> a
+    96:107:boolean removeLambdaDeserializationMethods(java.lang.Iterable):133:144 -> a
+    108:114:void adjustAccessibility():163:169 -> a
+    115:115:void adjustAccessibility():168:168 -> a
+    116:117:com.android.tools.r8.graph.DexProgramClass getLambdaClass(com.android.tools.r8.graph.DexType):178:179 -> a
+    118:126:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):185:193 -> a
+    127:127:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):191:191 -> a
+    128:130:java.lang.Object getKnown(java.util.Map,java.lang.Object):241:243 -> a
+    131:138:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):247:254 -> a
+    1:1:boolean hasLambdaClassPrefix(com.android.tools.r8.graph.DexType):82:82 -> b
+    2:4:java.util.Set getDesugaredCallSites():198:200 -> b
 com.android.tools.r8.ir.desugar.LambdaRewriterGraphLense -> com.android.tools.r8.ir.desugar.w:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():15:15 -> <clinit>
     1:5:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory):20:24 -> <init>
     6:6:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory):19:19 -> <init>
     1:3:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):31:33 -> b
-com.android.tools.r8.ir.desugar.StringConcatRewriter -> com.android.tools.r8.ir.desugar.C:
+com.android.tools.r8.ir.desugar.StringConcatRewriter -> com.android.tools.r8.ir.desugar.B:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexMethod defaultAppendMethod -> h
@@ -24324,7 +23844,7 @@
     1:1:com.android.tools.r8.graph.DexMethod access$200(com.android.tools.r8.ir.desugar.StringConcatRewriter):40:40 -> b
     1:1:com.android.tools.r8.graph.DexMethod access$300(com.android.tools.r8.ir.desugar.StringConcatRewriter):40:40 -> c
 com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> com.android.tools.r8.ir.desugar.x:
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> com.android.tools.r8.ir.desugar.B:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> com.android.tools.r8.ir.desugar.A:
     java.util.ListIterator blocks -> c
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> f
     com.android.tools.r8.graph.AppView appView -> a
@@ -24362,13 +23882,13 @@
     com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder this$1 -> b
     1:2:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,com.android.tools.r8.graph.DexMethod):407:408 -> <init>
     com.android.tools.r8.ir.code.Value getOrCreateValue() -> a
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ConstantChunk -> com.android.tools.r8.ir.desugar.A:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ConstantChunk -> com.android.tools.r8.ir.desugar.A$a:
     com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder this$1 -> d
     java.lang.String str -> c
     1:3:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,java.lang.String,com.android.tools.r8.graph.DexMethod):437:439 -> <init>
     1:7:com.android.tools.r8.ir.code.Value getOrCreateValue():444:450 -> a
     8:8:com.android.tools.r8.ir.code.Value getOrCreateValue():446:446 -> a
-com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode -> com.android.tools.r8.ir.desugar.D:
+com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode -> com.android.tools.r8.ir.desugar.C:
     com.android.tools.r8.graph.DexMethod currentMethod -> n
     boolean $assertionsDisabled -> p
     com.android.tools.r8.ir.desugar.LambdaClass lambda -> o
@@ -24422,7 +23942,7 @@
     33:39:int doHash(java.lang.Object):16 -> 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.ir.optimize.c:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.ir.optimize.b:
     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
@@ -24433,273 +23953,273 @@
     2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):98:104 -> <init>
     1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization):61:61 -> a
     2:14:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):108:120 -> a
-    15:59:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):321:365 -> a
+    15:59:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):320:364 -> a
     15:59:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
-    60:64:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):406:410 -> a
-    60:64:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):367 -> a
+    60:64:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):405:409 -> a
+    60:64:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):366 -> a
     60:64:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
-    65:94:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):369:398 -> a
+    65:94:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):368:397 -> a
     65:94:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
-    95:102:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):393:400 -> a
+    95:102:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):392:399 -> a
     95:102:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
     103:115:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):125:137 -> a
-    116:137:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):253:274 -> a
+    116:137:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):252:273 -> a
     116:137:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
-    138:175:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):278:315 -> a
-    138:175:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):274 -> a
+    138:175:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):277:314 -> a
+    138:175:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):273 -> a
     138:175:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
     176:176:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137:137 -> a
-    177:177:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):315:315 -> a
-    177:177:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):274 -> a
+    177:177:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):314:314 -> a
+    177:177:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):273 -> a
     177:177:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
     178:203:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138:163 -> a
-    204:313:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):139:248 -> a
-    314:314:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):398:398 -> a
-    314:314:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
-    315:315:com.android.tools.r8.graph.DexField lambda$optimize$0(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexField):215:215 -> a
-    316:317:void lambda$optimize$1():237:238 -> a
-    318:326:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):416:424 -> a
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.ir.optimize.b:
+    204:312:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):139:247 -> a
+    313:313:java.util.Collection computeUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):397:397 -> a
+    313:313:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
+    314:314:com.android.tools.r8.graph.DexField lambda$optimize$0(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexField):214:214 -> a
+    315:316:void lambda$optimize$1():236:237 -> a
+    317:325:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):415:423 -> a
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.ir.optimize.b$a:
     java.util.Map fieldsWithStaticValues -> a
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization this$0 -> c
     java.util.Set noLongerWrittenFields -> b
     1:3:void <init>(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization,java.util.Map,java.util.Set):70:72 -> <init>
     1:2:void join(java.util.Map,java.util.Set):78:79 -> a
-    3:5:void execute():85:87 -> a
-    6:10:void execute():86:90 -> a
+    1:3:void execute():85:87 -> execute
+    4:8:void execute():86:90 -> execute
 com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.ir.optimize.CodeRewriter:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
-    boolean $assertionsDisabled -> e
-    com.android.tools.r8.utils.InternalOptions options -> d
+    java.util.Set libraryMethodsReturningReceiver -> d
+    boolean $assertionsDisabled -> f
+    com.android.tools.r8.utils.InternalOptions options -> e
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
     1:1:void <clinit>():141:141 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):160:164 -> <init>
+    1:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,java.util.Set):164:169 -> <init>
     boolean lambda$computeConstantArrayValues$11(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction) -> a
-    1:2:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):190:191 -> a
-    3:26:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):202:225 -> a
-    27:36:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):230:239 -> a
-    37:65:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):292:320 -> a
-    66:102:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):468:504 -> a
-    103:104:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):336:337 -> a
-    103:104:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):505 -> a
-    105:119:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):506:520 -> a
-    120:121:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):336:337 -> a
-    120:121:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):521 -> a
-    122:131:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):522:531 -> a
-    132:145:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):579:592 -> a
-    146:146:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):589:589 -> a
-    147:158:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):602:613 -> a
-    159:166:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):618:625 -> a
-    167:167:int codeUnitMargin():632:632 -> a
-    168:168:int lambda$rewriteSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):769:769 -> a
-    169:172:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.OptimizationFeedback):1012:1015 -> a
-    173:179:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.OptimizationFeedback):1014:1020 -> a
-    180:180:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.OptimizationFeedback):1019:1019 -> a
-    181:234:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1036:1089 -> a
-    235:279:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1064:1108 -> a
-    280:353:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):1264:1337 -> a
-    354:354:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):1369:1369 -> a
-    355:359:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1372:1376 -> a
-    360:375:boolean isKotlinNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):1434:1449 -> a
-    360:375:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1378 -> a
-    376:397:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1379:1400 -> a
-    398:403:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1399:1404 -> a
-    404:411:boolean isInstantiationOfNullPointerException(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):1468:1475 -> a
-    404:411:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1404 -> a
-    412:432:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1405:1425 -> a
-    433:435:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1457:1459 -> a
-    436:436:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1489:1489 -> a
-    437:453:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$4(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1492:1508 -> a
-    454:513:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1520:1579 -> a
-    514:554:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1539:1579 -> a
-    555:568:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1566:1579 -> a
-    569:569:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1587:1587 -> a
-    570:570:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1586:1586 -> a
-    571:577:com.android.tools.r8.graph.DexType getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1597:1603 -> a
-    571:577:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1590 -> a
-    578:578:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1590:1590 -> a
-    579:583:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1589:1593 -> a
-    584:621:void disableAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1751:1788 -> a
-    622:633:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1872:1883 -> a
-    634:664:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1989:2019 -> a
-    634:664:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1883 -> a
-    665:681:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):2018:2034 -> a
-    665:681:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1883 -> a
-    682:682:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):2028:2028 -> a
-    682:682:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1883 -> a
-    683:685:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1895:1897 -> a
-    686:747:boolean removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1903:1964 -> a
-    748:749:boolean lambda$removeCheckCastInstructionIfTrivial$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):1928:1929 -> a
-    750:762:boolean isTypeInaccessibleInCurrentContext(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1969:1981 -> a
-    763:768:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):2041:2046 -> a
-    769:779:void removeOrReplaceByDebugLocalWrite(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2051:2061 -> a
-    780:781:boolean lambda$shortenLiveRanges$7(com.android.tools.r8.ir.code.ConstInstruction):2231:2232 -> a
-    782:836:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):2296:2350 -> a
-    837:848:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):2355:2366 -> a
-    849:852:boolean lambda$insertConstantInBlock$10(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):2360:2363 -> a
-    853:900:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):2401:2448 -> a
-    901:906:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2778:2783 -> a
-    907:907:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2800:2800 -> a
-    908:915:boolean hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2787:2794 -> a
-    908:915:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2801 -> a
-    916:932:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2803:2819 -> a
-    933:942:boolean shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2765:2774 -> a
-    933:942:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2820 -> a
-    943:958:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2821:2836 -> a
-    959:960:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2967:2968 -> a
-    961:961:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2972:2972 -> a
-    962:966: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):3381:3385 -> a
-    967:982:void rewriteLongCompareAndRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3436:3451 -> a
-    983:999:void rewriteLongCompareAndRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3449:3465 -> a
-    1000:1023:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3476:3499 -> a
-    1024:1058:java.util.Set computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3536:3570 -> a
-    1024:1058:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3503 -> a
-    1059:1081:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3504:3526 -> a
-    1082:1091:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3581:3590 -> a
-    1092:1092:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3643:3643 -> a
-    1093:1102:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3649:3658 -> a
-    1093:1102:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3645 -> a
-    1103:1103:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3655:3655 -> a
-    1103:1103:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3645 -> a
-    1104:1109: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):3664:3669 -> a
-    1110:1130:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3679:3699 -> a
-    1131:1140:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3698:3707 -> a
-    1141:1202:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3705:3766 -> a
-    1203:1218:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3765:3780 -> a
-    1219:1228:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3784:3793 -> a
-    1229:1239:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3807:3817 -> a
-    1229:1239:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3793 -> a
-    1240:1240:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3794:3794 -> a
-    1241:1266:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):3840:3865 -> a
-    1241:1266:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3794 -> a
-    1267:1271:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3795:3799 -> a
-    1272:1272:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3796:3796 -> a
-    1273:1273:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3815:3815 -> a
-    1273:1273:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3793 -> a
-    1274:1274:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3811:3811 -> a
-    1274:1274:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3793 -> a
-    1275:1281:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3821:3827 -> a
-    1:1:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):180:180 -> b
-    2:2:void lambda$removeSwitchMaps$2(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):901:901 -> b
-    3:7:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1135:1139 -> b
-    8:14:com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage collectParameterUsages(int,com.android.tools.r8.ir.code.Value):1151:1157 -> b
-    8:14:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1142 -> b
-    15:18:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1144:1147 -> b
-    19:20:boolean isClassDesiredAssertionStatusInvoke(com.android.tools.r8.ir.code.Instruction):1795:1796 -> b
-    21:22:com.android.tools.r8.ir.code.Value blockWithAssertionsDisabledFieldPut(com.android.tools.r8.ir.code.BasicBlock):1820:1821 -> b
-    23:24:boolean isAssertionsDisabledFieldPut(com.android.tools.r8.ir.code.Instruction):1801:1802 -> b
-    23:24:com.android.tools.r8.ir.code.Value blockWithAssertionsDisabledFieldPut(com.android.tools.r8.ir.code.BasicBlock):1823 -> b
-    25:25:com.android.tools.r8.ir.code.Value blockWithAssertionsDisabledFieldPut(com.android.tools.r8.ir.code.BasicBlock):1823:1823 -> b
-    26:26:boolean lambda$shortenLiveRanges$8(com.android.tools.r8.ir.code.ConstInstruction):2240:2240 -> b
-    27:85:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3184:3242 -> b
-    86:88:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$15():3928:3930 -> b
-    89:89:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$15():3928:3928 -> b
-    1:9:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):869:877 -> c
-    10:48:com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo com.android.tools.r8.ir.optimize.SwitchUtils.analyzeSwitchOverEnum(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):62:100 -> c
-    10:48:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):877 -> c
-    49:77:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):879:907 -> c
-    78:117:void identifyReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):964:1003 -> c
-    118:118:boolean isNotDebugInstruction(com.android.tools.r8.ir.code.Instruction):1806:1806 -> c
-    119:125:com.android.tools.r8.ir.code.Value blockWithSingleConstNumberAndGoto(com.android.tools.r8.ir.code.BasicBlock):1810:1816 -> c
-    1:15:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):921:935 -> collapseTrivialGotos
-    16:34:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):245:263 -> collapseTrivialGotos
-    16:34:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):936 -> collapseTrivialGotos
-    35:35:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):938:938 -> collapseTrivialGotos
-    36:49:void collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):269:282 -> collapseTrivialGotos
-    36:49:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):939 -> collapseTrivialGotos
-    50:66:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):943:959 -> collapseTrivialGotos
-    1:16:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1114:1129 -> d
-    17:96:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeInstanceInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.function.Function):1175:1254 -> d
-    17:96:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1129 -> d
-    97:97:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1130:1130 -> d
-    98:98:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1127:1127 -> d
-    99:134:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1608:1643 -> d
-    135:193:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1642:1700 -> d
-    194:217:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3347:3370 -> d
-    218:218:boolean lambda$logArgumentTypes$14(com.android.tools.r8.ir.code.Instruction):3688:3688 -> d
-    1:100:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):727:826 -> e
-    101:187:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.Switch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):636:722 -> e
-    101:187:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):827 -> e
-    188:207:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):830:849 -> e
-    208:208:java.util.List lambda$shortenLiveRangesInsideBlock$9(com.android.tools.r8.ir.code.BasicBlock):2344:2344 -> e
-    1:40:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3600:3639 -> f
-    1:59:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2217:2275 -> g
-    60:86:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2260:2286 -> g
-    1:12:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2478:2489 -> h
-    13:29:boolean allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2454:2470 -> h
-    13:29:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2490 -> h
-    30:46:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2493:2509 -> h
-    47:64:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2508:2525 -> h
-    65:81:short[] computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):2374:2390 -> h
-    65:81:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2526 -> h
-    82:124:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2530:2572 -> h
-    1:6:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2614:2619 -> i
-    7:24:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2658:2675 -> i
-    7:24:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2619 -> i
-    25:35:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2624:2634 -> i
-    36:60:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2581:2605 -> i
-    36:60:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2636 -> i
-    61:74:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2637:2650 -> i
-    75:75:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2610:2610 -> i
-    75:75:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2636 -> i
-    1:6:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2840:2845 -> j
-    7:23:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.BasicBlock):3415:3431 -> j
-    7:23:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2846 -> j
-    24:43:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3389:3408 -> j
-    24:43:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2847 -> j
-    44:105:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3276:3337 -> j
-    44:105:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2849 -> j
-    106:156:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2854:2904 -> j
-    157:158:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2896:2897 -> j
-    159:205:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2888:2934 -> j
-    206:243:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2924:2961 -> j
-    1:26:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2074:2099 -> k
-    1:4:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2113:2116 -> l
-    5:8:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2153:2156 -> l
-    5:8:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2117 -> l
-    9:17:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2171:2179 -> l
-    9:17:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2157 -> l
-    9:17:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2117 -> l
-    18:18:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> l
-    18:18:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2179 -> l
-    18:18:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2157 -> l
-    18:18:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2117 -> l
-    19:21:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2179:2181 -> l
-    19:21:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2157 -> l
-    19:21:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2117 -> l
-    22:29:boolean hasPath(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2202:2209 -> l
-    22:29:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2182 -> l
-    22:29:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2157 -> l
-    22:29:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2117 -> l
-    30:31:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2187:2188 -> l
-    30:31:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2157 -> l
-    30:31:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2117 -> l
-    32:52:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2118:2138 -> l
-    53:71:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2126:2144 -> l
-    1:15:void workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3984:3998 -> m
-    1:46:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3927:3972 -> n
-    1:37:boolean hasJavacClinitAssertionCode(com.android.tools.r8.ir.code.IRCode):1827:1863 -> o
-    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$6(com.android.tools.r8.ir.code.IRCode):2218:2218 -> p
-    1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):168:180 -> q
-    14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):177:183 -> q
-com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.ir.optimize.CodeRewriter$1:
+    1:2:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):195:196 -> a
+    3:26:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):207:230 -> a
+    27:36:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):235:244 -> a
+    37:65:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):297:325 -> a
+    66:102:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):473:509 -> a
+    103:104:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):341:342 -> a
+    103:104:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):510 -> a
+    105:119:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):511:525 -> a
+    120:121:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):341:342 -> a
+    120:121:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):526 -> a
+    122:131:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Switch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):527:536 -> a
+    132:145:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):584:597 -> a
+    146:146:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):594:594 -> a
+    147:158:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):607:618 -> a
+    159:166:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):623:630 -> a
+    167:167:int codeUnitMargin():637:637 -> a
+    168:168:int lambda$rewriteSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):774:774 -> a
+    169:172:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.OptimizationFeedback):1017:1020 -> a
+    173:179:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.OptimizationFeedback):1019:1025 -> a
+    180:180:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.OptimizationFeedback):1024:1024 -> a
+    181:234:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1041:1094 -> a
+    235:279:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1069:1113 -> a
+    280:342:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):1269:1331 -> a
+    343:343:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):1363:1363 -> a
+    344:348:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1366:1370 -> a
+    349:364:boolean isKotlinNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):1428:1443 -> a
+    349:364:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1372 -> a
+    365:386:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1373:1394 -> a
+    387:392:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1393:1398 -> a
+    393:400:boolean isInstantiationOfNullPointerException(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):1462:1469 -> a
+    393:400:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1398 -> a
+    401:421:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1399:1419 -> a
+    422:424:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1451:1453 -> a
+    425:425:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1483:1483 -> a
+    426:441:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$4(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1486:1501 -> a
+    442:501:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1513:1572 -> a
+    502:542:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1532:1572 -> a
+    543:556:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1559:1572 -> a
+    557:557:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1580:1580 -> a
+    558:558:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1579:1579 -> a
+    559:565:com.android.tools.r8.graph.DexType getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1590:1596 -> a
+    559:565:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1583 -> a
+    566:566:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1583:1583 -> a
+    567:571:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1582:1586 -> a
+    572:609:void disableAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1729:1766 -> a
+    610:621:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1850:1861 -> a
+    622:652:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1965:1995 -> a
+    622:652:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1861 -> a
+    653:669:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1994:2010 -> a
+    653:669:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1861 -> a
+    670:670:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):2004:2004 -> a
+    670:670:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1861 -> a
+    671:673:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,boolean):1873:1875 -> a
+    674:733:boolean removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.IRCode):1881:1940 -> a
+    734:734:boolean lambda$removeCheckCastInstructionIfTrivial$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):1905:1905 -> a
+    735:747:boolean isTypeInaccessibleInCurrentContext(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1945:1957 -> a
+    748:753:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):2017:2022 -> a
+    754:764:void removeOrReplaceByDebugLocalWrite(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2027:2037 -> a
+    765:766:boolean lambda$shortenLiveRanges$7(com.android.tools.r8.ir.code.ConstInstruction):2207:2208 -> a
+    767:821:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):2272:2326 -> a
+    822:833:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):2331:2342 -> a
+    834:837:boolean lambda$insertConstantInBlock$10(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):2336:2339 -> a
+    838:885:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):2377:2424 -> a
+    886:891:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2752:2757 -> a
+    892:892:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2774:2774 -> a
+    893:900:boolean hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2761:2768 -> a
+    893:900:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2775 -> a
+    901:917:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2777:2793 -> a
+    918:927:boolean shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2739:2748 -> a
+    918:927:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2794 -> a
+    928:943:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2795:2810 -> a
+    944:945:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2941:2942 -> a
+    946:946:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2946:2946 -> a
+    947:951: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):3355:3359 -> a
+    952:967:void rewriteLongCompareAndRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3410:3425 -> a
+    968:984:void rewriteLongCompareAndRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3423:3439 -> a
+    985:1008:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3450:3473 -> a
+    1009:1043:java.util.Set computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3510:3544 -> a
+    1009:1043:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3477 -> a
+    1044:1066:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3478:3500 -> a
+    1067:1076:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3555:3564 -> a
+    1077:1077:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3617:3617 -> a
+    1078:1087:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3623:3632 -> a
+    1078:1087:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3619 -> a
+    1088:1088:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3629:3629 -> a
+    1088:1088:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3619 -> a
+    1089:1094: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):3638:3643 -> a
+    1095:1115:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3653:3673 -> a
+    1116:1125:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3672:3681 -> a
+    1126:1187:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3679:3740 -> a
+    1188:1203:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3739:3754 -> a
+    1204:1210:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3796:3802 -> a
+    1:1:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):185:185 -> b
+    2:2:void lambda$removeSwitchMaps$2(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):906:906 -> b
+    3:7:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1140:1144 -> b
+    8:14:com.android.tools.r8.graph.ParameterUsagesInfo$ParameterUsage collectParameterUsages(int,com.android.tools.r8.ir.code.Value):1156:1162 -> b
+    8:14:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1147 -> b
+    15:18:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1149:1152 -> b
+    19:20:boolean isClassDesiredAssertionStatusInvoke(com.android.tools.r8.ir.code.Instruction):1773:1774 -> b
+    21:22:com.android.tools.r8.ir.code.Value blockWithAssertionsDisabledFieldPut(com.android.tools.r8.ir.code.BasicBlock):1798:1799 -> b
+    23:24:boolean isAssertionsDisabledFieldPut(com.android.tools.r8.ir.code.Instruction):1779:1780 -> b
+    23:24:com.android.tools.r8.ir.code.Value blockWithAssertionsDisabledFieldPut(com.android.tools.r8.ir.code.BasicBlock):1801 -> b
+    25:25:com.android.tools.r8.ir.code.Value blockWithAssertionsDisabledFieldPut(com.android.tools.r8.ir.code.BasicBlock):1801:1801 -> b
+    26:26:boolean lambda$shortenLiveRanges$8(com.android.tools.r8.ir.code.ConstInstruction):2216:2216 -> b
+    27:37:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode):3758:3768 -> b
+    38:48:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3782:3792 -> b
+    38:48:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode):3768 -> b
+    49:49:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode):3769:3769 -> b
+    50:75:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):3815:3840 -> b
+    50:75:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode):3769 -> b
+    76:80:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode):3770:3774 -> b
+    81:81:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode):3771:3771 -> b
+    82:82:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3790:3790 -> b
+    82:82:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode):3768 -> b
+    83:83:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3786:3786 -> b
+    83:83:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode):3768 -> b
+    84:86:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$15():3903:3905 -> b
+    87:87:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$15():3903:3903 -> b
+    1:40:void identifyReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):969:1008 -> c
+    41:41:boolean isNotDebugInstruction(com.android.tools.r8.ir.code.Instruction):1784:1784 -> c
+    42:48:com.android.tools.r8.ir.code.Value blockWithSingleConstNumberAndGoto(com.android.tools.r8.ir.code.BasicBlock):1788:1794 -> c
+    49:107:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3158:3216 -> c
+    1:15:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):926:940 -> collapseTrivialGotos
+    16:34:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):250:268 -> collapseTrivialGotos
+    16:34:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):941 -> collapseTrivialGotos
+    35:35:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):943:943 -> collapseTrivialGotos
+    36:49:void collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):274:287 -> collapseTrivialGotos
+    36:49:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):944 -> collapseTrivialGotos
+    50:66:void collapseTrivialGotos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):948:964 -> collapseTrivialGotos
+    1:9:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):874:882 -> d
+    10:48:com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo com.android.tools.r8.ir.optimize.SwitchUtils.analyzeSwitchOverEnum(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):62:100 -> d
+    10:48:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):882 -> d
+    49:77:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):884:912 -> d
+    78:93:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1119:1134 -> d
+    94:173:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeInstanceInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.function.Function):1180:1259 -> d
+    94:173:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1134 -> d
+    174:174:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1135:1135 -> d
+    175:175:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OptimizationFeedback):1132:1132 -> d
+    176:199:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3321:3344 -> d
+    200:200:boolean lambda$logArgumentTypes$14(com.android.tools.r8.ir.code.Instruction):3662:3662 -> d
+    1:78:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1601:1678 -> e
+    79:79:java.util.List lambda$shortenLiveRangesInsideBlock$9(com.android.tools.r8.ir.code.BasicBlock):2320:2320 -> e
+    1:100:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):732:831 -> f
+    101:187:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.Switch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):641:727 -> f
+    101:187:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):832 -> f
+    188:207:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):835:854 -> f
+    1:40:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3574:3613 -> g
+    1:59:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2193:2251 -> h
+    60:86:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2236:2262 -> h
+    1:12:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2454:2465 -> i
+    13:29:boolean allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2430:2446 -> i
+    13:29:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2466 -> i
+    30:46:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2469:2485 -> i
+    47:64:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2484:2501 -> i
+    65:81:short[] computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):2350:2366 -> i
+    65:81:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2502 -> i
+    82:124:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2506:2548 -> i
+    1:6:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2590:2595 -> j
+    7:24:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2634:2651 -> j
+    7:24:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2595 -> j
+    25:35:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2600:2610 -> j
+    36:60:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2557:2581 -> j
+    36:60:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2612 -> j
+    61:74:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2613:2626 -> j
+    75:75:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2586:2586 -> j
+    75:75:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2612 -> j
+    1:6:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2814:2819 -> k
+    7:23:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.BasicBlock):3389:3405 -> k
+    7:23:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2820 -> k
+    24:43:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.BasicBlock):3363:3382 -> k
+    24:43:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2821 -> k
+    44:105:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3250:3311 -> k
+    44:105:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2823 -> k
+    106:156:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2828:2878 -> k
+    157:158:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2870:2871 -> k
+    159:205:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2862:2908 -> k
+    206:243:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2898:2935 -> k
+    1:26:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2050:2075 -> l
+    1:4:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2089:2092 -> m
+    5:8:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2129:2132 -> m
+    5:8:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2093 -> m
+    9:17:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2147:2155 -> m
+    9:17:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2133 -> m
+    9:17:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2093 -> m
+    18:18:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> m
+    18:18:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2155 -> m
+    18:18:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2133 -> m
+    18:18:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2093 -> m
+    19:21:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2155:2157 -> m
+    19:21:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2133 -> m
+    19:21:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2093 -> m
+    22:29:boolean hasPath(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2178:2185 -> m
+    22:29:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2158 -> m
+    22:29:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2133 -> m
+    22:29:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2093 -> m
+    30:31:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2163:2164 -> m
+    30:31:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2133 -> m
+    30:31:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2093 -> m
+    32:52:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2094:2114 -> m
+    53:71:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2102:2120 -> m
+    1:14:void workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3959:3972 -> n
+    1:46:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3902:3947 -> o
+    1:37:boolean hasJavacClinitAssertionCode(com.android.tools.r8.ir.code.IRCode):1805:1841 -> p
+    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$6(com.android.tools.r8.ir.code.IRCode):2194:2194 -> q
+    1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):173:185 -> r
+    14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):182:188 -> r
+com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.ir.optimize.c:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
-    1:1:void <clinit>():2882:2882 -> <clinit>
+    1:1:void <clinit>():2856:2856 -> <clinit>
 com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.ir.optimize.CodeRewriter$a:
-    com.android.tools.r8.utils.InternalOptions options -> a
+    com.android.tools.r8.ir.code.IRCode code -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():2679:2679 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):2684:2686 -> <init>
-    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.CodeRewriter$1):2679 -> <init>
-    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2679:2679 -> a
-    2:21:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2694:2713 -> a
-    2:21:boolean doEquivalent(java.lang.Object,java.lang.Object):2679 -> a
-    22:22:int doHash(java.lang.Object):2679:2679 -> a
-    23:37:int doHash(com.android.tools.r8.ir.code.Instruction):2724:2738 -> a
-    23:37:int doHash(java.lang.Object):2679 -> a
-    38:43:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2745:2750 -> a
-    44:48:int getHashCode(com.android.tools.r8.ir.code.Value):2756:2760 -> a
+    1:1:void <clinit>():2655:2655 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.code.IRCode):2659:2660 -> <init>
+    1:2:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.CodeRewriter$1):2655 -> <init>
+    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2655:2655 -> a
+    2:21:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2668:2687 -> a
+    2:21:boolean doEquivalent(java.lang.Object,java.lang.Object):2655 -> a
+    22:22:int doHash(java.lang.Object):2655:2655 -> a
+    23:37:int doHash(com.android.tools.r8.ir.code.Instruction):2698:2712 -> a
+    23:37:int doHash(java.lang.Object):2655 -> a
+    38:43:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2719:2724 -> a
+    44:48:int getHashCode(com.android.tools.r8.ir.code.Value):2730:2734 -> a
 com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.ir.optimize.CodeRewriter$b:
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> g
     com.android.tools.r8.ir.code.BasicBlock target -> f
@@ -24707,17 +24227,17 @@
     com.android.tools.r8.ir.code.IRCode code -> c
     boolean $assertionsDisabled -> h
     int right -> e
-    1:1:void <clinit>():401:401 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRCode):409:410 -> <init>
+    1:1:void <clinit>():406:406 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRCode):414:415 -> <init>
     java.lang.Object self() -> a
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setLeft(com.android.tools.r8.ir.code.Value):419:419 -> a
-    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):424:424 -> a
-    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):434:434 -> a
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):429:429 -> b
-    2:10:com.android.tools.r8.ir.code.BasicBlock build():439:447 -> b
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setLeft(com.android.tools.r8.ir.code.Value):424:424 -> a
+    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):429:429 -> a
+    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):439:439 -> a
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):434:434 -> b
+    2:10:com.android.tools.r8.ir.code.BasicBlock build():444:452 -> b
     11:15: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.Instruction):1291:1295 -> b
-    11:15:com.android.tools.r8.ir.code.BasicBlock build():447 -> b
-    16:21:com.android.tools.r8.ir.code.BasicBlock build():449:454 -> b
+    11:15:com.android.tools.r8.ir.code.BasicBlock build():452 -> b
+    16:21:com.android.tools.r8.ir.code.BasicBlock build():454:459 -> b
 com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult -> com.android.tools.r8.ir.optimize.CodeRewriter$c:
     com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult FALSE -> c
     com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult TRUE -> b
@@ -24728,41 +24248,41 @@
 com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.ir.optimize.CodeRewriter$d:
     com.android.tools.r8.ir.code.Position position -> b
     int blockNumber -> a
-    1:2:void <init>(com.android.tools.r8.ir.code.Position):329:330 -> <init>
+    1:2:void <init>(com.android.tools.r8.ir.code.Position):334:335 -> <init>
     java.lang.Object self() -> a
 com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect -> com.android.tools.r8.ir.optimize.CodeRewriter$e:
     com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect NO_EFFECT -> d
     com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect DESIRED_EFFECT -> a
     com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect OTHER_EFFECT -> c
     com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect CONDITIONAL_EFFECT -> b
-    1:4:void <clinit>():1355:1358 -> <clinit>
-    5:5:void <clinit>():1354:1354 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1354:1354 -> <init>
+    1:4:void <clinit>():1349:1352 -> <clinit>
+    5:5:void <clinit>():1348:1348 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1348:1348 -> <init>
 com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.ir.optimize.CodeRewriter$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList keys -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():534:534 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):538:538 -> <init>
-    2:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):536:542 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList access$000(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):534:534 -> a
-    2:2:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):570:570 -> a
-    1:1:int getMax():551:551 -> b
-    1:1:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):560 -> b
-    2:2:int getMin():547:547 -> b
-    2:2:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):560 -> b
-    3:3:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):561:561 -> b
-    4:4:int com.android.tools.r8.ir.code.Switch.baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):113:113 -> b
-    4:4:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):564 -> b
-    5:5:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):564:564 -> b
-    6:6:int com.android.tools.r8.ir.code.Switch.basePackedSize(com.android.tools.r8.utils.InternalOutputMode):102:102 -> b
-    6:6:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):565 -> b
-    7:7:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):565:565 -> b
-    8:8:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):555:555 -> b
-    9:9:int getMax():551:551 -> b
-    9:9:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):555 -> b
-    10:10:int getMin():547:547 -> b
-    10:10:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):555 -> b
-    11:12:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):555:556 -> b
+    1:1:void <clinit>():539:539 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):543:543 -> <init>
+    2:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):541:547 -> <init>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList access$000(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):539:539 -> a
+    2:2:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):575:575 -> a
+    1:1:int getMax():556:556 -> b
+    1:1:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):565 -> b
+    2:2:int getMin():552:552 -> b
+    2:2:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):565 -> b
+    3:3:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):566:566 -> b
+    4:4:int com.android.tools.r8.ir.code.Switch.baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):108:108 -> b
+    4:4:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):569 -> b
+    5:5:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):569:569 -> b
+    6:6:int com.android.tools.r8.ir.code.Switch.basePackedSize(com.android.tools.r8.utils.InternalOutputMode):97:97 -> b
+    6:6:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):570 -> b
+    7:7:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):570:570 -> b
+    8:8:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):560:560 -> b
+    9:9:int getMax():556:556 -> b
+    9:9:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):560 -> b
+    10:10:int getMin():552:552 -> b
+    10:10:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):560 -> b
+    11:12:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):560:561 -> b
 com.android.tools.r8.ir.optimize.CodeRewriter$SCC -> com.android.tools.r8.ir.optimize.CodeRewriter$g:
     java.util.Deque unassignedStack -> d
     java.util.Set unassignedSet -> c
@@ -24771,59 +24291,56 @@
     java.util.Deque preorderStack -> e
     boolean $assertionsDisabled -> g
     int currentTime -> a
-    1:1:void <clinit>():3872:3872 -> <clinit>
-    1:8:void <init>():3872:3879 -> <init>
-    1:8:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):3872 -> <init>
-    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):3882:3884 -> a
-    1:33:void dfs(com.android.tools.r8.ir.code.Value):3888:3920 -> b
+    1:1:void <clinit>():3847:3847 -> <clinit>
+    1:8:void <init>():3847:3854 -> <init>
+    1:8:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):3847 -> <init>
+    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):3857:3859 -> a
+    1:33:void dfs(com.android.tools.r8.ir.code.Value):3863:3895 -> b
 com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.ir.optimize.CodeRewriter$h:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap keyToTarget -> d
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> e
     com.android.tools.r8.ir.code.Value value -> c
-    1:1:void <init>(com.android.tools.r8.ir.code.Position):347:347 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Position):343:343 -> <init>
+    1:1:void <init>(com.android.tools.r8.ir.code.Position):352:352 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Position):348:348 -> <init>
     java.lang.Object self() -> a
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):356:356 -> a
-    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):361:361 -> a
-    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):366:366 -> a
-    4:4:java.lang.Integer lambda$build$0(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):384:384 -> a
-    1:22:com.android.tools.r8.ir.code.BasicBlock build():372:393 -> b
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):361:361 -> a
+    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):366:366 -> a
+    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):371:371 -> a
+    4:4:java.lang.Integer lambda$build$0(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):389:389 -> a
+    1:22:com.android.tools.r8.ir.code.BasicBlock build():377:398 -> b
     23:26:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createSwitchBlock(int,com.android.tools.r8.ir.code.Switch):1300:1303 -> b
-    23:26:com.android.tools.r8.ir.code.BasicBlock build():393 -> b
+    23:26:com.android.tools.r8.ir.code.BasicBlock build():398 -> b
     27:27:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.keySet():87:87 -> b
-    27:27:com.android.tools.r8.ir.code.BasicBlock build():394 -> b
-    28:29:com.android.tools.r8.ir.code.BasicBlock build():394:395 -> b
-    30:30:java.lang.Integer lambda$build$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):390:390 -> b
+    27:27:com.android.tools.r8.ir.code.BasicBlock build():399 -> b
+    28:29:com.android.tools.r8.ir.code.BasicBlock build():399:400 -> b
+    30:30:java.lang.Integer lambda$build$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):395:395 -> b
 com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.ir.optimize.e:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():29:29 -> <clinit>
-    1:59:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):34:92 -> a
-    60:61:boolean constantUsedByInvokeRange(com.android.tools.r8.ir.code.ConstInstruction):185:186 -> a
-    60:61:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):92 -> a
-    62:62:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):96:96 -> a
-    63:109:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):95:141 -> a
-    110:110:java.util.List lambda$canonicalize$0(com.android.tools.r8.ir.code.ConstInstruction):96:96 -> a
-    111:111:boolean lambda$canonicalize$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):114:114 -> a
-    112:112:int lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):115:115 -> a
-    113:116:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):118:121 -> a
-    117:131:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):119:133 -> a
-    132:143:void insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstInstruction):146:157 -> a
-    132:143:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):134 -> a
-    144:145:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):135:136 -> a
-    146:161:com.android.tools.r8.ir.code.Position findFirstNonNonePosition(com.android.tools.r8.ir.code.IRCode):161:176 -> a
-    162:162:boolean lambda$findFirstNonNonePosition$4(com.android.tools.r8.ir.code.Instruction):163:163 -> a
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:48:void canonicalize(com.android.tools.r8.ir.code.IRCode):31:78 -> a
+    49:50:boolean constantUsedByInvokeRange(com.android.tools.r8.ir.code.ConstInstruction):166:167 -> a
+    49:50:void canonicalize(com.android.tools.r8.ir.code.IRCode):78 -> a
+    51:51:void canonicalize(com.android.tools.r8.ir.code.IRCode):82:82 -> a
+    52:93:void canonicalize(com.android.tools.r8.ir.code.IRCode):81:122 -> a
+    94:94:java.util.List lambda$canonicalize$0(com.android.tools.r8.ir.code.ConstInstruction):82:82 -> a
+    95:95:boolean lambda$canonicalize$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):100:100 -> a
+    96:96:int lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):101:101 -> a
+    97:107:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):104:114 -> a
+    108:119:void insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstInstruction):127:138 -> a
+    108:119:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):115 -> a
+    120:121:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):116:117 -> a
+    122:122:boolean lambda$findFirstNonNonePosition$4(com.android.tools.r8.ir.code.Instruction):144:144 -> a
+    1:16:com.android.tools.r8.ir.code.Position findFirstNonNonePosition(com.android.tools.r8.ir.code.IRCode):142:157 -> b
 com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.ir.optimize.d:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():36:36 -> <clinit>
-    1:1:void <init>():36:36 -> <init>
-    1:1:boolean equals(java.lang.Object,java.lang.Object):36:36 -> a
-    2:5:boolean equals(com.android.tools.r8.ir.code.ConstInstruction,com.android.tools.r8.ir.code.ConstInstruction):55:58 -> a
-    2:5:boolean equals(java.lang.Object,java.lang.Object):36 -> a
-    6:6:int hashCode(java.lang.Object):36:36 -> a
-    7:9:int hashCode(com.android.tools.r8.ir.code.ConstInstruction):39:41 -> a
-    7:9:int hashCode(java.lang.Object):36 -> a
-    10:20:int hashCode(com.android.tools.r8.ir.code.ConstInstruction):39:49 -> a
-    10:20:int hashCode(java.lang.Object):36 -> a
+    1:1:void <clinit>():33:33 -> <clinit>
+    1:1:void <init>():33:33 -> <init>
+    1:1:boolean equals(java.lang.Object,java.lang.Object):33:33 -> a
+    2:5:boolean equals(com.android.tools.r8.ir.code.ConstInstruction,com.android.tools.r8.ir.code.ConstInstruction):47:50 -> a
+    2:5:boolean equals(java.lang.Object,java.lang.Object):33 -> a
+    6:6:int hashCode(java.lang.Object):33:33 -> a
+    7:12:int hashCode(com.android.tools.r8.ir.code.ConstInstruction):36:41 -> a
+    7:12:int hashCode(java.lang.Object):33 -> a
 com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.ir.optimize.f:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> b
@@ -24863,22 +24380,22 @@
     1:14:com.android.tools.r8.graph.DexEncodedMethod validateCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):74:87 -> a
     15:31:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):97:113 -> a
     32:33:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):100:101 -> a
-    34:107:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):159:232 -> a
-    108:119:int computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):265:276 -> a
-    108:119:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):233 -> a
-    120:138:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):234:252 -> a
-    139:139:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):251:251 -> a
-    140:175:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType):288:323 -> a
-    176:192:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):331:347 -> a
-    193:213:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):128:148 -> a
-    193:213:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):347 -> a
-    214:221:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):354:361 -> a
-    222:226:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):376:380 -> a
-    227:228:boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):388:389 -> a
-    229:229:boolean stillHasBudget():394:394 -> a
-    230:269:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock):399:438 -> a
-    270:270:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):444:444 -> a
-    271:287:void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):450:466 -> a
+    34:108:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):159:233 -> a
+    109:120:int computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):266:277 -> a
+    109:120:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):234 -> a
+    121:139:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):235:253 -> a
+    140:140:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):252:252 -> a
+    141:177:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType):289:325 -> a
+    178:194:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):333:349 -> a
+    195:215:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):128:148 -> a
+    195:215:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):349 -> a
+    216:223:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):356:363 -> a
+    224:228:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):378:382 -> a
+    229:230:boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):389:390 -> a
+    231:231:boolean stillHasBudget():395:395 -> a
+    232:271:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock):400:439 -> a
+    272:272:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):445:445 -> a
+    273:291:void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):451:469 -> a
     void finish() -> b
     1:2:boolean isDoubleInliningTarget(com.android.tools.r8.graph.DexEncodedMethod):153:154 -> b
 com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.ir.optimize.h:
@@ -24895,28 +24412,28 @@
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):36:36 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.AppView):34:37 -> <init>
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness run():41:41 -> a
+    1:1:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness run():41:41 -> a
     2:43:void processClasses(com.android.tools.r8.graph.DexProgramClass):52:93 -> a
-    2:43:com.android.tools.r8.shaking.AppInfoWithLiveness run():42 -> a
-    44:47:com.android.tools.r8.shaking.AppInfoWithLiveness run() -> a
+    2:43:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness run():42 -> a
+    44:47:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness run() -> a
 com.android.tools.r8.ir.optimize.ForcedInliningOracle -> com.android.tools.r8.ir.optimize.j:
     java.util.Map invokesToInline -> b
     com.android.tools.r8.graph.DexEncodedMethod method -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():23:23 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):28:30 -> <init>
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):27:29 -> <init>
     com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexType) -> a
     void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode) -> a
-    boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy) -> a
+    boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode) -> a
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
     boolean stillHasBudget() -> a
     void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock) -> a
     boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock) -> a
-    1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType):40:40 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):48:48 -> a
-    3:6:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):102:105 -> a
+    1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType):39:39 -> a
+    2:2:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):47:47 -> a
+    3:6:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):100:103 -> a
     void finish() -> b
-    1:11:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod):52:62 -> b
+    1:11:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod):51:61 -> b
 com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.ir.optimize.l:
     java.util.Set idempotentMethods -> a
     boolean $assertionsDisabled -> b
@@ -24972,20 +24489,20 @@
     56:69:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.OptimizationFeedback):170:183 -> a
     70:74:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback):173:177 -> a
     75:81:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.OptimizationFeedback):173:179 -> a
-    82:83:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):444:445 -> a
-    84:142:boolean legalConstructorInline(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):462:520 -> a
-    143:144:void performForcedInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map):543:544 -> a
-    145:153:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):552:560 -> a
-    154:161:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):554:561 -> a
-    162:162:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):571:571 -> a
-    163:191:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):584:612 -> a
-    192:196:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):610:614 -> a
-    197:202:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason com.android.tools.r8.ir.optimize.Inliner$InlineAction.buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position):422:427 -> a
-    197:202:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):615 -> a
-    203:213:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):617:627 -> a
-    214:223:com.android.tools.r8.graph.DexType getDowncastTypeIfNeeded(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):663:672 -> a
-    214:223:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):630 -> a
-    224:249:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):633:658 -> a
+    82:83:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):448:449 -> a
+    84:142:boolean legalConstructorInline(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):466:524 -> a
+    143:144:void performForcedInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map):547:548 -> a
+    145:153:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):556:564 -> a
+    154:161:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):558:565 -> a
+    162:162:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):575:575 -> a
+    163:191:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):588:616 -> a
+    192:196:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):614:618 -> a
+    197:202:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason com.android.tools.r8.ir.optimize.Inliner$InlineAction.buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position):426:431 -> a
+    197:202:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):619 -> a
+    203:213:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):621:631 -> a
+    214:223:com.android.tools.r8.graph.DexType getDowncastTypeIfNeeded(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):667:676 -> a
+    214:223:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):634 -> a
+    224:249:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):637:662 -> a
     1:6:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):110:115 -> b
 com.android.tools.r8.ir.optimize.Inliner$Constraint -> com.android.tools.r8.ir.optimize.Inliner$Constraint:
     com.android.tools.r8.ir.optimize.Inliner$Constraint ALWAYS -> c
@@ -24997,7 +24514,7 @@
     8:26:void <clinit>():193:211 -> <clinit>
     1:2:void <init>(java.lang.String,int,int):203:204 -> <init>
     1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():193:193 -> a
-    1:1:boolean isSet(int):215:215 -> c
+    1:1:boolean isSet(int):215:215 -> b
 com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget -> com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget:
     com.android.tools.r8.ir.optimize.Inliner$Constraint constraint -> a
     com.android.tools.r8.graph.DexType targetHolder -> b
@@ -25005,33 +24522,34 @@
     1:9:void <clinit>():233:241 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):243:246 -> <init>
     5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):249:253 -> <init>
-    1:17:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):276:292 -> a
-    18:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):298:309 -> a
+    1:17:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexDefinitionSupplier):279:295 -> a
+    18:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):301:303 -> a
+    21:32:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):302:313 -> a
     1:5:boolean equals(java.lang.Object):266:270 -> equals
     1:4:int hashCode():258:261 -> hashCode
-    1:68:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):314:381 -> meet
+    1:68:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.DexDefinitionSupplier):318:385 -> meet
 com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.ir.optimize.Inliner$a:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> b
-    1:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):410:413 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.ir.optimize.m:
+    1:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):414:417 -> <init>
+com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.ir.optimize.Inliner$b:
     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):436:438 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.ir.optimize.n:
+    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner$Reason):440:442 -> <init>
+com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.ir.optimize.m:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.graph.DexType receiverType -> b
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):532:534 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):536:538 -> <init>
 com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.ir.optimize.Inliner$Reason:
     com.android.tools.r8.ir.optimize.Inliner$Reason DUAL_CALLER -> c
     com.android.tools.r8.ir.optimize.Inliner$Reason SIMPLE -> d
     com.android.tools.r8.ir.optimize.Inliner$Reason ALWAYS -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason SINGLE_CALLER -> b
-    1:5:void <clinit>():392:396 -> <clinit>
-    6:6:void <clinit>():391:391 -> <clinit>
-    1:1:void <init>(java.lang.String,int):391:391 -> <init>
-    1:1:boolean mustBeInlined():400:400 -> a
-com.android.tools.r8.ir.optimize.InliningConstraints -> com.android.tools.r8.ir.optimize.o:
+    1:5:void <clinit>():396:400 -> <clinit>
+    6:6:void <clinit>():395:395 -> <clinit>
+    1:1:void <init>(java.lang.String,int):395:395 -> <init>
+    1:1:boolean mustBeInlined():404:404 -> a
+com.android.tools.r8.ir.optimize.InliningConstraints -> com.android.tools.r8.ir.optimize.n:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.GraphLense graphLense -> c
     boolean allowStaticInterfaceMethodCalls -> b
@@ -25039,9 +24557,8 @@
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense):42:42 -> <init>
     2:20:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense):28:46 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forSwap():253:253 -> A
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forThrow():257:257 -> B
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forUnop():261:261 -> C
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forThrow():257:257 -> A
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forUnop():261:261 -> B
     1:1:void disallowStaticInterfaceMethodCalls():50:50 -> a
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):78:78 -> a
     3:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstanceGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):110:112 -> a
@@ -25056,11 +24573,10 @@
     30:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexType):128:128 -> a
     31:33:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):151:153 -> a
     34:34:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):152:152 -> a
-    35:35:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):182:182 -> a
-    36:52:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):271:287 -> a
-    53:66:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):285:298 -> a
-    67:90:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):303:326 -> a
-    91:136:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,java.util.Collection,com.android.tools.r8.graph.DexType):331:376 -> a
+    35:51:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):271:287 -> a
+    52:65:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):285:298 -> a
+    66:89:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):303:326 -> a
+    90:135:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,java.util.Collection,com.android.tools.r8.graph.DexType):331:376 -> a
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forAlwaysMaterializingUser():54:54 -> b
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):82:82 -> b
     3:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstancePut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):120:122 -> b
@@ -25069,20 +24585,22 @@
     10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):158:158 -> b
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forArgument():58:58 -> c
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):116:116 -> c
-    3:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):175:177 -> c
-    6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):176:176 -> c
-    7:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):237:239 -> c
-    10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):238:238 -> c
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokePolymorphic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):171:171 -> c
+    4:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):237:239 -> c
+    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):238:238 -> c
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forArrayGet():62:62 -> d
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeMultiNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):163:163 -> d
-    3:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):186:188 -> d
-    6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):187:187 -> d
+    3:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):175:177 -> d
+    6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):176:176 -> d
     7:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticPut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):243:245 -> d
     10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticPut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):244:244 -> d
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forArrayLength():66:66 -> e
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):167:167 -> e
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):182:182 -> e
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forArrayPut():70:70 -> f
-    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):213:213 -> f
+    2:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):186:188 -> f
+    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):187:187 -> f
+    6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):213:213 -> f
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forBinop():74:74 -> g
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):221:221 -> g
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forConstInstruction():86:86 -> h
@@ -25093,31 +24611,31 @@
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forDup():102:102 -> m
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forDup2():106:106 -> n
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeCustom():147:147 -> o
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokePolymorphic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):171:171 -> p
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forJumpInstruction():192:192 -> q
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forLoad():196:196 -> r
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forMonitor():201:201 -> s
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forMove():205:205 -> t
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forMoveException():209:209 -> u
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayFilledData():217:217 -> v
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNonNull():225:225 -> w
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forPop():229:229 -> x
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forReturn():233:233 -> y
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStore():249:249 -> z
-com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.ir.optimize.p:
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forJumpInstruction():192:192 -> p
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forLoad():196:196 -> q
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forMonitor():201:201 -> r
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forMove():205:205 -> s
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forMoveException():209:209 -> t
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayFilledData():217:217 -> u
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNonNull():225:225 -> v
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forPop():229:229 -> w
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forReturn():233:233 -> x
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStore():249:249 -> y
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forSwap():253:253 -> z
+com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.ir.optimize.o:
     com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis) -> a
     com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType) -> a
     void finish() -> b
-com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.ir.optimize.q:
+com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.ir.optimize.p:
     void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode) -> a
     com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod) -> a
-    boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy) -> a
+    boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode) -> a
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
     boolean stillHasBudget() -> a
     void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock) -> a
     boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock) -> a
-com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.ir.optimize.r:
+com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.ir.optimize.q:
     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
@@ -25125,145 +24643,119 @@
     3:12:int doHash(com.android.tools.r8.ir.code.Instruction):27:36 -> a
     3:12:int doHash(java.lang.Object):11 -> a
     13:14:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):20:21 -> a
-com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool -> com.android.tools.r8.ir.optimize.s:
+com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool -> com.android.tools.r8.ir.optimize.r:
     java.util.Set interfaces -> c
     java.util.Set subTypes -> d
     java.util.Set memberPool -> e
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> a
     com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool superType -> b
     boolean $assertionsDisabled -> f
-    1:1:void <clinit>():164:164 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.com.google.common.base.Equivalence):172:172 -> <init>
-    2:7:void <init>(com.android.tools.r8.com.google.common.base.Equivalence):168:173 -> <init>
-    1:2:void linkInterface(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):187:188 -> a
-    3:3:void seen(java.lang.Object):192:192 -> a
-    4:4:boolean hasSeen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):201:201 -> a
-    5:5:boolean hasSeenStrictlyBelow(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):221:221 -> a
-    5:5:boolean hasSeen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):201 -> a
-    6:6:boolean hasSeenDirectly(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):205:205 -> a
-    6:6:boolean hasSeenAbove(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,boolean):213 -> a
-    7:8:boolean hasSeenAbove(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,boolean):216:217 -> a
-    9:9:boolean lambda$hasSeenAbove$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):217:217 -> a
-    1:2:void linkSubtype(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):182:183 -> b
-    3:3:boolean hasSeenDirectly(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):205:205 -> b
-    3:3:boolean hasSeenBelow(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,boolean):225 -> b
-    4:4:boolean hasSeenBelow(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,boolean):228:228 -> b
-    5:5:boolean hasSeenDirectly(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):205:205 -> b
-    6:6:boolean lambda$hasSeenBelow$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):228:228 -> b
-    1:2:void linkSupertype(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):177:178 -> c
-    3:3:boolean hasSeenStrictlyAbove(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):209:209 -> c
-    1:1:boolean hasSeenStrictlyBelow(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):221:221 -> d
-    1:2:void seen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):196:197 -> e
-com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.ir.optimize.v:
+    1:1:void <clinit>():144:144 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.com.google.common.base.Equivalence):151:151 -> <init>
+    2:7:void <init>(com.android.tools.r8.com.google.common.base.Equivalence):147:152 -> <init>
+    1:2:void linkInterface(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):166:167 -> a
+    3:3:void seen(java.lang.Object):171:171 -> a
+    4:4:boolean hasSeen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):184:184 -> a
+    5:5:boolean lambda$hasSeenDownwardRecursive$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):203:203 -> a
+    1:2:void linkSubtype(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):161:162 -> b
+    3:3:boolean hasSeenDirectly(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):192:192 -> b
+    4:4:boolean lambda$hasSeenUpwardRecursive$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):198:198 -> b
+    1:2:void linkSupertype(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):156:157 -> c
+    3:4:void seen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):175:176 -> c
+    1:2:boolean hasSeenDownwardRecursive(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):202:203 -> d
+    1:3:boolean hasSeenUpwardRecursive(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):196:198 -> e
+com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.ir.optimize.u:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():43:43 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):64:65 -> <init>
-    1:8:com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup lookupMemberRule(com.android.tools.r8.graph.DexDefinition):84:91 -> a
-    9:12:com.android.tools.r8.ir.code.ConstNumber createConstNumberReplacement(com.android.tools.r8.ir.code.IRCode,long,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):128:131 -> a
-    13:15:com.android.tools.r8.ir.code.ConstNumber createConstNumberReplacement(com.android.tools.r8.ir.code.IRCode,long,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):130:132 -> a
-    16:16:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):168:168 -> a
-    17:20:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):100:103 -> a
-    17:20:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):168 -> a
-    21:28:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):102:109 -> a
-    21:28:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):168 -> a
-    29:40:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):108:119 -> a
-    29:40:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):168 -> a
-    41:41:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):171:171 -> a
-    42:44:void setValueRangeFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.Value):155:157 -> a
-    42:44:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):171 -> a
-    45:58:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):174:187 -> a
-    59:77:void rewritePutWithConstantValues(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType):337:355 -> a
-    78:78:boolean lambda$rewritePutWithConstantValues$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):348:348 -> a
-    79:88:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):366:375 -> a
-    89:116:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):200:227 -> a
-    89:116:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):374 -> a
-    117:119:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedMethod):75:77 -> a
-    117:119:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):228 -> a
-    117:119:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):374 -> a
-    120:126:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):231:237 -> a
-    120:126:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):374 -> a
-    127:137:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):236:246 -> a
-    127:137:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):374 -> a
-    138:145:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):245:252 -> a
-    138:145:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):374 -> a
-    146:150:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):140:144 -> a
-    146:150:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):251 -> a
-    146:150:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):374 -> a
-    151:154:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):142:145 -> a
-    151:154:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):251 -> a
-    151:154:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):374 -> a
-    155:164:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):141:150 -> a
-    155:164:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):251 -> a
-    155:164:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):374 -> a
-    165:173:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):255:263 -> a
-    165:173:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):374 -> a
-    174:183:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):376:385 -> a
-    184:187:void rewriteStaticGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):275:278 -> a
-    184:187:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):379 -> a
-    188:190:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedField):69:71 -> a
-    188:190:void rewriteStaticGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):279 -> a
-    188:190:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):379 -> a
-    191:236:void rewriteStaticGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):283:328 -> a
-    191:236:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):379 -> a
-    237:252:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):377:392 -> a
-com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.ir.optimize.t:
+    1:8:com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup lookupMemberRule(com.android.tools.r8.graph.DexDefinition):72:79 -> a
+    9:12:com.android.tools.r8.ir.code.ConstNumber createConstNumberReplacement(com.android.tools.r8.ir.code.IRCode,long,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):116:119 -> a
+    13:15:com.android.tools.r8.ir.code.ConstNumber createConstNumberReplacement(com.android.tools.r8.ir.code.IRCode,long,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):118:120 -> a
+    16:16:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):155:155 -> a
+    17:20:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):88:91 -> a
+    17:20:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):155 -> a
+    21:28:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):90:97 -> a
+    21:28:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):155 -> a
+    29:40:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):96:107 -> a
+    29:40:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):155 -> a
+    41:41:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):158:158 -> a
+    42:44:void setValueRangeFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.Value):142:144 -> a
+    42:44:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):158 -> a
+    45:58:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):161:174 -> a
+    59:68:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):346:355 -> a
+    69:114:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):187:232 -> a
+    69:114:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):354 -> a
+    115:122:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):231:238 -> a
+    115:122:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):354 -> a
+    123:127:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):128:132 -> a
+    123:127:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):237 -> a
+    123:127:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):354 -> a
+    128:136:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):129:137 -> a
+    128:136:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):237 -> a
+    128:136:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):354 -> a
+    137:145:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):241:249 -> a
+    137:145:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):354 -> a
+    146:155:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):356:365 -> a
+    156:209:void rewriteStaticGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):261:314 -> a
+    156:209:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):359 -> a
+    210:210:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):357:357 -> a
+    211:223:void rewritePutWithConstantValues(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.FieldInstruction):323:335 -> a
+    211:223:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):357 -> a
+    224:227:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Predicate):369:372 -> a
+com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.ir.optimize.s:
     com.android.tools.r8.shaking.ProguardMemberRule rule -> b
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType type -> a
     1:3:void <init>(com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType,com.android.tools.r8.shaking.ProguardMemberRule):58:60 -> <init>
-com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType -> com.android.tools.r8.ir.optimize.u:
+com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType -> com.android.tools.r8.ir.optimize.t:
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType ASSUME_VALUES -> c
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType NONE -> a
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType ASSUME_NO_SIDE_EFFECTS -> b
     1:3:void <clinit>():48:50 -> <clinit>
     4:4:void <clinit>():47:47 -> <clinit>
     1:1:void <init>(java.lang.String,int):47:47 -> <init>
-com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.ir.optimize.w:
+com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.ir.optimize.v:
     java.util.Map com.android.tools.r8.ir.optimize.MemberPoolCollection.memberPools -> c
-    com.android.tools.r8.graph.AppView com.android.tools.r8.ir.optimize.MemberPoolCollection.appView -> b
+    com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.optimize.MemberPoolCollection.application -> b
     com.android.tools.r8.com.google.common.base.Equivalence com.android.tools.r8.ir.optimize.MemberPoolCollection.equivalence -> a
     boolean com.android.tools.r8.ir.optimize.MemberPoolCollection.$assertionsDisabled -> d
-    1:1:void com.android.tools.r8.ir.optimize.MemberPoolCollection.<clinit>():31:31 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):32:32 -> <init>
-    2:2:void com.android.tools.r8.ir.optimize.MemberPoolCollection.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.base.Equivalence):38:38 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView):32 -> <init>
-    3:8:void com.android.tools.r8.ir.optimize.MemberPoolCollection.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.base.Equivalence):35:40 -> <init>
-    3:8:void <init>(com.android.tools.r8.graph.AppView):32 -> <init>
-    void com.android.tools.r8.ir.optimize.MemberPoolCollection.buildAll(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing) -> a
+    1:1:void com.android.tools.r8.ir.optimize.MemberPoolCollection.<clinit>():29:29 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication):27:27 -> <init>
+    2:2:void com.android.tools.r8.ir.optimize.MemberPoolCollection.<init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.com.google.common.base.Equivalence):35:35 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexApplication):27 -> <init>
+    3:7:void com.android.tools.r8.ir.optimize.MemberPoolCollection.<init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.com.google.common.base.Equivalence):33:37 -> <init>
+    3:7:void <init>(com.android.tools.r8.graph.DexApplication):27 -> <init>
     com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing) -> a
-    1:1:java.lang.Runnable computeMemberPoolForClass(com.android.tools.r8.graph.DexClass):37:37 -> a
-    2:3:void lambda$computeMemberPoolForClass$1(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexEncodedMethod):43:44 -> a
-    4:9:boolean com.android.tools.r8.ir.optimize.MemberPoolCollection.markIfNotSeen(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Descriptor):85:90 -> a
-    4:9:boolean com.android.tools.r8.ir.optimize.MemberPoolCollection.markIfNotSeen(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Descriptor):0 -> a
-    10:10:void com.android.tools.r8.ir.optimize.MemberPoolCollection.submitAll(java.lang.Iterable,java.util.List,java.util.concurrent.ExecutorService):98:98 -> a
-    11:11:void com.android.tools.r8.ir.optimize.MemberPoolCollection.submit(com.android.tools.r8.graph.DexClass,java.util.List,java.util.concurrent.ExecutorService):104:104 -> a
-    11:11:void com.android.tools.r8.ir.optimize.MemberPoolCollection.submitAll(java.lang.Iterable,java.util.List,java.util.concurrent.ExecutorService):99 -> a
-    12:12:void com.android.tools.r8.ir.optimize.MemberPoolCollection.submit(com.android.tools.r8.graph.DexClass,java.util.List,java.util.concurrent.ExecutorService):104:104 -> a
-    12:12:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$buildAll$0(java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):53 -> a
-    13:35:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):135:157 -> a
-    36:36:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$1(java.util.Deque,com.android.tools.r8.graph.DexType):140:140 -> a
-    37:37:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):234:234 -> a
-    1:13:void com.android.tools.r8.ir.optimize.MemberPoolCollection.buildAll(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):44:56 -> b
-    14:18:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):62:66 -> b
-    19:26:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):65:72 -> b
-    27:27:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):70:70 -> b
-    28:28:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):80:80 -> b
-    28:28:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):0 -> b
-    29:29:boolean com.android.tools.r8.ir.optimize.MemberPoolCollection.hasPool(com.android.tools.r8.graph.DexClass):76:76 -> b
-    29:29:boolean com.android.tools.r8.ir.optimize.MemberPoolCollection.hasPool(com.android.tools.r8.graph.DexClass):0 -> b
-    29:29:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):80 -> b
-    29:29:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):0 -> b
-    30:31:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):80:81 -> b
-    30:31:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):0 -> b
-    32:45:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSuperTypesInclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):112:125 -> b
-    46:46:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$2(java.util.Deque,com.android.tools.r8.graph.DexType):144:144 -> b
-    1:1:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool lambda$computeMemberPoolForClass$0(com.android.tools.r8.graph.DexClass):39:39 -> c
-    2:2:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$3(java.util.Deque,com.android.tools.r8.graph.DexType):154:154 -> c
-    1:1:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool lambda$computeMemberPoolForClass$2(com.android.tools.r8.graph.DexClass):51:51 -> d
-    2:2:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):158:158 -> d
-    1:1:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool lambda$computeMemberPoolForClass$3(com.android.tools.r8.graph.DexClass):61:61 -> e
-    1:26:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):38:63 -> f
-com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.ir.optimize.x:
+    1:1:java.lang.Runnable computeMemberPoolForClass(com.android.tools.r8.graph.DexClass):32:32 -> a
+    2:3:void lambda$computeMemberPoolForClass$1(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexEncodedMethod):38:39 -> a
+    4:11:void com.android.tools.r8.ir.optimize.MemberPoolCollection.buildAll(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):41:48 -> a
+    4:11:void com.android.tools.r8.ir.optimize.MemberPoolCollection.buildAll(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):0 -> a
+    12:17:boolean com.android.tools.r8.ir.optimize.MemberPoolCollection.markIfNotSeen(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Descriptor):77:82 -> a
+    12:17:boolean com.android.tools.r8.ir.optimize.MemberPoolCollection.markIfNotSeen(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Descriptor):0 -> a
+    18:19:void com.android.tools.r8.ir.optimize.MemberPoolCollection.submitAll(java.lang.Iterable,java.util.List,java.util.concurrent.ExecutorService):90:91 -> a
+    20:34:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):123:137 -> a
+    35:35:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$0(java.util.Deque,com.android.tools.r8.graph.DexType):126:126 -> a
+    36:36:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):209:209 -> a
+    1:5:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):54:58 -> b
+    6:13:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):57:64 -> b
+    14:14:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):62:62 -> b
+    15:15:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):72:72 -> b
+    15:15:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):0 -> b
+    16:16:boolean com.android.tools.r8.ir.optimize.MemberPoolCollection.hasPool(com.android.tools.r8.graph.DexClass):68:68 -> b
+    16:16:boolean com.android.tools.r8.ir.optimize.MemberPoolCollection.hasPool(com.android.tools.r8.graph.DexClass):0 -> b
+    16:16:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):72 -> b
+    16:16:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):0 -> b
+    17:18:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):72:73 -> b
+    17:18:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):0 -> b
+    19:32:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSuperTypesInclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):100:113 -> b
+    33:33:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$1(java.util.Deque,com.android.tools.r8.graph.DexType):128:128 -> b
+    1:1:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool lambda$computeMemberPoolForClass$0(com.android.tools.r8.graph.DexClass):34:34 -> c
+    2:2:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$2(java.util.Deque,com.android.tools.r8.graph.DexType):136:136 -> c
+    1:1:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool lambda$computeMemberPoolForClass$2(com.android.tools.r8.graph.DexClass):46:46 -> d
+    2:2:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$3(java.util.Deque,com.android.tools.r8.graph.DexType):138:138 -> d
+    1:1:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool lambda$computeMemberPoolForClass$3(com.android.tools.r8.graph.DexClass):56:56 -> e
+    1:25:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):33:57 -> f
+com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.ir.optimize.w:
     java.util.HashSet activeMoves -> a
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> b
     1:1:void <init>(com.android.tools.r8.ir.regalloc.RegisterAllocator):16:16 -> <init>
@@ -25273,31 +24765,33 @@
     52:56:boolean lambda$shouldBeEliminated$0(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Move):54:58 -> a
 com.android.tools.r8.ir.optimize.NonNullTracker -> com.android.tools.r8.ir.optimize.NonNullTracker:
     com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> b
-    1:1:void <clinit>():43:43 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.AppView):47:48 -> <init>
-    boolean lambda$addNonNullForValues$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    1:30:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):87:116 -> a
-    31:44:com.android.tools.r8.ir.code.Value getNonNullInput(com.android.tools.r8.ir.code.Instruction):63:76 -> a
-    31:44:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):117 -> a
-    45:46:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):118:119 -> a
-    47:47:com.android.tools.r8.ir.code.Value getNonNullInput(com.android.tools.r8.ir.code.Instruction):78:78 -> a
-    47:47:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):117 -> a
-    48:56:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):122:130 -> a
-    57:154:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):129:226 -> a
-    155:173:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):224:242 -> a
-    174:226:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):267:319 -> a
-    227:243:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):317:333 -> a
-    244:259:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):341:356 -> a
-    260:261:boolean isNonNullCandidate(com.android.tools.r8.ir.code.Value):365:366 -> a
-    262:293:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):370:401 -> a
-    294:339:boolean isNormalExitDominated(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):423:468 -> a
-    294:339:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):402 -> a
-    340:345:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):408:413 -> a
-    1:1:void addNonNull(com.android.tools.r8.ir.code.IRCode):82:82 -> addNonNull
-    1:47:void cleanupNonNull(com.android.tools.r8.ir.code.IRCode):473:519 -> cleanupNonNull
-    1:7:boolean throwsOnNullInput(com.android.tools.r8.ir.code.Instruction):53:59 -> throwsOnNullInput
-com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.ir.optimize.C:
+    java.util.Set libraryMethodsReturningNonNull -> b
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():42:42 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):49:51 -> <init>
+    boolean lambda$addNonNull$0(com.android.tools.r8.ir.code.BasicBlock) -> a
+    boolean lambda$addNonNullForValues$1(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
+    1:17:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):90:106 -> a
+    18:30:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):105:117 -> a
+    31:44:com.android.tools.r8.ir.code.Value getNonNullInput(com.android.tools.r8.ir.code.Instruction):66:79 -> a
+    31:44:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):118 -> a
+    45:46:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):119:120 -> a
+    47:47:com.android.tools.r8.ir.code.Value getNonNullInput(com.android.tools.r8.ir.code.Instruction):81:81 -> a
+    47:47:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):118 -> a
+    48:56:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):123:131 -> a
+    57:152:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):130:225 -> a
+    153:170:void addNonNullInPart(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):224:241 -> a
+    171:234:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):266:329 -> a
+    235:250:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):337:352 -> a
+    251:260:boolean isNonNullCandidate(com.android.tools.r8.ir.code.Value):361:370 -> a
+    261:292:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):374:405 -> a
+    293:338:boolean isNormalExitDominated(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):427:472 -> a
+    293:338:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):406 -> a
+    339:344:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.conversion.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):412:417 -> a
+    1:1:void addNonNull(com.android.tools.r8.ir.code.IRCode):85:85 -> addNonNull
+    1:47:void cleanupNonNull(com.android.tools.r8.ir.code.IRCode):477:523 -> cleanupNonNull
+    1:7:boolean throwsOnNullInput(com.android.tools.r8.ir.code.Instruction):56:62 -> throwsOnNullInput
+com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.ir.optimize.x:
     java.util.List candidateMethodLists -> a
     java.util.Map outlineSites -> c
     java.util.Map generatedOutlines -> d
@@ -25328,7 +24822,7 @@
     2:8:boolean selectMethodsForOutlining():1230:1236 -> d
     9:15:boolean selectMethodsForOutlining():1235:1241 -> d
     1:1:java.util.Map access$400(com.android.tools.r8.ir.optimize.Outliner):104:104 -> e
-com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android.tools.r8.ir.optimize.y:
+com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android.tools.r8.ir.optimize.x$a:
     com.android.tools.r8.ir.code.NumericType numericType -> c
     1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType,com.android.tools.r8.ir.code.NumericType):207:208 -> <init>
     java.lang.String getDetailsString() -> a
@@ -25348,7 +24842,7 @@
     int numberOfInputs() -> d
     1:5:boolean equals(java.lang.Object):224:228 -> equals
     1:1:int hashCode():219:219 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.android.tools.r8.ir.optimize.z:
+com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.android.tools.r8.ir.optimize.x$b:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> d
     com.android.tools.r8.graph.DexProto proto -> f
     boolean hasOutValue -> e
@@ -25381,7 +24875,7 @@
     1:1:int numberOfInputs():471:471 -> d
     1:8:boolean equals(java.lang.Object):416:423 -> equals
     1:5:int hashCode():407:411 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.android.tools.r8.ir.optimize.A:
+com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.android.tools.r8.ir.optimize.x$c:
     com.android.tools.r8.graph.DexType clazz -> c
     1:2:void <init>(com.android.tools.r8.graph.DexType):309:310 -> <init>
     1:1:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):330:330 -> a
@@ -25395,7 +24889,7 @@
     int numberOfInputs() -> d
     1:5:boolean equals(java.lang.Object):315:319 -> equals
     1:1:int hashCode():325:325 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.ir.optimize.B:
+com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.ir.optimize.x$d:
     java.util.List argumentMap -> b
     java.util.List argumentTypes -> a
     com.android.tools.r8.graph.DexProto proto -> e
@@ -25415,10 +24909,10 @@
     1:16:boolean equals(java.lang.Object):582:597 -> equals
     1:6:int hashCode():605:610 -> hashCode
     1:37:java.lang.String toString():666:702 -> toString
-com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.ir.optimize.C$a:
-    boolean $assertionsDisabled -> e
-    com.android.tools.r8.ir.optimize.Outliner this$0 -> d
-    com.android.tools.r8.ir.optimize.Outliner$Outline outline -> c
+com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.ir.optimize.y:
+    com.android.tools.r8.ir.optimize.Outliner this$0 -> c
+    com.android.tools.r8.ir.optimize.Outliner$Outline outline -> b
+    boolean $assertionsDisabled -> d
     1:1:void <clinit>():1485:1485 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline):1489:1490 -> <init>
     1:1:boolean computeEquals(java.lang.Object):1539:1539 -> b
@@ -25433,7 +24927,7 @@
     1:1:java.lang.String toString():1524:1524 -> toString
     2:38:java.lang.String com.android.tools.r8.ir.optimize.Outliner$Outline.toString():666:702 -> toString
     2:38:java.lang.String toString():1524 -> toString
-com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tools.r8.ir.optimize.E:
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tools.r8.ir.optimize.A:
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():120:120 -> <clinit>
@@ -25446,7 +24940,7 @@
     boolean hasOutValue() -> c
     int numberOfInputs() -> d
     1:1:int hashCode():179:179 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType -> com.android.tools.r8.ir.optimize.D:
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType -> com.android.tools.r8.ir.optimize.z:
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType[] $VALUES -> h
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType ADD -> a
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType SUB -> b
@@ -25459,13 +24953,13 @@
     8:8:void <clinit>():125:125 -> <clinit>
     1:1:void <init>(java.lang.String,int):125:125 -> <init>
     1:22:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType fromInstruction(com.android.tools.r8.ir.code.Instruction):135:156 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineMethodIdentifier -> com.android.tools.r8.ir.optimize.F:
+com.android.tools.r8.ir.optimize.Outliner$OutlineMethodIdentifier -> com.android.tools.r8.ir.optimize.B:
     java.util.Map candidateMap -> q
     com.android.tools.r8.ir.optimize.Outliner this$0 -> r
     1:3:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock,java.util.Map):1077:1079 -> <init>
     1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1084:1086 -> a
     4:5:java.util.List addOutlineMethodList(com.android.tools.r8.ir.optimize.Outliner$Outline):1090:1091 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.ir.optimize.G:
+com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.ir.optimize.C:
     java.util.ListIterator blocksIterator -> r
     java.util.List toRemove -> s
     com.android.tools.r8.ir.code.IRCode code -> q
@@ -25476,12 +24970,12 @@
     1:5:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.List):1120:1124 -> <init>
     1:60:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1129:1188 -> a
     61:63:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1195:1197 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.ir.optimize.H:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.ir.optimize.D:
     com.android.tools.r8.ir.optimize.Outliner this$0 -> q
     1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):1098:1099 -> <init>
     1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1104:1106 -> a
     4:4:java.util.List lambda$handle$0(com.android.tools.r8.ir.optimize.Outliner$Outline):1105:1105 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineSourceCode -> com.android.tools.r8.ir.optimize.I:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSourceCode -> com.android.tools.r8.ir.optimize.E:
     com.android.tools.r8.ir.optimize.Outliner this$0 -> d
     com.android.tools.r8.ir.code.Position position -> b
     com.android.tools.r8.ir.optimize.Outliner$Outline outline -> a
@@ -25498,7 +24992,7 @@
     1:1:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):1445:1445 -> resolveAndBuildNewArrayFilledData
     1:1:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):1439:1439 -> resolveAndBuildSwitch
     1:1:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):1384:1384 -> traceInstruction
-com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8.ir.optimize.J:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8.ir.optimize.x$e:
     int pendingNewInstanceIndex -> n
     com.android.tools.r8.graph.DexType returnType -> k
     boolean $assertionsDisabled -> p
@@ -25587,7 +25081,7 @@
     24:53:void removeRedundantInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):470:499 -> optimize
     24:53:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):41 -> optimize
     54:56:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):42:44 -> optimize
-com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.ir.optimize.K:
+com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.ir.optimize.F:
     1:1:void <init>():21:21 -> <init>
     1:6:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):112:117 -> a
     1:6:boolean optimize(com.android.tools.r8.ir.code.IRCode):24 -> a
@@ -25616,7 +25110,7 @@
     51:64:boolean tryMovePhiToStack(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Phi,java.util.Set):160:173 -> a
     51:64:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> a
     51:64:boolean optimize(com.android.tools.r8.ir.code.IRCode):24 -> a
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination -> com.android.tools.r8.ir.optimize.N:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination -> com.android.tools.r8.ir.optimize.I:
     java.util.HashMap activeStaticFields -> h
     com.android.tools.r8.graph.AppView appView -> a
     java.util.HashMap activeInstanceFields -> g
@@ -25648,8 +25142,8 @@
     110:137:void killActiveFields(com.android.tools.r8.ir.code.FieldInstruction):174:201 -> a
     138:138:void lambda$killActiveFields$0(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):184:184 -> a
     139:141:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):223:225 -> a
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.ir.optimize.L:
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.ir.optimize.M:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.ir.optimize.G:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.ir.optimize.H:
     com.android.tools.r8.graph.DexField field -> a
     com.android.tools.r8.ir.code.Value object -> b
     1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value):60:62 -> <init>
@@ -25657,11 +25151,11 @@
     1:1:com.android.tools.r8.graph.DexField access$100(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):56:56 -> a
     1:5:boolean equals(java.lang.Object):72:76 -> equals
     1:1:int hashCode():67:67 -> hashCode
-com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.ir.optimize.O:
+com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.ir.optimize.L:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():30:30 -> <clinit>
     1:54:void rewriteGetClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):80:133 -> a
-    55:56:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):314:315 -> a
+    55:56:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.classClassType(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.analysis.type.Nullability):302:303 -> a
     55:56:void rewriteGetClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):133 -> a
     57:62:void rewriteGetClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):134:139 -> a
     63:63:com.android.tools.r8.graph.DexString computeClassName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo,com.android.tools.r8.graph.DexItemFactory):148:148 -> a
@@ -25669,12 +25163,12 @@
     65:65:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory):160:160 -> a
     66:101:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory,int):170:205 -> a
     102:111:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory,int):192:201 -> a
-    112:113:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getCanonicalNameFromDescriptor(java.lang.String):238:239 -> a
+    112:113:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getCanonicalNameFromDescriptor(java.lang.String):237:238 -> a
     112:113:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory,int):186 -> a
     114:114:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory,int):188:188 -> a
     115:115:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory,int):179:179 -> a
     116:152:com.android.tools.r8.graph.DexString computeClassName(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption,com.android.tools.r8.graph.DexItemFactory,int):172:208 -> a
-com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo -> com.android.tools.r8.ir.optimize.O$a:
+com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo -> com.android.tools.r8.ir.optimize.K:
     int arrayDepth -> b
     com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo DEFAULT_INSTANCE -> c
     com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption classNameComputationOption -> a
@@ -25685,7 +25179,7 @@
     1:1:boolean needsToComputeClassName():70:70 -> a
     1:1:boolean needsToRegisterTypeReference():74:74 -> b
     1:1:com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo none():66:66 -> c
-com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption -> com.android.tools.r8.ir.optimize.O$a$a:
+com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption -> com.android.tools.r8.ir.optimize.J:
     com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption SIMPLE_NAME -> e
     com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption[] $VALUES -> f
     com.android.tools.r8.ir.optimize.ReflectionOptimizer$ClassNameComputationInfo$ClassNameComputationOption NAME -> b
@@ -25697,46 +25191,21 @@
     1:1:void <init>(java.lang.String,int):33:33 -> <init>
     1:1:boolean needsToComputeClassName():41:41 -> a
     1:1:boolean needsToRegisterTypeReference():45:45 -> b
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.ir.optimize.Q:
-    1:1:void <init>():58:58 -> <init>
-    1:90:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):61:150 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.ir.optimize.P:
-    com.android.tools.r8.graph.DexItemFactory factory -> b
-    com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> i
-    com.android.tools.r8.ir.code.InvokeStatic serviceLoaderLoad -> d
-    com.android.tools.r8.ir.code.MemberType memberType -> f
-    com.android.tools.r8.ir.code.Value valueArray -> g
-    int index -> h
-    com.android.tools.r8.ir.code.IRCode code -> c
-    com.android.tools.r8.ir.code.InstructionIterator iterator -> e
-    1:1:void <clinit>():186:186 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InvokeStatic):202:202 -> <init>
-    2:13:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InvokeStatic):196:207 -> <init>
-    boolean lambda$perform$1(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.code.Instruction) -> a
-    1:2:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):211:212 -> a
-    3:6:void clearGetClassLoader(com.android.tools.r8.ir.code.InvokeVirtual):291:294 -> a
-    3:6:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):216 -> a
-    7:37:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):217:247 -> a
-    38:51:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):246:259 -> a
-    52:57:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):258:263 -> a
-    58:58:boolean lambda$perform$0(com.android.tools.r8.ir.code.Instruction):217:217 -> a
-    59:79:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):267:287 -> a
-com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.ir.optimize.S:
+com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.ir.optimize.M:
     com.android.tools.r8.graph.DexString switchMapPrefix -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map switchMaps -> d
     com.android.tools.r8.graph.DexType intArrayType -> c
     1:1:void <init>(com.android.tools.r8.graph.AppView):68:68 -> <init>
     2:7:void <init>(com.android.tools.r8.graph.AppView):66:71 -> <init>
-    1:7:com.android.tools.r8.shaking.AppInfoWithLiveness run():75:81 -> a
+    1:7:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness run():75:81 -> a
     8:15:void processClasses(com.android.tools.r8.graph.DexProgramClass):86:93 -> a
     16:16:void lambda$processClasses$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedField):93:93 -> a
     17:57:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):98:138 -> a
     58:58:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):102:102 -> a
     59:61:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):143:145 -> a
-com.android.tools.r8.ir.optimize.SwitchUtils$1 -> com.android.tools.r8.ir.optimize.T:
-com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo -> com.android.tools.r8.ir.optimize.U:
+com.android.tools.r8.ir.optimize.SwitchUtils$1 -> com.android.tools.r8.ir.optimize.N:
+com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo -> com.android.tools.r8.ir.optimize.O:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap ordinalsMap -> e
     com.android.tools.r8.ir.code.Instruction arrayGet -> b
     com.android.tools.r8.ir.code.Instruction staticGet -> c
@@ -25744,121 +25213,113 @@
     com.android.tools.r8.ir.code.Instruction ordinalInvoke -> a
     1: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,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):34:40 -> <init>
     1: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,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.ir.optimize.SwitchUtils$1):22 -> <init>
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> com.android.tools.r8.ir.optimize.X:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> com.android.tools.r8.ir.optimize.Q:
+    com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> e
-    boolean $assertionsDisabled -> f
-    int numberOfInvokesWithNullReceiver -> d
-    int numberOfInstanceGetOrInstancePutWithNullReceiver -> b
-    int numberOfInvokesWithNullArgument -> c
-    1:46:void <clinit>():57:102 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):110:110 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.AppView):106:111 -> <init>
-    1:12:com.android.tools.r8.graph.GraphLense run(com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):118:129 -> a
-    13:27:com.android.tools.r8.graph.GraphLense run(com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128:142 -> a
-    28:28:com.android.tools.r8.graph.GraphLense run(com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):120:120 -> a
-    29:29:void lambda$run$0(java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map,com.android.tools.r8.graph.DexProgramClass):131:131 -> a
-    30:76:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):151:197 -> a
-    77:148:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):196:267 -> a
-    149:149:boolean lambda$processClass$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):233:233 -> a
-    150:150:java.util.Set lambda$processClass$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):265:265 -> a
-    151:157:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):275:281 -> a
-    158:158:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):277:277 -> a
-    159:194:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription):314:349 -> a
-    195:195:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription):348:348 -> a
-    196:216:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):353:373 -> a
-    217:218:void rewriteStaticFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):441:442 -> a
-    217:218:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):372 -> a
-    219:219:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):366:366 -> a
-    220:237:void rewriteInstanceFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):413:430 -> a
-    220:237:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):365 -> a
-    238:240:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):379:381 -> a
-    241:264:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):506:529 -> a
-    241:264:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):380 -> a
-    265:268:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):389:392 -> a
-    269:312:void rewriteFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):452:495 -> a
-    1:12:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):286:297 -> b
+    com.android.tools.r8.utils.InternalOptions options -> c
+    int numberOfInvokesWithNullReceiver -> f
+    boolean $assertionsDisabled -> g
+    int numberOfInstanceGetOrInstancePutWithNullReceiver -> d
+    int numberOfInvokesWithNullArgument -> e
+    1:1:void <clinit>():63:63 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions):117:117 -> <init>
+    2:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions):112:120 -> <init>
+    1:16:com.android.tools.r8.graph.GraphLense run(com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):125:140 -> a
+    17:150:com.android.tools.r8.graph.GraphLense run(com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):138:271 -> a
+    151:151:com.android.tools.r8.graph.GraphLense run(com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):135:135 -> a
+    152:198:void lambda$run$2(com.android.tools.r8.ir.optimize.MethodPoolCollection,com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexProgramClass):142:188 -> a
+    199:271:void lambda$run$2(com.android.tools.r8.ir.optimize.MethodPoolCollection,com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexProgramClass):187:259 -> a
+    272:272:boolean lambda$run$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):225:225 -> a
+    273:273:java.util.Set lambda$run$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):257:257 -> a
+    274:280:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):276:282 -> a
+    281:281:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):278:278 -> a
+    282:315:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription):315:348 -> a
+    316:316:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription):347:347 -> a
+    317:337:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):352:372 -> a
+    338:339:void rewriteStaticFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):440:441 -> a
+    338:339:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):371 -> a
+    340:340:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):365:365 -> a
+    341:358:void rewriteInstanceFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):412:429 -> a
+    341:358:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):364 -> a
+    359:361:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):378:380 -> a
+    362:385:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):506:529 -> a
+    362:385:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):379 -> a
+    386:389:void rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):388:391 -> a
+    390:418:void rewriteFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):451:479 -> a
+    419:436:void rewriteFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):478:495 -> a
+    437:472:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.ir.code.Instruction,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):542:577 -> a
+    473:482:void lambda$replaceCurrentInstructionWithThrowNull$3(java.util.Set,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.BasicBlock):579:588 -> a
+    483:492:boolean isAlwaysNull(com.android.tools.r8.ir.code.Value):595:604 -> a
+    493:497:boolean isAlwaysNull(com.android.tools.r8.graph.DexType):610:614 -> a
+    1:12:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):287:298 -> b
     13:13:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo.builder():117:117 -> b
-    13:13:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):300 -> b
-    14:17:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):301:304 -> b
-    18:28:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):299:309 -> b
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy -> com.android.tools.r8.ir.optimize.V:
+    13:13:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):301 -> b
+    14:17:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):302:305 -> b
+    18:28:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):300:310 -> b
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy -> com.android.tools.r8.ir.optimize.P:
     com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy ALLOW_ARGUMENT_REMOVAL -> a
     com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy DISALLOW_ARGUMENT_REMOVAL -> b
-    1:2:void <clinit>():60:61 -> <clinit>
-    3:3:void <clinit>():59:59 -> <clinit>
-    1:1:void <init>(java.lang.String,int):59:59 -> <init>
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLense -> com.android.tools.r8.ir.optimize.W:
+    1:2:void <clinit>():66:67 -> <clinit>
+    3:3:void <clinit>():65:65 -> <clinit>
+    1:1:void <init>(java.lang.String,int):65:65 -> <init>
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLense -> com.android.tools.r8.ir.optimize.Q$a:
     boolean $assertionsDisabled -> l
     java.util.Map removedArgumentsInfoPerMethod -> k
-    1:1:void <clinit>():64:64 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.AppView):73:79 -> <init>
-    8:16:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.AppView):72:80 -> <init>
-    1:12:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):85:96 -> f
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> com.android.tools.r8.ir.optimize.da:
-    com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> b
+    1:1:void <clinit>():70:70 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.AppView):79:85 -> <init>
+    8:16:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.AppView):78:86 -> <init>
+    1:12:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):91:102 -> f
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> com.android.tools.r8.ir.optimize.U:
+    java.util.Map removedArguments -> c
     com.android.tools.r8.graph.AppView appView -> a
-    java.util.Map removedArguments -> d
-    com.android.tools.r8.com.google.common.collect.BiMap methodMapping -> c
-    com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> e
-    boolean $assertionsDisabled -> f
-    1:3:void <clinit>():44:46 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.MethodPoolCollection):91:91 -> <init>
-    2:44:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.MethodPoolCollection):51:93 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector):44:44 -> a
-    2:2:com.android.tools.r8.utils.MethodSignatureEquivalence access$100():44:44 -> a
-    3:9:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):97:103 -> a
-    10:36:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):97:123 -> a
-    37:37:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):209:209 -> a
-    38:70:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):271:303 -> a
-    71:71:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo.builder():117:117 -> a
-    71:71:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):305 -> a
-    72:74:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):306:308 -> a
-    75:82:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):304:311 -> a
-    83:101:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):318:336 -> a
-    1:8:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):213:220 -> b
-    9:9:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod):266:266 -> b
-    9:9:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):221 -> b
-    10:22:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222:234 -> b
-    1:21:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):240:260 -> c
-    1:1:java.lang.Runnable runnableForClass(com.android.tools.r8.graph.DexProgramClass):209:209 -> d
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.ir.optimize.Y:
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.ir.optimize.Z:
+    com.android.tools.r8.com.google.common.collect.BiMap methodMapping -> b
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():41:41 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):84:84 -> <init>
+    2:42:void <init>(com.android.tools.r8.graph.AppView):45:85 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector):41:41 -> a
+    2:8:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService):89:95 -> a
+    9:29:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService):89:109 -> a
+    30:30:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):182:182 -> a
+    1:7:void processClass(com.android.tools.r8.graph.DexProgramClass):186:192 -> b
+    8:39:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod):206:237 -> b
+    8:39:void processClass(com.android.tools.r8.graph.DexProgramClass):193 -> b
+    40:47:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod):233:240 -> b
+    40:47:void processClass(com.android.tools.r8.graph.DexProgramClass):193 -> b
+    48:54:void processClass(com.android.tools.r8.graph.DexProgramClass):194:200 -> b
+    1:1:java.lang.Runnable runnableForClass(com.android.tools.r8.graph.DexProgramClass):182:182 -> c
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.ir.optimize.S:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.ir.optimize.T:
     java.util.BitSet used -> a
-    1:3:void <init>():339:341 -> <init>
-    1:3:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):339 -> <init>
-    1:1:java.util.BitSet getUsedArguments():344:344 -> a
-    2:2:boolean register(int):349:349 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.ir.optimize.aa:
-    com.android.tools.r8.ir.optimize.UnusedArgumentsCollector this$0 -> b
-    com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool methodPool -> a
-    1:2:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):177:178 -> <init>
-    1:12:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):187:198 -> a
-    13:14:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):203:204 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UnusedArgumentsGraphLense -> com.android.tools.r8.ir.optimize.ba:
+    1:3:void <init>():246:248 -> <init>
+    1:3:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):246 -> <init>
+    1:1:java.util.BitSet getUsedArguments():251:251 -> a
+    2:2:boolean register(int):256:256 -> a
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UnusedArgumentsGraphLense -> com.android.tools.r8.ir.optimize.U$a:
     java.util.Map removedArguments -> k
-    1:9:void <init>(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory,java.util.Map):67:75 -> <init>
-    1:6:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):81:86 -> f
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures -> com.android.tools.r8.ir.optimize.ca:
+    1:9:void <init>(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory,java.util.Map):61:69 -> <init>
+    1:6:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):75:80 -> f
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures -> com.android.tools.r8.ir.optimize.U$b:
     com.android.tools.r8.ir.optimize.UnusedArgumentsCollector this$0 -> c
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> a
     java.util.Set usedSignatures -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():126:126 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector):126:129 -> <init>
-    1:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector,com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):126 -> <init>
-    1:1:void markSignatureAsUsed(com.android.tools.r8.graph.DexMethod):136:136 -> a
-    1:1:void access$300(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures,com.android.tools.r8.graph.DexMethod):126 -> a
-    2:9:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):145:152 -> a
-    10:10:java.lang.String com.android.tools.r8.utils.StringUtils.numberToIdentifier(char[],int):260:260 -> a
-    10:10:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):151 -> a
-    11:19:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):150:158 -> a
-    20:20:boolean isMethodSignatureAvailable(com.android.tools.r8.graph.DexMethod):132:132 -> a
-    20:20:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):160 -> a
-    21:22:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):165:166 -> a
-    23:23:void markSignatureAsUsed(com.android.tools.r8.graph.DexMethod):136:136 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):168 -> a
-    24:24:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):169:169 -> a
+    1:1:void <clinit>():112:112 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector):112:115 -> <init>
+    1:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector,com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):112 -> <init>
+    1:19:com.android.tools.r8.graph.DexProto protoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):119:137 -> a
+    1:19:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):157 -> a
+    20:29:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):163:172 -> a
+    30:30:boolean isMethodSignatureAvailable(com.android.tools.r8.graph.DexMethod):141:141 -> a
+    30:30:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):174 -> a
+    31:31:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):175:175 -> a
+    32:33:void markSignatureAsNoLongerUsed(com.android.tools.r8.graph.DexMethod):149:150 -> a
+    32:33:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):175 -> a
+    34:34:void markSignatureAsUsed(com.android.tools.r8.graph.DexMethod):145:145 -> a
+    34:34:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):176 -> a
+    35:35:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):177:177 -> a
+    36:36:void markSignatureAsUsed(com.android.tools.r8.graph.DexMethod):145:145 -> a
+    36:36:void access$200(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures,com.android.tools.r8.graph.DexMethod):112 -> a
 com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.ir.optimize.a.a:
     java.util.concurrent.ConcurrentHashMap knownClasses -> b
     com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> a
@@ -25867,15 +25328,15 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter):34:34 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter):32:36 -> <init>
     1:54:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):128:181 -> a
-    55:96:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):158:199 -> a
-    97:97:boolean lambda$processMethodCode$0(com.android.tools.r8.ir.code.Instruction):129:129 -> a
-    98:98:boolean isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):205:205 -> a
-    98:98:boolean lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):149 -> a
-    99:116:boolean computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):221:238 -> a
-    99:116:boolean isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):207 -> a
-    99:116:boolean lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):149 -> a
-    117:122:boolean isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):207:212 -> a
-    117:122:boolean lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):149 -> a
+    55:95:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):158:198 -> a
+    96:96:boolean lambda$processMethodCode$0(com.android.tools.r8.ir.code.Instruction):129:129 -> a
+    97:97:boolean isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):204:204 -> a
+    97:97:boolean lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):149 -> a
+    98:115:boolean computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):220:237 -> a
+    98:115:boolean isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):206 -> a
+    98:115:boolean lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):149 -> a
+    116:121:boolean isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):206:211 -> a
+    116:121:boolean lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):149 -> a
 com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.ir.optimize.a.b:
     com.android.tools.r8.ir.code.Instruction root -> c
     com.android.tools.r8.graph.AppView appView -> d
@@ -26073,31 +25534,31 @@
     106:115:void processCode():188 -> b
 com.android.tools.r8.ir.optimize.lambda.CodeProcessor$1 -> com.android.tools.r8.ir.optimize.lambda.a:
     1:1:void <init>():77:77 -> <init>
+    boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> a
     boolean isValidNewInstance(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance) -> a
     boolean isValidStaticFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> a
-    1:1:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):120:120 -> a
-    2:2:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstancePut):125:125 -> a
-    3:3:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstanceGet):130:130 -> a
-    4:4:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticPut):135:135 -> a
-    5:5:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):140:140 -> a
-    boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> b
-    boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> b
+    1:1:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstancePut):125:125 -> a
+    2:2:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstanceGet):130:130 -> a
+    3:3:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticPut):135:135 -> a
+    4:4:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):140:140 -> a
+    boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> b
     1:1:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance):115:115 -> b
-    boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> c
-    boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> d
+    2:2:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):120:120 -> b
+    boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> c
+    boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> d
 com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy -> com.android.tools.r8.ir.optimize.lambda.b:
+    boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> a
     boolean isValidNewInstance(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance) -> a
     boolean isValidStaticFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> a
     void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstanceGet) -> a
     void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstancePut) -> a
-    void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> a
     void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet) -> a
     void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticPut) -> a
-    boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> b
-    boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> b
+    boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> b
+    void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> b
     void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance) -> b
-    boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> c
-    boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> d
+    boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> c
+    boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> d
 com.android.tools.r8.ir.optimize.lambda.LambdaGroup -> com.android.tools.r8.ir.optimize.lambda.f:
     java.util.Map lambdas -> c
     com.android.tools.r8.ir.optimize.lambda.LambdaGroupId id -> a
@@ -26142,9 +25603,9 @@
     1:2:void <init>(java.lang.String):211 -> <init>
     3:4:void <init>(java.lang.String,boolean):215:216 -> <init>
 com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder -> com.android.tools.r8.ir.optimize.lambda.g:
-    java.lang.String origin -> n
-    com.android.tools.r8.graph.DexItemFactory factory -> m
-    com.android.tools.r8.ir.optimize.lambda.LambdaGroup group -> l
+    com.android.tools.r8.graph.DexItemFactory factory -> b
+    com.android.tools.r8.ir.optimize.lambda.LambdaGroup group -> a
+    java.lang.String origin -> c
     1:4:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):27:30 -> <init>
     com.android.tools.r8.graph.ClassAccessFlags buildAccessFlags() -> a
     com.android.tools.r8.graph.DexAnnotationSet buildAnnotations() -> b
@@ -26277,7 +25738,7 @@
     1:1:void lambda$prepareInstructions$3(int,int,com.android.tools.r8.ir.conversion.IRBuilder):62:62 -> b
     1:3:void prepareInstructions():35:37 -> f
     4:35:void prepareInstructions():36:67 -> f
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup -> com.android.tools.r8.ir.optimize.lambda.a.g:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup -> com.android.tools.r8.ir.optimize.lambda.a.d:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId):106:106 -> <init>
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId,com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1):104 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):111:111 -> a
@@ -26289,7 +25750,7 @@
     1:4:com.android.tools.r8.ir.synthetic.SyntheticSourceCode createInstanceInitializerSourceCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):191:194 -> a
     5:5:com.android.tools.r8.graph.DexField lambda$createInstanceInitializerSourceCode$0(int):195:195 -> a
     1:1:com.android.tools.r8.graph.DexType getSuperClassType():185:185 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassValidator -> com.android.tools.r8.ir.optimize.lambda.a.d:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassValidator -> com.android.tools.r8.ir.optimize.lambda.a.d$a:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):152:152 -> <init>
     1:1:int getInstanceInitializerSize(java.util.List):157:157 -> a
     2:9:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):164:171 -> a
@@ -26299,15 +25760,15 @@
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup():145:145 -> a
     java.lang.String getLambdaKindDescriptor() -> b
     1:1:boolean equals(java.lang.Object):135:135 -> equals
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.lambda.a.f:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.lambda.a.d$b:
     com.android.tools.r8.graph.DexMethod objectInitializer -> p
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,java.util.function.IntFunction,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):213:214 -> <init>
     1:6:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):221:226 -> b
     7:7:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):221:221 -> b
     1:1:void prepareSuperConstructorCall(int):219:219 -> c
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.lambda.a.h:
-    boolean $assertionsDisabled -> n
-    com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory INSTANCE -> m
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.lambda.a.f:
+    com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory INSTANCE -> b
+    boolean $assertionsDisabled -> c
     1:2:void <clinit>():16:17 -> <clinit>
     1:1:void <init>():16:16 -> <init>
     1:6:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):22:27 -> b
@@ -26322,29 +25783,29 @@
     32:32:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):32 -> b
     33:33:void validateSuperclass(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):49:49 -> b
     33:33:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> b
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup -> com.android.tools.r8.ir.optimize.lambda.a.n:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup -> com.android.tools.r8.ir.optimize.lambda.a.l:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId):112:112 -> <init>
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId,com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1):110 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):117:117 -> a
     2:2:com.android.tools.r8.utils.ThrowingConsumer lambdaClassValidator(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):123:123 -> a
     java.lang.String getGroupSuffix() -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1 -> com.android.tools.r8.ir.optimize.lambda.a.i:
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.ir.optimize.lambda.a.j:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1 -> com.android.tools.r8.ir.optimize.lambda.a.g:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.ir.optimize.lambda.a.h:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):191:191 -> <init>
     1:7:com.android.tools.r8.ir.synthetic.SyntheticSourceCode createInstanceInitializerSourceCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):202:208 -> a
     8:8:com.android.tools.r8.graph.DexField lambda$createInstanceInitializerSourceCode$0(int):206:206 -> a
     1:1:com.android.tools.r8.graph.DexType getSuperClassType():196:196 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassValidator -> com.android.tools.r8.ir.optimize.lambda.a.k:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassValidator -> com.android.tools.r8.ir.optimize.lambda.a.i:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):158:158 -> <init>
     1:1:int getInstanceInitializerSize(java.util.List):163:163 -> a
     2:14:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):170:182 -> a
     15:15:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):178:178 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId -> com.android.tools.r8.ir.optimize.lambda.a.l:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId -> com.android.tools.r8.ir.optimize.lambda.a.j:
     1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):136:136 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup():151:151 -> a
     java.lang.String getLambdaKindDescriptor() -> b
     1:1:boolean equals(java.lang.Object):141:141 -> equals
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.lambda.a.m:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.lambda.a.k:
     int arity -> p
     com.android.tools.r8.graph.DexMethod lambdaInitializer -> q
     1:4:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,java.util.function.IntFunction,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position):227:230 -> <init>
@@ -26353,9 +25814,9 @@
     2:7:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):239:244 -> b
     8:8:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):239:239 -> b
     1:3:void prepareSuperConstructorCall(int):235:237 -> c
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.lambda.a.o:
-    boolean $assertionsDisabled -> n
-    com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory INSTANCE -> m
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.lambda.a.m:
+    com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory INSTANCE -> b
+    boolean $assertionsDisabled -> c
     1:2:void <clinit>():16:17 -> <clinit>
     1:1:void <init>():16:16 -> <init>
     1:6:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):22:27 -> b
@@ -26372,7 +25833,7 @@
     30:30:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):32 -> b
     31:31:void validateSuperclass(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):49:49 -> b
     31:31:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> b
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinInstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.lambda.a.p:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinInstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.lambda.a.n:
     com.android.tools.r8.graph.DexField idField -> n
     java.util.function.IntFunction fieldGenerator -> o
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,java.util.function.IntFunction,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):25:27 -> <init>
@@ -26381,7 +25842,7 @@
     3:3:void lambda$prepareInstructions$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):41:41 -> a
     void prepareSuperConstructorCall(int) -> c
     1:17:void prepareInstructions():32:48 -> f
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaClassValidator -> com.android.tools.r8.ir.optimize.lambda.a.q:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaClassValidator -> com.android.tools.r8.ir.optimize.lambda.a.o:
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> c
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> b
     com.android.tools.r8.kotlin.Kotlin kotlin -> a
@@ -26462,7 +25923,7 @@
     227:231:void accept(java.lang.Object):45 -> accept
     232:232:void accept(com.android.tools.r8.graph.DexClass):71:71 -> accept
     232:232:void accept(java.lang.Object):45 -> accept
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaConstants -> com.android.tools.r8.ir.optimize.lambda.a.r:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaConstants -> com.android.tools.r8.ir.optimize.lambda.a.p:
     com.android.tools.r8.graph.FieldAccessFlags CAPTURE_FIELD_FLAGS -> j
     com.android.tools.r8.graph.FieldAccessFlags SINGLETON_FIELD_FLAGS -> i
     com.android.tools.r8.graph.MethodAccessFlags CLASS_INITIALIZER_FLAGS -> c
@@ -26475,7 +25936,7 @@
     com.android.tools.r8.graph.MethodAccessFlags BRIDGE_METHOD_FLAGS -> g
     com.android.tools.r8.graph.MethodAccessFlags BRIDGE_METHOD_FLAGS_FIXED -> h
     1:38:void <clinit>():15:52 -> <clinit>
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup -> com.android.tools.r8.ir.optimize.lambda.a.s:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup -> com.android.tools.r8.ir.optimize.lambda.a.q:
     com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategy -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():19:19 -> <clinit>
@@ -26496,9 +25957,9 @@
     1:2:boolean hasAnySingletons():35:36 -> h
     1:1:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id():27:27 -> i
     1:1:boolean isStateless():31:31 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupClassBuilder -> com.android.tools.r8.ir.optimize.lambda.a.t:
-    boolean $assertionsDisabled -> p
-    com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id -> o
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupClassBuilder -> com.android.tools.r8.ir.optimize.lambda.a.r:
+    com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id -> d
+    boolean $assertionsDisabled -> e
     1:1:void <clinit>():36:36 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):42:43 -> <init>
     com.android.tools.r8.ir.synthetic.SyntheticSourceCode createInstanceInitializerSourceCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position) -> a
@@ -26526,59 +25987,59 @@
     1:33:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():90:122 -> i
     34:52:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():117:135 -> i
     1:3:java.util.Map collectVirtualMethods():143:145 -> l
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupCodeStrategy -> com.android.tools.r8.ir.optimize.lambda.a.u:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupCodeStrategy -> com.android.tools.r8.ir.optimize.lambda.a.s:
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():37:37 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup):40:41 -> <init>
     1:7:boolean isValidStaticFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):51:57 -> a
     8:8:boolean isValidNewInstance(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance):89:89 -> a
-    9:11:boolean isValidVirtualCall(com.android.tools.r8.ir.code.InvokeMethod):111:113 -> a
-    12:14:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):129:131 -> a
-    15:29:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):210:224 -> a
-    15:29:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):131 -> a
-    30:33:com.android.tools.r8.graph.DexMethod mapInitializerMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):255:258 -> a
-    30:33:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):224 -> a
-    30:33:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):131 -> a
-    34:34:com.android.tools.r8.graph.DexMethod mapInitializerMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):257:257 -> a
-    34:34:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):224 -> a
-    34:34:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):131 -> a
-    35:35:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):225:225 -> a
-    35:35:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):131 -> a
-    36:44:java.util.List mapInitializerArgs(com.android.tools.r8.ir.code.Value,java.util.List,com.android.tools.r8.graph.DexProto):240:248 -> a
-    36:44:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):225 -> a
-    36:44:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):131 -> a
-    45:45:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):226:226 -> a
-    45:45:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):131 -> a
-    46:48:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):134:136 -> a
-    49:49:com.android.tools.r8.graph.DexMethod mapVirtualMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):263:263 -> a
-    49:49:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):137 -> a
-    50:51:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):137:138 -> a
-    52:52:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):136:136 -> a
-    53:53:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstancePut):146:146 -> a
-    54:62:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstanceGet):151:159 -> a
-    63:63:com.android.tools.r8.graph.DexField mapCaptureField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):268:268 -> a
-    63:63:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstanceGet):160 -> a
-    64:84:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstanceGet):160:180 -> a
-    85:85:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticPut):188:188 -> a
-    86:91:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):194:199 -> a
-    92:92:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):198:198 -> a
-    93:96:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):197:200 -> a
-    97:97:com.android.tools.r8.graph.DexField mapSingletonInstanceField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexField):273:273 -> a
-    97:97:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):200 -> a
-    98:98:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):200:200 -> a
-    99:99:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):195:195 -> a
-    100:103:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):232:235 -> a
-    104:104:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):234:234 -> a
-    1:5:boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):72:76 -> b
-    6:6:boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):94:94 -> b
-    7:12:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance):118:123 -> b
-    13:13:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance):122:122 -> b
-    14:17:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance):121:124 -> b
-    1:4:boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):63:66 -> c
-    5:14:boolean isValidInitializerCall(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):98:107 -> c
-    1:1:boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):81:81 -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId -> com.android.tools.r8.ir.optimize.lambda.a.v:
+    9:9:boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):94:94 -> a
+    10:12:boolean isValidVirtualCall(com.android.tools.r8.ir.code.InvokeMethod):111:113 -> a
+    13:13:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstancePut):146:146 -> a
+    14:22:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstanceGet):151:159 -> a
+    23:23:com.android.tools.r8.graph.DexField mapCaptureField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):268:268 -> a
+    23:23:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstanceGet):160 -> a
+    24:44:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InstanceGet):160:180 -> a
+    45:45:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticPut):188:188 -> a
+    46:51:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):194:199 -> a
+    52:52:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):198:198 -> a
+    53:56:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):197:200 -> a
+    57:57:com.android.tools.r8.graph.DexField mapSingletonInstanceField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexField):273:273 -> a
+    57:57:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):200 -> a
+    58:58:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):200:200 -> a
+    59:59:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.StaticGet):195:195 -> a
+    60:63:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):232:235 -> a
+    64:64:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):234:234 -> a
+    1:4:boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):63:66 -> b
+    5:10:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance):118:123 -> b
+    11:11:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance):122:122 -> b
+    12:15:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance):121:124 -> b
+    16:18:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):129:131 -> b
+    19:33:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):210:224 -> b
+    19:33:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):131 -> b
+    34:37:com.android.tools.r8.graph.DexMethod mapInitializerMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):255:258 -> b
+    34:37:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):224 -> b
+    34:37:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):131 -> b
+    38:38:com.android.tools.r8.graph.DexMethod mapInitializerMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):257:257 -> b
+    38:38:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):224 -> b
+    38:38:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):131 -> b
+    39:39:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):225:225 -> b
+    39:39:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):131 -> b
+    40:48:java.util.List mapInitializerArgs(com.android.tools.r8.ir.code.Value,java.util.List,com.android.tools.r8.graph.DexProto):240:248 -> b
+    40:48:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):225 -> b
+    40:48:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):131 -> b
+    49:49:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):226:226 -> b
+    49:49:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):131 -> b
+    50:52:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):134:136 -> b
+    53:53:com.android.tools.r8.graph.DexMethod mapVirtualMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):263:263 -> b
+    53:53:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):137 -> b
+    54:55:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):137:138 -> b
+    56:56:void patch(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):136:136 -> b
+    1:1:boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):81:81 -> c
+    2:11:boolean isValidInitializerCall(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):98:107 -> c
+    1:5:boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):72:76 -> d
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId -> com.android.tools.r8.ir.optimize.lambda.a.t:
     com.android.tools.r8.graph.DexProto mainMethodProto -> g
     com.android.tools.r8.graph.ParameterAnnotationsList mainMethodParamAnnotations -> i
     int innerClassAccess -> k
@@ -26600,8 +26061,8 @@
     java.lang.String getLambdaKindDescriptor() -> b
     1:1:int hashCode():76:76 -> hashCode
     1:21:java.lang.String toString():113:133 -> toString
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.lambda.a.w:
-    boolean $assertionsDisabled -> l
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.lambda.a.u:
+    boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():23:23 -> <init>
     1:7:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId create(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):36:42 -> a
@@ -26625,7 +26086,7 @@
     17:30:void validateStaticFields(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):131:144 -> c
     31:31:void validateStaticFields(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):141:141 -> c
     32:43:void validateStaticFields(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):137:148 -> c
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaVirtualMethodSourceCode -> com.android.tools.r8.ir.optimize.lambda.a.x:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaVirtualMethodSourceCode -> com.android.tools.r8.ir.optimize.lambda.a.v:
     java.util.List implMethods -> p
     com.android.tools.r8.graph.DexItemFactory factory -> n
     com.android.tools.r8.graph.DexField idField -> o
@@ -26697,9 +26158,8 @@
     33:52:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):76:95 -> a
     1:10:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):51:60 -> b
 com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.ir.optimize.b.g:
-    int getMin() -> a
-    void setIndex(int) -> a
-    java.util.function.Predicate getPredicate() -> b
+    java.util.function.Predicate getPredicate() -> a
+    int getMin() -> b
     int getMax() -> c
 com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.ir.optimize.b.h:
     boolean $assertionsDisabled -> a
@@ -26735,11 +26195,11 @@
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>(java.util.function.Predicate):15:15 -> <init>
     2:5:void <init>(java.util.function.Predicate):13:16 -> <init>
-    int getMin() -> a
-    1:2:void setIndex(int):36:37 -> a
-    3:3:com.android.tools.r8.ir.code.Instruction get(com.android.tools.r8.ir.optimize.peepholes.Match):41:41 -> a
-    1:1:java.util.function.Predicate getPredicate():21:21 -> b
+    1:1:java.util.function.Predicate getPredicate():21:21 -> a
+    2:2:com.android.tools.r8.ir.code.Instruction get(com.android.tools.r8.ir.optimize.peepholes.Match):41:41 -> a
+    int getMin() -> b
     int getMax() -> c
+    1:2:void setIndex(int):36:37 -> setIndex
 com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.ir.optimize.b.k:
     com.android.tools.r8.ir.optimize.peepholes.Point loadExp -> b
     com.android.tools.r8.ir.optimize.peepholes.Point storeExp -> a
@@ -26780,11 +26240,11 @@
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(java.util.function.Predicate):16:16 -> <init>
     2:5:void <init>(java.util.function.Predicate):14:17 -> <init>
-    int getMin() -> a
-    1:2:void setIndex(int):37:38 -> a
-    3:3:java.util.List get(com.android.tools.r8.ir.optimize.peepholes.Match):42:42 -> a
-    1:1:java.util.function.Predicate getPredicate():22:22 -> b
+    1:1:java.util.function.Predicate getPredicate():22:22 -> a
+    2:2:java.util.List get(com.android.tools.r8.ir.optimize.peepholes.Match):42:42 -> a
+    int getMin() -> b
     int getMax() -> c
+    1:2:void setIndex(int):37:38 -> setIndex
 com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer -> com.android.tools.r8.ir.optimize.c.e:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$Phase phase -> d
@@ -26796,66 +26256,66 @@
     1:1:void <clinit>():47:47 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):106:106 -> <init>
     2:54:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):57:109 -> <init>
-    1:67:void collectCandidates(com.android.tools.r8.graph.DexApplication):116:182 -> a
-    68:102:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):127:161 -> a
-    103:107:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):167:171 -> a
-    108:113:boolean isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):186:191 -> a
-    108:113:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):172 -> a
-    114:117:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):173:176 -> a
-    118:131:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):221:234 -> a
-    132:152:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):233:253 -> a
-    153:161:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):339:347 -> a
-    153:161:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    162:162:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.DexEncodedMethod):84:84 -> a
-    162:162:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):350 -> a
-    162:162:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    163:203:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):353:393 -> a
-    163:203:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    204:204:boolean isNonThrowingConstInstruction(com.android.tools.r8.ir.code.Instruction):421:421 -> a
-    204:204:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):393 -> a
-    204:204:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    205:210:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):396:401 -> a
-    205:210:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    211:234:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):426:449 -> a
-    211:234:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):401 -> a
-    211:234:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    235:242:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):402:409 -> a
-    235:242:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    243:250:boolean isValidStaticPut(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):454:461 -> a
-    243:250:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):409 -> a
-    243:250:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    251:255:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):410:414 -> a
-    251:255:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    256:257:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):260:261 -> a
-    258:262:boolean isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):329:333 -> a
-    258:262:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):261 -> a
-    263:287:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):262:286 -> a
-    288:300:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):468:480 -> a
-    288:300:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):286 -> a
-    301:333:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):288:320 -> a
-    334:367:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):487:520 -> a
-    368:369:void staticizeCandidates(com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.concurrent.ExecutorService):541:542 -> a
-    370:373:void setFixupStrategy(java.util.function.BiConsumer):553:556 -> a
-    374:377:void cleanFixupStrategy():560:563 -> a
-    1:3:void fixupMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):546:548 -> b
+    1:65:void collectCandidates(com.android.tools.r8.graph.DexApplication):116:180 -> a
+    66:100:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):125:159 -> a
+    101:105:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):165:169 -> a
+    106:111:boolean isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):184:189 -> a
+    106:111:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):170 -> a
+    112:115:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):171:174 -> a
+    116:129:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):219:232 -> a
+    130:150:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):231:251 -> a
+    151:159:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):337:345 -> a
+    151:159:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):252 -> a
+    160:160:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.DexEncodedMethod):84:84 -> a
+    160:160:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):348 -> a
+    160:160:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):252 -> a
+    161:201:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):351:391 -> a
+    161:201:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):252 -> a
+    202:202:boolean isNonThrowingConstInstruction(com.android.tools.r8.ir.code.Instruction):419:419 -> a
+    202:202:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):391 -> a
+    202:202:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):252 -> a
+    203:208:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):394:399 -> a
+    203:208:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):252 -> a
+    209:232:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):424:447 -> a
+    209:232:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):399 -> a
+    209:232:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):252 -> a
+    233:240:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):400:407 -> a
+    233:240:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):252 -> a
+    241:248:boolean isValidStaticPut(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):452:459 -> a
+    241:248:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):407 -> a
+    241:248:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):252 -> a
+    249:253:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):408:412 -> a
+    249:253:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):252 -> a
+    254:255:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):258:259 -> a
+    256:260:boolean isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):327:331 -> a
+    256:260:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):259 -> a
+    261:285:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):260:284 -> a
+    286:298:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):466:478 -> a
+    286:298:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):284 -> a
+    299:331:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):286:318 -> a
+    332:365:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):485:518 -> a
+    366:367:void staticizeCandidates(com.android.tools.r8.ir.conversion.OptimizationFeedback,java.util.concurrent.ExecutorService):539:540 -> a
+    368:371:void setFixupStrategy(java.util.function.BiConsumer):551:554 -> a
+    372:375:void cleanFixupStrategy():558:561 -> a
+    1:3:void fixupMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):544:546 -> b
 com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.ir.optimize.c.a:
 com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.ir.optimize.c.b:
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer this$0 -> c
-    1:2:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory):568:569 -> <init>
-    1:2:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1):566 -> <init>
-    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):591:591 -> a
-    2:2:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):616:616 -> a
-    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):601:601 -> b
-    2:2:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):611:611 -> b
-    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):596:596 -> c
-    2:2:boolean registerNewInstance(com.android.tools.r8.graph.DexType):621:621 -> c
-    3:3:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):626:626 -> c
-    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):606:606 -> d
-    2:2:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):631:631 -> d
-    3:5:boolean registerTypeReference(com.android.tools.r8.graph.DexType):636:638 -> d
-    1:2:boolean registerField(com.android.tools.r8.graph.DexField):579:580 -> e
-    3:3:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):586:586 -> e
-    1:2:boolean registerMethod(com.android.tools.r8.graph.DexMethod):573:574 -> f
+    1:2:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory):566:567 -> <init>
+    1:2:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1):564 -> <init>
+    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):589:589 -> a
+    2:2:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):614:614 -> a
+    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):599:599 -> b
+    2:2:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):609:609 -> b
+    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):594:594 -> c
+    2:2:boolean registerNewInstance(com.android.tools.r8.graph.DexType):619:619 -> c
+    3:3:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):624:624 -> c
+    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):604:604 -> d
+    2:2:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):629:629 -> d
+    3:5:boolean registerTypeReference(com.android.tools.r8.graph.DexType):634:636 -> d
+    1:2:boolean registerField(com.android.tools.r8.graph.DexField):577:578 -> e
+    3:3:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):584:584 -> e
+    1:2:boolean registerMethod(com.android.tools.r8.graph.DexMethod):571:572 -> f
 com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.ir.optimize.c.c:
     java.util.concurrent.atomic.AtomicInteger instancesCreated -> e
     com.android.tools.r8.graph.DexEncodedField singletonField -> b
@@ -26961,30 +26421,27 @@
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> d
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> c
-    1:1:void <clinit>():41:41 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView):47:50 -> <init>
-    1:54:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):70:123 -> a
-    55:59:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):121:125 -> a
-    60:122:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):124:186 -> a
-    123:138:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):184:199 -> a
-    139:145:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):197:203 -> a
-    146:146:java.lang.Integer lambda$computeTrivialOperationsOnConstString$0(java.lang.String):135:135 -> a
-    147:147:java.lang.Integer lambda$computeTrivialOperationsOnConstString$1(java.lang.String,java.lang.String):137:137 -> a
-    148:174:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):210:236 -> a
-    175:251:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):235:311 -> a
-    252:298:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):294:340 -> a
-    299:300:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):320:321 -> a
-    299:300:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):340 -> a
-    301:301:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):341:341 -> a
-    302:313:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):339:350 -> a
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$2(java.lang.String,java.lang.String):139:139 -> b
-    2:21:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):388:407 -> b
-    22:54:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):405:437 -> b
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$3(java.lang.String,java.lang.String):141:141 -> c
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$4(java.lang.String,java.lang.String):143:143 -> d
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$5(java.lang.String,java.lang.String):145:145 -> e
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$6(java.lang.String,java.lang.String):147:147 -> f
-    1:22:boolean hasPotentialReadOutside(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):357:378 -> hasPotentialReadOutside
+    1:1:void <clinit>():42:42 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView):48:51 -> <init>
+    1:54:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):71:124 -> a
+    55:59:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):122:126 -> a
+    60:122:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):125:187 -> a
+    123:138:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):185:200 -> a
+    139:145:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):198:204 -> a
+    146:146:java.lang.Integer lambda$computeTrivialOperationsOnConstString$0(java.lang.String):136:136 -> a
+    147:147:java.lang.Integer lambda$computeTrivialOperationsOnConstString$1(java.lang.String,java.lang.String):138:138 -> a
+    148:174:void rewriteClassGetName(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.RootSetBuilder$RootSet):211:237 -> a
+    175:249:void rewriteClassGetName(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.RootSetBuilder$RootSet):236:310 -> a
+    250:295:void rewriteClassGetName(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.RootSetBuilder$RootSet):294:339 -> a
+    296:307:void rewriteClassGetName(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.RootSetBuilder$RootSet):337:348 -> a
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$2(java.lang.String,java.lang.String):140:140 -> b
+    2:21:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):386:405 -> b
+    22:54:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):403:435 -> b
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$3(java.lang.String,java.lang.String):142:142 -> c
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$4(java.lang.String,java.lang.String):144:144 -> d
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$5(java.lang.String,java.lang.String):146:146 -> e
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$6(java.lang.String,java.lang.String):148:148 -> f
+    1:22:boolean hasPotentialReadOutside(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):355:376 -> hasPotentialReadOutside
 com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator -> com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator:
     int firstParallelMoveTemporary -> n
     boolean $assertionsDisabled -> p
@@ -27328,31 +26785,31 @@
     1:16:void addRange(com.android.tools.r8.ir.regalloc.LiveRange):211 -> addRange
     17:17:void addRange(com.android.tools.r8.ir.regalloc.LiveRange):212:212 -> addRange
     1:2:void addUse(com.android.tools.r8.ir.regalloc.LiveIntervalsUse):239:240 -> addUse
-    1:2:com.android.tools.r8.ir.regalloc.LiveIntervalsUse firstUseWithConstraint():387:388 -> b
-    3:4:int compareTo(com.android.tools.r8.ir.regalloc.LiveIntervals):540:541 -> b
+    1:3:int firstUseAfter(int):374:376 -> b
+    4:5:com.android.tools.r8.ir.regalloc.LiveIntervalsUse firstUseWithConstraint():387:388 -> b
+    6:7:int compareTo(com.android.tools.r8.ir.regalloc.LiveIntervals):540:541 -> b
     1:1:boolean hasConflictingRegisters(com.android.tools.r8.ir.regalloc.LiveIntervals):318:318 -> c
-    2:4:int firstUseAfter(int):374:376 -> c
-    5:5:int getFirstUse():383:383 -> c
+    2:7:boolean overlapsPosition(int):327:332 -> c
+    8:8:int getFirstUse():383:383 -> c
     1:1:int compareTo(java.lang.Object):23:23 -> compareTo
     1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getHint():90:90 -> d
-    2:7:boolean overlapsPosition(int):327:332 -> d
-    8:17:int nextOverlap(com.android.tools.r8.ir.regalloc.LiveIntervals):357:366 -> d
-    1:2:void setMaxNonSpilledRegister(int):293:294 -> e
-    3:6:int getMaxNonSpilledRegister():298:301 -> e
-    7:7:boolean overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> e
+    2:3:void setMaxNonSpilledRegister(int):293:294 -> d
+    4:13:int nextOverlap(com.android.tools.r8.ir.regalloc.LiveIntervals):357:366 -> d
+    1:4:int getMaxNonSpilledRegister():298:301 -> e
+    5:5:boolean overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> e
+    6:8:com.android.tools.r8.ir.regalloc.LiveIntervals splitBefore(int):404:406 -> e
+    9:9:int toGapPosition(int):70:70 -> e
+    9:9:com.android.tools.r8.ir.regalloc.LiveIntervals splitBefore(int):409 -> e
+    10:47:com.android.tools.r8.ir.regalloc.LiveIntervals splitBefore(int):410:447 -> e
     1:1:void setHint(com.android.tools.r8.ir.regalloc.LiveIntervals):86:86 -> f
     2:2:com.android.tools.r8.ir.regalloc.LiveIntervals getNextConsecutive():145:145 -> f
-    3:5:com.android.tools.r8.ir.regalloc.LiveIntervals splitBefore(int):404:406 -> f
-    6:6:int toGapPosition(int):70:70 -> f
-    6:6:com.android.tools.r8.ir.regalloc.LiveIntervals splitBefore(int):409 -> f
-    7:44:com.android.tools.r8.ir.regalloc.LiveIntervals splitBefore(int):410:447 -> f
-    1:1:void updateRegisterConstraint(int):244:244 -> g
+    3:3:void updateRegisterConstraint(int):244:244 -> f
+    1:1:int toInstructionPosition(int):66:66 -> g
     2:2:java.util.List getRanges():252:252 -> g
     1:2:int getEnd():261:262 -> getEnd
     1:34:com.android.tools.r8.ir.regalloc.LiveIntervals getSplitCovering(int):476:509 -> getSplitCovering
     1:2:int getStart():256:257 -> getStart
-    1:1:int toInstructionPosition(int):66:66 -> h
-    2:2:int getRegister():266:266 -> h
+    1:1:int getRegister():266:266 -> h
     1:1:int getRegisterLimit():270:270 -> i
     1:1:java.util.List getSplitChildren():198:198 -> j
     1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getSplitParent():202:202 -> k
@@ -27406,7 +26863,7 @@
     6:11:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.Instruction):27:32 -> <init>
     1:10:boolean isBlocked(java.util.Set,java.util.Map):43:52 -> a
     11:37:int compareTo(com.android.tools.r8.ir.regalloc.RegisterMove):77:103 -> a
-    1:4:boolean writes(int):36:39 -> c
+    1:4:boolean writes(int):36:39 -> b
     1:1:int compareTo(java.lang.Object):13:13 -> compareTo
     1:5:boolean equals(java.lang.Object):68:72 -> equals
     1:1:int hashCode():63:63 -> hashCode
@@ -27441,7 +26898,7 @@
     91:105:void createMoveDestToTemp(com.android.tools.r8.ir.regalloc.RegisterMove):173:187 -> schedule
     91:105:void schedule():107 -> schedule
     106:106:void schedule():108:108 -> schedule
-com.android.tools.r8.ir.regalloc.RegisterPositions -> com.android.tools.r8.ir.regalloc.a:
+com.android.tools.r8.ir.regalloc.RegisterPositions -> com.android.tools.r8.ir.regalloc.b:
     int[] backing -> b
     boolean $assertionsDisabled -> f
     java.util.BitSet registerHoldsConstant -> c
@@ -27468,7 +26925,7 @@
     30:34:void set(int,int,com.android.tools.r8.ir.regalloc.LiveIntervals):74:78 -> a
     35:35:void set(int,int,com.android.tools.r8.ir.regalloc.LiveIntervals):77:77 -> a
     36:39:int get(int):82:85 -> a
-com.android.tools.r8.ir.regalloc.RegisterPositions$Type -> com.android.tools.r8.ir.regalloc.a$a:
+com.android.tools.r8.ir.regalloc.RegisterPositions$Type -> com.android.tools.r8.ir.regalloc.a:
     com.android.tools.r8.ir.regalloc.RegisterPositions$Type[] $VALUES -> e
     com.android.tools.r8.ir.regalloc.RegisterPositions$Type ANY -> d
     com.android.tools.r8.ir.regalloc.RegisterPositions$Type OTHER -> c
@@ -27476,7 +26933,7 @@
     com.android.tools.r8.ir.regalloc.RegisterPositions$Type MONITOR -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(java.lang.String,int):19:19 -> <init>
-com.android.tools.r8.ir.regalloc.SpillMove -> com.android.tools.r8.ir.regalloc.b:
+com.android.tools.r8.ir.regalloc.SpillMove -> com.android.tools.r8.ir.regalloc.c:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement type -> a
     com.android.tools.r8.ir.regalloc.LiveIntervals from -> b
     com.android.tools.r8.ir.regalloc.LiveIntervals to -> c
@@ -27486,7 +26943,7 @@
     1:9:boolean equals(java.lang.Object):47:55 -> equals
     1:1:int hashCode():29:29 -> hashCode
     1:1:java.lang.String toString():60:60 -> toString
-com.android.tools.r8.ir.regalloc.SpillMoveSet -> com.android.tools.r8.ir.regalloc.c:
+com.android.tools.r8.ir.regalloc.SpillMoveSet -> com.android.tools.r8.ir.regalloc.d:
     java.util.Map instructionToInMoves -> a
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement objectType -> f
     java.util.Map instructionToOutMoves -> b
@@ -27536,7 +26993,7 @@
     4:4:void addOutMove(int,com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):155:155 -> f
     5:5:java.util.Set lambda$scheduleMovesBeforeInstruction$5(java.lang.Integer):312:312 -> f
 com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode -> com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode:
-    boolean $assertionsDisabled -> c
+    boolean $assertionsDisabled -> b
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():22:22 -> <init>
     1:1:boolean computeEquals(java.lang.Object):87:87 -> b
@@ -27566,8 +27023,8 @@
     1:1:void lambda$prepareInstructions$3(int,com.android.tools.r8.ir.conversion.IRBuilder):147:147 -> c
     1:36:void prepareInstructions():112:147 -> f
 com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.ir.synthetic.SynthesizedCode:
-    com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider sourceCodeProvider -> d
-    java.util.function.Consumer registryCallback -> e
+    java.util.function.Consumer registryCallback -> d
+    com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider sourceCodeProvider -> c
     1:1:void <init>(com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider):17:17 -> <init>
     2:4:void <init>(com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider,java.util.function.Consumer):20:22 -> <init>
     1:1:void registerReachableDefinitionsDefault(com.android.tools.r8.graph.UseRegistry):36:36 -> a
@@ -27620,9 +27077,9 @@
     1:3:void setUp():170:172 -> setUp
     1:2:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):164:165 -> traceInstruction
 com.android.tools.r8.ir.synthetic.TemplateMethodCode -> com.android.tools.r8.ir.synthetic.c:
-    java.lang.String templateMethodDesc -> k
-    java.lang.String templateMethodName -> j
-    boolean $assertionsDisabled -> l
+    java.lang.String templateMethodName -> i
+    java.lang.String templateMethodDesc -> j
+    boolean $assertionsDisabled -> k
     1:1:void <clinit>():21:21 -> <clinit>
     1:3:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,java.lang.String,java.lang.String):28:30 -> <init>
     1:1:java.util.function.BiFunction createCodeLocator(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):41:41 -> a
@@ -27640,6 +27097,7 @@
     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.b.a.a.a.d:
+    1:1:void <clinit>():31:31 -> <clinit>
     int mix(int) -> a
     long nextPowerOfTwo(long) -> a
     1:2:int arraySize(int,float):228:229 -> a
@@ -27771,7 +27229,6 @@
     1:1:void defaultReturnValue(int):55:55 -> a
     2:5:java.lang.Integer put(java.lang.Integer,java.lang.Integer):135:138 -> a
     int put(int,int) -> b
-    int remove(int) -> b
     1:1:boolean containsKey(java.lang.Object):105:105 -> containsKey
     1:2:java.lang.Integer get(java.lang.Object):120:121 -> get
     1:2:java.lang.Object get(java.lang.Object):41 -> get
@@ -27780,8 +27237,8 @@
     1:4:java.lang.Object remove(java.lang.Object):41 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap -> com.android.tools.r8.b.a.a.a.b.c:
     1:1:void <init>():46:46 -> <init>
+    boolean containsValue(int) -> b
     1:1:boolean containsValue(java.lang.Object):63:63 -> containsValue
-    boolean containsValue(int) -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():311:311 -> entrySet
     1:1:java.util.Set entrySet():43 -> entrySet
     1:3:boolean equals(java.lang.Object):334:336 -> equals
@@ -27801,7 +27258,7 @@
     int value -> b
     int key -> a
     1:3:void <init>(int,int):122:124 -> <init>
-    1:1:int getIntKey():141:141 -> d
+    1:1:int getIntKey():141:141 -> c
     1:1:int getIntValue():158:158 -> e
     1:5:boolean equals(java.lang.Object):180:184 -> equals
     1:1:java.lang.Integer getKey():136:136 -> getKey
@@ -27822,12 +27279,12 @@
     1:1:java.lang.Object put(int,java.lang.Object):71:71 -> a
     2:4:java.lang.Object put(java.lang.Integer,java.lang.Object):135:137 -> a
     1:1:boolean containsKey(java.lang.Object):105:105 -> containsKey
-    1:1:java.lang.Object remove(int):82:82 -> d
     1:2:java.lang.Object get(java.lang.Object):120:121 -> get
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):41:41 -> put
     2:4:java.lang.Object put(java.lang.Integer,java.lang.Object):135:137 -> put
     2:4:java.lang.Object put(java.lang.Object,java.lang.Object):41 -> put
-    1:3:java.lang.Object remove(java.lang.Object):153:155 -> remove
+    1:1:java.lang.Object remove(int):82:82 -> remove
+    2:4:java.lang.Object remove(java.lang.Object):153:155 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectMap -> com.android.tools.r8.b.a.a.a.b.f:
     1:1:void <init>():45:45 -> <init>
     boolean containsKey(int) -> c
@@ -27843,7 +27300,7 @@
     java.lang.Object value -> b
     int key -> a
     1:3:void <init>(int,java.lang.Object):109:111 -> <init>
-    1:1:int getIntKey():128:128 -> d
+    1:1:int getIntKey():128:128 -> c
     1:4:boolean equals(java.lang.Object):143:146 -> equals
     1:1:java.lang.Integer getKey():123:123 -> getKey
     1:1:java.lang.Object getKey():100 -> getKey
@@ -27875,13 +27332,13 @@
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectSortedMap):122:122 -> <init>
     1:1:int lastInt():150:150 -> a
     1:1:int firstInt():145:145 -> b
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet subSet(int,int):165:165 -> b
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int):160:160 -> c
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int):160:160 -> b
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet subSet(int,int):165:165 -> b
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int):155:155 -> c
     1:1:void clear():135:135 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():140:140 -> comparator
     1:1:java.util.Comparator comparator():122 -> comparator
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int):155:155 -> d
-    1:1:boolean contains(int):125:125 -> e
+    1:1:boolean contains(int):125:125 -> d
     1:1:int size():130:130 -> size
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceFunction -> com.android.tools.r8.b.a.a.a.b.h:
     java.lang.Object defRetValue -> a
@@ -27910,7 +27367,7 @@
     java.lang.Object value -> b
     int key -> a
     1:3:void <init>(int,java.lang.Object):109:111 -> <init>
-    1:1:int getIntKey():128:128 -> d
+    1:1:int getIntKey():128:128 -> c
     1:4:boolean equals(java.lang.Object):143:146 -> equals
     1:1:java.lang.Integer getKey():123:123 -> getKey
     1:1:java.lang.Object getKey():100 -> getKey
@@ -27942,30 +27399,30 @@
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap):122:122 -> <init>
     1:1:int lastInt():150:150 -> a
     1:1:int firstInt():145:145 -> b
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet subSet(int,int):165:165 -> b
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int):160:160 -> c
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int):160:160 -> b
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet subSet(int,int):165:165 -> b
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int):155:155 -> c
     1:1:void clear():135:135 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():140:140 -> comparator
     1:1:java.util.Comparator comparator():122 -> comparator
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int):155:155 -> d
-    1:1:boolean contains(int):125:125 -> e
+    1:1:boolean contains(int):125:125 -> d
     1:1:int size():130:130 -> size
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntBidirectionalIterator -> com.android.tools.r8.b.a.a.a.b.l:
     1:1:void <init>():34:34 -> <init>
-    int previousInt() -> c
+    int previousInt() -> b
     1:1:java.lang.Integer previous():56:56 -> previous
     1:1:java.lang.Object previous():33 -> previous
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection -> com.android.tools.r8.b.a.a.a.b.m:
     1:1:void <init>():37:37 -> <init>
-    1:1:boolean add(int):68:68 -> a
-    2:2:boolean add(java.lang.Integer):114:114 -> a
-    3:4:int[] toArray(int[]):148:149 -> a
+    1:1:boolean add(java.lang.Integer):114:114 -> a
+    2:3:int[] toArray(int[]):148:149 -> a
     1:1:boolean add(java.lang.Object):36:36 -> add
-    1:1:int[] toIntArray(int[]):167:167 -> c
-    1:1:int[] toIntArray():155 -> c
+    2:2:boolean add(int):68:68 -> add
     1:1:boolean contains(java.lang.Object):129:129 -> contains
-    boolean contains(int) -> e
-    1:4:boolean rem(int):94:97 -> f
+    boolean contains(int) -> d
+    1:1:int[] toIntArray(int[]):167:167 -> d
+    1:1:int[] toIntArray():155 -> d
+    1:4:boolean rem(int):94:97 -> e
     1:1:boolean remove(java.lang.Object):143:143 -> remove
     1:14:java.lang.String toString():206:219 -> toString
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator -> com.android.tools.r8.b.a.a.a.b.n:
@@ -27977,42 +27434,42 @@
     1:1:void <init>():33:33 -> <init>
     boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection) -> a
     boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList) -> a
-    1:1:boolean add(int):86:86 -> a
-    2:8:void removeElements(int,int):341:347 -> a
-    9:9:void removeElements(int,int):344:344 -> a
-    10:15:void getElements(int,int[],int,int):388:393 -> a
-    16:16:void getElements(int,int[],int,int):391:391 -> a
-    17:17:void getElements(int,int[],int,int):390:390 -> a
-    18:18:void getElements(int,int[],int,int):389:389 -> a
-    19:37:int compareTo(java.util.List):464:482 -> a
-    38:38:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> a
-    39:39:void add(int,java.lang.Integer):578:578 -> a
+    int removeInt(int) -> a
+    1:7:void removeElements(int,int):341:347 -> a
+    8:8:void removeElements(int,int):344:344 -> a
+    9:14:void getElements(int,int[],int,int):388:393 -> a
+    15:15:void getElements(int,int[],int,int):391:391 -> a
+    16:16:void getElements(int,int[],int,int):390:390 -> a
+    17:17:void getElements(int,int[],int,int):389:389 -> a
+    18:36:int compareTo(java.util.List):464:482 -> a
+    37:37:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> a
+    38:38:void add(int,java.lang.Integer):578:578 -> a
     1:1:void add(int,java.lang.Object):32:32 -> add
     2:2:void add(int,int):74:74 -> add
+    3:3:boolean add(int):86:86 -> add
     1:5:boolean addAll(int,java.util.Collection):120:124 -> addAll
     6:6:boolean addAll(java.util.Collection):137:137 -> addAll
-    int removeInt(int) -> b
+    1:2:int popInt():492:493 -> c
+    3:3:int popInt():492:492 -> c
     1:1:void clear():403:403 -> clear
     1:1:int compareTo(java.lang.Object):32:32 -> compareTo
-    1:2:int popInt():492:493 -> d
-    3:3:int popInt():492:492 -> d
-    1:1:boolean contains(int):274:274 -> e
+    1:1:boolean contains(int):274:274 -> d
     1:14:boolean equals(java.lang.Object):430:443 -> equals
     15:15:boolean valEquals(java.lang.Object,java.lang.Object):407:407 -> equals
     15:15:boolean equals(java.lang.Object):443 -> equals
-    1:1:void ensureIndex(int):47:47 -> g
-    2:2:void ensureIndex(int):46:46 -> g
+    1:1:void ensureIndex(int):47:47 -> f
+    2:2:void ensureIndex(int):46:46 -> f
+    1:1:void ensureRestrictedIndex(int):62:62 -> g
+    2:2:void ensureRestrictedIndex(int):61:61 -> g
     1:1:java.lang.Integer get(int):606:606 -> get
     1:1:java.lang.Object get(int):32 -> get
-    1:1:void ensureRestrictedIndex(int):62:62 -> h
-    2:2:void ensureRestrictedIndex(int):61:61 -> h
+    1:5:int indexOf(int):279:283 -> h
     1:4:int hashCode():418:421 -> hashCode
-    1:5:int indexOf(int):279:283 -> i
+    1:5:int lastIndexOf(int):290:294 -> i
     1:1:int indexOf(java.lang.Object):620:620 -> indexOf
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():32:32 -> iterator
     2:2:java.util.Iterator iterator():32:32 -> iterator
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():180:180 -> iterator
-    1:5:int lastIndexOf(int):290:294 -> j
     1:1:int lastIndexOf(java.lang.Object):634:634 -> lastIndexOf
     1:1:java.util.ListIterator listIterator():32:32 -> listIterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():192:192 -> listIterator
@@ -28034,7 +27491,7 @@
     1:1:void <clinit>():726:726 -> <clinit>
     1:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int,int):735:738 -> <init>
     1:1:boolean access$000(com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList):726:726 -> a
-    2:4:boolean add(int):750:752 -> a
+    2:4:int removeInt(int):779:781 -> a
     5:7:void getElements(int,int[],int,int):797:799 -> a
     8:8:void getElements(int,int[],int,int):798:798 -> a
     9:13:void removeElements(int,int):804:808 -> a
@@ -28045,12 +27502,12 @@
     21:21:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):542:542 -> a
     21:21:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):905 -> a
     1:1:void add(int,java.lang.Object):726:726 -> add
-    2:5:void add(int,int):758:761 -> add
+    2:4:boolean add(int):750:752 -> add
+    5:8:void add(int,int):758:761 -> add
     1:3:boolean addAll(int,java.util.Collection):766:768 -> addAll
-    1:3:int removeInt(int):779:781 -> b
     1:1:int compareTo(java.lang.Object):726:726 -> compareTo
     1:3:boolean assertRange():742:744 -> e
-    1:5:boolean rem(int):888:892 -> f
+    4:8:boolean rem(int):888:892 -> e
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.get(int):606:606 -> get
     1:1:java.lang.Object get(int):726 -> get
     1:2:int getInt(int):773:774 -> getInt
@@ -28086,14 +27543,14 @@
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList,int):822:823 -> <init>
     1:4:void add(int):852:855 -> a
     5:5:void add(int):852:852 -> a
-    1:2:void set(int):859:860 -> b
-    3:4:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList.set(int,int):786:787 -> b
-    3:4:void set(int):860 -> b
-    5:5:void set(int):859:859 -> b
-    1:1:boolean hasPrevious():830:830 -> c
-    1:1:int previousInt():839 -> c
-    2:2:int previousInt():840:840 -> c
-    3:3:int previousInt():839:839 -> c
+    1:1:boolean hasPrevious():830:830 -> b
+    1:1:int previousInt():839 -> b
+    2:2:int previousInt():840:840 -> b
+    3:3:int previousInt():839:839 -> b
+    4:5:void set(int):859:860 -> b
+    6:7:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList.set(int,int):786:787 -> b
+    6:7:void set(int):860 -> b
+    8:8:void set(int):859:859 -> b
     1:1:boolean hasNext():826:826 -> hasNext
     1:1:boolean hasPrevious():830:830 -> hasPrevious
     1:1:int nextIndex():844:844 -> nextIndex
@@ -28119,8 +27576,8 @@
     2:2:void set(java.lang.Object):34 -> set
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSet -> com.android.tools.r8.b.a.a.a.b.s:
     1:1:void <init>():32:32 -> <init>
+    1:1:boolean rem(int):87:87 -> e
     1:4:boolean equals(java.lang.Object):41:44 -> equals
-    1:1:boolean rem(int):87:87 -> f
     1:5:int hashCode():57:61 -> hashCode
     1:1:boolean remove(int):75:75 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSortedSet -> com.android.tools.r8.b.a.a.a.b.t:
@@ -28146,8 +27603,8 @@
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):37:37 -> a
     2:2:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap,int):37:37 -> a
     1:1:int access$010(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):37:37 -> b
-    2:21:int put(int,int):279:298 -> b
-    22:28:int remove(int):304:310 -> b
+    2:3:boolean containsValue(int):266:267 -> b
+    4:23:int put(int,int):279:298 -> b
     1:1:int[] access$100(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):37:37 -> c
     2:2:boolean containsKey(int):261:261 -> c
     1:1:void clear():256:256 -> clear
@@ -28156,14 +27613,14 @@
     7:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap clone():341:341 -> clone
     7:7:java.lang.Object clone():37 -> clone
     1:1:int[] access$200(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):37:37 -> d
-    2:3:boolean containsValue(int):266:267 -> d
-    1:3:int findKey(int):234:236 -> e
+    2:4:int findKey(int):234:236 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet int2IntEntrySet():230:230 -> f
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():37 -> f
     1:4:int get(int):243:246 -> get
     1:1:boolean isEmpty():273:273 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():316:316 -> keySet
     1:1:java.util.Set keySet():37 -> keySet
+    1:7:int remove(int):304:310 -> remove
     1:1:int size():251:251 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():321:321 -> values
     1:1:java.util.Collection values():37 -> values
@@ -28199,7 +27656,7 @@
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap -> com.android.tools.r8.b.a.a.a.b.B:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet() -> f
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry -> com.android.tools.r8.b.a.a.a.b.z:
-    int getIntKey() -> d
+    int getIntKey() -> c
     int getIntValue() -> e
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet -> com.android.tools.r8.b.a.a.a.b.A:
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.android.tools.r8.b.a.a.a.b.K:
@@ -28248,28 +27705,27 @@
     1:16:int insert(int,int):248:263 -> b
     1:16:int put(int,int):270 -> b
     17:19:int put(int,int):271:273 -> b
-    20:31:int remove(int):352:363 -> b
+    20:24:boolean containsValue(int):403:407 -> b
     1:10:boolean containsKey(int):387:396 -> c
     1:4:void clear():420:423 -> clear
     1:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap clone():1017:1026 -> clone
     1:10:java.lang.Object clone():50 -> clone
     11:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap clone():1019:1019 -> clone
     11:11:java.lang.Object clone():50 -> clone
-    1:5:boolean containsValue(int):403:407 -> d
-    1:7:void rehash(int):979:985 -> e
-    8:8:int realSize():206:206 -> e
-    8:8:void rehash(int):986 -> e
-    9:21:void rehash(int):987:999 -> e
-    1:2:int removeEntry(int):220:221 -> f
-    3:8:void shiftKeys(int):333:338 -> f
-    3:8:int removeEntry(int):222 -> f
-    9:9:int removeEntry(int):223:223 -> f
-    10:15:void shiftKeys(int):341:346 -> f
-    10:15:int removeEntry(int):222 -> f
-    16:16:void shiftKeys(int):343:343 -> f
-    16:16:int removeEntry(int):222 -> f
-    17:18:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet int2IntEntrySet():773:774 -> f
-    17:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():50 -> f
+    1:7:void rehash(int):979:985 -> d
+    8:8:int realSize():206:206 -> d
+    8:8:void rehash(int):986 -> d
+    9:21:void rehash(int):987:999 -> d
+    1:2:int removeEntry(int):220:221 -> e
+    3:8:void shiftKeys(int):333:338 -> e
+    3:8:int removeEntry(int):222 -> e
+    9:9:int removeEntry(int):223:223 -> e
+    10:15:void shiftKeys(int):341:346 -> e
+    10:15:int removeEntry(int):222 -> e
+    16:16:void shiftKeys(int):343:343 -> e
+    16:16:int removeEntry(int):222 -> e
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet int2IntEntrySet():773:774 -> f
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():50 -> f
     1:11:int get(int):370:380 -> get
     1:1:int realSize():206:206 -> hashCode
     1:1:int hashCode():1043 -> hashCode
@@ -28287,6 +27743,7 @@
     6:7:void putAll(java.util.Map):239 -> putAll
     8:20:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap.putAll(java.util.Map):83:95 -> putAll
     8:20:void putAll(java.util.Map):242 -> putAll
+    1:12:int remove(int):352:363 -> remove
     1:1:int size():428:428 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():866:887 -> values
     1:22:java.util.Collection values():50 -> values
@@ -28294,9 +27751,9 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):866:866 -> <init>
     1:1:void clear():884:884 -> clear
-    1:1:boolean contains(int):879:879 -> e
-    2:6:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.containsValue(int):403:407 -> e
-    2:6:boolean contains(int):879 -> e
+    1:1:boolean contains(int):879:879 -> d
+    2:6:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.containsValue(int):403:407 -> d
+    2:6:boolean contains(int):879 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():869:869 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():869:869 -> iterator
     2:2:java.util.Iterator iterator():866 -> iterator
@@ -28337,9 +27794,9 @@
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):803:803 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1):803 -> <init>
     1:1:void clear():828:828 -> clear
-    1:1:boolean contains(int):816:816 -> e
-    2:11:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.containsKey(int):387:396 -> e
-    2:11:boolean contains(int):816 -> e
+    1:1:boolean contains(int):816:816 -> d
+    2:11:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.containsKey(int):387:396 -> d
+    2:11:boolean contains(int):816 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():806:806 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():806:806 -> iterator
     2:2:java.util.Iterator iterator():803 -> iterator
@@ -28349,7 +27806,7 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,int):472:473 -> <init>
-    1:1:int getIntKey():481:481 -> d
+    1:1:int getIntKey():481:481 -> c
     1:1:int getIntValue():486:486 -> e
     1:3:boolean equals(java.lang.Object):535:537 -> equals
     1:1:java.lang.Integer getKey():505:505 -> getKey
@@ -28433,12 +27890,12 @@
     136:136:java.lang.Object put(int,java.lang.Object):283 -> a
     137:138:int firstIntKey():1001:1002 -> a
     139:139:int firstIntKey():1001:1001 -> a
-    140:140:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int):1416:1416 -> a
+    140:140:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int):1411:1411 -> a
     141:141:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap subMap(int,int):1421:1421 -> a
     1:1:int compare(int,int):232:232 -> b
     2:3:int lastIntKey():1007:1008 -> b
     4:4:int lastIntKey():1007:1007 -> b
-    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int):1411:1411 -> b
+    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int):1416:1416 -> b
     1:1:boolean containsKey(int):980:980 -> c
     2:80:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ObjectEntrySet():1161:1239 -> c
     2:80:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ObjectEntrySet():41 -> c
@@ -28452,31 +27909,31 @@
     4:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$ValueIterator.next():1351:1351 -> containsValue
     4:4:boolean containsValue(java.lang.Object):693 -> containsValue
     5:5:boolean containsValue(java.lang.Object):694:694 -> containsValue
-    1:1:void allocatePaths():278:278 -> d
-    2:9:java.lang.Object remove(int):484:491 -> d
-    10:10:int compare(int,int):232:232 -> d
-    10:10:java.lang.Object remove(int):491 -> d
-    11:59:java.lang.Object remove(int):500:548 -> d
-    60:77:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry parent(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry):453:470 -> d
-    60:77:java.lang.Object remove(int):556 -> d
-    78:196:java.lang.Object remove(int):558:676 -> d
-    197:198:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry parent(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry):474:475 -> d
-    197:198:java.lang.Object remove(int):556 -> d
-    199:202:java.lang.Object remove(int):681:684 -> d
-    203:206:java.lang.Object remove(int):494:497 -> d
-    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry findKey(int):245:247 -> e
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry findKey(int):245:247 -> d
+    4:4:int compare(int,int):232:232 -> d
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry findKey(int):247 -> d
+    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry findKey(int):248:248 -> d
+    6:6:void allocatePaths():278:278 -> d
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry locateKey(int):262:264 -> e
     4:4:int compare(int,int):232:232 -> e
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry findKey(int):247 -> e
-    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry findKey(int):248:248 -> e
-    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry locateKey(int):262:264 -> f
-    4:4:int compare(int,int):232:232 -> f
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry locateKey(int):264 -> f
-    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry locateKey(int):266:266 -> f
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry locateKey(int):264 -> e
+    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry locateKey(int):266:266 -> e
     1:2:java.lang.Object get(int):995:996 -> get
     1:1:boolean isEmpty():990:990 -> isEmpty
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1334:1335 -> keySet
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1334:1335 -> keySet
     3:4:java.util.Set keySet():41 -> keySet
+    1:8:java.lang.Object remove(int):484:491 -> remove
+    9:9:int compare(int,int):232:232 -> remove
+    9:9:java.lang.Object remove(int):491 -> remove
+    10:58:java.lang.Object remove(int):500:548 -> remove
+    59:76:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry parent(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry):453:470 -> remove
+    59:76:java.lang.Object remove(int):556 -> remove
+    77:195:java.lang.Object remove(int):558:676 -> remove
+    196:197:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry parent(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry):474:475 -> remove
+    196:197:java.lang.Object remove(int):556 -> remove
+    198:201:java.lang.Object remove(int):681:684 -> remove
+    202:205:java.lang.Object remove(int):494:497 -> remove
     1:1:int size():985:985 -> size
     1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():1384:1401 -> values
     1:18:java.util.Collection values():41 -> values
@@ -28537,19 +27994,19 @@
     3:4:void pred(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry):829:830 -> b
     5:5:void decBalance():893:893 -> b
     1:2:void right(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry):862:863 -> c
-    3:3:void incBalance():888:888 -> c
     1:1:java.lang.Object clone():720:720 -> clone
     2:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry clone():933:939 -> clone
     9:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry clone():935:935 -> clone
     1:2:void succ(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry):840:841 -> d
+    3:3:void incBalance():888:888 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry left():767:767 -> e
     1:3:boolean equals(java.lang.Object):946:948 -> equals
-    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry next():902:904 -> f
-    1:1:boolean pred():786:786 -> g
-    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry prev():915:917 -> h
+    1:1:boolean pred():786:786 -> f
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry prev():915:917 -> g
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry right():777:777 -> h
     1:1:int hashCode():953:953 -> hashCode
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry right():777:777 -> i
-    1:1:boolean succ():795:795 -> j
+    1:1:boolean succ():795:795 -> i
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry next():902:904 -> next
     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.Int2ObjectAVLTreeMap$EntryIterator -> com.android.tools.r8.b.a.a.a.b.Q$a:
@@ -28569,7 +28026,7 @@
     1:1:void add(java.lang.Object):1252:1252 -> add
     2:2:void add(java.lang.Integer):1301:1301 -> add
     2:2:void add(java.lang.Object):1252 -> add
-    1:1:int previousInt():1267:1267 -> c
+    1:1:int previousInt():1267:1267 -> b
     1:1:java.lang.Integer next():1283:1283 -> next
     1:1:java.lang.Object next():1252 -> next
     1:1:int nextInt():1262:1262 -> nextInt
@@ -28598,11 +28055,11 @@
     boolean bottom -> d
     1:7:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap,int,boolean,int,boolean):1466:1472 -> <init>
     1:4:java.lang.Object put(int,java.lang.Object):1648:1651 -> a
-    5:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int):1692:1693 -> a
+    5:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int):1686:1687 -> a
     7:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap subMap(int,int):1698:1702 -> a
     12:14:int firstIntKey():1753:1755 -> a
     15:15:int firstIntKey():1754:1754 -> a
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int):1686:1687 -> b
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int):1692:1693 -> b
     3:5:int lastIntKey():1760:1762 -> b
     6:6:int lastIntKey():1761:1761 -> b
     1:81:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ObjectEntrySet():1497:1577 -> c
@@ -28620,15 +28077,15 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():1681:1681 -> comparator
     2:2:java.util.Comparator comparator():1435 -> comparator
     1:5:boolean containsValue(java.lang.Object):1629:1633 -> containsValue
-    1:4:java.lang.Object remove(int):1657:1660 -> d
-    5:17:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry firstEntry():1712:1724 -> d
-    1:1:boolean in(int):1492:1492 -> e
-    2:14:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry lastEntry():1735:1747 -> e
+    1:1:boolean in(int):1492:1492 -> d
+    2:14:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry firstEntry():1712:1724 -> d
+    1:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry lastEntry():1735:1747 -> e
     1:1:java.lang.Object get(int):1643:1643 -> get
     1:1:boolean isEmpty():1676:1676 -> isEmpty
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1592:1593 -> keySet
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1592:1593 -> keySet
     3:4:java.util.Set keySet():1435 -> keySet
+    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.ObjectCollection values():1598:1618 -> values
     1:21:java.util.Collection values():1435 -> values
@@ -28720,7 +28177,7 @@
     1:1:void add(java.lang.Object):1846:1846 -> add
     2:2:void add(java.lang.Integer):1896:1896 -> add
     2:2:void add(java.lang.Object):1846 -> add
-    1:1:int previousInt():1862:1862 -> c
+    1:1:int previousInt():1862:1862 -> b
     1:1:java.lang.Integer next():1878:1878 -> next
     1:1:java.lang.Object next():1846 -> next
     1:1:int nextInt():1857:1857 -> nextInt
@@ -28746,10 +28203,10 @@
     2:5:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap):1040:1043 -> <init>
     1:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry nextEntry():1068:1072 -> a
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry nextEntry():1068:1068 -> a
-    1:1:boolean hasPrevious():1060:1060 -> b
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry previousEntry():1080 -> b
-    2:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry previousEntry():1081:1084 -> b
-    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry previousEntry():1080:1080 -> b
+    1:1:boolean hasPrevious():1060:1060 -> c
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry previousEntry():1080 -> c
+    2:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry previousEntry():1081:1084 -> c
+    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry previousEntry():1080:1080 -> c
     1:1:void updateNext():1064:1064 -> d
     1:1:void updatePrevious():1076:1076 -> e
     1:1:boolean hasNext():1056:1056 -> hasNext
@@ -28785,12 +28242,12 @@
     7:7:java.lang.Object clone():37 -> clone
     1:2:boolean containsValue(java.lang.Object):270:271 -> containsValue
     1:1:java.lang.Object[] access$200(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap):37:37 -> d
-    2:9:java.lang.Object remove(int):308:315 -> d
-    1:3:int findKey(int):235:237 -> e
+    2:4:int findKey(int):235:237 -> d
     1:4:java.lang.Object get(int):244:247 -> get
     1:1:boolean isEmpty():277:277 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():321:321 -> keySet
     1:1:java.util.Set keySet():37 -> keySet
+    1:8:java.lang.Object remove(int):308:315 -> remove
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
@@ -28829,7 +28286,7 @@
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap -> com.android.tools.r8.b.a.a.a.b.ba:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ObjectEntrySet() -> c
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry -> com.android.tools.r8.b.a.a.a.b.Z:
-    int getIntKey() -> d
+    int getIntKey() -> c
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$FastEntrySet -> com.android.tools.r8.b.a.a.a.b.aa:
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMaps -> com.android.tools.r8.b.a.a.a.b.da:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMaps$EmptyMap EMPTY_MAP -> a
@@ -28875,19 +28332,18 @@
     11:11:java.lang.Object clone():49 -> clone
     1:5:boolean containsValue(java.lang.Object):360:364 -> containsValue
     1:5:java.lang.Object removeNullEntry():228:232 -> d
-    6:17:java.lang.Object remove(int):309:320 -> d
-    1:7:void rehash(int):907:913 -> e
-    8:8:int realSize():205:205 -> e
-    8:8:void rehash(int):914 -> e
-    9:21:void rehash(int):915:927 -> e
-    1:3:java.lang.Object removeEntry(int):219:221 -> f
-    4:10:void shiftKeys(int):289:295 -> f
-    4:10:java.lang.Object removeEntry(int):222 -> f
-    11:11:java.lang.Object removeEntry(int):223:223 -> f
-    12:17:void shiftKeys(int):298:303 -> f
-    12:17:java.lang.Object removeEntry(int):222 -> f
-    18:18:void shiftKeys(int):300:300 -> f
-    18:18:java.lang.Object removeEntry(int):222 -> f
+    6:12:void rehash(int):907:913 -> d
+    13:13:int realSize():205:205 -> d
+    13:13:void rehash(int):914 -> d
+    14:26:void rehash(int):915:927 -> d
+    1:3:java.lang.Object removeEntry(int):219:221 -> e
+    4:10:void shiftKeys(int):289:295 -> e
+    4:10:java.lang.Object removeEntry(int):222 -> e
+    11:11:java.lang.Object removeEntry(int):223:223 -> e
+    12:17:void shiftKeys(int):298:303 -> e
+    12:17:java.lang.Object removeEntry(int):222 -> e
+    18:18:void shiftKeys(int):300:300 -> e
+    18:18:java.lang.Object removeEntry(int):222 -> e
     1:11:java.lang.Object get(int):327:337 -> get
     1:1:int realSize():205:205 -> hashCode
     1:1:int hashCode():971 -> hashCode
@@ -28905,6 +28361,7 @@
     6:7:void putAll(java.util.Map):240 -> putAll
     8:20:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectMap.putAll(java.util.Map):70:82 -> putAll
     8:20:void putAll(java.util.Map):243 -> putAll
+    1:12:java.lang.Object remove(int):309:320 -> remove
     1:1:int size():386:386 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():794:815 -> values
     1:22:java.util.Collection values():49 -> values
@@ -28955,9 +28412,9 @@
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):737:737 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1):737 -> <init>
     1:1:void clear():762:762 -> clear
-    1:1:boolean contains(int):750:750 -> e
-    2:11:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap.containsKey(int):344:353 -> e
-    2:11:boolean contains(int):750 -> e
+    1:1:boolean contains(int):750:750 -> d
+    2:11:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap.containsKey(int):344:353 -> d
+    2:11:boolean contains(int):750 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     2:2:java.util.Iterator iterator():737 -> iterator
@@ -28967,7 +28424,7 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap,int):430:431 -> <init>
-    1:1:int getIntKey():439:439 -> d
+    1:1:int getIntKey():439:439 -> c
     1:3:boolean equals(java.lang.Object):469:471 -> equals
     1:1:java.lang.Integer getKey():463:463 -> getKey
     1:1:java.lang.Object getKey():425 -> getKey
@@ -29015,10 +28472,10 @@
     1:1:java.lang.Object next():788:788 -> next
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap -> com.android.tools.r8.b.a.a.a.b.ga:
     int firstIntKey() -> a
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int) -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap subMap(int,int) -> a
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int) -> a
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int) -> b
     int lastIntKey() -> b
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int) -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ObjectEntrySet() -> c
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps -> com.android.tools.r8.b.a.a.a.b.ia:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps$EmptySortedMap EMPTY_MAP -> a
@@ -29026,9 +28483,9 @@
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps$EmptySortedMap -> com.android.tools.r8.b.a.a.a.b.ha:
     1:1:void <init>():60:60 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap subMap(int,int):95:95 -> a
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int):107:107 -> a
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int):101:101 -> a
     3:3:int firstIntKey():112:112 -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int):101:101 -> b
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int):107:107 -> b
     2:2:int lastIntKey():117:117 -> b
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ObjectEntrySet():71:71 -> c
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ObjectEntrySet():57 -> c
@@ -29093,12 +28550,12 @@
     136:136:java.lang.Object put(int,java.lang.Object):283 -> a
     137:138:int firstIntKey():1001:1002 -> a
     139:139:int firstIntKey():1001:1001 -> a
-    140:140:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1416:1416 -> a
+    140:140:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1411:1411 -> a
     141:141:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1421:1421 -> a
     1:1:int compare(int,int):232:232 -> b
     2:3:int lastIntKey():1007:1008 -> b
     4:4:int lastIntKey():1007:1007 -> b
-    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1411:1411 -> b
+    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1416:1416 -> b
     1:1:void allocatePaths():278:278 -> c
     2:2:boolean containsKey(int):980:980 -> c
     1:6:void clear():701:706 -> clear
@@ -29199,19 +28656,19 @@
     3:4:void pred(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry):829:830 -> b
     5:5:void decBalance():893:893 -> b
     1:2:void right(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry):862:863 -> c
-    3:3:void incBalance():888:888 -> c
     1:1:java.lang.Object clone():720:720 -> clone
     2:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry clone():933:939 -> clone
     9:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry clone():935:935 -> clone
     1:2:void succ(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry):840:841 -> d
+    3:3:void incBalance():888:888 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry left():767:767 -> e
     1:3:boolean equals(java.lang.Object):946:948 -> equals
-    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry next():902:904 -> f
-    1:1:boolean pred():786:786 -> g
-    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry prev():915:917 -> h
+    1:1:boolean pred():786:786 -> f
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry prev():915:917 -> g
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry right():777:777 -> h
     1:1:int hashCode():953:953 -> hashCode
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry right():777:777 -> i
-    1:1:boolean succ():795:795 -> j
+    1:1:boolean succ():795:795 -> i
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry next():902:904 -> next
     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.b.a.a.a.b.oa$a:
@@ -29231,7 +28688,7 @@
     1:1:void add(java.lang.Object):1252:1252 -> add
     2:2:void add(java.lang.Integer):1301:1301 -> add
     2:2:void add(java.lang.Object):1252 -> add
-    1:1:int previousInt():1267:1267 -> c
+    1:1:int previousInt():1267:1267 -> b
     1:1:java.lang.Integer next():1283:1283 -> next
     1:1:java.lang.Object next():1252 -> next
     1:1:int nextInt():1262:1262 -> nextInt
@@ -29260,11 +28717,11 @@
     boolean bottom -> d
     1:7:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap,int,boolean,int,boolean):1466:1472 -> <init>
     1:4:java.lang.Object put(int,java.lang.Object):1648:1651 -> a
-    5:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1692:1693 -> a
+    5:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1686:1687 -> a
     7:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1698:1702 -> a
     12:14:int firstIntKey():1753:1755 -> a
     15:15:int firstIntKey():1754:1754 -> a
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1686:1687 -> b
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1692:1693 -> b
     3:5:int lastIntKey():1760:1762 -> b
     6:6:int lastIntKey():1761:1761 -> b
     1:1:boolean containsKey(int):1624:1624 -> c
@@ -29385,7 +28842,7 @@
     1:1:void add(java.lang.Object):1846:1846 -> add
     2:2:void add(java.lang.Integer):1896:1896 -> add
     2:2:void add(java.lang.Object):1846 -> add
-    1:1:int previousInt():1862:1862 -> c
+    1:1:int previousInt():1862:1862 -> b
     1:1:java.lang.Integer next():1878:1878 -> next
     1:1:java.lang.Object next():1846 -> next
     1:1:int nextInt():1857:1857 -> nextInt
@@ -29411,10 +28868,10 @@
     2:5:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1040:1043 -> <init>
     1:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry nextEntry():1068:1072 -> a
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry nextEntry():1068:1068 -> a
-    1:1:boolean hasPrevious():1060:1060 -> b
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry previousEntry():1080 -> b
-    2:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry previousEntry():1081:1084 -> b
-    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry previousEntry():1080:1080 -> b
+    1:1:boolean hasPrevious():1060:1060 -> c
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry previousEntry():1080 -> c
+    2:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry previousEntry():1081:1084 -> c
+    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry previousEntry():1080:1080 -> c
     1:1:void updateNext():1064:1064 -> d
     1:1:void updatePrevious():1076:1076 -> e
     1:1:boolean hasNext():1056:1056 -> hasNext
@@ -29493,15 +28950,15 @@
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunctions$EmptyFunction -> com.android.tools.r8.b.a.a.a.b.va:
     1:1:void <init>():41:41 -> <init>
     boolean containsKey(int) -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap -> com.android.tools.r8.b.a.a.a.b.wa:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap -> com.android.tools.r8.b.a.a.a.b.ya:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet() -> d
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry -> com.android.tools.r8.b.a.a.a.b.wa$a:
-    int getIntKey() -> d
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry -> com.android.tools.r8.b.a.a.a.b.wa:
+    int getIntKey() -> c
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet -> com.android.tools.r8.b.a.a.a.b.xa:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.b.a.a.a.b.za:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.b.a.a.a.b.Aa:
     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.b.a.a.a.b.ya:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap -> com.android.tools.r8.b.a.a.a.b.za:
     1:1:void <init>():46:46 -> <init>
     1:1:java.lang.Object clone():95:95 -> clone
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():62:62 -> d
@@ -29516,7 +28973,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 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.b.a.a.a.b.Ba:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap -> com.android.tools.r8.b.a.a.a.b.Ca:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet entries -> j
     java.lang.Object[] value -> c
     float f -> i
@@ -29607,7 +29064,7 @@
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():794:815 -> values
     23:44:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():794:815 -> values
     23:44:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1 -> com.android.tools.r8.b.a.a.a.b.Aa:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1 -> com.android.tools.r8.b.a.a.a.b.Ba:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):794:794 -> <init>
     1:1:void clear():812:812 -> clear
@@ -29618,7 +29075,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():797:797 -> iterator
     2:2:java.util.Iterator iterator():794 -> iterator
     1:1:int size():802:802 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.b.a.a.a.b.Ba$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.b.a.a.a.b.Ca$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):600:600 -> <init>
@@ -29643,30 +29100,30 @@
     28:28:void remove():611:611 -> remove
     29:29:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapIterator.remove():576:576 -> remove
     29:29:void remove():610 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.b.a.a.a.b.Ba$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.b.a.a.a.b.Ca$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):721:722 -> <init>
     1:1:java.lang.Integer 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.b.a.a.a.b.Ba$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.b.a.a.a.b.Ca$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):737:737 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1):737 -> <init>
     1:1:void clear():762:762 -> clear
-    1:1:boolean contains(int):750:750 -> e
-    2:11:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.containsKey(int):344:353 -> e
-    2:11:boolean contains(int):750 -> e
+    1:1:boolean contains(int):750:750 -> d
+    2:11:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.containsKey(int):344:353 -> d
+    2:11:boolean contains(int):750 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     2:2:java.util.Iterator iterator():737 -> iterator
     1:3:boolean remove(int):755:757 -> remove
     1:1:int size():745:745 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.b.a.a.a.b.Ba$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.b.a.a.a.b.Ca$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,int):430:431 -> <init>
-    1:1:int getIntKey():439:439 -> d
+    1:1:int getIntKey():439:439 -> c
     1:3:boolean equals(java.lang.Object):469:471 -> equals
     1:1:java.lang.Integer getKey():463:463 -> getKey
     1:1:java.lang.Object getKey():425 -> getKey
@@ -29674,7 +29131,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.b.a.a.a.b.Ba$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.b.a.a.a.b.Ca$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):625:625 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1):625:625 -> <init>
@@ -29685,7 +29142,7 @@
     2:2:java.util.Iterator iterator():625 -> 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.b.a.a.a.b.Ba$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.b.a.a.a.b.Ca$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> e
     int last -> b
     int pos -> a
@@ -29708,18 +29165,18 @@
     25:25:void remove():580 -> remove
     26:27:void remove():583:584 -> remove
     28:28:void remove():576:576 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.b.a.a.a.b.Ba$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.b.a.a.a.b.Ca$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):782:783 -> <init>
     1:1:java.lang.Object next():788:788 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap -> com.android.tools.r8.b.a.a.a.b.Ca:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap -> com.android.tools.r8.b.a.a.a.b.Da:
     int firstIntKey() -> a
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int) -> 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 tailMap(int) -> a
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int) -> b
     int lastIntKey() -> b
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int) -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet() -> d
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> com.android.tools.r8.b.a.a.a.b.Ea:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> com.android.tools.r8.b.a.a.a.b.Fa:
     int size -> b
     1:3:void <init>(int):81:83 -> <init>
     4:4:void <init>(int):82:82 -> <init>
@@ -29727,27 +29184,27 @@
     6:6:void <init>(int[]):135:135 -> <init>
     7:9:void <init>(int[],int,int):149:151 -> <init>
     7:9:void <init>(int[]):135 -> <init>
-    1:2:boolean add(int):266:267 -> a
-    3:4:void getElements(int,int[],int,int):393:394 -> a
-    5:7:void removeElements(int,int):407:409 -> a
-    8:9:int[] toArray(int[]):436:437 -> a
-    10:18:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):443:451 -> a
-    19:25:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):458:464 -> a
+    1:4:int removeInt(int):294:297 -> a
+    5:5:int removeInt(int):294:294 -> a
+    6:7:void getElements(int,int[],int,int):393:394 -> a
+    8:10:void removeElements(int,int):407:409 -> a
+    11:12:int[] toArray(int[]):436:437 -> a
+    13:21:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):443:451 -> a
+    22:28:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):458:464 -> a
     1:5:void add(int,int):256:260 -> add
-    1:4:int removeInt(int):294:297 -> b
-    5:5:int removeInt(int):294:294 -> b
+    6:7:boolean add(int):266:267 -> add
     1:1:void clear():321:321 -> clear
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList clone():549:551 -> clone
     1:3:java.lang.Object clone():48 -> clone
-    1:2:int indexOf(int):280:281 -> f
-    1:2:boolean rem(int):304 -> f
-    3:3:boolean rem(int):306:306 -> f
+    1:2:int indexOf(int):280:281 -> e
+    1:2:boolean rem(int):304 -> e
+    3:3:boolean rem(int):306:306 -> e
     1:2:int getInt(int):274:275 -> getInt
     3:3:int getInt(int):274:274 -> getInt
-    1:2:int indexOf(int):280:281 -> i
+    1:2:int indexOf(int):280:281 -> h
+    1:2:int lastIndexOf(int):287:288 -> i
     1:1:boolean isEmpty():339:339 -> isEmpty
-    1:2:int lastIndexOf(int):287:288 -> j
-    1:1:void grow(int):250:250 -> k
+    1:1:void grow(int):250:250 -> j
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):493:494 -> listIterator
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):493:494 -> listIterator
     3:4:java.util.ListIterator listIterator(int):48 -> listIterator
@@ -29755,23 +29212,23 @@
     1:3:int set(int,int):313:315 -> set
     4:4:int set(int,int):313:313 -> set
     1:1:int size():327:327 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList$1 -> com.android.tools.r8.b.a.a.a.b.Da:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList$1 -> com.android.tools.r8.b.a.a.a.b.Ea:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList this$0 -> d
     int last -> b
     int val$index -> c
     int pos -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList,int):494:495 -> <init>
     1:2:void add(int):524:525 -> a
-    1:2:void set(int):529:530 -> b
-    3:5:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.set(int,int):313:315 -> b
-    3:5:void set(int):530 -> b
-    6:6:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.set(int,int):313:313 -> b
-    6:6:void set(int):530 -> b
-    7:7:void set(int):529:529 -> b
-    1:1:boolean hasPrevious():502:502 -> c
-    1:1:int previousInt():511 -> c
-    2:2:int previousInt():512:512 -> c
-    3:3:int previousInt():511:511 -> c
+    1:1:boolean hasPrevious():502:502 -> b
+    1:1:int previousInt():511 -> b
+    2:2:int previousInt():512:512 -> b
+    3:3:int previousInt():511:511 -> b
+    4:5:void set(int):529:530 -> b
+    6:8:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.set(int,int):313:315 -> b
+    6:8:void set(int):530 -> b
+    9:9:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.set(int,int):313:313 -> b
+    9:9:void set(int):530 -> b
+    10:10:void set(int):529:529 -> b
     1:1:boolean hasNext():498:498 -> hasNext
     1:1:boolean hasPrevious():502:502 -> hasPrevious
     1:1:int nextIndex():516:516 -> nextIndex
@@ -29782,13 +29239,13 @@
     1:1:int previousIndex():520:520 -> previousIndex
     1:9:void remove():534:542 -> remove
     10:10:void remove():534:534 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools.r8.b.a.a.a.b.Ga:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools.r8.b.a.a.a.b.Ha:
     int size -> b
     1:2:void <init>():55:56 -> <init>
     3:4:void <init>(int):65:66 -> <init>
     5:8:void <init>(int[],int):104:107 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet):29:29 -> a
-    2:10:boolean add(int):164:172 -> a
+    1:9:boolean add(int):164:172 -> add
     1:1:int access$010(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet):29:29 -> b
     1:1:int[] access$100(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet):29:29 -> c
     1:1:void clear():178:178 -> clear
@@ -29796,15 +29253,15 @@
     1:5:java.lang.Object clone():29 -> clone
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet clone():203:203 -> clone
     6:6:java.lang.Object clone():29 -> clone
-    1:1:boolean contains(int):143:143 -> e
-    1:2:int findKey(int):111:112 -> g
+    1:1:boolean contains(int):143:143 -> d
+    1:2:int findKey(int):111:112 -> f
     1:1:boolean isEmpty():183:183 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():119:119 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():119:119 -> iterator
     2:2:java.util.Iterator iterator():29 -> iterator
     1:6:boolean remove(int):153:158 -> remove
     1:1:int size():148:148 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet$1 -> com.android.tools.r8.b.a.a.a.b.Fa:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet$1 -> com.android.tools.r8.b.a.a.a.b.Ga:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet this$0 -> b
     int next -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet):119:120 -> <init>
@@ -29814,7 +29271,7 @@
     2:2:int nextInt():130:130 -> nextInt
     3: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.b.a.a.a.b.Ha:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.b.a.a.a.b.Ia:
     int[] EMPTY_ARRAY -> a
     1:1:void <clinit>():100:100 -> <clinit>
     1:1:void ensureOffsetLength(int[],int,int):389:389 -> a
@@ -29825,36 +29282,35 @@
     4:4:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureOffsetLength(int,int,int):71:71 -> a
     4:4:void ensureOffsetLength(int[],int,int):389 -> a
     1:4:int[] grow(int[],int,int):204:207 -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator -> com.android.tools.r8.b.a.a.a.b.Ia:
-    int previousInt() -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.b.a.a.a.b.Ja:
-    boolean add(int) -> a
-    int[] toIntArray() -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> com.android.tools.r8.b.a.a.a.b.Ma:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator -> com.android.tools.r8.b.a.a.a.b.Ja:
+    int previousInt() -> b
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.b.a.a.a.b.Ka:
+    int[] toIntArray() -> d
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> com.android.tools.r8.b.a.a.a.b.Na:
     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.b.a.a.a.b.Ka:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$EmptyCollection -> com.android.tools.r8.b.a.a.a.b.La:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
-    boolean contains(int) -> e
+    boolean contains(int) -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():38:38 -> iterator
     2:2:java.util.Iterator iterator():38:38 -> iterator
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():55:55 -> iterator
     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.b.a.a.a.b.La:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$UnmodifiableCollection -> com.android.tools.r8.b.a.a.a.b.Ma:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):369:371 -> <init>
     4:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):370:370 -> <init>
-    1:1:boolean add(int):376:376 -> a
     1:1:boolean add(java.lang.Object):365:365 -> add
     2:2:boolean add(java.lang.Integer):453:453 -> add
     2:2:boolean add(java.lang.Object):365 -> add
+    3:3:boolean add(int):376:376 -> add
     1:1:boolean addAll(java.util.Collection):437:437 -> addAll
-    1:1:int[] toIntArray():470:470 -> c
     1:1:void clear():417:417 -> clear
     1:1:boolean contains(java.lang.Object):459:459 -> contains
     1:1:boolean containsAll(java.util.Collection):432:432 -> containsAll
+    1:1:int[] toIntArray():470:470 -> d
     1:1:boolean equals(java.lang.Object):523:523 -> equals
     1:1:int hashCode():517:517 -> hashCode
     1:1:boolean isEmpty():391:391 -> isEmpty
@@ -29868,11 +29324,11 @@
     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.b.a.a.a.b.Na:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator -> com.android.tools.r8.b.a.a.a.b.Oa:
     int compare(int,int) -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterable -> com.android.tools.r8.b.a.a.a.b.Oa:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.b.a.a.a.b.Pa:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.b.a.a.a.b.Ta:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterable -> com.android.tools.r8.b.a.a.a.b.Pa:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.b.a.a.a.b.Qa:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.b.a.a.a.b.Ua:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator EMPTY_ITERATOR -> a
     1:1:void <clinit>():103:103 -> <clinit>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator singleton(int):159:159 -> a
@@ -29884,19 +29340,19 @@
     8:8:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):288:288 -> a
     8:8:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
     9:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator):830:830 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.b.a.a.a.b.Qa:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.b.a.a.a.b.Ra:
     1:1:void <init>():42:42 -> <init>
-    1:1:int previousInt():62:62 -> c
+    1:1:int previousInt():62:62 -> b
     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$SingletonIterator -> com.android.tools.r8.b.a.a.a.b.Ra:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$SingletonIterator -> com.android.tools.r8.b.a.a.a.b.Sa:
     int curr -> b
     int element -> a
     1:2:void <init>(int):110:111 -> <init>
-    1:1:boolean hasPrevious():121:121 -> c
-    1:1:int previousInt():133 -> c
-    2:3:int previousInt():134:135 -> c
-    4:4:int previousInt():133:133 -> c
+    1:1:boolean hasPrevious():121:121 -> b
+    1:1:int previousInt():133 -> b
+    2:3:int previousInt():134:135 -> b
+    4:4:int previousInt():133:133 -> b
     1:1:boolean hasNext():116:116 -> hasNext
     1:1:boolean hasPrevious():121:121 -> hasPrevious
     1:1:int nextIndex():140:140 -> nextIndex
@@ -29905,29 +29361,29 @@
     2:3:int nextInt():127:128 -> nextInt
     4:4:int nextInt():126:126 -> nextInt
     1:1:int previousIndex():145:145 -> previousIndex
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.b.a.a.a.b.Sa:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.b.a.a.a.b.Ta:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator i -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator):807:808 -> <init>
     1:1:boolean hasNext():813:813 -> hasNext
     1:1:int nextInt():818:818 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.b.a.a.a.b.Ua:
-    boolean add(int) -> a
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.b.a.a.a.b.Va:
     boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList) -> a
     void getElements(int,int[],int,int) -> a
     void removeElements(int,int) -> a
-    int removeInt(int) -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.b.a.a.a.b.Va:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists -> com.android.tools.r8.b.a.a.a.b.Xa:
+    int removeInt(int) -> a
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.b.a.a.a.b.Wa:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists -> com.android.tools.r8.b.a.a.a.b._a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList EMPTY_LIST -> a
     1:1:void <clinit>():323:323 -> <clinit>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList singleton(int):478:478 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$1 -> com.android.tools.r8.b.a.a.a.b.Wa:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList -> com.android.tools.r8.b.a.a.a.b.Xa$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$1 -> com.android.tools.r8.b.a.a.a.b.Xa:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList -> com.android.tools.r8.b.a.a.a.b.Ya:
     1:1:void <init>():65:65 -> <init>
-    1:1:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):110:110 -> a
-    2:2:boolean add(java.lang.Integer):156:156 -> a
-    3:4:void getElements(int,int[],int,int):263:264 -> a
-    5:5:void removeElements(int,int):269:269 -> a
+    1:1:int removeInt(int):80:80 -> a
+    2:2:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):110:110 -> a
+    3:3:boolean add(java.lang.Integer):156:156 -> a
+    4:5:void getElements(int,int[],int,int):263:264 -> a
+    6:6:void removeElements(int,int):269:269 -> a
     1:1:void add(int,java.lang.Object):62:62 -> add
     2:2:void add(int,java.lang.Integer):132:132 -> add
     2:2:void add(int,java.lang.Object):62 -> add
@@ -29936,13 +29392,12 @@
     4:4:boolean add(java.lang.Object):62 -> add
     5:5:void add(int,int):85:85 -> add
     1:1:boolean addAll(int,java.util.Collection):105:105 -> addAll
-    1:1:int removeInt(int):80:80 -> b
     1:1:java.lang.Object clone():295:295 -> clone
     1:1:int compareTo(java.lang.Object):62:62 -> compareTo
     2:2:int compareTo(java.util.List):290:290 -> compareTo
     2:2:int compareTo(java.lang.Object):62 -> compareTo
+    1:1:boolean rem(int):75:75 -> e
     1:1:boolean equals(java.lang.Object):306:306 -> equals
-    1:1:boolean rem(int):75:75 -> f
     1:1:java.lang.Integer get(int):144:144 -> get
     1:1:java.lang.Object get(int):62 -> get
     1:1:int getInt(int):70:70 -> getInt
@@ -29966,20 +29421,20 @@
     3:3:int set(int,int):90:90 -> set
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):246:246 -> subList
     1:1:java.util.List subList(int,int):62 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$Singleton -> com.android.tools.r8.b.a.a.a.b.Ya:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$Singleton -> com.android.tools.r8.b.a.a.a.b.Za:
     int element -> a
     1:2:void <init>(int):336:337 -> <init>
     1:2:void <init>(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$1):332 -> <init>
-    1:1:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):419:419 -> a
-    2:2:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):424:424 -> a
-    3:3:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):429:429 -> a
+    1:1:int removeInt(int):353:353 -> a
+    2:2:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):419:419 -> a
+    3:3:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):424:424 -> a
+    4:4:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):429:429 -> a
     1:1:boolean addAll(int,java.util.Collection):399:399 -> addAll
     2:2:boolean addAll(java.util.Collection):404:404 -> addAll
-    1:1:int removeInt(int):353:353 -> b
-    1:2:int[] toIntArray():364:365 -> c
     1:1:void clear():459:459 -> clear
-    1:1:boolean contains(int):358:358 -> e
-    1:1:boolean rem(int):348:348 -> f
+    1:1:boolean contains(int):358:358 -> d
+    2:3:int[] toIntArray():364:365 -> d
+    1:1:boolean rem(int):348:348 -> e
     1:2:int getInt(int):342:343 -> getInt
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():376:376 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():332 -> iterator
@@ -30002,7 +29457,7 @@
     6:9:java.util.List subList(int,int):332 -> subList
     10:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):392:392 -> subList
     10:10:java.util.List subList(int,int):332 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.b.a.a.a.b.ab:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.b.a.a.a.b.cb:
     float f -> g
     int size -> f
     int n -> d
@@ -30023,7 +29478,7 @@
     7:7:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):280:280 -> a
     8:9:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):173:174 -> a
     8:9:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):283 -> a
-    10:23:boolean add(int):302:315 -> a
+    1:14:boolean add(int):302:315 -> add
     1:1:boolean addAll(java.util.Collection):289:289 -> addAll
     2:3:void ensureCapacity(int):266:267 -> addAll
     2:3:boolean addAll(java.util.Collection):289 -> addAll
@@ -30035,19 +29490,19 @@
     1:6:java.lang.Object clone():40 -> clone
     7:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet clone():674:674 -> clone
     7:7:java.lang.Object clone():40 -> clone
-    1:9:boolean contains(int):382:390 -> e
-    1:5:void rehash(int):639:643 -> g
-    6:6:int realSize():262:262 -> g
-    6:6:void rehash(int):644 -> g
-    7:16:void rehash(int):645:654 -> g
-    1:1:boolean removeEntry(int):348:348 -> h
-    2:7:void shiftKeys(int):331:336 -> h
-    2:7:boolean removeEntry(int):349 -> h
-    8:8:boolean removeEntry(int):350:350 -> h
-    9:13:void shiftKeys(int):339:343 -> h
-    9:13:boolean removeEntry(int):349 -> h
-    14:14:void shiftKeys(int):341:341 -> h
-    14:14:boolean removeEntry(int):349 -> h
+    1:9:boolean contains(int):382:390 -> d
+    1:5:void rehash(int):639:643 -> f
+    6:6:int realSize():262:262 -> f
+    6:6:void rehash(int):644 -> f
+    7:16:void rehash(int):645:654 -> f
+    1:1:boolean removeEntry(int):348:348 -> g
+    2:7:void shiftKeys(int):331:336 -> g
+    2:7:boolean removeEntry(int):349 -> g
+    8:8:boolean removeEntry(int):350:350 -> g
+    9:13:void shiftKeys(int):339:343 -> g
+    9:13:boolean removeEntry(int):349 -> g
+    14:14:void shiftKeys(int):341:341 -> g
+    14:14:boolean removeEntry(int):349 -> g
     1:1:int realSize():262:262 -> hashCode
     1:1:int hashCode():694 -> hashCode
     2:4:int hashCode():695:697 -> hashCode
@@ -30060,8 +29515,8 @@
     2:5:boolean remove(int):365 -> remove
     6:13:boolean remove(int):369:376 -> remove
     1:1:int size():412:412 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$1 -> com.android.tools.r8.b.a.a.a.b.Za:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.b.a.a.a.b._a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$1 -> com.android.tools.r8.b.a.a.a.b.ab:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.b.a.a.a.b.bb:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet this$0 -> f
     int last -> b
@@ -30084,26 +29539,26 @@
     23:23:void remove():532 -> remove
     24:25:void remove():535:536 -> remove
     26:26:void remove():528:528 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet -> com.android.tools.r8.b.a.a.a.b.bb:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.b.a.a.a.b.db:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet -> com.android.tools.r8.b.a.a.a.b.db:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.b.a.a.a.b.fb:
     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.b.a.a.a.b.cb:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet -> com.android.tools.r8.b.a.a.a.b.eb:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():52:52 -> clone
+    1:1:boolean rem(int):64:64 -> e
     1:1:boolean equals(java.lang.Object):58:58 -> equals
-    1:1:boolean rem(int):64:64 -> f
     1:1:boolean remove(int):47:47 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.b.a.a.a.b.eb:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.b.a.a.a.b.gb:
     int lastInt() -> a
     int firstInt() -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet subSet(int,int) -> b
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int) -> c
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int) -> d
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.b.a.a.a.b.gb:
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int) -> b
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int) -> c
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.b.a.a.a.b.ib:
     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.b.a.a.a.b.fb:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet -> com.android.tools.r8.b.a.a.a.b.hb:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():155:155 -> clone
     1:1:java.lang.Integer first():139:139 -> first
@@ -30119,7 +29574,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):39:39 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(java.lang.Integer):128:128 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):39 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntStack -> com.android.tools.r8.b.a.a.a.b.hb:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntStack -> com.android.tools.r8.b.a.a.a.b.jb:
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction -> com.android.tools.r8.b.a.a.a.c.a:
     boolean defRetValue -> a
     1:1:void <init>():44:44 -> <init>
@@ -30143,10 +29598,10 @@
     8:8:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry.getBooleanValue():145:145 -> putAll
     8:8:void putAll(java.util.Map):88 -> putAll
     9:15:void putAll(java.util.Map):88:94 -> putAll
-    1:14:java.lang.String toString():328:341 -> toString
-    15:15:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry.getBooleanValue():145:145 -> toString
-    15:15:java.lang.String toString():341 -> toString
-    16:19:java.lang.String toString():341:344 -> toString
+    1:13:java.lang.String toString():328:340 -> toString
+    14:14:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry.getBooleanValue():145:145 -> toString
+    14:14:java.lang.String toString():341 -> toString
+    15:18:java.lang.String toString():341:344 -> toString
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry -> com.android.tools.r8.b.a.a.a.c.b:
     java.lang.Object key -> a
     boolean value -> b
@@ -30295,9 +29750,9 @@
     int defRetValue -> a
     1:1:void <init>():44:44 -> <init>
     int put(java.lang.Object,int) -> a
+    int removeInt(java.lang.Object) -> a
     1:1:void defaultReturnValue(int):55:55 -> a
     2:4:java.lang.Integer put(java.lang.Object,java.lang.Integer):123:125 -> a
-    int removeInt(java.lang.Object) -> b
     1:1:java.lang.Integer get(java.lang.Object):108:108 -> get
     1:1:java.lang.Object get(java.lang.Object):41 -> get
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):41:41 -> put
@@ -30352,11 +29807,11 @@
     6:6:boolean addAll(java.util.Collection):138:138 -> addAll
     1:1:void clear():404:404 -> clear
     1:1:boolean contains(java.lang.Object):275:275 -> contains
-    1:1:void ensureIndex(int):48:48 -> e
-    2:2:void ensureIndex(int):47:47 -> e
+    1:1:void ensureIndex(int):48:48 -> d
+    2:2:void ensureIndex(int):47:47 -> d
+    1:1:void ensureRestrictedIndex(int):63:63 -> e
+    2:2:void ensureRestrictedIndex(int):62:62 -> e
     1:7:boolean equals(java.lang.Object):427:433 -> equals
-    1:1:void ensureRestrictedIndex(int):63:63 -> f
-    2:2:void ensureRestrictedIndex(int):62:62 -> f
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():181:181 -> hashCode
     1:1:int hashCode():415 -> hashCode
     2:5:int hashCode():416:419 -> hashCode
@@ -30387,7 +29842,7 @@
     1:3:boolean add(java.lang.Object):503:505 -> add
     4:7:void add(int,java.lang.Object):511:514 -> add
     1:3:boolean addAll(int,java.util.Collection):519:521 -> addAll
-    1:3:boolean assertRange():495:497 -> d
+    1:3:boolean assertRange():495:497 -> c
     1:2:java.lang.Object get(int):526:527 -> get
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList.iterator():181:181 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():479 -> iterator
@@ -30504,9 +29959,8 @@
     1:6:void remove():153:158 -> remove
     7:7:void remove():153:153 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanFunction -> com.android.tools.r8.b.a.a.a.c.E:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap -> com.android.tools.r8.b.a.a.a.c.F:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry -> com.android.tools.r8.b.a.a.a.c.F$a:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$FastEntrySet -> com.android.tools.r8.b.a.a.a.c.G:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap -> com.android.tools.r8.b.a.a.a.c.G:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$FastEntrySet -> com.android.tools.r8.b.a.a.a.c.F:
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.b.a.a.a.c.H:
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.b.a.a.a.c.J:
     float f -> l
@@ -30587,7 +30041,7 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1596:1596 -> <init>
     1:1:void clear():1614:1614 -> clear
-    1:1:boolean contains(int):1609:1609 -> e
+    1:1:boolean contains(int):1609:1609 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     2:2:java.util.Iterator iterator():1596 -> iterator
@@ -30701,10 +30155,10 @@
     1:1:int nextEntry():1127 -> a
     2:6:int nextEntry():1128:1132 -> a
     7:7:int nextEntry():1127:1127 -> a
-    1:1:boolean hasPrevious():1095:1095 -> b
-    1:1:int previousEntry():1136 -> b
-    2:6:int previousEntry():1137:1141 -> b
-    7:7:int previousEntry():1136:1136 -> b
+    1:1:boolean hasPrevious():1095:1095 -> c
+    1:1:int previousEntry():1136 -> c
+    2:6:int previousEntry():1137:1141 -> c
+    7:7:int previousEntry():1136:1136 -> c
     1:14:void ensureIndexKnown():1099:1112 -> d
     1:1:boolean hasNext():1091:1091 -> hasNext
     1:1:boolean hasPrevious():1095:1095 -> hasPrevious
@@ -30719,7 +30173,7 @@
     1:1:void add(java.lang.Object):1544:1544 -> add
     2:2:void add(java.lang.Integer):1565:1565 -> add
     2:2:void add(java.lang.Object):1544 -> add
-    1:1:int previousInt():1547:1547 -> c
+    1:1:int previousInt():1547:1547 -> b
     1:1:java.lang.Integer next():1590:1590 -> next
     1:1:java.lang.Object next():1544 -> next
     1:1:int nextInt():1584:1584 -> nextInt
@@ -31240,13 +30694,12 @@
     1:3:void <init>():70:72 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):37:37 -> a
     2:2:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap,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
+    3:22:int put(java.lang.Object,int):283:302 -> a
+    23:30:int removeInt(java.lang.Object):308:315 -> a
     1:1:int access$010(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):37:37 -> b
-    2:3:boolean containsValue(int):270:271 -> b
-    4:11:int removeInt(java.lang.Object):308:315 -> b
+    2:4:int findKey(java.lang.Object):235:237 -> b
+    5:6:boolean containsValue(int):270:271 -> b
     1:1:java.lang.Object[] access$100(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):37:37 -> c
-    2:4:int findKey(java.lang.Object):235:237 -> c
     1:4:void clear():257:260 -> clear
     1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap clone():344:349 -> clone
     1:6:java.lang.Object clone():37 -> clone
@@ -31256,6 +30709,7 @@
     1:1:int[] access$200(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):37:37 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet reference2IntEntrySet():231:231 -> e
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():37 -> e
+    1:4:int getInt(java.lang.Object):244:247 -> getInt
     1:1:boolean isEmpty():277:277 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():321:321 -> keySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():321:321 -> keySet
@@ -31290,7 +30744,6 @@
     1:6:void remove():153:158 -> remove
     7:7:void remove():153:153 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.b.a.a.a.c.Ba:
-    int getInt(java.lang.Object) -> a
     int put(java.lang.Object,int) -> a
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.b.a.a.a.c.Da:
     float f -> l
@@ -31317,10 +30770,9 @@
     9:33:int insert(java.lang.Object,int):307:331 -> a
     9:33:int put(java.lang.Object,int):338 -> a
     34:36:int put(java.lang.Object,int):339:341 -> a
-    37:47:int getInt(java.lang.Object):721:731 -> a
-    48:71:void fixPointers(int,int):937:960 -> a
-    1:12:int removeInt(java.lang.Object):431:442 -> b
-    13:17:boolean containsValue(int):754:758 -> b
+    37:48:int removeInt(java.lang.Object):431:442 -> a
+    49:72:void fixPointers(int,int):937:960 -> a
+    1:5:boolean containsValue(int):754:758 -> b
     1:25:void fixPointers(int):899:923 -> c
     1:5:void clear():771:775 -> clear
     1:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap clone():1768:1778 -> clone
@@ -31342,6 +30794,7 @@
     21:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet reference2IntEntrySet():1422:1423 -> e
     1:2:java.lang.Object firstKey():970:971 -> firstKey
     3:3:java.lang.Object firstKey():970:970 -> firstKey
+    1:11:int getInt(java.lang.Object):721:731 -> getInt
     1:1:int realSize():262:262 -> hashCode
     1:1:int hashCode():1795 -> hashCode
     2:10:int hashCode():1796:1804 -> hashCode
@@ -31374,9 +30827,9 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1596:1596 -> <init>
     1:1:void clear():1614:1614 -> clear
-    1:1:boolean contains(int):1609:1609 -> e
-    2:6:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.containsValue(int):754:758 -> e
-    2:6:boolean contains(int):1609 -> e
+    1:1:boolean contains(int):1609:1609 -> d
+    2:6:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.containsValue(int):754:758 -> d
+    2:6:boolean contains(int):1609 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     2:2:java.util.Iterator iterator():1596 -> iterator
@@ -31490,10 +30943,10 @@
     1:1:int nextEntry():1127 -> a
     2:6:int nextEntry():1128:1132 -> a
     7:7:int nextEntry():1127:1127 -> a
-    1:1:boolean hasPrevious():1095:1095 -> b
-    1:1:int previousEntry():1136 -> b
-    2:6:int previousEntry():1137:1141 -> b
-    7:7:int previousEntry():1136:1136 -> b
+    1:1:boolean hasPrevious():1095:1095 -> c
+    1:1:int previousEntry():1136 -> c
+    2:6:int previousEntry():1137:1141 -> c
+    7:7:int previousEntry():1136:1136 -> c
     1:14:void ensureIndexKnown():1099:1112 -> d
     1:1:boolean hasNext():1091:1091 -> hasNext
     1:1:boolean hasPrevious():1095:1095 -> hasPrevious
@@ -31508,7 +30961,7 @@
     1:1:void add(java.lang.Object):1544:1544 -> add
     2:2:void add(java.lang.Integer):1565:1565 -> add
     2:2:void add(java.lang.Object):1544 -> add
-    1:1:int previousInt():1547:1547 -> c
+    1:1:int previousInt():1547:1547 -> b
     1:1:java.lang.Integer next():1590:1590 -> next
     1:1:java.lang.Object next():1544 -> next
     1:1:int nextInt():1584:1584 -> nextInt
@@ -31517,12 +30970,12 @@
     1:1:void set(java.lang.Object):1544:1544 -> set
     2:2:void 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.b.a.a.a.c.Ea:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap -> com.android.tools.r8.b.a.a.a.c.Ga:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet() -> e
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.b.a.a.a.c.Ea$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.b.a.a.a.c.Ea:
     int getIntValue() -> e
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.b.a.a.a.c.Fa:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.b.a.a.a.c.Ha:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.b.a.a.a.c.Ia:
     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 -> b
@@ -31545,9 +30998,8 @@
     8:23:int insert(java.lang.Object,int):248:263 -> a
     8:23:int put(java.lang.Object,int):270 -> a
     24:26:int put(java.lang.Object,int):271:273 -> a
-    27:37:int getInt(java.lang.Object):371:381 -> a
-    1:12:int removeInt(java.lang.Object):353:364 -> b
-    13:17:boolean containsValue(int):404:408 -> b
+    27:38:int removeInt(java.lang.Object):353:364 -> a
+    1:5:boolean containsValue(int):404:408 -> b
     1:7:void rehash(int):961:967 -> c
     8:8:int realSize():205:205 -> c
     8:8:void rehash(int):968 -> c
@@ -31568,6 +31020,7 @@
     16:16:int removeEntry(int):221 -> d
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet reference2IntEntrySet():761:762 -> e
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():49 -> e
+    1:11:int getInt(java.lang.Object):371:381 -> getInt
     1:1:int realSize():205:205 -> hashCode
     1:1:int hashCode():1025 -> hashCode
     2:10:int hashCode():1026:1034 -> hashCode
@@ -31587,18 +31040,18 @@
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection 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.b.a.a.a.c.Ga:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.b.a.a.a.c.Ha:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):848:848 -> <init>
     1:1:void clear():866:866 -> clear
-    1:1:boolean contains(int):861:861 -> e
-    2:6:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.containsValue(int):404:408 -> e
-    2:6:boolean contains(int):861 -> e
+    1:1:boolean contains(int):861:861 -> d
+    2:6:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.containsValue(int):404:408 -> d
+    2:6:boolean contains(int):861 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():851:851 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():851:851 -> iterator
     2:2:java.util.Iterator iterator():848 -> iterator
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.b.a.a.a.c.Ha$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.b.a.a.a.c.Ia$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):654:654 -> <init>
@@ -31623,11 +31076,11 @@
     27:27:void remove():665:665 -> remove
     28:28:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator.remove():630:630 -> remove
     28:28:void remove():664 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.b.a.a.a.c.Ha$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.b.a.a.a.c.Ia$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.b.a.a.a.c.Ha$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.b.a.a.a.c.Ia$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):785:785 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1):785 -> <init>
@@ -31640,7 +31093,7 @@
     2:2:java.util.Iterator iterator():785 -> 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.b.a.a.a.c.Ha$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.b.a.a.a.c.Ia$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,int):473:474 -> <init>
@@ -31659,7 +31112,7 @@
     5:5:java.lang.Integer 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.b.a.a.a.c.Ha$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.b.a.a.a.c.Ia$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):679:679 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1):679 -> <init>
@@ -31670,7 +31123,7 @@
     2:2:java.util.Iterator iterator():679 -> 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.b.a.a.a.c.Ha$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.b.a.a.a.c.Ia$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> e
     int last -> b
@@ -31693,15 +31146,15 @@
     24:24:void remove():634 -> remove
     25:26:void remove():637:638 -> remove
     27:27:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.b.a.a.a.c.Ha$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.b.a.a.a.c.Ia$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):830:831 -> <init>
     1:1:java.lang.Integer 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 -> com.android.tools.r8.b.a.a.a.c.Ja:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.b.a.a.a.c.Ia:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.b.a.a.a.c.La:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap -> com.android.tools.r8.b.a.a.a.c.Ka:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.b.a.a.a.c.Ja:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.b.a.a.a.c.Ma:
     java.lang.Object[] a -> b
     boolean wrapped -> a
     int size -> c
@@ -31713,7 +31166,7 @@
     1:2:void clear():365:366 -> clear
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList clone():553:555 -> clone
     1:3:java.lang.Object clone():57 -> clone
-    1:7:void grow(int):285:291 -> g
+    1:7:void grow(int):285:291 -> f
     1:2:java.lang.Object get(int):317:318 -> get
     3:3:java.lang.Object get(int):317:317 -> get
     1:2:int indexOf(java.lang.Object):323:324 -> indexOf
@@ -31731,7 +31184,7 @@
     1:3:java.lang.Object set(int,java.lang.Object):357:359 -> set
     4:4:java.lang.Object set(int,java.lang.Object):357:357 -> set
     1:1:int size():372:372 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.b.a.a.a.c.Ka:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.b.a.a.a.c.La:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -31754,7 +31207,7 @@
     10:10:void remove():538:538 -> remove
     1:2:void set(java.lang.Object):533:534 -> set
     3:3:void set(java.lang.Object):533:533 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.b.a.a.a.c.Na:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.b.a.a.a.c.Oa:
     int size -> b
     1:4:void <init>(java.lang.Object[],int):104:107 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet):29:29 -> a
@@ -31774,7 +31227,7 @@
     2:2:java.util.Iterator iterator():29 -> iterator
     1:7:boolean remove(java.lang.Object):154:160 -> remove
     1:1:int size():149:149 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.b.a.a.a.c.Ma:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.b.a.a.a.c.Na:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet this$0 -> b
     int next -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet):119:120 -> <init>
@@ -31784,8 +31237,8 @@
     2:2:java.lang.Object next():130:130 -> next
     3: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.b.a.a.a.c.Oa:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.b.a.a.a.c.Pa:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.b.a.a.a.c.Pa:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.b.a.a.a.c.Qa:
     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
@@ -31795,7 +31248,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.b.a.a.a.c.Qa:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$UnmodifiableCollection -> com.android.tools.r8.b.a.a.a.c.Ra:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):276:278 -> <init>
     4:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):277:277 -> <init>
@@ -31817,9 +31270,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.b.a.a.a.c.Ra:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList -> com.android.tools.r8.b.a.a.a.c.Sa:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.b.a.a.a.c.Ta:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.b.a.a.a.c.Ua:
     java.lang.Object[] key -> a
     float f -> g
     int size -> f
@@ -31845,18 +31298,18 @@
     7:7:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet clone():642:642 -> clone
     7:7:java.lang.Object clone():40 -> clone
     1:9:boolean contains(java.lang.Object):350:358 -> contains
-    1:5:void rehash(int):607:611 -> e
-    6:6:int realSize():239:239 -> e
-    6:6:void rehash(int):612 -> e
-    7:16:void rehash(int):613:622 -> e
-    1:1:boolean removeEntry(int):314:314 -> f
-    2:7:void shiftKeys(int):297:302 -> f
-    2:7:boolean removeEntry(int):315 -> f
-    8:8:boolean removeEntry(int):316:316 -> f
-    9:13:void shiftKeys(int):305:309 -> f
-    9:13:boolean removeEntry(int):315 -> f
-    14:14:void shiftKeys(int):307:307 -> f
-    14:14:boolean removeEntry(int):315 -> f
+    1:5:void rehash(int):607:611 -> d
+    6:6:int realSize():239:239 -> d
+    6:6:void rehash(int):612 -> d
+    7:16:void rehash(int):613:622 -> d
+    1:1:boolean removeEntry(int):314:314 -> e
+    2:7:void shiftKeys(int):297:302 -> e
+    2:7:boolean removeEntry(int):315 -> e
+    8:8:boolean removeEntry(int):316:316 -> e
+    9:13:void shiftKeys(int):305:309 -> e
+    9:13:boolean removeEntry(int):315 -> e
+    14:14:void shiftKeys(int):307:307 -> e
+    14:14:boolean removeEntry(int):315 -> e
     1:1:int realSize():239:239 -> hashCode
     1:1:int hashCode():662 -> hashCode
     2:4:int hashCode():663:665 -> hashCode
@@ -31869,8 +31322,8 @@
     2:5:boolean remove(java.lang.Object):332 -> remove
     6:13:boolean remove(java.lang.Object):336:343 -> remove
     1:1:int size():380:380 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1 -> com.android.tools.r8.b.a.a.a.c.Sa:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.b.a.a.a.c.Ta$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1 -> com.android.tools.r8.b.a.a.a.c.Ta:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.b.a.a.a.c.Ua$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> e
     int last -> b
@@ -31893,16 +31346,16 @@
     23:23:void remove():500 -> remove
     24:25:void remove():503:504 -> remove
     26:26:void remove():496:496 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.b.a.a.a.c.Ua:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.b.a.a.a.c.Wa:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.b.a.a.a.c.Va:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.b.a.a.a.c.Xa:
     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.b.a.a.a.c.Va:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet -> com.android.tools.r8.b.a.a.a.c.Wa:
     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.ReferenceSortedSet -> com.android.tools.r8.b.a.a.a.c.Xa:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet -> com.android.tools.r8.b.a.a.a.c.Ya:
 com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.c.b:
     com.android.tools.r8.graph.DexApplication application -> a
     java.lang.String proguardSeedsData -> i
@@ -31916,96 +31369,94 @@
     com.android.tools.r8.dex.Marker marker -> f
     1:1:void <clinit>():62:62 -> <clinit>
     1:11:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.Marker,java.lang.String,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,java.lang.String,com.android.tools.r8.naming.ProguardMapSupplier):90:100 -> <init>
-    1:1:com.android.tools.r8.ByteDataView com.android.tools.r8.ByteDataView.of(byte[]):17:17 -> a
-    1:1:void lambda$writeClass$0(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):194 -> a
-    2:2:void lambda$writeClass$0(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):194:194 -> a
-    3:7:void write(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):104:108 -> a
-    8:29:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):114:135 -> a
-    30:30:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):128:128 -> a
-    31:34:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):140:143 -> a
-    35:40:int getClassFileVersion(com.android.tools.r8.graph.DexProgramClass):198:203 -> a
-    35:40:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):144 -> a
-    41:55:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):145:159 -> a
-    56:67:com.android.tools.r8.com.google.common.collect.ImmutableMap getAnnotationDefaults(com.android.tools.r8.graph.DexAnnotationSet):236:247 -> a
-    56:67:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):159 -> a
-    68:100:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):161:193 -> a
-    101:105:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):30:34 -> a
-    101:105:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):193 -> a
-    106:113:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):209:216 -> a
-    114:126:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotationSet):220:232 -> a
-    127:130:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):273:276 -> a
-    131:134:java.lang.Object getStaticValue(com.android.tools.r8.graph.DexEncodedField):266:269 -> a
-    131:134:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):277 -> a
-    135:137:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):278:280 -> a
-    138:142:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):288:292 -> a
-    143:152:java.lang.String[] getExceptions(com.android.tools.r8.graph.DexAnnotationSet):251:260 -> a
-    143:152:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):292 -> a
-    153:164:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):293:304 -> a
-    165:170:void writeCode(com.android.tools.r8.graph.Code,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.utils.InternalOptions,int):402:407 -> a
-    165:170:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):304 -> a
-    171:171:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):306:306 -> a
-    172:172:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):315:315 -> a
-    173:176:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):314:317 -> a
-    177:184:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):316:323 -> a
-    185:185:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):321:321 -> a
-    186:186:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor lambda$writeParameterAnnotations$1(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,boolean):322:322 -> a
-    187:196:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):332:341 -> a
-    197:202:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):340:345 -> a
-    203:204:void writeAnnotation(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,com.android.tools.r8.graph.DexEncodedAnnotation):351:352 -> a
-    205:209:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):357:361 -> a
-    210:228:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):360:378 -> a
-    229:248:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):377:396 -> a
-    249:249:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):394:394 -> a
-    250:250:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):386:386 -> a
-    251:251:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):384:384 -> a
-    252:252:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):382:382 -> a
-    253:253:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):380:380 -> a
+    1:5:void write(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):104:108 -> a
+    6:27:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):114:135 -> a
+    28:28:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):128:128 -> a
+    29:32:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):140:143 -> a
+    33:38:int getClassFileVersion(com.android.tools.r8.graph.DexProgramClass):198:203 -> a
+    33:38:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):144 -> a
+    39:53:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):145:159 -> a
+    54:65:com.android.tools.r8.com.google.common.collect.ImmutableMap getAnnotationDefaults(com.android.tools.r8.graph.DexAnnotationSet):236:247 -> a
+    54:65:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):159 -> a
+    66:98:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):161:193 -> a
+    99:103:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):30:34 -> a
+    99:103:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):193 -> a
+    104:104:void lambda$writeClass$0(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):194:194 -> a
+    105:112:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):209:216 -> a
+    113:125:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotationSet):220:232 -> a
+    126:129:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):273:276 -> a
+    130:133:java.lang.Object getStaticValue(com.android.tools.r8.graph.DexEncodedField):266:269 -> a
+    130:133:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):277 -> a
+    134:136:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):278:280 -> a
+    137:141:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):288:292 -> a
+    142:151:java.lang.String[] getExceptions(com.android.tools.r8.graph.DexAnnotationSet):251:260 -> a
+    142:151:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):292 -> a
+    152:163:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):293:304 -> a
+    164:169:void writeCode(com.android.tools.r8.graph.Code,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.utils.InternalOptions,int):402:407 -> a
+    164:169:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):304 -> a
+    170:170:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):306:306 -> a
+    171:171:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):315:315 -> a
+    172:175:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):314:317 -> a
+    176:183:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):316:323 -> a
+    184:184:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):321:321 -> a
+    185:185:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor lambda$writeParameterAnnotations$1(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,boolean):322:322 -> a
+    186:195:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):332:341 -> a
+    196:201:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):340:345 -> a
+    202:203:void writeAnnotation(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,com.android.tools.r8.graph.DexEncodedAnnotation):351:352 -> a
+    204:208:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):357:361 -> a
+    209:227:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):360:378 -> a
+    228:247:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):377:396 -> a
+    248:248:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):394:394 -> a
+    249:249:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):386:386 -> a
+    250:250:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):384:384 -> a
+    251:251:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):382:382 -> a
+    252:252:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):380:380 -> a
 com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer -> com.android.tools.r8.c.a:
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visit(java.lang.String,boolean) -> a
 com.android.tools.r8.jar.InliningConstraintVisitor -> com.android.tools.r8.c.c:
-    com.android.tools.r8.ir.optimize.InliningConstraints inliningConstraints -> m
-    com.android.tools.r8.graph.DexType invocationContext -> o
-    com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget constraint -> p
-    com.android.tools.r8.graph.DexEncodedMethod method -> n
-    boolean $assertionsDisabled -> q
-    com.android.tools.r8.graph.AppView appView -> k
-    com.android.tools.r8.graph.GraphLense graphLense -> l
-    com.android.tools.r8.graph.JarApplicationReader application -> j
+    boolean $assertionsDisabled -> j
+    com.android.tools.r8.graph.GraphLense graphLense -> e
+    com.android.tools.r8.graph.JarApplicationReader application -> c
+    com.android.tools.r8.graph.AppView appView -> d
+    com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget constraint -> i
+    com.android.tools.r8.graph.DexType invocationContext -> h
+    com.android.tools.r8.ir.optimize.InliningConstraints inliningConstraints -> f
+    com.android.tools.r8.graph.DexEncodedMethod method -> g
     1:1:void <clinit>():37:37 -> <clinit>
     1:12:void <init>(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):54:65 -> <init>
     1:1:void updateConstraint(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):77:77 -> a
-    2:2:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):93:93 -> a
-    3:3:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.JarApplicationReader.getField(java.lang.String,java.lang.String,java.lang.String):84:84 -> a
-    3:3:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):93 -> a
-    4:4:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):112:112 -> a
-    5:5:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):100:100 -> a
-    6:18:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):96:108 -> a
-    19:19:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):104:104 -> a
-    20:26:void visitLdcInsn(java.lang.Object):118:124 -> a
-    27:95:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):130:198 -> a
-    96:134:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):138:176 -> a
-    135:184:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):152:201 -> a
-    185:185:boolean noNeedToUseGraphLense(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):205:205 -> a
-    186:186:void visitInsn(int):214:214 -> a
-    187:188:void visitMultiANewArrayInsn(java.lang.String,int):224:225 -> a
-    189:208:void visitTypeInsn(int,java.lang.String):230:249 -> a
-    209:209:void visitTypeInsn(int,java.lang.String):237:237 -> a
-    210:222:void visitTypeInsn(int,java.lang.String):233:245 -> a
-    1:1:void accept(com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode):88:88 -> d
-    1:1:void disallowStaticInterfaceMethodCalls():69:69 -> e
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget getConstraint():73:73 -> f
-    1:1:boolean isFinished():83:83 -> g
+    2:2:void accept(com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode):88:88 -> a
+    3:3:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):93:93 -> a
+    4:4:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.JarApplicationReader.getField(java.lang.String,java.lang.String,java.lang.String):84:84 -> a
+    4:4:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):93 -> a
+    5:5:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):112:112 -> a
+    6:6:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):100:100 -> a
+    7:19:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):96:108 -> a
+    20:20:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):104:104 -> a
+    21:27:void visitLdcInsn(java.lang.Object):118:124 -> a
+    28:96:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):130:198 -> a
+    97:135:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):138:176 -> a
+    136:185:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):152:201 -> a
+    186:186:boolean noNeedToUseGraphLense(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):205:205 -> a
+    187:187:void visitInsn(int):214:214 -> a
+    188:189:void visitMultiANewArrayInsn(java.lang.String,int):224:225 -> a
+    190:209:void visitTypeInsn(int,java.lang.String):230:249 -> a
+    210:210:void visitTypeInsn(int,java.lang.String):237:237 -> a
+    211:223:void visitTypeInsn(int,java.lang.String):233:245 -> a
+    1:1:void disallowStaticInterfaceMethodCalls():69:69 -> d
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget getConstraint():73:73 -> e
+    1:1:boolean isFinished():83:83 -> f
 com.android.tools.r8.jar.JarArgumentUseVisitor -> com.android.tools.r8.c.d:
-    int arguments -> l
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap slotToArgument -> k
-    com.android.tools.r8.graph.ArgumentUse registry -> j
+    com.android.tools.r8.graph.ArgumentUse registry -> c
+    int arguments -> e
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap slotToArgument -> d
     1:30:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ArgumentUse):28:57 -> <init>
     1:2:void visitVarInsn(int,int):69:70 -> d
 com.android.tools.r8.jar.JarRegisterEffectsVisitor -> com.android.tools.r8.c.e:
-    boolean $assertionsDisabled -> m
-    com.android.tools.r8.graph.UseRegistry registry -> k
-    com.android.tools.r8.graph.DexType clazz -> j
-    com.android.tools.r8.graph.JarApplicationReader application -> l
+    com.android.tools.r8.graph.JarApplicationReader application -> e
+    com.android.tools.r8.graph.UseRegistry registry -> d
+    boolean $assertionsDisabled -> f
+    com.android.tools.r8.graph.DexType clazz -> c
     1:1:void <clinit>():23:23 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.JarApplicationReader):30:33 -> <init>
     1:7:void visitTypeInsn(int,java.lang.String):38:44 -> a
@@ -32113,14 +31564,15 @@
     10:10:java.lang.String toString():90:90 -> toString
 com.android.tools.r8.jetbrains.kotlin._Assertions -> com.android.tools.r8.d.a.q:
     boolean ENABLED -> a
-    1:1:void <clinit>():14:14 -> <clinit>
+    1:4:void <clinit>():11:14 -> <clinit>
+    1:1:void <init>():11:11 -> <init>
 com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection -> com.android.tools.r8.d.a.a.b:
     1:1:void <init>():13:13 -> <init>
+    int getSize() -> c
     1:2:boolean contains(java.lang.Object):40:41 -> contains
     3:3:boolean contains(java.lang.Object):17:17 -> contains
     1:2:boolean containsAll(java.util.Collection):43:44 -> containsAll
     3:3:boolean containsAll(java.util.Collection):20:20 -> containsAll
-    int getSize() -> d
     1:1:int size():13:13 -> isEmpty
     1:1:boolean isEmpty():22 -> isEmpty
     1:1:int size():13:13 -> size
@@ -32129,8 +31581,8 @@
     1:1:java.lang.String toString():24:24 -> toString
 com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection$toString$1 -> com.android.tools.r8.d.a.a.a:
     com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection this$0 -> a
-    1:1:java.lang.CharSequence invoke(java.lang.Object):25:25 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):13 -> a
+    1:1:java.lang.CharSequence invoke(java.lang.Object):25:25 -> invoke
+    1:1:java.lang.Object invoke(java.lang.Object):13 -> invoke
 com.android.tools.r8.jetbrains.kotlin.collections.AbstractList -> com.android.tools.r8.d.a.a.d:
     com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion Companion -> a
     1:1:void <init>():22:22 -> <init>
@@ -32158,7 +31610,7 @@
     int index -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.collections.AbstractList):72:72 -> <init>
     1:1:void setIndex(int):74:74 -> a
-    1:1:int getIndex():74:74 -> d
+    1:1:int getIndex():74:74 -> c
     1:1:boolean hasNext():76:76 -> hasNext
     2:2:int com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection.size():13:13 -> hasNext
     2:2:boolean hasNext():76 -> hasNext
@@ -32190,7 +31642,7 @@
     6:6:int com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection.size():13:13 -> <init>
     6:6:void <init>(com.android.tools.r8.jetbrains.kotlin.collections.AbstractList,int,int):42 -> <init>
     7:8:void <init>(com.android.tools.r8.jetbrains.kotlin.collections.AbstractList,int,int):42:43 -> <init>
-    1:1:int getSize():52:52 -> d
+    1:1:int getSize():52:52 -> c
     1:3:java.lang.Object get(int):47:49 -> get
 com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt -> com.android.tools.r8.d.a.a.f:
     1:76:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.asList(int[]):0:75 -> a
@@ -32258,13 +31710,13 @@
 com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3 -> com.android.tools.r8.d.a.a.h:
     int[] receiver$0 -> b
     1:1:void <init>(int[]):75:75 -> <init>
+    1:1:int getSize():76:76 -> c
     1:1:boolean contains(java.lang.Object):75:75 -> contains
     2:2:boolean contains(int):78:78 -> contains
     2:2:boolean contains(java.lang.Object):75 -> contains
     3:408:boolean com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.contains(int[],int):0:405 -> contains
     3:408:boolean contains(int):78 -> contains
     3:408:boolean contains(java.lang.Object):75 -> contains
-    1:1:int getSize():76:76 -> d
     1:1:java.lang.Integer get(int):79:79 -> get
     1:1:java.lang.Object get(int):75 -> get
     1:1:int indexOf(java.lang.Object):75:75 -> indexOf
@@ -32367,7 +31819,6 @@
 com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> com.android.tools.r8.d.a.c.a.a:
     java.lang.Object invoke() -> a
 com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.d.a.c.a.b:
-    java.lang.Object invoke(java.lang.Object) -> a
 com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 -> com.android.tools.r8.d.a.c.a.c:
     java.lang.Object invoke(java.lang.Object,java.lang.Object) -> a
 com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference$NoReceiver -> com.android.tools.r8.d.a.c.b.a:
@@ -32427,14 +31878,13 @@
     4:4:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.compute():0 -> a
     5:5:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.compute():68:68 -> a
     5:5:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.compute():0 -> a
-    java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getName() -> b
-    com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getOwner() -> c
-    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getReflected():75:75 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty getReflected():25 -> d
-    2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty getReflected():25:25 -> d
-    3:3:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getReflected():77:77 -> d
-    3:3:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty getReflected():25 -> d
-    java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getSignature() -> e
+    com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getOwner() -> b
+    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getReflected():75:75 -> c
+    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty getReflected():25 -> c
+    2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty getReflected():25:25 -> c
+    3:3:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getReflected():77:77 -> c
+    3:3:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty getReflected():25 -> c
+    java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getSignature() -> d
     1:3:boolean equals(java.lang.Object):43:45 -> equals
     4:4:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getBoundReceiver():60:60 -> equals
     4:4:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getBoundReceiver():0 -> equals
@@ -32452,14 +31902,14 @@
     1:1:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.<init>():13:13 -> <init>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer,java.lang.String,java.lang.String):15 -> <init>
     2:4:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer,java.lang.String,java.lang.String):16:18 -> <init>
-    1:1:java.lang.Object get(java.lang.Object):38:38 -> a
-    1:1:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.invoke(java.lang.Object):28 -> a
-    1:1:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.invoke(java.lang.Object):0 -> a
-    1:1:java.lang.String getName():28:28 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer getOwner():23:23 -> c
-    1:1:java.lang.String getSignature():33:33 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():33:33 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():0 -> f
+    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer getOwner():23:23 -> b
+    1:1:java.lang.String getSignature():33:33 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():33:33 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():0 -> e
+    1:1:java.lang.String getName():28:28 -> getName
+    1:1:java.lang.Object get(java.lang.Object):38:38 -> invoke
+    1:1:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.invoke(java.lang.Object):28 -> invoke
+    1:1:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.invoke(java.lang.Object):0 -> invoke
 com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection -> com.android.tools.r8.d.a.c.b.i:
     com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory factory -> a
     1:9:void <clinit>():22:30 -> <clinit>
@@ -32480,10 +31930,10 @@
     int first -> a
     1:24:void <init>(int,int,int):70:93 -> <init>
     25:25:void <init>(int,int,int):77:77 -> <init>
-    1:1:int getFirst():83:83 -> d
-    1:1:int getLast():88:88 -> e
+    1:1:int getStep():93:93 -> c
     1:1:boolean equals(java.lang.Object):101:101 -> equals
-    1:1:int getStep():93:93 -> g
+    1:1:int getFirst():83:83 -> getFirst
+    1:1:int getLast():88:88 -> getLast
     1:1:int hashCode():105:105 -> hashCode
     1:1:boolean isEmpty():98:98 -> isEmpty
     1:1:com.android.tools.r8.jetbrains.kotlin.collections.IntIterator iterator():95:95 -> iterator
@@ -32523,8 +31973,8 @@
     com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion Companion -> f
     1:1:void <clinit>():58:58 -> <clinit>
     1:1:void <init>(int,int):39:39 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange access$getEMPTY$cp():39:39 -> e
     1:1:boolean equals(java.lang.Object):48:48 -> equals
-    1:1:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange access$getEMPTY$cp():39:39 -> h
     1:1:int hashCode():52:52 -> hashCode
     1:1:boolean isEmpty():45:45 -> isEmpty
     1:1:java.lang.String toString():54:54 -> toString
@@ -32579,11 +32029,11 @@
     5:5:int com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.coerceIn(int,int,int):918:918 -> <init>
     5:5:int com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.coerceIn(int,int,int):0 -> <init>
     5:5:void <init>(com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence):1047 -> <init>
-    1:15:void calcNext():1053:1067 -> d
-    16:17:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.until(int,int):587:588 -> d
-    16:17:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.until(int,int):0 -> d
-    16:17:void calcNext():1067 -> d
-    18:23:void calcNext():1067:1072 -> d
+    1:15:void calcNext():1053:1067 -> c
+    16:17:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.until(int,int):587:588 -> c
+    16:17:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.until(int,int):0 -> c
+    16:17:void calcNext():1067 -> c
+    18:23:void calcNext():1067:1072 -> c
     1:3:boolean hasNext():1089:1091 -> hasNext
     1:8:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange next():1077:1084 -> next
     1:8:java.lang.Object next():1045 -> next
@@ -32685,25 +32135,25 @@
     4644:4644:java.lang.Object invoke(java.lang.Object,java.lang.Object):0 -> a
 com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2 -> com.android.tools.r8.d.a.g.i:
     java.lang.CharSequence receiver$0 -> a
-    1:1185:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):0:1184 -> a
-    1:1185:java.lang.Object invoke(java.lang.Object):0 -> a
-    1186:1186:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):0:0 -> a
-    1186:1186:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1184 -> a
-    1186:1186:java.lang.Object invoke(java.lang.Object):0 -> a
-    1187:1187:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.ranges.IntRange.getStart():40:40 -> a
-    1187:1187:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):329 -> a
-    1187:1187:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1184 -> a
-    1187:1187:java.lang.Object invoke(java.lang.Object):0 -> a
-    1188:1188:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):329:329 -> a
-    1188:1188:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1184 -> a
-    1188:1188:java.lang.Object invoke(java.lang.Object):0 -> a
-    1189:1189:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.ranges.IntRange.getEndInclusive():41:41 -> a
-    1189:1189:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):329 -> a
-    1189:1189:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1184 -> a
-    1189:1189:java.lang.Object invoke(java.lang.Object):0 -> a
-    1190:1190:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):329:329 -> a
-    1190:1190:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1184 -> a
-    1190:1190:java.lang.Object invoke(java.lang.Object):0 -> a
+    1:1185:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):0:1184 -> invoke
+    1:1185:java.lang.Object invoke(java.lang.Object):0 -> invoke
+    1186:1186:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):0:0 -> invoke
+    1186:1186:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1184 -> invoke
+    1186:1186:java.lang.Object invoke(java.lang.Object):0 -> invoke
+    1187:1187:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.ranges.IntRange.getStart():40:40 -> invoke
+    1187:1187:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):329 -> invoke
+    1187:1187:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1184 -> invoke
+    1187:1187:java.lang.Object invoke(java.lang.Object):0 -> invoke
+    1188:1188:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):329:329 -> invoke
+    1188:1188:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1184 -> invoke
+    1188:1188:java.lang.Object invoke(java.lang.Object):0 -> invoke
+    1189:1189:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.ranges.IntRange.getEndInclusive():41:41 -> invoke
+    1189:1189:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):329 -> invoke
+    1189:1189:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1184 -> invoke
+    1189:1189:java.lang.Object invoke(java.lang.Object):0 -> invoke
+    1190:1190:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):329:329 -> invoke
+    1190:1190:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1184 -> invoke
+    1190:1190:java.lang.Object invoke(java.lang.Object):0 -> invoke
 com.android.tools.r8.jetbrains.kotlin.text.StringsKt___StringsJvmKt -> com.android.tools.r8.d.a.g.j:
 com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.d.b.a.c:
     int bitWidth -> b
@@ -32716,10 +32166,12 @@
     1:1:boolean invoke(int):56:56 -> a
 com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Property -> com.android.tools.r8.d.b.a.a:
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_VAR -> a
-    1:79:void <clinit>():316:394 -> <clinit>
+    1:84:void <clinit>():311:394 -> <clinit>
+    1:1:void <init>():311:311 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Type -> com.android.tools.r8.d.b.a.b:
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_NULLABLE -> a
-    1:7:void <clinit>():428:434 -> <clinit>
+    1:12:void <clinit>():423:434 -> <clinit>
+    1:1:void <init>():423:423 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.d.b.a.d:
     1:1:void <init>(java.lang.String,java.lang.Throwable):8:8 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor -> com.android.tools.r8.d.b.a.e:
@@ -32963,14 +32415,14 @@
     1:1:int access$4302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,int):1875:1875 -> a
     2:2:java.util.List access$4400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation):1875:1875 -> a
     3:3:java.util.List access$4402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,java.util.List):1875:1875 -> a
-    4:9:boolean isInitialized():4041:4046 -> a
-    10:10:int getArgumentCount():4019:4019 -> a
-    10:10:boolean isInitialized():4049 -> a
-    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument getArgument(int):4025:4025 -> a
-    11:11:boolean isInitialized():4050 -> a
-    12:17:boolean isInitialized():4050:4055 -> a
     1:1:int access$4502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,int):1875:1875 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$4600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation):1875:1875 -> b
+    3:8:boolean isInitialized():4041:4046 -> b
+    9:9:int getArgumentCount():4019:4019 -> b
+    9:9:boolean isInitialized():4049 -> b
+    10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument getArgument(int):4025:4025 -> b
+    10:10:boolean isInitialized():4050 -> b
+    11:16:boolean isInitialized():4050:4055 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder newBuilder():4150:4150 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation):4153 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation):4153:4153 -> c
@@ -33027,11 +32479,11 @@
     1:1:int access$3702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument,int):1996:1996 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value access$3802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value):1996:1996 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$4000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument):1996:1996 -> a
-    4:13:boolean isInitialized():3654:3663 -> a
-    14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value getValue():3645:3645 -> a
-    14:14:boolean isInitialized():3666 -> a
-    15:19:boolean isInitialized():3666:3670 -> a
     1:1:int access$3902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument,int):1996:1996 -> b
+    2:11:boolean isInitialized():3654:3663 -> b
+    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value getValue():3645:3645 -> b
+    12:12:boolean isInitialized():3666 -> b
+    13:17:boolean isInitialized():3666:3670 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder newBuilderForType():3766:3766 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():1996 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument):3768:3768 -> e
@@ -33039,11 +32491,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():1996 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument getDefaultInstance():2009:2009 -> f
     1:1:int getNameId():3630:3630 -> g
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value getValue():3645:3645 -> h
-    1:1:boolean hasNameId():3624:3624 -> i
-    1:1:boolean hasValue():3639:3639 -> j
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder newBuilder():3765:3765 -> k
-    1:2:void initFields():3649:3650 -> l
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value getValue():3645:3645 -> getValue
+    1:1:boolean hasNameId():3624:3624 -> h
+    1:1:boolean hasValue():3639:3639 -> i
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder newBuilder():3765:3765 -> j
+    1:2:void initFields():3649:3650 -> k
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1 -> com.android.tools.r8.d.b.a.b.a.c:
     1:1:void <init>():2080:2080 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2085:2085 -> a
@@ -33158,17 +32610,17 @@
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation access$3002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation):2224:2224 -> a
     7:7:java.util.List access$3100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value):2224:2224 -> a
     8:8:java.util.List access$3102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,java.util.List):2224:2224 -> a
-    9:13:boolean isInitialized():2743:2747 -> a
-    14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation getAnnotation():2668:2668 -> a
-    14:14:boolean isInitialized():2748 -> a
-    15:16:boolean isInitialized():2748:2749 -> a
-    17:17:int getArrayElementCount():2690:2690 -> a
-    17:17:boolean isInitialized():2753 -> a
-    18:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value getArrayElement(int):2696:2696 -> a
-    18:18:boolean isInitialized():2754 -> a
-    19:24:boolean isInitialized():2754:2759 -> a
     1:1:int access$2802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,int):2224:2224 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$3400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value):2224:2224 -> b
+    3:7:boolean isInitialized():2743:2747 -> b
+    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation getAnnotation():2668:2668 -> b
+    8:8:boolean isInitialized():2748 -> b
+    9:10:boolean isInitialized():2748:2749 -> b
+    11:11:int getArrayElementCount():2690:2690 -> b
+    11:11:boolean isInitialized():2753 -> b
+    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value getArrayElement(int):2696:2696 -> b
+    12:12:boolean isInitialized():2754 -> b
+    13:18:boolean isInitialized():2754:2759 -> b
     1:1:int access$2902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,int):2224:2224 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder newBuilder():2910:2910 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value):2913 -> c
@@ -33181,25 +32633,25 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder toBuilder():2915:2915 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation getAnnotation():2668:2668 -> f
     1:1:int getClassId():2638:2638 -> g
+    1:1:int getFlags():2726:2726 -> getFlags
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value getDefaultInstance():2237:2237 -> h
     1:1:double getDoubleValue():2600:2600 -> i
     1:1:int getEnumValueId():2653:2653 -> j
-    1:1:int getFlags():2726:2726 -> k
-    1:1:float getFloatValue():2585:2585 -> l
-    1:1:long getIntValue():2570:2570 -> m
-    1:1:int getStringValue():2615:2615 -> n
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type getType():2555:2555 -> o
-    1:1:boolean hasAnnotation():2662:2662 -> p
-    1:1:boolean hasClassId():2628:2628 -> q
-    1:1:boolean hasDoubleValue():2594:2594 -> r
-    1:1:boolean hasEnumValueId():2647:2647 -> s
-    1:1:boolean hasFlags():2716:2716 -> t
-    1:1:boolean hasFloatValue():2579:2579 -> u
-    1:1:boolean hasIntValue():2564:2564 -> v
-    1:1:boolean hasStringValue():2609:2609 -> w
-    1:1:boolean hasType():2543:2543 -> x
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder newBuilder():2910:2910 -> y
-    1:10:void initFields():2730:2739 -> z
+    1:1:float getFloatValue():2585:2585 -> k
+    1:1:long getIntValue():2570:2570 -> l
+    1:1:int getStringValue():2615:2615 -> m
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type getType():2555:2555 -> n
+    1:1:boolean hasAnnotation():2662:2662 -> o
+    1:1:boolean hasClassId():2628:2628 -> p
+    1:1:boolean hasDoubleValue():2594:2594 -> q
+    1:1:boolean hasEnumValueId():2647:2647 -> r
+    1:1:boolean hasFlags():2716:2716 -> s
+    1:1:boolean hasFloatValue():2579:2579 -> t
+    1:1:boolean hasIntValue():2564:2564 -> u
+    1:1:boolean hasStringValue():2609:2609 -> v
+    1:1:boolean hasType():2543:2543 -> w
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder newBuilder():2910:2910 -> x
+    1:10:void initFields():2730:2739 -> y
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1 -> com.android.tools.r8.d.b.a.b.a.e:
     1:1:void <init>():2361:2361 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2366:2366 -> a
@@ -33283,19 +32735,19 @@
     50:50:void <clinit>():2378:2378 -> <clinit>
     1:2:void <init>(java.lang.String,int,int,int):2523:2524 -> <init>
     1:1:int getNumber():2488:2488 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2504:2504 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2503:2503 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2502:2502 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2501:2501 -> c
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2500:2500 -> c
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2499:2499 -> c
-    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2498:2498 -> c
-    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2497:2497 -> c
-    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2496:2496 -> c
-    10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2495:2495 -> c
-    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2494:2494 -> c
-    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2493:2493 -> c
-    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2492:2492 -> c
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2504:2504 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2503:2503 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2502:2502 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2501:2501 -> b
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2500:2500 -> b
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2499:2499 -> b
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2498:2498 -> b
+    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2497:2497 -> b
+    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2496:2496 -> b
+    10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2495:2495 -> b
+    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2494:2494 -> b
+    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2493:2493 -> b
+    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2492:2492 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$ValueOrBuilder -> com.android.tools.r8.d.b.a.b.a.i:
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$ArgumentOrBuilder -> com.android.tools.r8.d.b.a.b.a.k:
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.d.b.a.b.a.l:
@@ -33377,60 +32829,59 @@
     2873:3058:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8372:8557 -> <init>
     3059:3104:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8555:8600 -> <init>
     3105:3144:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8561:8600 -> <init>
-    1:1:boolean hasFqName():8773:8773 -> A
-    1:1:boolean hasTypeTable():9117:9117 -> B
-    1:1:boolean hasVersionRequirementTable():9166:9166 -> C
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder newBuilder():9500:9500 -> D
-    1:16:void initFields():9176:9191 -> E
+    1:1:boolean hasTypeTable():9117:9117 -> A
+    1:1:boolean hasVersionRequirementTable():9166:9166 -> B
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder newBuilder():9500:9500 -> C
+    1:16:void initFields():9176:9191 -> D
     1:1:java.util.List access$10000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8323:8323 -> a
     2:2:java.util.List access$10002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8323:8323 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable access$10102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):8323:8323 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable access$10302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):8323:8323 -> a
     5:5:int access$10402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,int):8323:8323 -> a
-    6:11:boolean isInitialized():9195:9200 -> a
-    12:12:int getTypeParameterCount():8816:8816 -> a
-    12:12:boolean isInitialized():9203 -> a
-    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getTypeParameter(int):8822:8822 -> a
-    13:13:boolean isInitialized():9204 -> a
-    14:15:boolean isInitialized():9204:9205 -> a
-    16:16:int getSupertypeCount():8851:8851 -> a
-    16:16:boolean isInitialized():9209 -> a
-    17:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getSupertype(int):8857:8857 -> a
-    17:17:boolean isInitialized():9210 -> a
-    18:19:boolean isInitialized():9210:9211 -> a
-    20:20:int getConstructorCount():8932:8932 -> a
-    20:20:boolean isInitialized():9215 -> a
-    21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor getConstructor(int):8938:8938 -> a
-    21:21:boolean isInitialized():9216 -> a
-    22:23:boolean isInitialized():9216:9217 -> a
-    24:24:int getFunctionCount():8967:8967 -> a
-    24:24:boolean isInitialized():9221 -> a
-    25:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function getFunction(int):8973:8973 -> a
-    25:25:boolean isInitialized():9222 -> a
-    26:27:boolean isInitialized():9222:9223 -> a
-    28:28:int getPropertyCount():9002:9002 -> a
-    28:28:boolean isInitialized():9227 -> a
-    29:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property getProperty(int):9008:9008 -> a
-    29:29:boolean isInitialized():9228 -> a
-    30:31:boolean isInitialized():9228:9229 -> a
-    32:32:int getTypeAliasCount():9037:9037 -> a
-    32:32:boolean isInitialized():9233 -> a
-    33:33:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias getTypeAlias(int):9043:9043 -> a
-    33:33:boolean isInitialized():9234 -> a
-    34:35:boolean isInitialized():9234:9235 -> a
-    36:36:int getEnumEntryCount():9072:9072 -> a
-    36:36:boolean isInitialized():9239 -> a
-    37:37:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry getEnumEntry(int):9078:9078 -> a
-    37:37:boolean isInitialized():9240 -> a
-    38:43:boolean isInitialized():9240:9245 -> a
-    44:44:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():9123:9123 -> a
-    44:44:boolean isInitialized():9246 -> a
-    45:54:boolean isInitialized():9246:9255 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class getDefaultInstanceForType():8341:8341 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():8323 -> a
     1:1:java.util.List access$10200(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8323:8323 -> b
     2:2:java.util.List access$10202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8323:8323 -> b
     3:3:int access$8802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,int):8323:8323 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class getDefaultInstanceForType():8341:8341 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():8323 -> b
+    4:9:boolean isInitialized():9195:9200 -> b
+    10:10:int getTypeParameterCount():8816:8816 -> b
+    10:10:boolean isInitialized():9203 -> b
+    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getTypeParameter(int):8822:8822 -> b
+    11:11:boolean isInitialized():9204 -> b
+    12:13:boolean isInitialized():9204:9205 -> b
+    14:14:int getSupertypeCount():8851:8851 -> b
+    14:14:boolean isInitialized():9209 -> b
+    15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getSupertype(int):8857:8857 -> b
+    15:15:boolean isInitialized():9210 -> b
+    16:17:boolean isInitialized():9210:9211 -> b
+    18:18:int getConstructorCount():8932:8932 -> b
+    18:18:boolean isInitialized():9215 -> b
+    19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor getConstructor(int):8938:8938 -> b
+    19:19:boolean isInitialized():9216 -> b
+    20:21:boolean isInitialized():9216:9217 -> b
+    22:22:int getFunctionCount():8967:8967 -> b
+    22:22:boolean isInitialized():9221 -> b
+    23:23:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function getFunction(int):8973:8973 -> b
+    23:23:boolean isInitialized():9222 -> b
+    24:25:boolean isInitialized():9222:9223 -> b
+    26:26:int getPropertyCount():9002:9002 -> b
+    26:26:boolean isInitialized():9227 -> b
+    27:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property getProperty(int):9008:9008 -> b
+    27:27:boolean isInitialized():9228 -> b
+    28:29:boolean isInitialized():9228:9229 -> b
+    30:30:int getTypeAliasCount():9037:9037 -> b
+    30:30:boolean isInitialized():9233 -> b
+    31:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias getTypeAlias(int):9043:9043 -> b
+    31:31:boolean isInitialized():9234 -> b
+    32:33:boolean isInitialized():9234:9235 -> b
+    34:34:int getEnumEntryCount():9072:9072 -> b
+    34:34:boolean isInitialized():9239 -> b
+    35:35:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry getEnumEntry(int):9078:9078 -> b
+    35:35:boolean isInitialized():9240 -> b
+    36:41:boolean isInitialized():9240:9245 -> b
+    42:42:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():9123:9123 -> b
+    42:42:boolean isInitialized():9246 -> b
+    43:52:boolean isInitialized():9246:9255 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$10500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8323:8323 -> c
     2:2:int access$8902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,int):8323:8323 -> c
     3:3:java.util.List access$9102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8323:8323 -> c
@@ -33448,6 +32899,7 @@
     2:2:java.util.List access$9402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8323:8323 -> f
     1:1:java.util.List access$9400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8323:8323 -> g
     2:2:java.util.List access$9502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8323:8323 -> g
+    1:1:int getFlags():8764:8764 -> getFlags
     1:1:java.util.List access$9500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8323:8323 -> h
     2:2:java.util.List access$9602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8323:8323 -> h
     3:3:int getCompanionObjectName():8794:8794 -> h
@@ -33461,21 +32913,21 @@
     2:2:java.util.List access$9902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8323:8323 -> k
     3:3:java.util.List getEnumEntryList():9059:9059 -> k
     1:1:java.util.List access$9900(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8323:8323 -> l
-    2:2:int getFlags():8764:8764 -> l
-    1:1:int getFqName():8779:8779 -> m
-    1:1:java.util.List getFunctionList():8954:8954 -> n
-    1:1:java.util.List getNestedClassNameList():8897:8897 -> o
-    1:1:java.util.List getPropertyList():8989:8989 -> p
-    1:1:java.util.List getSealedSubclassFqNameList():9095:9095 -> q
-    1:1:java.util.List getSupertypeIdList():8874:8874 -> r
-    1:1:java.util.List getSupertypeList():8838:8838 -> s
-    1:1:java.util.List getTypeAliasList():9024:9024 -> t
-    1:1:java.util.List getTypeParameterList():8803:8803 -> u
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():9123:9123 -> v
-    1:1:java.util.List getVersionRequirementList():9137:9137 -> w
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable getVersionRequirementTable():9172:9172 -> x
-    1:1:boolean hasCompanionObjectName():8788:8788 -> y
-    1:1:boolean hasFlags():8746:8746 -> z
+    2:2:int getFqName():8779:8779 -> l
+    1:1:java.util.List getFunctionList():8954:8954 -> m
+    1:1:java.util.List getNestedClassNameList():8897:8897 -> n
+    1:1:java.util.List getPropertyList():8989:8989 -> o
+    1:1:java.util.List getSealedSubclassFqNameList():9095:9095 -> p
+    1:1:java.util.List getSupertypeIdList():8874:8874 -> q
+    1:1:java.util.List getSupertypeList():8838:8838 -> r
+    1:1:java.util.List getTypeAliasList():9024:9024 -> s
+    1:1:java.util.List getTypeParameterList():8803:8803 -> t
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():9123:9123 -> u
+    1:1:java.util.List getVersionRequirementList():9137:9137 -> v
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable getVersionRequirementTable():9172:9172 -> w
+    1:1:boolean hasCompanionObjectName():8788:8788 -> x
+    1:1:boolean hasFlags():8746:8746 -> y
+    1:1:boolean hasFqName():8773:8773 -> z
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.d.b.a.b.a.o:
     1:1:void <init>():8604:8604 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8609:8609 -> a
@@ -33627,30 +33079,30 @@
     1:1:int access$12602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,int):13193:13193 -> a
     2:2:java.util.List access$12700(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor):13193:13193 -> a
     3:3:java.util.List access$12702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,java.util.List):13193:13193 -> a
-    4:4:boolean isInitialized():13418:13418 -> a
-    5:5:int getValueParameterCount():13361:13361 -> a
-    5:5:boolean isInitialized():13422 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getValueParameter(int):13367:13367 -> a
-    6:6:boolean isInitialized():13423 -> a
-    7:16:boolean isInitialized():13423:13432 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor getDefaultInstanceForType():13211:13211 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():13193 -> a
     1:1:java.util.List access$12800(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor):13193:13193 -> b
     2:2:java.util.List access$12802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,java.util.List):13193:13193 -> b
     3:3:int access$12902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,int):13193:13193 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor getDefaultInstanceForType():13211:13211 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():13193 -> b
+    4:4:boolean isInitialized():13418:13418 -> b
+    5:5:int getValueParameterCount():13361:13361 -> b
+    5:5:boolean isInitialized():13422 -> b
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getValueParameter(int):13367:13367 -> b
+    6:6:boolean isInitialized():13423 -> b
+    7:16:boolean isInitialized():13423:13432 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$13000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor):13193:13193 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder newBuilderForType():13545:13545 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():13193 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor):13547:13547 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder toBuilder():13549 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():13193 -> e
+    1:1:int getFlags():13339:13339 -> getFlags
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor getDefaultInstance():13207:13207 -> h
-    1:1:int getFlags():13339:13339 -> i
-    1:1:java.util.List getValueParameterList():13348:13348 -> j
-    1:1:java.util.List getVersionRequirementList():13388:13388 -> k
-    1:1:boolean hasFlags():13327:13327 -> l
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder newBuilder():13544:13544 -> m
-    1:3:void initFields():13412:13414 -> n
+    1:1:java.util.List getValueParameterList():13348:13348 -> i
+    1:1:java.util.List getVersionRequirementList():13388:13388 -> j
+    1:1:boolean hasFlags():13327:13327 -> k
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder newBuilder():13544:13544 -> l
+    1:3:void initFields():13412:13414 -> m
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.d.b.a.b.a.t:
     1:1:void <init>():13300:13300 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13305:13305 -> a
@@ -33713,13 +33165,13 @@
     394:401:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):23138 -> <init>
     1:1:java.util.List access$22400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23138:23138 -> a
     2:2:java.util.List access$22402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,java.util.List):23138:23138 -> a
-    3:3:boolean isInitialized():23269:23269 -> a
-    4:4:int getEffectCount():23248:23248 -> a
-    4:4:boolean isInitialized():23273 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect getEffect(int):23254:23254 -> a
-    5:5:boolean isInitialized():23274 -> a
-    6:11:boolean isInitialized():23274:23279 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$22500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23138:23138 -> b
+    2:2:boolean isInitialized():23269:23269 -> b
+    3:3:int getEffectCount():23248:23248 -> b
+    3:3:boolean isInitialized():23273 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect getEffect(int):23254:23254 -> b
+    4:4:boolean isInitialized():23274 -> b
+    5:10:boolean isInitialized():23274:23279 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder newBuilder():23367:23367 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23370 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23370:23370 -> c
@@ -33804,16 +33256,16 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression access$23102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):23668:23668 -> a
     5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind access$23202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind):23668:23668 -> a
     6:6:int access$23302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect,int):23668:23668 -> a
-    7:7:boolean isInitialized():24059:24059 -> a
-    8:8:int getEffectConstructorArgumentCount():23995:23995 -> a
-    8:8:boolean isInitialized():24063 -> a
-    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getEffectConstructorArgument(int):24001:24001 -> a
-    9:9:boolean isInitialized():24064 -> a
-    10:15:boolean isInitialized():24064:24069 -> a
-    16:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getConclusionOfConditionalEffect():24033:24033 -> a
-    16:16:boolean isInitialized():24070 -> a
-    17:22:boolean isInitialized():24070:24075 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$23400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect):23668:23668 -> b
+    2:2:boolean isInitialized():24059:24059 -> b
+    3:3:int getEffectConstructorArgumentCount():23995:23995 -> b
+    3:3:boolean isInitialized():24063 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getEffectConstructorArgument(int):24001:24001 -> b
+    4:4:boolean isInitialized():24064 -> b
+    5:10:boolean isInitialized():24064:24069 -> b
+    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getConclusionOfConditionalEffect():24033:24033 -> b
+    11:11:boolean isInitialized():24070 -> b
+    12:17:boolean isInitialized():24070:24075 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder newBuilderForType():24185:24185 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():23668 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect):24187:24187 -> e
@@ -33880,9 +33332,9 @@
     1:2:void <init>(java.lang.String,int,int,int):23888:23889 -> <init>
     1:1:int getNumber():23863:23863 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType[] values():23807:23807 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):23869:23869 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):23868:23868 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):23867:23867 -> c
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):23869:23869 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):23868:23868 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):23867:23867 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.d.b.a.b.a.E:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind AT_MOST_ONCE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind EXACTLY_ONCE -> c
@@ -33894,9 +33346,9 @@
     1:2:void <init>(java.lang.String,int,int,int):23953:23954 -> <init>
     1:1:int getNumber():23928:23928 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind[] values():23898:23898 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):23934:23934 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):23933:23933 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):23932:23932 -> c
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):23934:23934 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):23933:23933 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):23932:23932 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EffectOrBuilder -> com.android.tools.r8.d.b.a.b.a.G:
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.d.b.a.b.a.J:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
@@ -33929,20 +33381,20 @@
     326:332:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):20283 -> <init>
     1:1:int access$19302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry,int):20283:20283 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$19500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry):20283:20283 -> a
-    3:11:boolean isInitialized():20390:20398 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry getDefaultInstanceForType():20301:20301 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():20283 -> a
     1:1:int access$19402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry,int):20283:20283 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry getDefaultInstanceForType():20301:20301 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():20283 -> b
+    2:10:boolean isInitialized():20390:20398 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder newBuilderForType():20492:20492 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():20283 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry):20494:20494 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder toBuilder():20496 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():20283 -> e
+    1:1:int getName():20382:20382 -> getName
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry getDefaultInstance():20297:20297 -> h
-    1:1:int getName():20382:20382 -> i
-    1:1:boolean hasName():20376:20376 -> j
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder newBuilder():20491:20491 -> k
-    1:1:void initFields():20386:20386 -> l
+    1:1:boolean hasName():20376:20376 -> i
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder newBuilder():20491:20491 -> j
+    1:1:void initFields():20386:20386 -> k
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.d.b.a.b.a.H:
     1:1:void <init>():20355:20355 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20360:20360 -> a
@@ -34037,23 +33489,23 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$24102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):24773:24773 -> a
     4:4:java.util.List access$24300(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):24773:24773 -> a
     5:5:java.util.List access$24302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,java.util.List):24773:24773 -> a
-    6:10:boolean isInitialized():25227:25231 -> a
-    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getIsInstanceType():25068:25068 -> a
-    11:11:boolean isInitialized():25232 -> a
-    12:13:boolean isInitialized():25232:25233 -> a
-    14:14:int getAndArgumentCount():25123:25123 -> a
-    14:14:boolean isInitialized():25237 -> a
-    15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getAndArgument(int):25135:25135 -> a
-    15:15:boolean isInitialized():25238 -> a
-    16:17:boolean isInitialized():25238:25239 -> a
-    18:18:int getOrArgumentCount():25188:25188 -> a
-    18:18:boolean isInitialized():25243 -> a
-    19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getOrArgument(int):25200:25200 -> a
-    19:19:boolean isInitialized():25244 -> a
-    20:25:boolean isInitialized():25244:25249 -> a
     1:1:int access$23902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,int):24773:24773 -> b
     2:2:java.util.List access$24400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):24773:24773 -> b
     3:3:java.util.List access$24402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,java.util.List):24773:24773 -> b
+    4:8:boolean isInitialized():25227:25231 -> b
+    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getIsInstanceType():25068:25068 -> b
+    9:9:boolean isInitialized():25232 -> b
+    10:11:boolean isInitialized():25232:25233 -> b
+    12:12:int getAndArgumentCount():25123:25123 -> b
+    12:12:boolean isInitialized():25237 -> b
+    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getAndArgument(int):25135:25135 -> b
+    13:13:boolean isInitialized():25238 -> b
+    14:15:boolean isInitialized():25238:25239 -> b
+    16:16:int getOrArgumentCount():25188:25188 -> b
+    16:16:boolean isInitialized():25243 -> b
+    17:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getOrArgument(int):25200:25200 -> b
+    17:17:boolean isInitialized():25244 -> b
+    18:23:boolean isInitialized():25244:25249 -> b
     1:1:int access$24202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,int):24773:24773 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$24600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):24773:24773 -> c
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder newBuilderForType():25380:25380 -> c
@@ -34066,17 +33518,17 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder toBuilder():25384:25384 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue getConstantValue():25043:25043 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getDefaultInstance():24786:24786 -> g
-    1:1:int getFlags():25003:25003 -> h
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getIsInstanceType():25068:25068 -> i
-    1:1:int getIsInstanceTypeId():25083:25083 -> j
-    1:1:int getValueParameterReference():25028:25028 -> k
-    1:1:boolean hasConstantValue():25037:25037 -> l
-    1:1:boolean hasFlags():24992:24992 -> m
-    1:1:boolean hasIsInstanceType():25057:25057 -> n
-    1:1:boolean hasIsInstanceTypeId():25077:25077 -> o
-    1:1:boolean hasValueParameterReference():25017:25017 -> p
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder newBuilder():25379:25379 -> q
-    1:7:void initFields():25217:25223 -> r
+    1:1:int getFlags():25003:25003 -> getFlags
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getIsInstanceType():25068:25068 -> h
+    1:1:int getIsInstanceTypeId():25083:25083 -> i
+    1:1:int getValueParameterReference():25028:25028 -> j
+    1:1:boolean hasConstantValue():25037:25037 -> k
+    1:1:boolean hasFlags():24992:24992 -> l
+    1:1:boolean hasIsInstanceType():25057:25057 -> m
+    1:1:boolean hasIsInstanceTypeId():25077:25077 -> n
+    1:1:boolean hasValueParameterReference():25017:25017 -> o
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder newBuilder():25379:25379 -> p
+    1:7:void initFields():25217:25223 -> q
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.d.b.a.b.a.L:
     1:1:void <init>():24901:24901 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):24906:24906 -> a
@@ -34139,9 +33591,9 @@
     1:2:void <init>(java.lang.String,int,int,int):24973:24974 -> <init>
     1:1:int getNumber():24948:24948 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue[] values():24918:24918 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):24954:24954 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):24953:24953 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):24952:24952 -> c
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):24954:24954 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):24953:24953 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):24952:24952 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ExpressionOrBuilder -> com.android.tools.r8.d.b.a.b.a.P:
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.d.b.a.b.a.T:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function defaultInstance -> q
@@ -34235,46 +33687,44 @@
     1741:1762:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):14139 -> <init>
     1763:1778:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14310:14325 -> <init>
     1763:1778:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):14139 -> <init>
-    1:1:boolean hasReturnType():14423:14423 -> A
-    1:1:boolean hasReturnTypeId():14438:14438 -> B
-    1:1:boolean hasTypeTable():14553:14553 -> C
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder newBuilder():14850:14850 -> D
-    1:12:void initFields():14612:14623 -> E
+    1:1:boolean hasTypeTable():14553:14553 -> A
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder newBuilder():14850:14850 -> B
+    1:12:void initFields():14612:14623 -> C
     1:1:int access$13402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,int):14139:14139 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$13702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):14139:14139 -> a
     3:3:java.util.List access$13900(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):14139:14139 -> a
     4:4:java.util.List access$13902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,java.util.List):14139:14139 -> a
     5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable access$14302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):14139:14139 -> a
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract access$14502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):14139:14139 -> a
-    7:15:boolean isInitialized():14627:14635 -> a
-    16:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReturnType():14429:14429 -> a
-    16:16:boolean isInitialized():14636 -> a
-    17:18:boolean isInitialized():14636:14637 -> a
-    19:19:int getTypeParameterCount():14466:14466 -> a
-    19:19:boolean isInitialized():14641 -> a
-    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getTypeParameter(int):14472:14472 -> a
-    20:20:boolean isInitialized():14642 -> a
-    21:26:boolean isInitialized():14642:14647 -> a
-    27:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReceiverType():14494:14494 -> a
-    27:27:boolean isInitialized():14648 -> a
-    28:29:boolean isInitialized():14648:14649 -> a
-    30:30:int getValueParameterCount():14531:14531 -> a
-    30:30:boolean isInitialized():14653 -> a
-    31:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getValueParameter(int):14537:14537 -> a
-    31:31:boolean isInitialized():14654 -> a
-    32:37:boolean isInitialized():14654:14659 -> a
-    38:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():14559:14559 -> a
-    38:38:boolean isInitialized():14660 -> a
-    39:44:boolean isInitialized():14660:14665 -> a
-    45:45:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract getContract():14608:14608 -> a
-    45:45:boolean isInitialized():14666 -> a
-    46:55:boolean isInitialized():14666:14675 -> a
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function getDefaultInstanceForType():14157:14157 -> a
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():14139 -> a
     1:1:int access$13502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,int):14139:14139 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$14002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):14139:14139 -> b
     3:3:java.util.List access$14200(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):14139:14139 -> b
     4:4:java.util.List access$14202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,java.util.List):14139:14139 -> b
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function getDefaultInstanceForType():14157:14157 -> b
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():14139 -> b
+    5:13:boolean isInitialized():14627:14635 -> b
+    14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReturnType():14429:14429 -> b
+    14:14:boolean isInitialized():14636 -> b
+    15:16:boolean isInitialized():14636:14637 -> b
+    17:17:int getTypeParameterCount():14466:14466 -> b
+    17:17:boolean isInitialized():14641 -> b
+    18:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getTypeParameter(int):14472:14472 -> b
+    18:18:boolean isInitialized():14642 -> b
+    19:24:boolean isInitialized():14642:14647 -> b
+    25:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReceiverType():14494:14494 -> b
+    25:25:boolean isInitialized():14648 -> b
+    26:27:boolean isInitialized():14648:14649 -> b
+    28:28:int getValueParameterCount():14531:14531 -> b
+    28:28:boolean isInitialized():14653 -> b
+    29:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getValueParameter(int):14537:14537 -> b
+    29:29:boolean isInitialized():14654 -> b
+    30:35:boolean isInitialized():14654:14659 -> b
+    36:36:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():14559:14559 -> b
+    36:36:boolean isInitialized():14660 -> b
+    37:42:boolean isInitialized():14660:14665 -> b
+    43:43:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract getContract():14608:14608 -> b
+    43:43:boolean isInitialized():14666 -> b
+    44:53:boolean isInitialized():14666:14675 -> b
     1:1:int access$13602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,int):14139:14139 -> c
     2:2:java.util.List access$14400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):14139:14139 -> c
     3:3:java.util.List access$14402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,java.util.List):14139:14139 -> c
@@ -34287,25 +33737,27 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder toBuilder():14855 -> e
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():14139 -> e
     1:1:int access$14602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,int):14139:14139 -> f
+    1:1:int getFlags():14384:14384 -> getFlags
+    1:1:int getName():14414:14414 -> getName
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract getContract():14608:14608 -> h
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function getDefaultInstance():14153:14153 -> i
-    1:1:int getFlags():14384:14384 -> j
-    1:1:int getName():14414:14414 -> k
-    1:1:int getOldFlags():14399:14399 -> l
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReceiverType():14494:14494 -> m
-    1:1:int getReceiverTypeId():14509:14509 -> n
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReturnType():14429:14429 -> o
-    1:1:int getReturnTypeId():14444:14444 -> p
-    1:1:java.util.List getTypeParameterList():14453:14453 -> q
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():14559:14559 -> r
-    1:1:java.util.List getValueParameterList():14518:14518 -> s
-    1:1:java.util.List getVersionRequirementList():14573:14573 -> t
-    1:1:boolean hasContract():14602:14602 -> u
-    1:1:boolean hasFlags():14364:14364 -> v
-    1:1:boolean hasName():14408:14408 -> w
-    1:1:boolean hasOldFlags():14393:14393 -> x
-    1:1:boolean hasReceiverType():14488:14488 -> y
-    1:1:boolean hasReceiverTypeId():14503:14503 -> z
+    1:1:int getOldFlags():14399:14399 -> j
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReceiverType():14494:14494 -> k
+    1:1:int getReceiverTypeId():14509:14509 -> l
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReturnType():14429:14429 -> m
+    1:1:int getReturnTypeId():14444:14444 -> n
+    1:1:java.util.List getTypeParameterList():14453:14453 -> o
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():14559:14559 -> p
+    1:1:java.util.List getValueParameterList():14518:14518 -> q
+    1:1:java.util.List getVersionRequirementList():14573:14573 -> r
+    1:1:boolean hasContract():14602:14602 -> s
+    1:1:boolean hasFlags():14364:14364 -> t
+    1:1:boolean hasName():14408:14408 -> u
+    1:1:boolean hasOldFlags():14393:14393 -> v
+    1:1:boolean hasReceiverType():14488:14488 -> w
+    1:1:boolean hasReceiverTypeId():14503:14503 -> x
+    1:1:boolean hasReturnType():14423:14423 -> y
+    1:1:boolean hasReturnTypeId():14438:14438 -> z
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.d.b.a.b.a.Q:
     1:1:void <init>():14329:14329 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14334:14334 -> a
@@ -34439,29 +33891,29 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable access$11202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):11384:11384 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable access$11302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):11384:11384 -> a
     5:5:int access$11402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,int):11384:11384 -> a
-    6:6:boolean isInitialized():11669:11669 -> a
-    7:7:int getFunctionCount():11544:11544 -> a
-    7:7:boolean isInitialized():11673 -> a
-    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function getFunction(int):11550:11550 -> a
-    8:8:boolean isInitialized():11674 -> a
-    9:10:boolean isInitialized():11674:11675 -> a
-    11:11:int getPropertyCount():11579:11579 -> a
-    11:11:boolean isInitialized():11679 -> a
-    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property getProperty(int):11585:11585 -> a
-    12:12:boolean isInitialized():11680 -> a
-    13:14:boolean isInitialized():11680:11681 -> a
-    15:15:int getTypeAliasCount():11614:11614 -> a
-    15:15:boolean isInitialized():11685 -> a
-    16:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias getTypeAlias(int):11620:11620 -> a
-    16:16:boolean isInitialized():11686 -> a
-    17:22:boolean isInitialized():11686:11691 -> a
-    23:23:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():11642:11642 -> a
-    23:23:boolean isInitialized():11692 -> a
-    24:33:boolean isInitialized():11692:11701 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package getDefaultInstanceForType():11402:11402 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():11384 -> a
     1:1:java.util.List access$11000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):11384:11384 -> b
     2:2:java.util.List access$11002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,java.util.List):11384:11384 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package getDefaultInstanceForType():11402:11402 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():11384 -> b
+    3:3:boolean isInitialized():11669:11669 -> b
+    4:4:int getFunctionCount():11544:11544 -> b
+    4:4:boolean isInitialized():11673 -> b
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function getFunction(int):11550:11550 -> b
+    5:5:boolean isInitialized():11674 -> b
+    6:7:boolean isInitialized():11674:11675 -> b
+    8:8:int getPropertyCount():11579:11579 -> b
+    8:8:boolean isInitialized():11679 -> b
+    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property getProperty(int):11585:11585 -> b
+    9:9:boolean isInitialized():11680 -> b
+    10:11:boolean isInitialized():11680:11681 -> b
+    12:12:int getTypeAliasCount():11614:11614 -> b
+    12:12:boolean isInitialized():11685 -> b
+    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias getTypeAlias(int):11620:11620 -> b
+    13:13:boolean isInitialized():11686 -> b
+    14:19:boolean isInitialized():11686:11691 -> b
+    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():11642:11642 -> b
+    20:20:boolean isInitialized():11692 -> b
+    21:30:boolean isInitialized():11692:11701 -> b
     1:1:java.util.List access$11100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):11384:11384 -> c
     2:2:java.util.List access$11102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,java.util.List):11384:11384 -> c
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder newBuilderForType():11823:11823 -> c
@@ -34624,38 +34076,36 @@
     1693:1711:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):16116 -> <init>
     1712:1724:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16276:16288 -> <init>
     1712:1724:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):16116 -> <init>
-    1:1:boolean hasReturnType():16390:16390 -> A
-    1:1:boolean hasReturnTypeId():16405:16405 -> B
-    1:1:boolean hasSetterFlags():16539:16539 -> C
-    1:1:boolean hasSetterValueParameter():16485:16485 -> D
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder newBuilder():16809:16809 -> E
-    1:12:void initFields():16583:16594 -> F
+    1:1:boolean hasSetterFlags():16539:16539 -> A
+    1:1:boolean hasSetterValueParameter():16485:16485 -> B
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder newBuilder():16809:16809 -> C
+    1:12:void initFields():16583:16594 -> D
     1:1:int access$15102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16116:16116 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$15402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):16116:16116 -> a
     3:3:java.util.List access$15600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):16116:16116 -> a
     4:4:java.util.List access$15602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,java.util.List):16116:16116 -> a
     5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter access$15902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):16116:16116 -> a
-    6:14:boolean isInitialized():16598:16606 -> a
-    15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReturnType():16396:16396 -> a
-    15:15:boolean isInitialized():16607 -> a
-    16:17:boolean isInitialized():16607:16608 -> a
-    18:18:int getTypeParameterCount():16433:16433 -> a
-    18:18:boolean isInitialized():16612 -> a
-    19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getTypeParameter(int):16439:16439 -> a
-    19:19:boolean isInitialized():16613 -> a
-    20:25:boolean isInitialized():16613:16618 -> a
-    26:26:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReceiverType():16461:16461 -> a
-    26:26:boolean isInitialized():16619 -> a
-    27:32:boolean isInitialized():16619:16624 -> a
-    33:33:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getSetterValueParameter():16491:16491 -> a
-    33:33:boolean isInitialized():16625 -> a
-    34:43:boolean isInitialized():16625:16634 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property getDefaultInstanceForType():16134:16134 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():16116 -> a
     1:1:int access$15202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16116:16116 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$15702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):16116:16116 -> b
     3:3:java.util.List access$16200(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):16116:16116 -> b
     4:4:java.util.List access$16202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,java.util.List):16116:16116 -> b
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property getDefaultInstanceForType():16134:16134 -> b
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():16116 -> b
+    5:13:boolean isInitialized():16598:16606 -> b
+    14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReturnType():16396:16396 -> b
+    14:14:boolean isInitialized():16607 -> b
+    15:16:boolean isInitialized():16607:16608 -> b
+    17:17:int getTypeParameterCount():16433:16433 -> b
+    17:17:boolean isInitialized():16612 -> b
+    18:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getTypeParameter(int):16439:16439 -> b
+    18:18:boolean isInitialized():16613 -> b
+    19:24:boolean isInitialized():16613:16618 -> b
+    25:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReceiverType():16461:16461 -> b
+    25:25:boolean isInitialized():16619 -> b
+    26:31:boolean isInitialized():16619:16624 -> b
+    32:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getSetterValueParameter():16491:16491 -> b
+    32:32:boolean isInitialized():16625 -> b
+    33:42:boolean isInitialized():16625:16634 -> b
     1:1:int access$15302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16116:16116 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$16400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):16116:16116 -> c
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder newBuilderForType():16810:16810 -> c
@@ -34667,26 +34117,28 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():16116 -> e
     1:1:int access$16002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16116:16116 -> f
     1:1:int access$16102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16116:16116 -> g
+    1:1:int getFlags():16351:16351 -> getFlags
+    1:1:int getName():16381:16381 -> getName
     1:1:int access$16302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16116:16116 -> h
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property getDefaultInstance():16130:16130 -> h
-    1:1:int getFlags():16351:16351 -> i
-    1:1:int getGetterFlags():16530:16530 -> j
-    1:1:int getName():16381:16381 -> k
-    1:1:int getOldFlags():16366:16366 -> l
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReceiverType():16461:16461 -> m
-    1:1:int getReceiverTypeId():16476:16476 -> n
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReturnType():16396:16396 -> o
-    1:1:int getReturnTypeId():16411:16411 -> p
-    1:1:int getSetterFlags():16545:16545 -> q
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getSetterValueParameter():16491:16491 -> r
-    1:1:java.util.List getTypeParameterList():16420:16420 -> s
-    1:1:java.util.List getVersionRequirementList():16559:16559 -> t
-    1:1:boolean hasFlags():16329:16329 -> u
-    1:1:boolean hasGetterFlags():16512:16512 -> v
-    1:1:boolean hasName():16375:16375 -> w
-    1:1:boolean hasOldFlags():16360:16360 -> x
-    1:1:boolean hasReceiverType():16455:16455 -> y
-    1:1:boolean hasReceiverTypeId():16470:16470 -> z
+    1:1:int getGetterFlags():16530:16530 -> i
+    1:1:int getOldFlags():16366:16366 -> j
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReceiverType():16461:16461 -> k
+    1:1:int getReceiverTypeId():16476:16476 -> l
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReturnType():16396:16396 -> m
+    1:1:int getReturnTypeId():16411:16411 -> n
+    1:1:int getSetterFlags():16545:16545 -> o
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getSetterValueParameter():16491:16491 -> p
+    1:1:java.util.List getTypeParameterList():16420:16420 -> q
+    1:1:java.util.List getVersionRequirementList():16559:16559 -> r
+    1:1:boolean hasFlags():16329:16329 -> s
+    1:1:boolean hasGetterFlags():16512:16512 -> t
+    1:1:boolean hasName():16375:16375 -> u
+    1:1:boolean hasOldFlags():16360:16360 -> v
+    1:1:boolean hasReceiverType():16455:16455 -> w
+    1:1:boolean hasReceiverTypeId():16470:16470 -> x
+    1:1:boolean hasReturnType():16390:16390 -> y
+    1:1:boolean hasReturnTypeId():16405:16405 -> z
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.d.b.a.b.a.ba:
     1:1:void <init>():16292:16292 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16297:16297 -> a
@@ -34863,44 +34315,43 @@
     3719:3734:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):4631 -> <init>
     3735:3744:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):4785:4794 -> <init>
     3735:3744:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):4631 -> <init>
-    1:1:boolean hasFlexibleUpperBound():5574:5574 -> A
-    1:1:boolean hasFlexibleUpperBoundId():5589:5589 -> B
-    1:1:boolean hasNullable():5534:5534 -> C
-    1:1:boolean hasOuterType():5694:5694 -> D
-    1:1:boolean hasOuterTypeId():5713:5713 -> E
-    1:1:boolean hasTypeAliasName():5670:5670 -> F
-    1:1:boolean hasTypeParameter():5623:5623 -> G
-    1:1:boolean hasTypeParameterName():5646:5646 -> H
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder newBuilder():6009:6009 -> I
-    1:3:void initFields():5776:5778 -> J
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getDefaultInstance():4645:4645 -> J
-    4:4:void initFields():5779 -> J
-    5:15:void initFields():5779:5789 -> J
+    1:1:boolean hasFlexibleUpperBoundId():5589:5589 -> A
+    1:1:boolean hasNullable():5534:5534 -> B
+    1:1:boolean hasOuterType():5694:5694 -> C
+    1:1:boolean hasOuterTypeId():5713:5713 -> D
+    1:1:boolean hasTypeAliasName():5670:5670 -> E
+    1:1:boolean hasTypeParameter():5623:5623 -> F
+    1:1:boolean hasTypeParameterName():5646:5646 -> G
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder newBuilder():6009:6009 -> H
+    1:3:void initFields():5776:5778 -> I
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getDefaultInstance():4645:4645 -> I
+    4:4:void initFields():5779 -> I
+    5:15:void initFields():5779:5789 -> I
     1:1:java.util.List access$5800(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):4631:4631 -> a
     2:2:java.util.List access$5802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,java.util.List):4631:4631 -> a
     3:3:boolean access$5902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,boolean):4631:4631 -> a
     4:4:int access$6002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,int):4631:4631 -> a
     5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$6102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):4631:4631 -> a
-    6:6:boolean isInitialized():5793:5793 -> a
-    7:7:int getArgumentCount():5512:5512 -> a
-    7:7:boolean isInitialized():5797 -> a
-    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument getArgument(int):5518:5518 -> a
-    8:8:boolean isInitialized():5798 -> a
-    9:14:boolean isInitialized():5798:5803 -> a
-    15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getFlexibleUpperBound():5580:5580 -> a
-    15:15:boolean isInitialized():5804 -> a
-    16:21:boolean isInitialized():5804:5809 -> a
-    22:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getOuterType():5704:5704 -> a
-    22:22:boolean isInitialized():5810 -> a
-    23:28:boolean isInitialized():5810:5815 -> a
-    29:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getAbbreviatedType():5734:5734 -> a
-    29:29:boolean isInitialized():5816 -> a
-    30:39:boolean isInitialized():5816:5825 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getDefaultInstanceForType():4649:4649 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():4631 -> a
     1:1:int access$6202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,int):4631:4631 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$6702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):4631:4631 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$7300(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):4631:4631 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getDefaultInstanceForType():4649:4649 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():4631 -> b
+    4:4:boolean isInitialized():5793:5793 -> b
+    5:5:int getArgumentCount():5512:5512 -> b
+    5:5:boolean isInitialized():5797 -> b
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument getArgument(int):5518:5518 -> b
+    6:6:boolean isInitialized():5798 -> b
+    7:12:boolean isInitialized():5798:5803 -> b
+    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getFlexibleUpperBound():5580:5580 -> b
+    13:13:boolean isInitialized():5804 -> b
+    14:19:boolean isInitialized():5804:5809 -> b
+    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getOuterType():5704:5704 -> b
+    20:20:boolean isInitialized():5810 -> b
+    21:26:boolean isInitialized():5810:5815 -> b
+    27:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getAbbreviatedType():5734:5734 -> b
+    27:27:boolean isInitialized():5816 -> b
+    28:37:boolean isInitialized():5816:5825 -> b
     1:1:int access$6302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,int):4631:4631 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$6902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):4631:4631 -> c
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder newBuilder():6009:6009 -> c
@@ -34915,6 +34366,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():4631 -> e
     1:1:int access$6602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,int):4631:4631 -> f
     1:1:int access$6802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,int):4631:4631 -> g
+    1:1:int getFlags():5772:5772 -> getFlags
     1:1:int access$7002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,int):4631:4631 -> h
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getAbbreviatedType():5734:5734 -> h
     1:1:int access$7102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,int):4631:4631 -> i
@@ -34922,21 +34374,21 @@
     1:1:int access$7202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,int):4631:4631 -> j
     2:2:int getClassName():5610:5610 -> j
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getDefaultInstance():4645:4645 -> k
-    1:1:int getFlags():5772:5772 -> l
-    1:1:int getFlexibleTypeCapabilitiesId():5565:5565 -> m
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getFlexibleUpperBound():5580:5580 -> n
-    1:1:int getFlexibleUpperBoundId():5595:5595 -> o
-    1:1:boolean getNullable():5540:5540 -> p
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getOuterType():5704:5704 -> q
-    1:1:int getOuterTypeId():5719:5719 -> r
-    1:1:int getTypeAliasName():5681:5681 -> s
-    1:1:int getTypeParameter():5633:5633 -> t
-    1:1:int getTypeParameterName():5656:5656 -> u
-    1:1:boolean hasAbbreviatedType():5728:5728 -> v
-    1:1:boolean hasAbbreviatedTypeId():5743:5743 -> w
-    1:1:boolean hasClassName():5604:5604 -> x
-    1:1:boolean hasFlags():5762:5762 -> y
-    1:1:boolean hasFlexibleTypeCapabilitiesId():5554:5554 -> z
+    1:1:int getFlexibleTypeCapabilitiesId():5565:5565 -> l
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getFlexibleUpperBound():5580:5580 -> m
+    1:1:int getFlexibleUpperBoundId():5595:5595 -> n
+    1:1:boolean getNullable():5540:5540 -> o
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getOuterType():5704:5704 -> p
+    1:1:int getOuterTypeId():5719:5719 -> q
+    1:1:int getTypeAliasName():5681:5681 -> r
+    1:1:int getTypeParameter():5633:5633 -> s
+    1:1:int getTypeParameterName():5656:5656 -> t
+    1:1:boolean hasAbbreviatedType():5728:5728 -> u
+    1:1:boolean hasAbbreviatedTypeId():5743:5743 -> v
+    1:1:boolean hasClassName():5604:5604 -> w
+    1:1:boolean hasFlags():5762:5762 -> x
+    1:1:boolean hasFlexibleTypeCapabilitiesId():5554:5554 -> y
+    1:1:boolean hasFlexibleUpperBound():5574:5574 -> z
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.d.b.a.b.a.fa:
     1:1:void <init>():4798:4798 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):4803:4803 -> a
@@ -34986,11 +34438,11 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$5202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):4854:4854 -> a
     3:3:int access$5302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument,int):4854:4854 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$5500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument):4854:4854 -> a
-    5:9:boolean isInitialized():5099:5103 -> a
-    10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getType():5074:5074 -> a
-    10:10:boolean isInitialized():5104 -> a
-    11:16:boolean isInitialized():5104:5109 -> a
     1:1:int access$5402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument,int):4854:4854 -> b
+    2:6:boolean isInitialized():5099:5103 -> b
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getType():5074:5074 -> b
+    7:7:boolean isInitialized():5104 -> b
+    8:13:boolean isInitialized():5104:5109 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder newBuilderForType():5212:5212 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():4854 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument):5214:5214 -> e
@@ -35052,10 +34504,10 @@
     1:2:void <init>(java.lang.String,int,int,int):5031:5032 -> <init>
     1:1:int getNumber():5005:5005 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection[] values():4967:4967 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5012:5012 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5011:5011 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5010:5010 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5009:5009 -> c
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5012:5012 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5011:5011 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5010:5010 -> b
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5009:5009 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$ArgumentOrBuilder -> com.android.tools.r8.d.b.a.b.a.ka:
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.d.b.a.b.a.la:
     int outerTypeId_ -> o
@@ -35210,29 +34662,29 @@
     2:2:java.util.List access$18100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):18839:18839 -> a
     3:3:java.util.List access$18102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,java.util.List):18839:18839 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$18202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18839:18839 -> a
-    5:10:boolean isInitialized():19230:19235 -> a
-    11:11:int getTypeParameterCount():19072:19072 -> a
-    11:11:boolean isInitialized():19238 -> a
-    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getTypeParameter(int):19078:19078 -> a
-    12:12:boolean isInitialized():19239 -> a
-    13:18:boolean isInitialized():19239:19244 -> a
-    19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getUnderlyingType():19100:19100 -> a
-    19:19:boolean isInitialized():19245 -> a
-    20:25:boolean isInitialized():19245:19250 -> a
-    26:26:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getExpandedType():19130:19130 -> a
-    26:26:boolean isInitialized():19251 -> a
-    27:28:boolean isInitialized():19251:19252 -> a
-    29:29:int getAnnotationCount():19167:19167 -> a
-    29:29:boolean isInitialized():19256 -> a
-    30:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation getAnnotation(int):19173:19173 -> a
-    30:30:boolean isInitialized():19257 -> a
-    31:40:boolean isInitialized():19257:19266 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias getDefaultInstanceForType():18857:18857 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():18839 -> a
     1:1:int access$18002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,int):18839:18839 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$18402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18839:18839 -> b
     3:3:java.util.List access$18600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):18839:18839 -> b
     4:4:java.util.List access$18602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,java.util.List):18839:18839 -> b
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias getDefaultInstanceForType():18857:18857 -> b
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():18839 -> b
+    5:10:boolean isInitialized():19230:19235 -> b
+    11:11:int getTypeParameterCount():19072:19072 -> b
+    11:11:boolean isInitialized():19238 -> b
+    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getTypeParameter(int):19078:19078 -> b
+    12:12:boolean isInitialized():19239 -> b
+    13:18:boolean isInitialized():19239:19244 -> b
+    19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getUnderlyingType():19100:19100 -> b
+    19:19:boolean isInitialized():19245 -> b
+    20:25:boolean isInitialized():19245:19250 -> b
+    26:26:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getExpandedType():19130:19130 -> b
+    26:26:boolean isInitialized():19251 -> b
+    27:28:boolean isInitialized():19251:19252 -> b
+    29:29:int getAnnotationCount():19167:19167 -> b
+    29:29:boolean isInitialized():19256 -> b
+    30:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation getAnnotation(int):19173:19173 -> b
+    30:30:boolean isInitialized():19257 -> b
+    31:40:boolean isInitialized():19257:19266 -> b
     1:1:int access$18302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,int):18839:18839 -> c
     2:2:java.util.List access$18700(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):18839:18839 -> c
     3:3:java.util.List access$18702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,java.util.List):18839:18839 -> c
@@ -35244,21 +34696,21 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19423:19423 -> e
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder toBuilder():19425 -> e
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():18839 -> e
+    1:1:int getFlags():19035:19035 -> getFlags
+    1:1:int getName():19050:19050 -> getName
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias getDefaultInstance():18853:18853 -> h
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getExpandedType():19130:19130 -> i
     1:1:int getExpandedTypeId():19145:19145 -> j
-    1:1:int getFlags():19035:19035 -> k
-    1:1:int getName():19050:19050 -> l
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getUnderlyingType():19100:19100 -> m
-    1:1:int getUnderlyingTypeId():19115:19115 -> n
-    1:1:boolean hasExpandedType():19124:19124 -> o
-    1:1:boolean hasExpandedTypeId():19139:19139 -> p
-    1:1:boolean hasFlags():19024:19024 -> q
-    1:1:boolean hasName():19044:19044 -> r
-    1:1:boolean hasUnderlyingType():19094:19094 -> s
-    1:1:boolean hasUnderlyingTypeId():19109:19109 -> t
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder newBuilder():19420:19420 -> u
-    1:9:void initFields():19218:19226 -> v
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getUnderlyingType():19100:19100 -> k
+    1:1:int getUnderlyingTypeId():19115:19115 -> l
+    1:1:boolean hasExpandedType():19124:19124 -> m
+    1:1:boolean hasExpandedTypeId():19139:19139 -> n
+    1:1:boolean hasFlags():19024:19024 -> o
+    1:1:boolean hasName():19044:19044 -> p
+    1:1:boolean hasUnderlyingType():19094:19094 -> q
+    1:1:boolean hasUnderlyingTypeId():19109:19109 -> r
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder newBuilder():19420:19420 -> s
+    1:9:void initFields():19218:19226 -> t
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.d.b.a.b.a.na:
     1:1:void <init>():18998:18998 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19003:19003 -> a
@@ -35385,17 +34837,17 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance access$8002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance):7076:7076 -> a
     4:4:java.util.List access$8100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):7076:7076 -> a
     5:5:java.util.List access$8102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,java.util.List):7076:7076 -> a
-    6:15:boolean isInitialized():7413:7422 -> a
-    16:16:int getUpperBoundCount():7364:7364 -> a
-    16:16:boolean isInitialized():7425 -> a
-    17:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getUpperBound(int):7370:7370 -> a
-    17:17:boolean isInitialized():7426 -> a
-    18:27:boolean isInitialized():7426:7435 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getDefaultInstanceForType():7094:7094 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():7076 -> a
     1:1:int access$7802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,int):7076:7076 -> b
     2:2:java.util.List access$8200(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):7076:7076 -> b
     3:3:java.util.List access$8202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,java.util.List):7076:7076 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getDefaultInstanceForType():7094:7094 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():7076 -> b
+    4:13:boolean isInitialized():7413:7422 -> b
+    14:14:int getUpperBoundCount():7364:7364 -> b
+    14:14:boolean isInitialized():7425 -> b
+    15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getUpperBound(int):7370:7370 -> b
+    15:15:boolean isInitialized():7426 -> b
+    16:25:boolean isInitialized():7426:7435 -> b
     1:1:int access$8302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,int):7076:7076 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$8400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):7076:7076 -> c
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder newBuilderForType():7578:7578 -> c
@@ -35403,17 +34855,17 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):7580:7580 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder toBuilder():7582 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():7076 -> e
+    1:1:int getName():7312:7312 -> getName
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getDefaultInstance():7090:7090 -> h
     1:1:int getId():7297:7297 -> i
-    1:1:int getName():7312:7312 -> j
-    1:1:boolean getReified():7327:7327 -> k
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance getVariance():7342:7342 -> l
-    1:1:boolean hasId():7291:7291 -> m
-    1:1:boolean hasName():7306:7306 -> n
-    1:1:boolean hasReified():7321:7321 -> o
-    1:1:boolean hasVariance():7336:7336 -> p
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder newBuilder():7577:7577 -> q
-    1:6:void initFields():7404:7409 -> r
+    1:1:boolean getReified():7327:7327 -> j
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance getVariance():7342:7342 -> k
+    1:1:boolean hasId():7291:7291 -> l
+    1:1:boolean hasName():7306:7306 -> m
+    1:1:boolean hasReified():7321:7321 -> n
+    1:1:boolean hasVariance():7336:7336 -> o
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder newBuilder():7577:7577 -> p
+    1:6:void initFields():7404:7409 -> q
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.d.b.a.b.a.sa:
     1:1:void <init>():7205:7205 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):7210:7210 -> a
@@ -35472,9 +34924,9 @@
     1:2:void <init>(java.lang.String,int,int,int):7277:7278 -> <init>
     1:1:int getNumber():7252:7252 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance[] values():7222:7222 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7258:7258 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7257:7257 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7256:7256 -> c
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7258:7258 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7257:7257 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7256:7256 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameterOrBuilder -> com.android.tools.r8.d.b.a.b.a.wa:
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.d.b.a.b.a.za:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
@@ -35514,14 +34966,14 @@
     1:1:java.util.List access$11900(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12551:12551 -> a
     2:2:java.util.List access$11902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable,java.util.List):12551:12551 -> a
     3:3:int access$12002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable,int):12551:12551 -> a
-    4:4:boolean isInitialized():12714:12714 -> a
-    5:5:int getTypeCount():12667:12667 -> a
-    5:5:boolean isInitialized():12718 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getType(int):12673:12673 -> a
-    6:6:boolean isInitialized():12719 -> a
-    7:12:boolean isInitialized():12719:12724 -> a
     1:1:int access$12102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable,int):12551:12551 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$12200(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12551:12551 -> b
+    3:3:boolean isInitialized():12714:12714 -> b
+    4:4:int getTypeCount():12667:12667 -> b
+    4:4:boolean isInitialized():12718 -> b
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getType(int):12673:12673 -> b
+    5:5:boolean isInitialized():12719 -> b
+    6:11:boolean isInitialized():12719:12724 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder newBuilder():12819:12819 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12822 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12822:12822 -> c
@@ -35626,20 +35078,20 @@
     1:1:int access$16802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,int):17873:17873 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$17002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17873:17873 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$17500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):17873:17873 -> a
-    4:12:boolean isInitialized():18115:18123 -> a
-    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getType():18057:18057 -> a
-    13:13:boolean isInitialized():18124 -> a
-    14:19:boolean isInitialized():18124:18129 -> a
-    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getVarargElementType():18087:18087 -> a
-    20:20:boolean isInitialized():18130 -> a
-    21:30:boolean isInitialized():18130:18139 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getDefaultInstanceForType():17891:17891 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():17873 -> a
     1:1:int access$16902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,int):17873:17873 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$17202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17873:17873 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getDefaultInstanceForType():17891:17891 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():17873 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder():18267:18267 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18270 -> b
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18270:18270 -> b
+    3:11:boolean isInitialized():18115:18123 -> b
+    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getType():18057:18057 -> b
+    12:12:boolean isInitialized():18124 -> b
+    13:18:boolean isInitialized():18124:18129 -> b
+    19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getVarargElementType():18087:18087 -> b
+    19:19:boolean isInitialized():18130 -> b
+    20:29:boolean isInitialized():18130:18139 -> b
+    30:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder():18267:18267 -> b
+    30:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18270 -> b
+    31:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18270:18270 -> b
     1:1:int access$17102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,int):17873:17873 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilderForType():18268:18268 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():17873 -> c
@@ -35647,21 +35099,21 @@
     1:1:int access$17402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,int):17873:17873 -> e
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():17873:17873 -> e
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder toBuilder():18272:18272 -> e
+    1:1:int getFlags():18027:18027 -> getFlags
+    1:1:int getName():18042:18042 -> getName
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getDefaultInstance():17887:17887 -> h
-    1:1:int getFlags():18027:18027 -> i
-    1:1:int getName():18042:18042 -> j
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getType():18057:18057 -> k
-    1:1:int getTypeId():18072:18072 -> l
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getVarargElementType():18087:18087 -> m
-    1:1:int getVarargElementTypeId():18102:18102 -> n
-    1:1:boolean hasFlags():18014:18014 -> o
-    1:1:boolean hasName():18036:18036 -> p
-    1:1:boolean hasType():18051:18051 -> q
-    1:1:boolean hasTypeId():18066:18066 -> r
-    1:1:boolean hasVarargElementType():18081:18081 -> s
-    1:1:boolean hasVarargElementTypeId():18096:18096 -> t
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder():18267:18267 -> u
-    1:6:void initFields():18106:18111 -> v
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getType():18057:18057 -> i
+    1:1:int getTypeId():18072:18072 -> j
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getVarargElementType():18087:18087 -> k
+    1:1:int getVarargElementTypeId():18102:18102 -> l
+    1:1:boolean hasFlags():18014:18014 -> m
+    1:1:boolean hasName():18036:18036 -> n
+    1:1:boolean hasType():18051:18051 -> o
+    1:1:boolean hasTypeId():18066:18066 -> p
+    1:1:boolean hasVarargElementType():18081:18081 -> q
+    1:1:boolean hasVarargElementTypeId():18096:18096 -> r
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder():18267:18267 -> s
+    1:6:void initFields():18106:18111 -> t
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.d.b.a.b.a.Ba:
     1:1:void <init>():17986:17986 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):17991:17991 -> a
@@ -35780,8 +35232,8 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level access$20102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level):20750:20750 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind access$20402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind):20750:20750 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$20600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):20750:20750 -> a
-    5:9:boolean isInitialized():21161:21165 -> a
     1:1:int access$20002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement,int):20750:20750 -> b
+    2:6:boolean isInitialized():21161:21165 -> b
     1:1:int access$20202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement,int):20750:20750 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder newBuilderForType():21289:21289 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():20750 -> c
@@ -35864,9 +35316,9 @@
     10:10:void <clinit>():20877:20877 -> <clinit>
     1:2:void <init>(java.lang.String,int,int,int):20932:20933 -> <init>
     1:1:int getNumber():20907:20907 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):20913:20913 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):20912:20912 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):20911:20911 -> c
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):20913:20913 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):20912:20912 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):20911:20911 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.d.b.a.b.a.Ia:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind COMPILER_VERSION -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind LANGUAGE_VERSION -> b
@@ -35878,9 +35330,9 @@
     1:2:void <init>(java.lang.String,int,int,int):20997:20998 -> <init>
     1:1:int getNumber():20972:20972 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind[] values():20942:20942 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):20978:20978 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):20977:20977 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):20976:20976 -> c
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):20978:20978 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):20977:20977 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):20976:20976 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementOrBuilder -> com.android.tools.r8.d.b.a.b.a.Ka:
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.d.b.a.b.a.Na:
     java.util.List requirement_ -> b
@@ -35910,8 +35362,8 @@
     394:401:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):21770 -> <init>
     1:1:java.util.List access$21000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):21770:21770 -> a
     2:2:java.util.List access$21002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable,java.util.List):21770:21770 -> a
-    3:7:boolean isInitialized():21901:21905 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$21100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):21770:21770 -> b
+    2:6:boolean isInitialized():21901:21905 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder newBuilder():21993:21993 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):21996 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):21996:21996 -> c
@@ -36133,11 +35585,11 @@
     410:414:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):2594 -> <init>
     1:1:int access$2702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature,int):2594:2594 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$3000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2594:2594 -> a
-    3:7:boolean isInitialized():2729:2733 -> a
     1:1:int access$2802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature,int):2594:2594 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder():2828:2828 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2831 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2831:2831 -> b
+    2:6:boolean isInitialized():2729:2733 -> b
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder():2828:2828 -> b
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2831 -> b
+    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2831:2831 -> b
     1:1:int access$2902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature,int):2594:2594 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilderForType():2829:2829 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():2594 -> c
@@ -36145,11 +35597,11 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder toBuilder():2833:2833 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature getDefaultInstance():2607:2607 -> f
     1:1:int getDesc():2720:2720 -> g
-    1:1:int getName():2697:2697 -> h
-    1:1:boolean hasDesc():2710:2710 -> i
-    1:1:boolean hasName():2691:2691 -> j
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder():2828:2828 -> k
-    1:2:void initFields():2724:2725 -> l
+    1:1:int getName():2697:2697 -> getName
+    1:1:boolean hasDesc():2710:2710 -> h
+    1:1:boolean hasName():2691:2691 -> i
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder():2828:2828 -> j
+    1:2:void initFields():2724:2725 -> k
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.d.b.a.b.a.b.b:
     1:1:void <init>():2670:2670 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2675:2675 -> a
@@ -36224,11 +35676,11 @@
     410:414:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):2132 -> <init>
     1:1:int access$2002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature,int):2132:2132 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$2300(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2132:2132 -> a
-    3:7:boolean isInitialized():2267:2271 -> a
     1:1:int access$2102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature,int):2132:2132 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder():2366:2366 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2369 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2369:2369 -> b
+    2:6:boolean isInitialized():2267:2271 -> b
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder():2366:2366 -> b
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2369 -> b
+    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2369:2369 -> b
     1:1:int access$2202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature,int):2132:2132 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilderForType():2367:2367 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():2132 -> c
@@ -36237,11 +35689,11 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():2132 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getDefaultInstance():2145:2145 -> f
     1:1:int getDesc():2258:2258 -> g
-    1:1:int getName():2235:2235 -> h
-    1:1:boolean hasDesc():2248:2248 -> i
-    1:1:boolean hasName():2229:2229 -> j
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder():2366:2366 -> k
-    1:2:void initFields():2262:2263 -> l
+    1:1:int getName():2235:2235 -> getName
+    1:1:boolean hasDesc():2248:2248 -> h
+    1:1:boolean hasName():2229:2229 -> i
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder():2366:2366 -> j
+    1:2:void initFields():2262:2263 -> k
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.d.b.a.b.a.b.f:
     1:1:void <init>():2208:2208 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2213:2213 -> a
@@ -36312,8 +35764,8 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$3502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3074:3074 -> a
     3:3:int access$3802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature,int):3074:3074 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$3900(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3074:3074 -> a
-    5:9:boolean isInitialized():3283:3287 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$3602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3074:3074 -> b
+    2:6:boolean isInitialized():3283:3287 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$3702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3074:3074 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder newBuilderForType():3397:3397 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():3074 -> c
@@ -36412,9 +35864,9 @@
     4747:4757:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):70 -> <init>
     1:1:java.util.List access$1400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):70:70 -> a
     2:2:java.util.List access$1402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes,java.util.List):70:70 -> a
-    3:7:boolean isInitialized():1638:1642 -> a
     1:1:java.util.List access$1500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):70:70 -> b
     2:2:java.util.List access$1502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes,java.util.List):70:70 -> b
+    3:7:boolean isInitialized():1638:1642 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$1600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):70:70 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder newBuilderForType():1752:1752 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():70 -> c
@@ -36539,10 +35991,10 @@
     3:3:java.lang.Object access$602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record,java.lang.Object):328:328 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation access$702(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$Operation):328:328 -> a
     5:5:java.util.List access$802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record,java.util.List):328:328 -> a
-    6:10:boolean isInitialized():782:786 -> a
     1:1:int access$402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record,int):328:328 -> b
     2:2:java.lang.Object access$600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):328:328 -> b
     3:3:java.util.List access$902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record,java.util.List):328:328 -> b
+    4:8:boolean isInitialized():782:786 -> b
     1:1:int access$502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record,int):328:328 -> c
     2:2:java.util.List access$800(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):328:328 -> c
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder newBuilderForType():938:938 -> c
@@ -36621,9 +36073,9 @@
     1:2:void <init>(java.lang.String,int,int,int):562:563 -> <init>
     1:1:int getNumber():537:537 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation[] values():487:487 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):543:543 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):542:542 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):541:541 -> c
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):543:543 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):542:542 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):541:541 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$RecordOrBuilder -> com.android.tools.r8.d.b.a.b.a.b.t:
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypesOrBuilder -> com.android.tools.r8.d.b.a.b.a.b.v:
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding -> com.android.tools.r8.d.b.a.b.a.b.a.a:
@@ -36644,23 +36096,24 @@
     1:2:java.lang.String[] dropMarker(java.lang.String[]):199:200 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite -> com.android.tools.r8.d.b.a.b.a.b.a.c:
     java.util.Map map -> a
-    1:10:void <clinit>():20:29 -> <clinit>
-    11:11:void <clinit>():21:21 -> <clinit>
-    12:166:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.getIndices(java.util.Collection):0:154 -> <clinit>
-    12:166:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.getIndices(java.util.Collection):0 -> <clinit>
-    12:166:void <clinit>():32 -> <clinit>
-    167:622:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):0:455 -> <clinit>
-    167:622:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):0 -> <clinit>
-    167:622:void <clinit>():32 -> <clinit>
-    623:623:void com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt__RangesKt.checkStepIsPositive(boolean,java.lang.Number):0:0 -> <clinit>
-    623:623:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):455 -> <clinit>
-    623:623:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):0 -> <clinit>
-    623:623:void <clinit>():32 -> <clinit>
-    624:624:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):456:456 -> <clinit>
-    624:624:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):0 -> <clinit>
-    624:624:void <clinit>():32 -> <clinit>
-    625:660:void <clinit>():32:67 -> <clinit>
-    661:661:void <clinit>():20:20 -> <clinit>
+    1:15:void <clinit>():15:29 -> <clinit>
+    16:16:void <clinit>():21:21 -> <clinit>
+    17:171:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.getIndices(java.util.Collection):0:154 -> <clinit>
+    17:171:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.getIndices(java.util.Collection):0 -> <clinit>
+    17:171:void <clinit>():32 -> <clinit>
+    172:627:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):0:455 -> <clinit>
+    172:627:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):0 -> <clinit>
+    172:627:void <clinit>():32 -> <clinit>
+    628:628:void com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt__RangesKt.checkStepIsPositive(boolean,java.lang.Number):0:0 -> <clinit>
+    628:628:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):455 -> <clinit>
+    628:628:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):0 -> <clinit>
+    628:628:void <clinit>():32 -> <clinit>
+    629:629:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):456:456 -> <clinit>
+    629:629:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):0 -> <clinit>
+    629:629:void <clinit>():32 -> <clinit>
+    630:665:void <clinit>():32:67 -> <clinit>
+    666:666:void <clinit>():20:20 -> <clinit>
+    1:1:void <init>():15:15 -> <init>
     1:1:java.lang.String mapClass(java.lang.String):76:76 -> a
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite$map$1$1 -> com.android.tools.r8.d.b.a.b.a.b.a.b:
     java.util.Map receiver$0 -> a
@@ -36922,7 +36375,7 @@
     49:49:void copyTo(byte[],int,int,int):482:482 -> a
     void copyToInternal(byte[],int,int,int) -> b
     int partialIsValidUtf8(int,int,int) -> b
-    int getTreeDepth() -> d
+    int getTreeDepth() -> c
     boolean isBalanced() -> e
     boolean isValidUtf8() -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output newOutput():751:751 -> h
@@ -36940,16 +36393,16 @@
     1:1:void <clinit>():765:765 -> <clinit>
     1:7:void <init>(int):783:789 -> <init>
     8:8:void <init>(int):785:785 -> <init>
-    1:1:int size():872:872 -> a
-    2:10:void flushFullBuffer(int):898:906 -> a
-    1:1:void flushLastBuffer():914:914 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> b
-    2:3:byte[] copyArray(byte[],int):835:836 -> b
-    2:3:void flushLastBuffer():916 -> b
-    2:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> b
-    4:18:void flushLastBuffer():917:931 -> b
-    4:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> b
-    19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():828:828 -> b
+    1:9:void flushFullBuffer(int):898:906 -> a
+    10:10:void flushLastBuffer():914:914 -> a
+    10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> a
+    11:12:byte[] copyArray(byte[],int):835:836 -> a
+    11:12:void flushLastBuffer():916 -> a
+    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> a
+    13:27:void flushLastBuffer():917:931 -> a
+    13:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> a
+    28:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():828:828 -> a
+    1:1:int size():872:872 -> size
     1:1:java.lang.String toString():888:888 -> toString
     1:4:void write(int):794:797 -> write
     5:19:void write(byte[],int,int):802:816 -> write
@@ -37445,7 +36898,7 @@
     23:23:int partialHash(int,int,int):271 -> a
     1:1:void copyToInternal(byte[],int,int,int):117:117 -> b
     2:3:int partialIsValidUtf8(int,int,int):169:170 -> b
-    int getTreeDepth() -> d
+    int getTreeDepth() -> c
     boolean isBalanced() -> e
     1:17:boolean equals(java.lang.Object):181:197 -> equals
     1:2:boolean isValidUtf8():163:164 -> g
@@ -37482,8 +36935,8 @@
     1:3:byte nextByte():330:332 -> nextByte
     1:1:void remove():337:337 -> remove
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.d.b.a.b.b.F:
-    boolean isInitialized() -> a
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType() -> b
+    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.d.b.a.b.b.G:
     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.d.b.a.b.b.L:
@@ -37513,7 +36966,7 @@
     2:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString concatenateBytes(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):214:219 -> b
     8:16:void copyToInternal(byte[],int,int,int):360:368 -> b
     17:24:int partialIsValidUtf8(int,int,int):437:444 -> b
-    1:1:int getTreeDepth():277:277 -> d
+    1:1:int getTreeDepth():277:277 -> c
     1:1:boolean isBalanced():290:290 -> e
     1:20:boolean equals(java.lang.Object):456:475 -> equals
     21:58:boolean equalsFragments(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):494:531 -> equals
@@ -37664,7 +37117,7 @@
     int pos -> a
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap):532:534 -> <init>
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1):532 -> <init>
-    1:4:java.util.Iterator getOverflowIterator():577:580 -> d
+    1:4:java.util.Iterator getOverflowIterator():577:580 -> c
     1:1:boolean hasNext():540:540 -> hasNext
     1:7:java.util.Map$Entry next():546:552 -> next
     1:7:java.lang.Object next():532 -> next
@@ -37994,16 +37447,16 @@
     23:23:void <init>(java.util.Collection,java.lang.String):55:55 -> <init>
     java.lang.Object convert(java.lang.String) -> a
     void handleOption(com.android.tools.r8.joptsimple.OptionParser,com.android.tools.r8.joptsimple.ArgumentList,com.android.tools.r8.joptsimple.OptionSet,java.lang.String) -> a
-    1:1:java.lang.String description():71:71 -> a
-    2:2:java.lang.Object com.android.tools.r8.joptsimple.internal.Reflection.convertWith(com.android.tools.r8.joptsimple.ValueConverter,java.lang.String):128:128 -> a
-    2:2:java.lang.Object convertWith(com.android.tools.r8.joptsimple.ValueConverter,java.lang.String):91 -> a
-    3:3:java.lang.Object convertWith(com.android.tools.r8.joptsimple.ValueConverter,java.lang.String):97:97 -> a
-    4:4:java.lang.Object convertWith(com.android.tools.r8.joptsimple.ValueConverter,java.lang.String):94:94 -> a
+    1:1:java.lang.Object com.android.tools.r8.joptsimple.internal.Reflection.convertWith(com.android.tools.r8.joptsimple.ValueConverter,java.lang.String):128:128 -> a
+    1:1:java.lang.Object convertWith(com.android.tools.r8.joptsimple.ValueConverter,java.lang.String):91 -> a
+    2:2:java.lang.Object convertWith(com.android.tools.r8.joptsimple.ValueConverter,java.lang.String):97:97 -> a
+    3:3:java.lang.Object convertWith(com.android.tools.r8.joptsimple.ValueConverter,java.lang.String):94:94 -> a
+    1:1:java.lang.String description():71:71 -> description
     1:5:boolean equals(java.lang.Object):137:141 -> equals
+    1:1:com.android.tools.r8.joptsimple.AbstractOptionSpec forHelp():75:75 -> g
+    1:1:boolean isForHelp():80:80 -> h
     1:1:int hashCode():146:146 -> hashCode
-    1:1:com.android.tools.r8.joptsimple.AbstractOptionSpec forHelp():75:75 -> i
-    1:1:boolean isForHelp():80:80 -> j
-    1:1:java.util.Collection options():59:59 -> k
+    1:1:java.util.Collection options():59:59 -> i
     1:1:java.lang.String toString():151:151 -> toString
 com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec -> com.android.tools.r8.e.b:
     java.lang.String argumentDescription -> g
@@ -38015,49 +37468,49 @@
     1:1:void <init>(java.util.Collection,boolean,java.lang.String):75:75 -> <init>
     2:15:void <init>(java.util.Collection,boolean,java.lang.String):64:77 -> <init>
     void detectOptionArgument(com.android.tools.r8.joptsimple.OptionParser,com.android.tools.r8.joptsimple.ArgumentList,com.android.tools.r8.joptsimple.OptionSet) -> a
-    1:1:java.lang.String description():58:58 -> a
-    2:2:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec ofType(java.lang.Class):106:106 -> a
-    3:3:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withValuesConvertedBy(com.android.tools.r8.joptsimple.ValueConverter):126:126 -> a
+    1:1:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec ofType(java.lang.Class):106:106 -> a
+    2:2:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withValuesConvertedBy(com.android.tools.r8.joptsimple.ValueConverter):126:126 -> a
+    2:2:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec ofType(java.lang.Class):106 -> a
+    3:3:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withValuesConvertedBy(com.android.tools.r8.joptsimple.ValueConverter):124:124 -> a
     3:3:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec ofType(java.lang.Class):106 -> a
-    4:4:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withValuesConvertedBy(com.android.tools.r8.joptsimple.ValueConverter):124:124 -> a
-    4:4:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec ofType(java.lang.Class):106 -> a
-    5:5:void addDefaultValue(java.lang.Object):248:248 -> a
-    5:5:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):210 -> a
-    6:6:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object[]):224:224 -> a
+    4:4:void addDefaultValue(java.lang.Object):248:248 -> a
+    4:4:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):210 -> a
+    5:5:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object[]):224:224 -> a
+    5:5:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):211 -> a
+    6:6:void addDefaultValue(java.lang.Object):248:248 -> a
+    6:6:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object[]):225 -> a
     6:6:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):211 -> a
-    7:7:void addDefaultValue(java.lang.Object):248:248 -> a
+    7:7:void com.android.tools.r8.joptsimple.internal.Objects.ensureNotNull(java.lang.Object):44:44 -> a
+    7:7:void addDefaultValue(java.lang.Object):247 -> a
     7:7:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object[]):225 -> a
     7:7:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):211 -> a
     8:8:void com.android.tools.r8.joptsimple.internal.Objects.ensureNotNull(java.lang.Object):44:44 -> a
     8:8:void addDefaultValue(java.lang.Object):247 -> a
-    8:8:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object[]):225 -> a
-    8:8:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):211 -> a
-    9:9:void com.android.tools.r8.joptsimple.internal.Objects.ensureNotNull(java.lang.Object):44:44 -> a
-    9:9:void addDefaultValue(java.lang.Object):247 -> a
-    9:9:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):210 -> a
-    10:13:void handleOption(com.android.tools.r8.joptsimple.OptionParser,com.android.tools.r8.joptsimple.ArgumentList,com.android.tools.r8.joptsimple.OptionSet,java.lang.String):255:258 -> a
-    14:19:void addArguments(com.android.tools.r8.joptsimple.OptionSet,java.lang.String):262:267 -> a
-    20:20:java.lang.Object convert(java.lang.String):276:276 -> a
+    8:8:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):210 -> a
+    9:12:void handleOption(com.android.tools.r8.joptsimple.OptionParser,com.android.tools.r8.joptsimple.ArgumentList,com.android.tools.r8.joptsimple.OptionSet,java.lang.String):255:258 -> a
+    13:18:void addArguments(com.android.tools.r8.joptsimple.OptionSet,java.lang.String):262:267 -> a
+    19:19:java.lang.Object convert(java.lang.String):276:276 -> a
+    20:20:boolean requiresArgument():301:301 -> a
     1:5:boolean canConvertArgument(java.lang.String):280:284 -> b
     6:6:java.lang.Object convert(java.lang.String):276:276 -> b
     6:6:boolean canConvertArgument(java.lang.String):284 -> b
-    7:7:boolean requiresArgument():301:301 -> b
+    7:7:java.lang.String argumentDescription():305:305 -> b
     1:1:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec describedAs(java.lang.String):138:138 -> c
-    2:2:java.lang.String argumentDescription():305:305 -> c
-    boolean acceptsArguments() -> d
-    1:1:java.util.List defaultValues():313:313 -> e
+    2:2:java.lang.String argumentTypeIndicator():309:309 -> c
+    3:4:java.lang.String com.android.tools.r8.joptsimple.AbstractOptionSpec.argumentTypeIndicatorFrom(com.android.tools.r8.joptsimple.ValueConverter):105:106 -> c
+    3:4:java.lang.String argumentTypeIndicator():309 -> c
+    1:1:java.util.List defaultValues():313:313 -> d
+    1:1:java.lang.String description():58:58 -> description
+    boolean representsNonOptions() -> e
     1:4:boolean equals(java.lang.Object):318:321 -> equals
     5:5:boolean requiresArgument():301:301 -> equals
     5:5:boolean equals(java.lang.Object):322 -> equals
     6:6:boolean requiresArgument():301:301 -> equals
     6:6:boolean equals(java.lang.Object):322 -> equals
-    1:1:boolean isRequired():243:243 -> f
-    1:1:java.lang.String argumentTypeIndicator():309:309 -> g
-    2:3:java.lang.String com.android.tools.r8.joptsimple.AbstractOptionSpec.argumentTypeIndicatorFrom(com.android.tools.r8.joptsimple.ValueConverter):105:106 -> g
-    2:3:java.lang.String argumentTypeIndicator():309 -> g
-    boolean representsNonOptions() -> h
+    boolean acceptsArguments() -> f
     1:1:int hashCode():327:327 -> hashCode
-    1:1:boolean isArgumentOfNumberType():293:293 -> l
+    1:1:boolean isRequired():243:243 -> isRequired
+    1:1:boolean isArgumentOfNumberType():293:293 -> j
     1:1:java.lang.String toString():58:58 -> toString
 com.android.tools.r8.joptsimple.ArgumentList -> com.android.tools.r8.e.c:
     java.lang.String[] arguments -> a
@@ -38164,19 +37617,18 @@
     java.lang.String argumentDescription -> e
     1:1:void <init>(java.lang.String):64:64 -> <init>
     2:2:void <init>(java.lang.String):57:57 -> <init>
-    1:1:java.lang.String description():53:53 -> a
-    2:2:java.lang.Object convert(java.lang.String):133:133 -> a
-    3:3:void handleOption(com.android.tools.r8.joptsimple.OptionParser,com.android.tools.r8.joptsimple.ArgumentList,com.android.tools.r8.joptsimple.OptionSet,java.lang.String):140:140 -> a
-    boolean requiresArgument() -> b
-    1:1:java.lang.String argumentDescription():160:160 -> c
-    boolean acceptsArguments() -> d
-    1:1:java.util.List defaultValues():144:144 -> e
+    boolean requiresArgument() -> a
+    1:1:java.lang.Object convert(java.lang.String):133:133 -> a
+    2:2:void handleOption(com.android.tools.r8.joptsimple.OptionParser,com.android.tools.r8.joptsimple.ArgumentList,com.android.tools.r8.joptsimple.OptionSet,java.lang.String):140:140 -> a
+    1:1:java.lang.String argumentDescription():160:160 -> b
+    1:1:java.lang.String argumentTypeIndicator():164:164 -> c
+    2:3:java.lang.String com.android.tools.r8.joptsimple.AbstractOptionSpec.argumentTypeIndicatorFrom(com.android.tools.r8.joptsimple.ValueConverter):105:106 -> c
+    2:3:java.lang.String argumentTypeIndicator():164 -> c
+    1:1:java.util.List defaultValues():144:144 -> d
+    1:1:java.lang.String description():53:53 -> description
+    boolean representsNonOptions() -> e
     1:1:boolean equals(java.lang.Object):53:53 -> equals
-    boolean isRequired() -> f
-    1:1:java.lang.String argumentTypeIndicator():164:164 -> g
-    2:3:java.lang.String com.android.tools.r8.joptsimple.AbstractOptionSpec.argumentTypeIndicatorFrom(com.android.tools.r8.joptsimple.ValueConverter):105:106 -> g
-    2:3:java.lang.String argumentTypeIndicator():164 -> g
-    boolean representsNonOptions() -> h
+    boolean acceptsArguments() -> f
     1:1:int hashCode():53:53 -> hashCode
     1:1:java.lang.String toString():53:53 -> toString
 com.android.tools.r8.joptsimple.OptionArgumentConversionException -> com.android.tools.r8.e.j:
@@ -38184,14 +37636,12 @@
     1:3:void <init>(java.util.Collection,java.lang.String,java.lang.Throwable):41:43 -> <init>
     1:1:java.lang.String getMessage():48:48 -> getMessage
 com.android.tools.r8.joptsimple.OptionDescriptor -> com.android.tools.r8.e.k:
-    java.lang.String description() -> a
-    boolean requiresArgument() -> b
-    java.lang.String argumentDescription() -> c
-    boolean acceptsArguments() -> d
-    java.util.List defaultValues() -> e
-    boolean isRequired() -> f
-    java.lang.String argumentTypeIndicator() -> g
-    boolean representsNonOptions() -> h
+    boolean requiresArgument() -> a
+    java.lang.String argumentDescription() -> b
+    java.lang.String argumentTypeIndicator() -> c
+    java.util.List defaultValues() -> d
+    boolean representsNonOptions() -> e
+    boolean acceptsArguments() -> f
 com.android.tools.r8.joptsimple.OptionException -> com.android.tools.r8.e.l:
     java.util.List options -> a
     1:1:void <init>(java.util.Collection):47:47 -> <init>
@@ -38343,30 +37793,29 @@
     3:3:void attachToParser():71:71 -> <init>
     3:3:void <init>(com.android.tools.r8.joptsimple.OptionParser,java.util.Collection,java.lang.String):67 -> <init>
     java.lang.Object com.android.tools.r8.joptsimple.NoArgumentOptionSpec.convert(java.lang.String) -> a
-    1:1:java.lang.String description():60:60 -> a
-    2:4:com.android.tools.r8.joptsimple.OptionSpecBuilder requiredIf(com.android.tools.r8.joptsimple.OptionSpec,com.android.tools.r8.joptsimple.OptionSpec[]):135:137 -> a
-    5:5:void com.android.tools.r8.joptsimple.OptionSet.add(com.android.tools.r8.joptsimple.AbstractOptionSpec):259:259 -> a
-    5:5:void com.android.tools.r8.joptsimple.NoArgumentOptionSpec.handleOption(com.android.tools.r8.joptsimple.OptionParser,com.android.tools.r8.joptsimple.ArgumentList,com.android.tools.r8.joptsimple.OptionSet,java.lang.String):51 -> a
-    5:5:void com.android.tools.r8.joptsimple.NoArgumentOptionSpec.handleOption(com.android.tools.r8.joptsimple.OptionParser,com.android.tools.r8.joptsimple.ArgumentList,com.android.tools.r8.joptsimple.OptionSet,java.lang.String):0 -> a
-    boolean requiresArgument() -> b
-    java.lang.String argumentDescription() -> c
-    boolean acceptsArguments() -> d
-    1:1:java.util.List com.android.tools.r8.joptsimple.NoArgumentOptionSpec.defaultValues():80:80 -> e
-    1:1:java.util.List defaultValues():60 -> e
+    boolean requiresArgument() -> a
+    1:3:com.android.tools.r8.joptsimple.OptionSpecBuilder requiredIf(com.android.tools.r8.joptsimple.OptionSpec,com.android.tools.r8.joptsimple.OptionSpec[]):135:137 -> a
+    4:4:void com.android.tools.r8.joptsimple.OptionSet.add(com.android.tools.r8.joptsimple.AbstractOptionSpec):259:259 -> a
+    4:4:void com.android.tools.r8.joptsimple.NoArgumentOptionSpec.handleOption(com.android.tools.r8.joptsimple.OptionParser,com.android.tools.r8.joptsimple.ArgumentList,com.android.tools.r8.joptsimple.OptionSet,java.lang.String):51 -> a
+    4:4:void com.android.tools.r8.joptsimple.NoArgumentOptionSpec.handleOption(com.android.tools.r8.joptsimple.OptionParser,com.android.tools.r8.joptsimple.ArgumentList,com.android.tools.r8.joptsimple.OptionSet,java.lang.String):0 -> a
+    java.lang.String argumentDescription() -> b
+    java.lang.String argumentTypeIndicator() -> c
+    1:1:java.util.List com.android.tools.r8.joptsimple.NoArgumentOptionSpec.defaultValues():80:80 -> d
+    1:1:java.util.List defaultValues():60 -> d
+    1:1:java.lang.String description():60:60 -> description
+    boolean representsNonOptions() -> e
     1:1:boolean equals(java.lang.Object):60:60 -> equals
-    boolean isRequired() -> f
-    java.lang.String argumentTypeIndicator() -> g
-    boolean representsNonOptions() -> h
+    boolean acceptsArguments() -> f
+    com.android.tools.r8.joptsimple.AbstractOptionSpec forHelp() -> g
     1:1:int hashCode():60:60 -> hashCode
-    com.android.tools.r8.joptsimple.AbstractOptionSpec forHelp() -> i
-    1:1:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withOptionalArg():93:93 -> l
-    2:2:java.lang.String description():60:60 -> l
-    2:2:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withOptionalArg():93 -> l
-    3:5:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withOptionalArg():93:95 -> l
-    1:1:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withRequiredArg():80:80 -> m
-    2:2:java.lang.String description():60:60 -> m
-    2:2:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withRequiredArg():80 -> m
-    3:5:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withRequiredArg():80:82 -> m
+    1:1:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withOptionalArg():93:93 -> j
+    2:2:java.lang.String description():60:60 -> j
+    2:2:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withOptionalArg():93 -> j
+    3:5:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withOptionalArg():93:95 -> j
+    1:1:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withRequiredArg():80:80 -> k
+    2:2:java.lang.String description():60:60 -> k
+    2:2:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withRequiredArg():80 -> k
+    3:5:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withRequiredArg():80:82 -> k
     1:1:java.lang.String toString():60:60 -> toString
 com.android.tools.r8.joptsimple.OptionalArgumentOptionSpec -> com.android.tools.r8.e.u:
     1:1:void <init>(java.util.Collection,java.lang.String):42:42 -> <init>
@@ -38543,7 +37992,7 @@
     1:5:boolean equals(java.lang.Object):67:71 -> equals
     1:1:int hashCode():76:76 -> hashCode
     1:1:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.f.c:
+com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.f.e:
     java.lang.String KOTLIN -> f
     com.android.tools.r8.kotlin.Kotlin$Functional functional -> b
     com.android.tools.r8.kotlin.Kotlin$Metadata metadata -> d
@@ -38570,7 +38019,7 @@
     30:30:void <init>(com.android.tools.r8.kotlin.Kotlin):60:60 -> <init>
     30:30:void <init>(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.kotlin.Kotlin$1):45 -> <init>
     1:1:boolean isFunctionInterface(com.android.tools.r8.graph.DexType):76:76 -> a
-com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.f.c$a:
+com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.f.c:
     com.android.tools.r8.graph.DexType type -> a
     com.android.tools.r8.graph.DexMethod throwNpe -> d
     com.android.tools.r8.graph.DexMethod checkParameterIsNotNull -> c
@@ -38580,7 +38029,7 @@
     5:8:void <init>(com.android.tools.r8.kotlin.Kotlin):95:98 -> <init>
     9:13:void <init>(com.android.tools.r8.kotlin.Kotlin):97:101 -> <init>
     14:14:void <init>(com.android.tools.r8.kotlin.Kotlin):100:100 -> <init>
-com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.f.c$b:
+com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.f.d:
     com.android.tools.r8.graph.DexString kind -> b
     com.android.tools.r8.graph.DexString metadataVersion -> c
     com.android.tools.r8.graph.DexString bytecodeVersion -> d
@@ -38592,7 +38041,7 @@
     com.android.tools.r8.graph.DexString extraInt -> i
     com.android.tools.r8.graph.DexType kotlinMetadataType -> a
     1:10:void <init>(com.android.tools.r8.kotlin.Kotlin):80:89 -> <init>
-com.android.tools.r8.kotlin.KotlinClass -> com.android.tools.r8.f.e:
+com.android.tools.r8.kotlin.KotlinClass -> com.android.tools.r8.f.g:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,com.android.tools.r8.graph.DexClass):26:26 -> <init>
@@ -38600,22 +38049,22 @@
     2:2:void processMetadata(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class):32:32 -> a
     2:2:void processMetadata(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):16 -> a
     3:5:com.android.tools.r8.kotlin.KotlinClass fromKotlinClassMetadata(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexClass):20:22 -> a
-com.android.tools.r8.kotlin.KotlinClass$1 -> com.android.tools.r8.f.d:
-com.android.tools.r8.kotlin.KotlinClass$ClassVisitorForNonNullParameterHints -> com.android.tools.r8.f.e$a:
+com.android.tools.r8.kotlin.KotlinClass$1 -> com.android.tools.r8.f.f:
+com.android.tools.r8.kotlin.KotlinClass$ClassVisitorForNonNullParameterHints -> com.android.tools.r8.f.g$a:
     com.android.tools.r8.kotlin.KotlinClass this$0 -> b
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinClass):35:35 -> <init>
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinClass,com.android.tools.r8.kotlin.KotlinClass$1):35 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):38:38 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor visitConstructor(int):43:43 -> a
     3:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int):49:50 -> a
-com.android.tools.r8.kotlin.KotlinClassFacade -> com.android.tools.r8.f.f:
+com.android.tools.r8.kotlin.KotlinClassFacade -> com.android.tools.r8.f.h:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void com.android.tools.r8.kotlin.KotlinInfo.<init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):22:22 -> <init>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade):19 -> <init>
     1:1:void processMetadata(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):9:9 -> a
     1:4:com.android.tools.r8.kotlin.KotlinClassFacade fromKotlinClassMetadata(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):12:15 -> b
-com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.f.h:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.f.j:
     1:15:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.DiagnosticsHandler):27:41 -> a
     16:16:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.DiagnosticsHandler):39:39 -> a
     17:19:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.DiagnosticsHandler):35:37 -> a
@@ -38631,9 +38080,9 @@
     5:5:java.lang.String getUnboxedString(com.android.tools.r8.graph.DexValue,java.lang.String):122:122 -> b
     1:8:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):108:115 -> c
     9:9:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):109:109 -> c
-com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.f.g:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.f.i:
     1:1:void <init>(java.lang.String):129:129 -> <init>
-com.android.tools.r8.kotlin.KotlinClassPart -> com.android.tools.r8.f.j:
+com.android.tools.r8.kotlin.KotlinClassPart -> com.android.tools.r8.f.l:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void com.android.tools.r8.kotlin.KotlinInfo.<init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):22:22 -> <init>
@@ -38642,14 +38091,14 @@
     2:2:void processMetadata(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart):30:30 -> a
     2:2:void processMetadata(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):14 -> a
     1:4:com.android.tools.r8.kotlin.KotlinClassPart fromKotlinClassMetdata(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):17:20 -> b
-com.android.tools.r8.kotlin.KotlinClassPart$1 -> com.android.tools.r8.f.i:
-com.android.tools.r8.kotlin.KotlinClassPart$PackageVisitorForNonNullParameterHints -> com.android.tools.r8.f.j$a:
+com.android.tools.r8.kotlin.KotlinClassPart$1 -> com.android.tools.r8.f.k:
+com.android.tools.r8.kotlin.KotlinClassPart$PackageVisitorForNonNullParameterHints -> com.android.tools.r8.f.l$a:
     com.android.tools.r8.kotlin.KotlinClassPart this$0 -> b
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinClassPart):33:33 -> <init>
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinClassPart,com.android.tools.r8.kotlin.KotlinClassPart$1):33 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):36:36 -> a
     2:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int):42:43 -> a
-com.android.tools.r8.kotlin.KotlinFile -> com.android.tools.r8.f.l:
+com.android.tools.r8.kotlin.KotlinFile -> com.android.tools.r8.f.n:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void com.android.tools.r8.kotlin.KotlinInfo.<init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):22:22 -> <init>
@@ -38658,14 +38107,14 @@
     2:2:void processMetadata(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade):30:30 -> a
     2:2:void processMetadata(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):14 -> a
     1:4:com.android.tools.r8.kotlin.KotlinFile fromKotlinClassMetadata(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):17:20 -> b
-com.android.tools.r8.kotlin.KotlinFile$1 -> com.android.tools.r8.f.k:
-com.android.tools.r8.kotlin.KotlinFile$PackageVisitorForNonNullParameterHints -> com.android.tools.r8.f.l$a:
+com.android.tools.r8.kotlin.KotlinFile$1 -> com.android.tools.r8.f.m:
+com.android.tools.r8.kotlin.KotlinFile$PackageVisitorForNonNullParameterHints -> com.android.tools.r8.f.n$a:
     com.android.tools.r8.kotlin.KotlinFile this$0 -> b
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinFile):33:33 -> <init>
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinFile,com.android.tools.r8.kotlin.KotlinFile$1):33 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):36:36 -> a
     2:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int):42:43 -> a
-com.android.tools.r8.kotlin.KotlinInfo -> com.android.tools.r8.f.m:
+com.android.tools.r8.kotlin.KotlinInfo -> com.android.tools.r8.f.o:
     com.android.tools.r8.graph.DexClass clazz -> a
     com.android.tools.r8.com.google.common.collect.HashBasedTable nonNullparamHints -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexClass):25:25 -> <init>
@@ -38675,7 +38124,7 @@
     1:1:java.util.BitSet lookupNonNullParameterHint(java.lang.String,java.lang.String):85:85 -> a
     1:1:boolean hasNonNullParameterHints():81:81 -> b
     boolean isSyntheticClass() -> c
-com.android.tools.r8.kotlin.KotlinSyntheticClass -> com.android.tools.r8.f.p:
+com.android.tools.r8.kotlin.KotlinSyntheticClass -> com.android.tools.r8.f.r:
     com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour flavour -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():12:12 -> <clinit>
@@ -38697,21 +38146,21 @@
     1:1:boolean isJavaStyleLambda():64:64 -> d
     1:1:boolean isKotlinStyleLambda():60:60 -> e
     1:1:boolean isLambda():56:56 -> f
-com.android.tools.r8.kotlin.KotlinSyntheticClass$1 -> com.android.tools.r8.f.n:
-com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour -> com.android.tools.r8.f.o:
+com.android.tools.r8.kotlin.KotlinSyntheticClass$1 -> com.android.tools.r8.f.p:
+com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour -> com.android.tools.r8.f.q:
     com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour Unclassified -> c
     com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour JavaStyleLambda -> b
     com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour KotlinStyleLambda -> a
     1:3:void <clinit>():14:16 -> <clinit>
     4:4:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):13:13 -> <init>
-com.android.tools.r8.kotlin.KotlinSyntheticClass$LambdaVisitorForNonNullParameterHints -> com.android.tools.r8.f.p$a:
+com.android.tools.r8.kotlin.KotlinSyntheticClass$LambdaVisitorForNonNullParameterHints -> com.android.tools.r8.f.r$a:
     com.android.tools.r8.kotlin.KotlinSyntheticClass this$0 -> b
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinSyntheticClass):48:48 -> <init>
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinSyntheticClass,com.android.tools.r8.kotlin.KotlinSyntheticClass$1):48 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):51:51 -> a
-com.android.tools.r8.kotlin.NonNullParameterHintCollector -> com.android.tools.r8.f.y:
-com.android.tools.r8.kotlin.NonNullParameterHintCollector$ConstructorVisitor -> com.android.tools.r8.f.s:
+com.android.tools.r8.kotlin.NonNullParameterHintCollector -> com.android.tools.r8.f.A:
+com.android.tools.r8.kotlin.NonNullParameterHintCollector$ConstructorVisitor -> com.android.tools.r8.f.u:
     int paramIndex -> d
     java.util.BitSet paramHint -> c
     java.lang.String descriptor -> e
@@ -38725,17 +38174,17 @@
     8:11:void visitEnd():142:145 -> a
     1:1:int access$408(com.android.tools.r8.kotlin.NonNullParameterHintCollector$ConstructorVisitor):90:90 -> b
     1:1:java.util.BitSet access$500(com.android.tools.r8.kotlin.NonNullParameterHintCollector$ConstructorVisitor):90:90 -> c
-com.android.tools.r8.kotlin.NonNullParameterHintCollector$ConstructorVisitor$1 -> com.android.tools.r8.f.q:
+com.android.tools.r8.kotlin.NonNullParameterHintCollector$ConstructorVisitor$1 -> com.android.tools.r8.f.s:
     com.android.tools.r8.kotlin.NonNullParameterHintCollector$ConstructorVisitor this$0 -> b
     1:1:void <init>(com.android.tools.r8.kotlin.NonNullParameterHintCollector$ConstructorVisitor):114:114 -> <init>
     1:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitType(int):117:120 -> a
-com.android.tools.r8.kotlin.NonNullParameterHintCollector$ConstructorVisitor$2 -> com.android.tools.r8.f.r:
+com.android.tools.r8.kotlin.NonNullParameterHintCollector$ConstructorVisitor$2 -> com.android.tools.r8.f.t:
     com.android.tools.r8.kotlin.NonNullParameterHintCollector$ConstructorVisitor this$0 -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():131:131 -> <clinit>
     1:1:void <init>(com.android.tools.r8.kotlin.NonNullParameterHintCollector$ConstructorVisitor):131:131 -> <init>
     1:2:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):134:135 -> a
-com.android.tools.r8.kotlin.NonNullParameterHintCollector$FunctionVisitor -> com.android.tools.r8.f.v:
+com.android.tools.r8.kotlin.NonNullParameterHintCollector$FunctionVisitor -> com.android.tools.r8.f.x:
     java.lang.String descriptor -> f
     int paramIndex -> d
     java.util.BitSet paramHint -> c
@@ -38752,15 +38201,15 @@
     2:2:java.lang.String access$302(com.android.tools.r8.kotlin.NonNullParameterHintCollector$FunctionVisitor,java.lang.String):29:29 -> b
     3:6:void visitEnd():83:86 -> b
     1:1:java.util.BitSet access$100(com.android.tools.r8.kotlin.NonNullParameterHintCollector$FunctionVisitor):29:29 -> c
-com.android.tools.r8.kotlin.NonNullParameterHintCollector$FunctionVisitor$1 -> com.android.tools.r8.f.t:
+com.android.tools.r8.kotlin.NonNullParameterHintCollector$FunctionVisitor$1 -> com.android.tools.r8.f.v:
     com.android.tools.r8.kotlin.NonNullParameterHintCollector$FunctionVisitor this$0 -> b
     1:1:void <init>(com.android.tools.r8.kotlin.NonNullParameterHintCollector$FunctionVisitor):53:53 -> <init>
     1:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitType(int):56:59 -> a
-com.android.tools.r8.kotlin.NonNullParameterHintCollector$FunctionVisitor$2 -> com.android.tools.r8.f.u:
+com.android.tools.r8.kotlin.NonNullParameterHintCollector$FunctionVisitor$2 -> com.android.tools.r8.f.w:
     com.android.tools.r8.kotlin.NonNullParameterHintCollector$FunctionVisitor this$0 -> c
     1:1:void <init>(com.android.tools.r8.kotlin.NonNullParameterHintCollector$FunctionVisitor):70:70 -> <init>
     1:2:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):74:75 -> a
-com.android.tools.r8.kotlin.NonNullParameterHintCollector$PropertyVisitor -> com.android.tools.r8.f.x:
+com.android.tools.r8.kotlin.NonNullParameterHintCollector$PropertyVisitor -> com.android.tools.r8.f.z:
     java.lang.String descriptor -> f
     int paramIndex -> d
     java.util.BitSet paramHint -> c
@@ -38773,7 +38222,7 @@
     6:9:void visitEnd():191:194 -> a
     1:1:java.lang.String access$802(com.android.tools.r8.kotlin.NonNullParameterHintCollector$PropertyVisitor,java.lang.String):149:149 -> b
     2:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):163:166 -> b
-com.android.tools.r8.kotlin.NonNullParameterHintCollector$PropertyVisitor$1 -> com.android.tools.r8.f.w:
+com.android.tools.r8.kotlin.NonNullParameterHintCollector$PropertyVisitor$1 -> com.android.tools.r8.f.y:
     com.android.tools.r8.kotlin.NonNullParameterHintCollector$PropertyVisitor this$0 -> c
     1:1:void <init>(com.android.tools.r8.kotlin.NonNullParameterHintCollector$PropertyVisitor):175:175 -> <init>
     1:2:void visit(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):182:183 -> a
@@ -38787,53 +38236,50 @@
     com.android.tools.r8.com.google.common.collect.ImmutableMap classNameMappings -> a
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():37:37 -> <clinit>
-    1:1:void <init>(java.util.Map):108:108 -> <init>
+    1:1:void <init>(java.util.Map):104:104 -> <init>
     1:1:void <init>(java.util.Map,com.android.tools.r8.naming.ClassNameMapper$1):37 -> <init>
-    2:9:void <init>(java.util.Map):106:113 -> <init>
+    2:9:void <init>(java.util.Map):102:109 -> <init>
     2:9:void <init>(java.util.Map,com.android.tools.r8.naming.ClassNameMapper$1):37 -> <init>
-    1:5:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader):96:100 -> a
-    6:10:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader):96:100 -> a
-    11:14:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):126:129 -> a
-    15:15:java.lang.String deobfuscateType(java.lang.String):158:158 -> a
-    15:15:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):129 -> a
-    16:18:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):129:131 -> a
-    19:19:java.lang.String deobfuscateType(java.lang.String):158:158 -> a
-    19:19:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):131 -> a
-    20:20:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):133:133 -> a
-    21:25:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):117:121 -> a
-    21:25:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):135 -> a
-    26:26:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):135:135 -> a
-    27:27:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):139:139 -> a
-    28:28:java.lang.String deobfuscateType(java.lang.String):158:158 -> a
-    28:28:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):139 -> a
-    29:29:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):140:140 -> a
-    30:34:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):117:121 -> a
-    30:34:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):140 -> a
-    35:35:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):140:140 -> a
-    36:40:void write(java.io.Writer):180:184 -> a
-    41:41:java.lang.String lambda$write$0(com.android.tools.r8.naming.ClassNamingForNameMapper):182:182 -> a
-    42:49:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):223:230 -> a
-    50:59:java.lang.String lookupName(com.android.tools.r8.naming.MemberNaming$Signature,com.android.tools.r8.graph.DexType):235:244 -> a
-    1:11:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):248:258 -> b
-    12:22:com.android.tools.r8.naming.MemberNaming$FieldSignature originalSignatureOf(com.android.tools.r8.graph.DexField):262:272 -> b
+    1:6:com.android.tools.r8.naming.ClassNameMapper mapperFromInputStream(java.io.InputStream):71:76 -> a
+    7:11:com.android.tools.r8.naming.ClassNameMapper mapperFromInputStream(java.io.InputStream):72:76 -> a
+    12:15:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):122:125 -> a
+    16:16:java.lang.String deobfuscateType(java.lang.String):154:154 -> a
+    16:16:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):125 -> a
+    17:19:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):125:127 -> a
+    20:20:java.lang.String deobfuscateType(java.lang.String):154:154 -> a
+    20:20:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):127 -> a
+    21:21:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):129:129 -> a
+    22:26:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):113:117 -> a
+    22:26:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):131 -> a
+    27:27:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):131:131 -> a
+    28:28:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):135:135 -> a
+    29:29:java.lang.String deobfuscateType(java.lang.String):154:154 -> a
+    29:29:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):135 -> a
+    30:30:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):136:136 -> a
+    31:35:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):113:117 -> a
+    31:35:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):136 -> a
+    36:36:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):136:136 -> a
+    37:41:void write(java.io.Writer):176:180 -> a
+    42:42:java.lang.String lambda$write$0(com.android.tools.r8.naming.ClassNamingForNameMapper):178:178 -> a
+    43:50:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):219:226 -> a
+    51:60:java.lang.String lookupName(com.android.tools.r8.naming.MemberNaming$Signature,com.android.tools.r8.graph.DexType):231:240 -> a
+    1:11:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):244:254 -> b
+    12:22:com.android.tools.r8.naming.MemberNaming$FieldSignature originalSignatureOf(com.android.tools.r8.graph.DexField):258:268 -> b
     1:1:com.android.tools.r8.naming.ClassNameMapper$Builder builder():67:67 -> builder
-    1:5:java.lang.String deobfuscateClassName(java.lang.String):150:154 -> deobfuscateClassName
-    1:2:boolean equals(java.lang.Object):213:214 -> equals
-    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper getClassNaming(java.lang.String):174:174 -> getClassNaming
-    1:9:com.android.tools.r8.utils.BiMapContainer getObfuscatedToOriginalMapping():200:208 -> getObfuscatedToOriginalMapping
-    1:1:int hashCode():219:219 -> hashCode
-    1:1:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path):76:76 -> mapperFromFile
-    2:8:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path,com.android.tools.r8.naming.ClassNameMapper$MissingFileAction):81:87 -> mapperFromFile
-    9:9:com.android.tools.r8.naming.ClassNameMapper mapperFromInputStream(java.io.InputStream):71:71 -> mapperFromFile
-    9:9:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path,com.android.tools.r8.naming.ClassNameMapper$MissingFileAction):87 -> mapperFromFile
-    1:1:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):91:91 -> mapperFromString
-    2:3:java.io.BufferedReader com.android.tools.r8.com.google.common.io.CharSource.openBufferedStream():113:114 -> mapperFromString
-    2:3:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):91 -> mapperFromString
-    4:4:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):91:91 -> mapperFromString
-    1:1:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):276:276 -> originalNameOf
-    2:2:java.lang.String deobfuscateType(java.lang.String):158:158 -> originalNameOf
-    2:2:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):276 -> originalNameOf
-    1:5:java.lang.String toString():191:195 -> toString
+    1:5:java.lang.String deobfuscateClassName(java.lang.String):146:150 -> deobfuscateClassName
+    1:2:boolean equals(java.lang.Object):209:210 -> equals
+    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper getClassNaming(java.lang.String):170:170 -> getClassNaming
+    1:9:com.android.tools.r8.utils.BiMapContainer getObfuscatedToOriginalMapping():196:204 -> getObfuscatedToOriginalMapping
+    1:1:int hashCode():215:215 -> hashCode
+    1:1:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path):80:80 -> mapperFromFile
+    2:8:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path,com.android.tools.r8.naming.ClassNameMapper$MissingFileAction):85:91 -> mapperFromFile
+    1:2:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):95:96 -> mapperFromString
+    3:3:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):95:95 -> mapperFromString
+    1:1:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):272:272 -> originalNameOf
+    2:2:java.lang.String deobfuscateType(java.lang.String):154:154 -> originalNameOf
+    2:2:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):272 -> originalNameOf
+    1:5:java.lang.String toString():187:191 -> toString
+com.android.tools.r8.naming.ClassNameMapper$1 -> com.android.tools.r8.naming.b:
 com.android.tools.r8.naming.ClassNameMapper$Builder -> com.android.tools.r8.naming.ClassNameMapper$Builder:
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder mapBuilder -> a
     1:2:void <init>():47:48 -> <init>
@@ -38847,139 +38293,139 @@
     1:1:void <init>(java.lang.String,int):39:39 -> <init>
 com.android.tools.r8.naming.ClassNameMinifier -> com.android.tools.r8.naming.ClassNameMinifier:
     boolean keepInnerClassStructure -> n
-    boolean $assertionsDisabled -> p
     com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.naming.ClassNameMinifier$Namespace topLevelState -> o
+    com.android.tools.r8.naming.ClassNameMinifier$Namespace topLevelState -> q
     java.lang.Iterable classes -> d
+    boolean $assertionsDisabled -> r
     java.util.Set noObfuscationPrefixes -> g
     com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy classNamingStrategy -> b
     java.util.Set usedPackagePrefixes -> h
     java.util.Set usedTypeNames -> i
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode packageObfuscationMode -> e
     com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy packageNamingStrategy -> c
+    java.util.Set noObfuscationTypes -> o
     boolean isAccessModificationAllowed -> f
     java.util.Map renaming -> j
+    java.util.Set keepPackageName -> p
     java.util.Map states -> k
     java.util.List classDictionary -> m
     java.util.List packageDictionary -> l
     1:1:void <clinit>():40:40 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy,com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy,java.lang.Iterable):64:64 -> <init>
-    2:37:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy,com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy,java.lang.Iterable):48:83 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy,com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy,java.lang.Iterable):68:68 -> <init>
+    2:43:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy,com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy,java.lang.Iterable):48:89 -> <init>
+    44:44:void com.android.tools.r8.naming.ClassNameMinifier$Namespace.<init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String):357:357 -> <init>
+    44:44:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy,com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy,java.lang.Iterable):89 -> <init>
+    45:47:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy,com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy,java.lang.Iterable):89:91 -> <init>
     1:1:java.util.List access$100(com.android.tools.r8.naming.ClassNameMinifier):40:40 -> a
-    2:2:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing):98:98 -> a
-    3:32:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing,java.util.Map):103:132 -> a
-    33:55:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing,java.util.Map):129:151 -> a
-    56:64:java.util.Map getPackageRenaming():155:163 -> a
-    56:64:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing,java.util.Map):151 -> a
-    65:65:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing,java.util.Map):151:151 -> a
-    66:67:void renameDanglingTypes(com.android.tools.r8.graph.DexClass):167:168 -> a
-    68:68:void renameDanglingTypesInField(com.android.tools.r8.graph.DexEncodedField):172:172 -> a
-    69:72:void renameDanglingTypesInMethod(com.android.tools.r8.graph.DexEncodedMethod):176:179 -> a
-    73:76:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):265:268 -> a
-    77:81:java.lang.String getInnerNameForType(com.android.tools.r8.graph.DexType):256:260 -> a
-    77:81:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):272 -> a
-    82:82:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):272:272 -> a
-    83:85:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):271:273 -> a
-    86:102:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForOuterClass(com.android.tools.r8.graph.DexType,java.lang.String):337:353 -> a
-    86:102:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):274 -> a
-    103:105:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):278:280 -> a
-    106:123:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForPackagePrefix(java.lang.String):314:331 -> a
-    124:125:boolean isNotKotlinMetadata(com.android.tools.r8.graph.DexAnnotation):479:480 -> a
+    2:35:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing):107:140 -> a
+    36:44:java.util.Map getPackageRenaming():144:152 -> a
+    36:44:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing):140 -> a
+    45:45:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing):140:140 -> a
+    46:47:void renameDanglingTypes(com.android.tools.r8.graph.DexClass):156:157 -> a
+    48:48:void renameDanglingTypesInField(com.android.tools.r8.graph.DexEncodedField):161:161 -> a
+    49:52:void renameDanglingTypesInMethod(com.android.tools.r8.graph.DexEncodedMethod):165:168 -> a
+    53:56:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):244:247 -> a
+    57:73:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForOuterClass(com.android.tools.r8.graph.DexType):311:327 -> a
+    57:73:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):249 -> a
+    74:76:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):253:255 -> a
+    77:93:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForPackagePrefix(java.lang.String):288:304 -> a
+    94:94:void com.android.tools.r8.naming.ClassNameMinifier$Namespace.<init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String):357:357 -> a
+    94:94:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForPackagePrefix(java.lang.String):304 -> a
+    95:95:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForPackagePrefix(java.lang.String):305:305 -> a
+    96:97:boolean isNotKotlinMetadata(com.android.tools.r8.graph.DexAnnotation):451:452 -> a
     1:1:java.util.List access$200(com.android.tools.r8.naming.ClassNameMinifier):40:40 -> b
-    2:22:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):230:250 -> b
-    23:23:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForClass$0(java.lang.String):290:290 -> b
+    2:20:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):218:236 -> b
+    21:21:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForClass$0(java.lang.String):264:264 -> b
+    22:22:void com.android.tools.r8.naming.ClassNameMinifier$Namespace.<init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String):357:357 -> b
+    22:22:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForClass$0(java.lang.String):264 -> b
     1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.naming.ClassNameMinifier):40:40 -> c
-    2:22:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):284:304 -> c
-    23:23:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):300:300 -> c
-    24:24:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):296:296 -> c
-    25:25:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):290:290 -> c
-    26:27:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForClass$1(java.lang.String):305:306 -> c
+    2:21:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):259:278 -> c
+    22:22:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):274:274 -> c
+    23:23:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):270:270 -> c
+    24:24:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):264:264 -> c
+    25:26:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForClass$1(java.lang.String):279:280 -> c
+    27:27:void com.android.tools.r8.naming.ClassNameMinifier$Namespace.<init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String):357:357 -> c
+    27:27:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForClass$1(java.lang.String):280 -> c
     1:1:java.util.Set access$400(com.android.tools.r8.naming.ClassNameMinifier):40:40 -> d
-    2:4:void registerClassAsUsed(com.android.tools.r8.graph.DexType):196:198 -> d
-    5:11:void registerPackagePrefixesAsUsed(java.lang.String):219:225 -> d
-    5:11:void registerClassAsUsed(com.android.tools.r8.graph.DexType):197 -> d
-    12:20:void registerClassAsUsed(com.android.tools.r8.graph.DexType):199:207 -> d
-    21:21:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForPackagePrefix$2(java.lang.String):321:321 -> d
+    2:4:void registerClassAsUsed(com.android.tools.r8.graph.DexType):185:187 -> d
+    5:11:void registerPackagePrefixesAsUsed(java.lang.String):207:213 -> d
+    5:11:void registerClassAsUsed(com.android.tools.r8.graph.DexType):186 -> d
+    12:19:void registerClassAsUsed(com.android.tools.r8.graph.DexType):188:195 -> d
+    20:20:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForPackagePrefix$2(java.lang.String):295:295 -> d
+    21:21:void com.android.tools.r8.naming.ClassNameMinifier$Namespace.<init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String):357:357 -> d
+    21:21:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForPackagePrefix$2(java.lang.String):295 -> d
     1:1:com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy access$500(com.android.tools.r8.naming.ClassNameMinifier):40:40 -> e
-    2:13:void renameArrayTypeIfNeeded(com.android.tools.r8.graph.DexType):359:370 -> e
+    2:13:void renameArrayTypeIfNeeded(com.android.tools.r8.graph.DexType):333:344 -> e
     1:1:com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy access$600(com.android.tools.r8.naming.ClassNameMinifier):40:40 -> f
-    2:9:void renameDanglingType(com.android.tools.r8.graph.DexType):184:191 -> f
+    2:9:void renameDanglingType(com.android.tools.r8.graph.DexType):173:180 -> f
     1:1:java.util.Set access$700(com.android.tools.r8.naming.ClassNameMinifier):40:40 -> g
-    1:5:java.lang.String getParentPackagePrefix(java.lang.String):471:475 -> getParentPackagePrefix
-com.android.tools.r8.naming.ClassNameMinifier$1 -> com.android.tools.r8.naming.ClassNameMinifier$1:
+    1:5:java.lang.String getParentPackagePrefix(java.lang.String):443:447 -> getParentPackagePrefix
+com.android.tools.r8.naming.ClassNameMinifier$1 -> com.android.tools.r8.naming.c:
     int[] $SwitchMap$com$android$tools$r8$utils$InternalOptions$PackageObfuscationMode -> a
-    1:1:void <clinit>():293:293 -> <clinit>
+    1:1:void <clinit>():267:267 -> <clinit>
 com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy -> com.android.tools.r8.naming.ClassNameMinifier$a:
     boolean bypassDictionary() -> a
     com.android.tools.r8.graph.DexString next(com.android.tools.r8.naming.ClassNameMinifier$Namespace,com.android.tools.r8.graph.DexType,char[]) -> a
-    java.util.Set noObfuscation() -> b
 com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming -> com.android.tools.r8.naming.ClassNameMinifier$b:
     java.util.Map packageRenaming -> a
     java.util.Map classRenaming -> b
-    1:3:void <init>(java.util.Map,java.util.Map):91:93 -> <init>
-    1:3:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.naming.ClassNameMinifier$1):86 -> <init>
+    1:3:void <init>(java.util.Map,java.util.Map):99:101 -> <init>
+    1:3:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.naming.ClassNameMinifier$1):94 -> <init>
 com.android.tools.r8.naming.ClassNameMinifier$Namespace -> com.android.tools.r8.naming.ClassNameMinifier$c:
     java.util.Iterator classDictionaryIterator -> d
     char[] packagePrefix -> b
     java.util.Iterator packageDictionaryIterator -> c
     com.android.tools.r8.naming.ClassNameMinifier this$0 -> e
     java.lang.String packageName -> a
-    1:1:void <init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String):383:383 -> <init>
-    2:14:void <init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String,java.lang.String):386:398 -> <init>
-    1:1:java.lang.String getPackageName():402:402 -> a
-    2:7:com.android.tools.r8.graph.DexString nextSuggestedNameForClass(com.android.tools.r8.graph.DexType):406:411 -> a
-    2:7:com.android.tools.r8.graph.DexString nextTypeName(com.android.tools.r8.graph.DexType):418 -> a
-    8:9:com.android.tools.r8.graph.DexString nextTypeName(com.android.tools.r8.graph.DexType):419:420 -> a
-    1:6:java.lang.String nextSuggestedNameForSubpackage():429:434 -> b
-    1:6:java.lang.String nextPackagePrefix():441 -> b
-    7:8:java.lang.String nextPackagePrefix():442:443 -> b
+    1:13:void <init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String,char):360:372 -> <init>
+    1:1:java.lang.String getPackageName():376:376 -> a
+    2:7:com.android.tools.r8.graph.DexString nextSuggestedNameForClass(com.android.tools.r8.graph.DexType):380:385 -> a
+    2:7:com.android.tools.r8.graph.DexString nextTypeName(com.android.tools.r8.graph.DexType):392 -> a
+    8:9:com.android.tools.r8.graph.DexString nextTypeName(com.android.tools.r8.graph.DexType):393:394 -> a
+    1:6:java.lang.String nextSuggestedNameForSubpackage():403:408 -> b
+    1:6:java.lang.String nextPackagePrefix():415 -> b
+    7:8:java.lang.String nextPackagePrefix():416:417 -> b
 com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy -> com.android.tools.r8.naming.ClassNameMinifier$d:
-com.android.tools.r8.naming.ClassNaming -> com.android.tools.r8.naming.b:
-com.android.tools.r8.naming.ClassNaming$Builder -> com.android.tools.r8.naming.b$a:
+com.android.tools.r8.naming.ClassNaming -> com.android.tools.r8.naming.d:
+com.android.tools.r8.naming.ClassNaming$Builder -> com.android.tools.r8.naming.d$a:
     1:1:void <init>():16:16 -> <init>
     void addMappedRange(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String) -> a
     com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming) -> a
-com.android.tools.r8.naming.ClassNamingForMapApplier -> com.android.tools.r8.naming.d:
-    com.android.tools.r8.com.google.common.collect.ImmutableMap qualifiedMethodMembers -> d
+com.android.tools.r8.naming.ClassNamingForMapApplier -> com.android.tools.r8.naming.f:
+    com.android.tools.r8.com.google.common.collect.ImmutableMap methodMembers -> d
     com.android.tools.r8.position.Position position -> c
-    com.android.tools.r8.com.google.common.collect.ImmutableMap fieldMembers -> f
-    com.android.tools.r8.com.google.common.collect.ImmutableMap methodMembers -> e
-    boolean $assertionsDisabled -> g
+    com.android.tools.r8.com.google.common.collect.ImmutableMap fieldMembers -> e
+    boolean $assertionsDisabled -> f
     java.lang.String originalName -> a
     java.lang.String renamedName -> b
-    1:1:void <clinit>():35:35 -> <clinit>
-    1:7:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,java.util.Map,java.util.Map,java.util.Map):122:128 -> <init>
-    1:7:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.naming.ClassNamingForMapApplier$1):35 -> <init>
-    1:1:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder builder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):94:94 -> a
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap getQualifiedMethodMembers():132:132 -> a
-    3:4:void forAllFieldNaming(com.android.tools.r8.utils.ThrowingConsumer):145:146 -> a
-    1:2:void forAllMethodNaming(com.android.tools.r8.utils.ThrowingConsumer):153:154 -> b
-    1:11:boolean equals(java.lang.Object):221:231 -> equals
-    1:1:int hashCode():236:236 -> hashCode
-    2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):76:76 -> hashCode
-    2:2:int hashCode():236 -> hashCode
-    1:11:com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature):162:172 -> lookup
-com.android.tools.r8.naming.ClassNamingForMapApplier$1 -> com.android.tools.r8.naming.c:
-com.android.tools.r8.naming.ClassNamingForMapApplier$Builder -> com.android.tools.r8.naming.d$a:
+    1:1:void <clinit>():32:32 -> <clinit>
+    1:6:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,java.util.Map,java.util.Map):118:123 -> <init>
+    1:6:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,java.util.Map,java.util.Map,com.android.tools.r8.naming.ClassNamingForMapApplier$1):32 -> <init>
+    1:1:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder builder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):93:93 -> a
+    2:3:void forAllFieldNaming(com.android.tools.r8.utils.ThrowingConsumer):136:137 -> a
+    1:2:void forAllMethodNaming(com.android.tools.r8.utils.ThrowingConsumer):144:145 -> b
+    1:10:boolean equals(java.lang.Object):212:221 -> equals
+    1:4:int hashCode():226:229 -> hashCode
+    1:11:com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature):153:163 -> lookup
+com.android.tools.r8.naming.ClassNamingForMapApplier$1 -> com.android.tools.r8.naming.e:
+com.android.tools.r8.naming.ClassNamingForMapApplier$Builder -> com.android.tools.r8.naming.f$a:
     com.android.tools.r8.position.Position position -> c
     com.android.tools.r8.utils.Reporter reporter -> d
     java.lang.String originalName -> a
-    java.util.Map qualifiedMethodMembers -> e
+    java.util.Map methodMembers -> e
     java.lang.String renamedName -> b
-    java.util.Map methodMembers -> f
-    java.util.Map fieldMembers -> g
-    1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):46:46 -> <init>
-    1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter,com.android.tools.r8.naming.ClassNamingForMapApplier$1):37 -> <init>
-    2:10:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):42:50 -> <init>
-    2:10:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter,com.android.tools.r8.naming.ClassNamingForMapApplier$1):37 -> <init>
+    java.util.Map fieldMembers -> f
+    1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):42:42 -> <init>
+    1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter,com.android.tools.r8.naming.ClassNamingForMapApplier$1):34 -> <init>
+    2:9:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):39:46 -> <init>
+    2:9:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter,com.android.tools.r8.naming.ClassNamingForMapApplier$1):34 -> <init>
     void addMappedRange(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String) -> a
-    1:8:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):57:64 -> a
-    9:9:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):63:63 -> a
-    10:19:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):62:71 -> a
-    20:20:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):70:70 -> a
-    21:21:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):69:69 -> a
-    22:22:java.util.List lambda$addMemberEntry$0(com.android.tools.r8.naming.MemberNaming$MethodSignature):60:60 -> a
-    23:23:com.android.tools.r8.naming.ClassNamingForMapApplier build():79:79 -> a
+    1:11:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):53:63 -> a
+    12:12:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):62:62 -> a
+    13:22:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):61:70 -> a
+    23:23:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):69:69 -> a
+    24:24:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):68:68 -> a
+    25:25:com.android.tools.r8.naming.ClassNamingForMapApplier build():78:78 -> a
 com.android.tools.r8.naming.ClassNamingForNameMapper -> com.android.tools.r8.naming.ClassNamingForNameMapper:
     com.android.tools.r8.com.google.common.collect.ImmutableMap fieldMembers -> c
     java.lang.String renamedName -> a
@@ -39001,6 +38447,7 @@
     1:9:java.util.List lookupByOriginalName(java.lang.String):225:233 -> lookupByOriginalName
     1:11:com.android.tools.r8.naming.MemberNaming lookupByOriginalSignature(com.android.tools.r8.naming.MemberNaming$Signature):206:216 -> lookupByOriginalSignature
     1:5:java.lang.String toString():291:295 -> toString
+com.android.tools.r8.naming.ClassNamingForNameMapper$1 -> com.android.tools.r8.naming.g:
 com.android.tools.r8.naming.ClassNamingForNameMapper$Builder -> com.android.tools.r8.naming.ClassNamingForNameMapper$Builder:
     java.util.Map methodMembers -> c
     java.util.Map fieldMembers -> d
@@ -39040,7 +38487,7 @@
     1:7:boolean equals(java.lang.Object):145:151 -> equals
     1:8:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange firstRangeForLine(int):96:103 -> firstRangeForLine
     1:1:int hashCode():156:156 -> hashCode
-com.android.tools.r8.naming.DictionaryReader -> com.android.tools.r8.naming.e:
+com.android.tools.r8.naming.DictionaryReader -> com.android.tools.r8.naming.h:
     java.io.BufferedReader reader -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -39049,124 +38496,46 @@
     24:31:com.android.tools.r8.com.google.common.collect.ImmutableList readAllNames(java.nio.file.Path,com.android.tools.r8.utils.Reporter):59:66 -> a
     32:43:com.android.tools.r8.com.google.common.collect.ImmutableList readAllNames(java.nio.file.Path,com.android.tools.r8.utils.Reporter):60:71 -> a
     1:2:void close():52:53 -> close
-com.android.tools.r8.naming.FieldNameMinifier -> com.android.tools.r8.naming.g:
-    java.util.Map renaming -> b
-    java.util.Map reservedNamingStates -> c
-    com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> e
-    com.android.tools.r8.naming.MemberNamingStrategy strategy -> d
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):35:35 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):31:37 -> <init>
-    1:1:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):45:45 -> a
-    2:4:void reserveFieldNames():85:87 -> a
-    2:4:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):46 -> a
-    5:9:boolean shouldReserveName(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):113:117 -> a
-    5:9:void reserveFieldNames():88 -> a
-    5:9:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):46 -> a
-    10:29:void reserveFieldNames():90:109 -> a
-    10:29:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):46 -> a
-    30:32:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):47:49 -> a
-    33:34:void renameFieldsInInterfaces(java.util.Collection):172:173 -> a
-    33:34:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):50 -> a
-    35:68:void renameFieldsInInterfacePartition(java.util.Set):179:212 -> a
-    35:68:void renameFieldsInInterfaces(java.util.Collection):174 -> a
-    35:68:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):50 -> a
-    69:76:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):51:58 -> a
-    77:77:com.android.tools.r8.naming.ReservedFieldNamingState getOrCreateReservedFieldNamingState(com.android.tools.r8.graph.DexType):79:79 -> a
-    78:80:void propagateReservedFieldNamesUpwards():124:126 -> a
-    81:81:void propagateReservedFieldNamesUpwards():125:125 -> a
-    82:82:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):128:128 -> a
-    83:83:com.android.tools.r8.naming.ReservedFieldNamingState getReservedFieldNamingState(com.android.tools.r8.graph.DexType):75:75 -> a
-    83:83:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):128 -> a
-    84:87:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):130:133 -> a
-    88:92:void lambda$renameFieldsInClasses$3(java.util.Map,com.android.tools.r8.graph.DexClass):147:151 -> a
-    93:93:void com.android.tools.r8.naming.FieldNamingState.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):28:28 -> a
-    93:93:void lambda$renameFieldsInClasses$3(java.util.Map,com.android.tools.r8.graph.DexClass):151 -> a
-    94:94:void lambda$renameFieldsInClasses$3(java.util.Map,com.android.tools.r8.graph.DexClass):155:155 -> a
-    95:109:void lambda$renameFieldsInClasses$3(java.util.Map,com.android.tools.r8.graph.DexClass):153:167 -> a
-    110:110:com.android.tools.r8.graph.DexString renameField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.naming.FieldNamingState):219:219 -> a
-    111:119:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.FieldNamingState.getOrCreateNameFor(com.android.tools.r8.graph.DexField):56:64 -> a
-    111:119:com.android.tools.r8.graph.DexString renameField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.naming.FieldNamingState):220 -> a
-    120:120:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.FieldNamingState.getOrCreateNameFor(com.android.tools.r8.graph.DexField):60:60 -> a
-    120:120:com.android.tools.r8.graph.DexString renameField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.naming.FieldNamingState):220 -> a
-    121:121:java.lang.Object com.android.tools.r8.naming.FieldNamingStateBase.getOrCreateInternalState(com.android.tools.r8.graph.DexField):30:30 -> a
-    121:121:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.FieldNamingState.getOrCreateNameFor(com.android.tools.r8.graph.DexField):67 -> a
-    121:121:com.android.tools.r8.graph.DexString renameField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.naming.FieldNamingState):220 -> a
-    122:122:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.FieldNamingState.getOrCreateNameFor(com.android.tools.r8.graph.DexField):67:67 -> a
-    122:122:com.android.tools.r8.graph.DexString renameField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.naming.FieldNamingState):220 -> a
-    123:124:com.android.tools.r8.graph.DexString renameField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.naming.FieldNamingState):221:222 -> a
-    125:150:void renameNonReboundReference(com.android.tools.r8.graph.DexField):238:263 -> a
-    1:1:com.android.tools.r8.naming.ReservedFieldNamingState getReservedFieldNamingState(com.android.tools.r8.graph.DexType):75:75 -> b
-    2:6:void renameFieldsInClasses():141:145 -> b
-    7:7:void renameFieldsInClasses():144:144 -> b
-    1:1:com.android.tools.r8.naming.ReservedFieldNamingState lambda$getOrCreateReservedFieldNamingState$0(com.android.tools.r8.graph.DexType):80:80 -> c
-    2:5:void renameNonReboundReferences():229:232 -> c
-    6:9:void renameNonReboundReferences():230:233 -> c
-    1:1:com.android.tools.r8.naming.FieldNamingState lambda$renameFieldsInClasses$2(com.android.tools.r8.graph.DexType):154:154 -> d
-    2:2:void com.android.tools.r8.naming.FieldNamingState.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):28:28 -> d
-    2:2:com.android.tools.r8.naming.FieldNamingState lambda$renameFieldsInClasses$2(com.android.tools.r8.graph.DexType):154 -> d
-com.android.tools.r8.naming.FieldNameMinifier$1 -> com.android.tools.r8.naming.f:
-com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming -> com.android.tools.r8.naming.g$a:
+com.android.tools.r8.naming.FieldNameMinifier -> com.android.tools.r8.naming.k:
+    boolean $assertionsDisabled -> k
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy):26:26 -> <init>
+    1:6:java.util.function.Function getKeyTransform():31:36 -> a
+    7:13:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(com.android.tools.r8.utils.Timing):45:51 -> a
+    14:14:void com.android.tools.r8.graph.DexType.forAllInterfaces(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):287:287 -> a
+    14:14:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(com.android.tools.r8.utils.Timing):50 -> a
+    15:17:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(com.android.tools.r8.utils.Timing):52:54 -> a
+    18:18:void renameFieldsInClasses():100:100 -> a
+    18:18:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(com.android.tools.r8.utils.Timing):55 -> a
+    19:19:void renameFieldsInInterfaces():122:122 -> a
+    19:19:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(com.android.tools.r8.utils.Timing):56 -> a
+    20:28:void renameFieldsInInterface(com.android.tools.r8.graph.DexType):128:136 -> a
+    20:28:void renameFieldsInInterfaces():123 -> a
+    20:28:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(com.android.tools.r8.utils.Timing):56 -> a
+    29:34:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(com.android.tools.r8.utils.Timing):57:62 -> a
+    35:35:void lambda$computeRenaming$1(com.android.tools.r8.graph.DexType):51:51 -> a
+    36:45:void reserveNamesInSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingState):79:88 -> a
+    46:46:com.android.tools.r8.naming.NamingState lambda$reserveNamesInSubtypes$2(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexType):85:85 -> a
+    47:47:void lambda$reserveNamesInSubtypes$3(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):87:87 -> a
+    48:50:void reserveFieldName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.naming.NamingState,boolean):93:95 -> a
+    48:50:void lambda$reserveNamesInSubtypes$3(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):87 -> a
+    51:64:void renameFieldsInSubclasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):104:117 -> a
+    65:76:void renameField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.naming.NamingState):141:152 -> a
+    77:77:void renameField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.naming.NamingState):151:151 -> a
+    78:103:void renameNonReboundReference(com.android.tools.r8.graph.DexField):167:192 -> a
+    104:108:void print(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingState,java.io.PrintStream):197:201 -> a
+    1:1:java.lang.Object lambda$getKeyTransform$0(com.android.tools.r8.graph.DexType):36:36 -> b
+    2:2:void lambda$reserveNamesInSubtypes$4(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexType):88:88 -> b
+    3:6:void renameNonReboundReferences():158:161 -> b
+    7:10:void renameNonReboundReferences():159:162 -> b
+com.android.tools.r8.naming.FieldNameMinifier$1 -> com.android.tools.r8.naming.i:
+com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming -> com.android.tools.r8.naming.j:
     java.util.Map renaming -> a
-    1:2:void <init>(java.util.Map):65:66 -> <init>
-    3:4:void <init>(java.util.Map):65:66 -> <init>
-    3:4:void <init>(java.util.Map,com.android.tools.r8.naming.FieldNameMinifier$1):61 -> <init>
-    1:1:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming empty():70:70 -> a
-com.android.tools.r8.naming.FieldNameMinifier$InterfacePartitioning -> com.android.tools.r8.naming.h:
-    com.android.tools.r8.graph.AppView appView -> a
-    java.util.Set visited -> b
-    boolean $assertionsDisabled -> c
-    1:1:void <clinit>():267:267 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):272:272 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView):270:273 -> <init>
-    1:1:java.util.List access$100(com.android.tools.r8.naming.FieldNameMinifier$InterfacePartitioning,java.util.Collection):267:267 -> a
-    2:9:java.util.List sortedPartitions(java.util.Collection):277:284 -> a
-    10:43:java.util.Set buildSortedPartition(com.android.tools.r8.graph.DexClass):291:324 -> a
-    44:44:int lambda$buildSortedPartition$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):291:291 -> a
-com.android.tools.r8.naming.FieldNamingState -> com.android.tools.r8.naming.i:
-    com.android.tools.r8.naming.ReservedFieldNamingState reservedNames -> c
-    com.android.tools.r8.naming.MemberNamingStrategy strategy -> d
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy,com.android.tools.r8.naming.ReservedFieldNamingState):35:35 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy,com.android.tools.r8.naming.ReservedFieldNamingState,java.util.Map):43:45 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy,com.android.tools.r8.naming.ReservedFieldNamingState):35 -> <init>
-    5:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy,com.android.tools.r8.naming.ReservedFieldNamingState,java.util.Map):43:45 -> <init>
-    1:1:com.android.tools.r8.naming.ReservedFieldNamingState access$000(com.android.tools.r8.naming.FieldNamingState):22:22 -> a
-    2:4:com.android.tools.r8.naming.FieldNamingState createChildState(com.android.tools.r8.naming.ReservedFieldNamingState):49:51 -> a
-    5:5:void includeReservations(com.android.tools.r8.naming.ReservedFieldNamingState):71:71 -> a
-    5:5:com.android.tools.r8.naming.FieldNamingState createChildState(com.android.tools.r8.naming.ReservedFieldNamingState):51 -> a
-    6:6:com.android.tools.r8.naming.FieldNamingState$InternalState createInternalState():76:76 -> a
-    6:6:java.lang.Object createInternalState():22 -> a
-    7:7:void com.android.tools.r8.naming.FieldNamingState$InternalState.<init>(com.android.tools.r8.naming.FieldNamingState):94:94 -> a
-    7:7:com.android.tools.r8.naming.FieldNamingState$InternalState createInternalState():76 -> a
-    7:7:java.lang.Object createInternalState():22 -> a
-    1:1:com.android.tools.r8.naming.MemberNamingStrategy access$100(com.android.tools.r8.naming.FieldNamingState):22:22 -> b
-    1:1:java.lang.Object clone():22:22 -> clone
-    2:6:com.android.tools.r8.naming.FieldNamingState clone():81:85 -> clone
-com.android.tools.r8.naming.FieldNamingState$InternalState -> com.android.tools.r8.naming.i$a:
-    java.util.Iterator dictionaryIterator -> a
-    com.android.tools.r8.naming.FieldNamingState this$0 -> c
-    int nextNameIndex -> b
-    1:3:void <init>(com.android.tools.r8.naming.FieldNamingState,int,java.util.Iterator):97:99 -> <init>
-    1:4:com.android.tools.r8.graph.DexString nextNameAccordingToStrategy(com.android.tools.r8.graph.DexField):112:115 -> a
-    1:4:com.android.tools.r8.graph.DexString createNewName(com.android.tools.r8.graph.DexField):105 -> a
-    5:5:com.android.tools.r8.graph.DexString createNewName(com.android.tools.r8.graph.DexField):106:106 -> a
-    6:7:boolean com.android.tools.r8.naming.ReservedFieldNamingState.isReserved(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):25:26 -> a
-    6:7:com.android.tools.r8.graph.DexString createNewName(com.android.tools.r8.graph.DexField):106 -> a
-    8:9:com.android.tools.r8.graph.DexString createNewName(com.android.tools.r8.graph.DexField):106:107 -> a
-    10:12:com.android.tools.r8.graph.DexString nextNameAccordingToState():120:122 -> a
-    1:1:java.lang.Object clone():88:88 -> clone
-    2:2:com.android.tools.r8.naming.FieldNamingState$InternalState clone():127:127 -> clone
-com.android.tools.r8.naming.FieldNamingStateBase -> com.android.tools.r8.naming.j:
-    java.util.Map internalStates -> b
-    com.android.tools.r8.graph.AppView appView -> a
-    1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):19:21 -> <init>
-    java.lang.Object createInternalState() -> a
-    1:2:java.lang.Object getInternalState(com.android.tools.r8.graph.DexType):25:26 -> a
-    1:2:java.lang.Object getOrCreateInternalState(com.android.tools.r8.graph.DexType):34:35 -> b
-    1:4:com.android.tools.r8.graph.DexType getInternalStateKey(com.android.tools.r8.graph.DexType):39:42 -> c
-    1:1:java.lang.Object lambda$getOrCreateInternalState$0(com.android.tools.r8.graph.DexType):35:35 -> d
-com.android.tools.r8.naming.IdentifierMinifier -> com.android.tools.r8.naming.k:
+    1:2:void <init>(java.util.Map):69:70 -> <init>
+    3:4:void <init>(java.util.Map):69:70 -> <init>
+    3:4:void <init>(java.util.Map,com.android.tools.r8.naming.FieldNameMinifier$1):65 -> <init>
+    1:1:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming empty():74:74 -> a
+com.android.tools.r8.naming.IdentifierMinifier -> com.android.tools.r8.naming.l:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.NamingLens lens -> c
     com.android.tools.r8.shaking.ProguardClassFilter adaptClassStrings -> b
@@ -39190,7 +38559,7 @@
     16:22:void replaceDexItemBasedConstStringInStaticField(com.android.tools.r8.graph.DexEncodedField):137:143 -> c
     16:22:void replaceDexItemBasedConstString():123 -> c
     23:23:void replaceDexItemBasedConstString():125:125 -> c
-com.android.tools.r8.naming.IdentifierNameStringMarker -> com.android.tools.r8.naming.l:
+com.android.tools.r8.naming.IdentifierNameStringMarker -> com.android.tools.r8.naming.m:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> b
     boolean $assertionsDisabled -> c
@@ -39206,109 +38575,126 @@
     219:275:void decoupleIdentifierNameStringsInMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):106:162 -> a
     276:276:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringsInMethod$0(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):268:268 -> a
     277:306:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):289:318 -> a
-com.android.tools.r8.naming.IdentifierNameStringUtils -> com.android.tools.r8.naming.m:
+com.android.tools.r8.naming.IdentifierNameStringUtils -> com.android.tools.r8.naming.n:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():34:34 -> <clinit>
+    1:1:void <clinit>():33:33 -> <clinit>
     boolean lambda$evaluateTypeArrayContentFromConstructionToUse$0(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction) -> a
-    1:79:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):54:132 -> a
-    80:86:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):85:91 -> a
-    87:136:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):151:200 -> a
-    137:175:com.android.tools.r8.graph.DexTypeList retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):431:469 -> a
-    137:175:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):200 -> a
-    176:182:com.android.tools.r8.graph.DexTypeList retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):468:474 -> a
-    176:182:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):200 -> a
-    183:183:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):204:204 -> a
-    184:188:com.android.tools.r8.graph.DexReference inferMethodInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexTypeList):296:300 -> a
-    184:188:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):204 -> a
-    189:191:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):206:208 -> a
-    192:224:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):236:268 -> a
-    192:224:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):217 -> a
-    225:227:com.android.tools.r8.graph.DexReference inferMethodNameInHolder(com.android.tools.r8.graph.DexClass,java.lang.String):286:288 -> a
-    225:227:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):270 -> a
-    225:227:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):217 -> a
-    228:228:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):220:220 -> a
-    229:232:com.android.tools.r8.graph.DexReference inferFieldInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexType):276:279 -> a
-    233:276:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):329:372 -> a
-    277:285:com.android.tools.r8.graph.DexType getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):308:316 -> a
-    277:285:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):372 -> a
-    286:286:com.android.tools.r8.graph.DexType getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):315:315 -> a
-    286:286:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):372 -> a
-    287:302:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):377:392 -> a
-    1:1:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):227:227 -> b
-    2:3:java.lang.String com.android.tools.r8.utils.DescriptorUtils.javaTypeToDescriptorIfValidJavaType(java.lang.String):90:91 -> b
-    2:3:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):227 -> b
-    4:4:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):229:229 -> b
+    1:79:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):53:131 -> a
+    80:86:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):84:90 -> a
+    87:137:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.InvokeMethod):150:200 -> a
+    138:176:com.android.tools.r8.graph.DexTypeList retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):425:463 -> a
+    138:176:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.InvokeMethod):200 -> a
+    177:183:com.android.tools.r8.graph.DexTypeList retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):462:468 -> a
+    177:183:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.InvokeMethod):200 -> a
+    184:184:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.InvokeMethod):204:204 -> a
+    185:189:com.android.tools.r8.graph.DexReference inferMethodInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexTypeList):290:294 -> a
+    185:189:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.InvokeMethod):204 -> a
+    190:192:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.InvokeMethod):206:208 -> a
+    193:210:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):230:247 -> a
+    193:210:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):217 -> a
+    211:212:java.lang.String com.android.tools.r8.utils.DescriptorUtils.javaTypeToDescriptorIfValidJavaType(java.lang.String):89:90 -> a
+    211:212:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):253 -> a
+    211:212:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):217 -> a
+    213:218:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):257:262 -> a
+    213:218:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):217 -> a
+    219:221:com.android.tools.r8.graph.DexReference inferMethodNameInHolder(com.android.tools.r8.graph.DexClass,java.lang.String):280:282 -> a
+    219:221:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):264 -> a
+    219:221:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):217 -> a
+    222:222:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):220:220 -> a
+    223:224:java.lang.String com.android.tools.r8.utils.DescriptorUtils.javaTypeToDescriptorIfValidJavaType(java.lang.String):89:90 -> a
+    223:224:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):220 -> a
+    225:225:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):222:222 -> a
+    226:229:com.android.tools.r8.graph.DexReference inferFieldInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexType):270:273 -> a
+    230:273:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):323:366 -> a
+    274:282:com.android.tools.r8.graph.DexType getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):302:310 -> a
+    274:282:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):366 -> a
+    283:283:com.android.tools.r8.graph.DexType getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):309:309 -> a
+    283:283:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):366 -> a
+    284:299:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):371:386 -> a
 com.android.tools.r8.naming.InterfaceMethodNameMinifier -> com.android.tools.r8.naming.o:
-    com.android.tools.r8.naming.MethodNameMinifier$State minifierState -> e
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> j
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> c
+    com.android.tools.r8.naming.MemberNameMinifier$State minifierState -> e
     java.util.Map sourceMethodsMap -> i
     java.util.Set desugaredCallSites -> b
     java.util.Map callSiteRenamings -> f
     com.android.tools.r8.naming.MethodNameMinifier$FrontierState frontierState -> d
     java.util.Map globalStateMap -> g
     java.util.Map originStates -> h
-    1:1:void <clinit>():38:38 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.com.google.common.base.Equivalence,com.android.tools.r8.naming.MethodNameMinifier$FrontierState,com.android.tools.r8.naming.MethodNameMinifier$State):124:124 -> <init>
-    2:25:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.com.google.common.base.Equivalence,com.android.tools.r8.naming.MethodNameMinifier$FrontierState,com.android.tools.r8.naming.MethodNameMinifier$State):106:129 -> <init>
-    1:1:java.util.Comparator createDefaultInterfaceMethodOrdering():133:133 -> a
-    2:2:int lambda$createDefaultInterfaceMethodOrdering$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):133:133 -> a
-    3:5:void reserveNamesInInterfaces(java.util.Collection):141:143 -> a
-    3:5:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):149 -> a
-    6:99:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):154:247 -> a
-    100:116:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):246:262 -> a
-    117:117:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.MethodNameMinifier$State.getRenaming(com.android.tools.r8.graph.DexMethod):97:97 -> a
-    117:117:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):262 -> a
-    118:127:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):263:272 -> a
-    128:149:void lambda$assignNamesToInterfaceMethods$1(java.util.Map,java.util.Set,java.util.Map,com.android.tools.r8.graph.DexCallSite):183:204 -> a
-    150:150:boolean lambda$assignNamesToInterfaceMethods$3(java.util.Map,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):228:228 -> a
-    151:175:void assignNameToInterfaceMethod(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.util.Map):295:319 -> a
-    176:196:void assignNameForInterfaceMethodInAllStates(java.util.List,java.util.Set,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodNamingState):327:347 -> a
-    176:196:void assignNameToInterfaceMethod(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.util.Map):320 -> a
-    197:197:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):101:101 -> a
-    197:197:void assignNameForInterfaceMethodInAllStates(java.util.List,java.util.Set,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodNamingState):347 -> a
-    197:197:void assignNameToInterfaceMethod(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.util.Map):320 -> a
-    198:202:void addStatesToGlobalMapForMethod(com.android.tools.r8.graph.DexMethod,java.util.Set,com.android.tools.r8.graph.DexType):353:357 -> a
-    203:203:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getState(com.android.tools.r8.graph.DexType):105:105 -> a
-    203:203:void addStatesToGlobalMapForMethod(com.android.tools.r8.graph.DexMethod,java.util.Set,com.android.tools.r8.graph.DexType):357 -> a
-    204:204:void addStatesToGlobalMapForMethod(com.android.tools.r8.graph.DexMethod,java.util.Set,com.android.tools.r8.graph.DexType):357:357 -> a
-    205:205:java.util.Set lambda$addStatesToGlobalMapForMethod$6(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):355:355 -> a
-    206:212:boolean anyIsReserved(java.util.List):378:384 -> a
-    213:216:boolean anyIsReserved(java.util.List):383:386 -> a
-    217:217:java.lang.Boolean lambda$anyIsReserved$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):384:384 -> a
-    218:218:boolean com.android.tools.r8.naming.MethodNameMinifier$State.isReservedInGlobalState(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):113:113 -> a
-    218:218:java.lang.Boolean lambda$anyIsReserved$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):384 -> a
-    219:219:java.lang.Boolean lambda$anyIsReserved$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):384:384 -> a
-    220:226:java.util.Set getReachableInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):413:419 -> a
-    220:226:java.util.Set getReachableStates(com.android.tools.r8.graph.DexType,java.util.Set):394 -> a
-    227:238:java.util.Set getReachableStates(com.android.tools.r8.graph.DexType,java.util.Set):395:406 -> a
-    239:241:void collectSubInterfaces(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Set):439:441 -> a
-    242:251:void print(com.android.tools.r8.graph.DexMethod,java.util.Set,java.util.List,java.io.PrintStream):451:460 -> a
-    252:252:void lambda$print$9(java.io.PrintStream,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodNamingState):459:459 -> a
-    1:1:java.util.Map getCallSiteRenamings():137:137 -> b
-    2:9:boolean propagateReservedNames(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.util.Map):278:285 -> b
-    10:10:java.util.Set lambda$addStatesToGlobalMapForMethod$7(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):356:356 -> b
-    11:17:boolean anyIsReserved(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.util.Map):363:369 -> b
-    11:17:boolean lambda$assignNamesToInterfaceMethods$4(java.util.Map,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):237 -> b
-    18:22:void collectSuperInterfaces(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Set):425:429 -> b
-    1:1:java.util.Set lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):217:217 -> c
-    2:2:boolean lambda$assignNamesToInterfaceMethods$5(java.util.Map,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):247:247 -> c
-com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodNamingState -> com.android.tools.r8.naming.n:
-    com.android.tools.r8.graph.DexString name -> b
-    com.android.tools.r8.graph.DexProto proto -> c
-    boolean $assertionsDisabled -> e
-    com.android.tools.r8.graph.DexMethod method -> d
-    com.android.tools.r8.naming.MethodNamingState parent -> a
-    1:1:void <clinit>():46:46 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):54:59 -> <init>
-    1:1:com.android.tools.r8.graph.DexString assignNewName():63:63 -> a
-    2:2:void addRenaming(com.android.tools.r8.graph.DexString):75:75 -> a
-    3:9:void print(java.lang.String,java.util.function.Function,java.io.PrintStream):90:96 -> a
-    1:1:boolean isAvailable(com.android.tools.r8.graph.DexString):71:71 -> b
-    2:2:com.android.tools.r8.graph.DexString getName():79:79 -> b
-    1:1:com.android.tools.r8.graph.DexProto getProto():83:83 -> c
-    1:1:boolean isReserved():67:67 -> d
+    1:1:void <clinit>():37:37 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.com.google.common.base.Equivalence,com.android.tools.r8.naming.MethodNameMinifier$FrontierState,com.android.tools.r8.naming.MemberNameMinifier$State):64:64 -> <init>
+    2:26:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.com.google.common.base.Equivalence,com.android.tools.r8.naming.MethodNameMinifier$FrontierState,com.android.tools.r8.naming.MemberNameMinifier$State):45:69 -> <init>
+    1:1:java.util.Comparator createDefaultInterfaceMethodOrdering():73:73 -> a
+    2:2:int lambda$createDefaultInterfaceMethodOrdering$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):73:73 -> a
+    3:5:void reserveNamesInInterfaces():81:83 -> a
+    3:5:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing):89 -> a
+    6:95:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing):94:183 -> a
+    96:108:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing):182:194 -> a
+    109:109:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.MemberNameMinifier$State.getRenaming(java.lang.Object):76:76 -> a
+    109:109:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing):194 -> a
+    110:118:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing):195:203 -> a
+    119:140:void lambda$assignNamesToInterfaceMethods$1(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexCallSite):124:145 -> a
+    141:141:boolean lambda$assignNamesToInterfaceMethods$3(java.util.Map,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):168:168 -> a
+    142:166:void assignNameToInterfaceMethod(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.util.Map):226:250 -> a
+    167:199:void assignNameForInterfaceMethodInAllStates(java.util.List,java.util.Set,com.android.tools.r8.naming.MethodNameMinifier$MethodNamingState):258:290 -> a
+    167:199:void assignNameToInterfaceMethod(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.util.Map):251 -> a
+    200:200:void com.android.tools.r8.naming.MemberNameMinifier$State.putRenaming(java.lang.Object,com.android.tools.r8.graph.DexString):80:80 -> a
+    200:200:void assignNameForInterfaceMethodInAllStates(java.util.List,java.util.Set,com.android.tools.r8.naming.MethodNameMinifier$MethodNamingState):290 -> a
+    200:200:void assignNameToInterfaceMethod(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.util.Map):251 -> a
+    201:204:void addStatesToGlobalMapForMethod(com.android.tools.r8.graph.DexMethod,java.util.Set,com.android.tools.r8.graph.DexType):296:299 -> a
+    205:205:java.util.Set lambda$addStatesToGlobalMapForMethod$6(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):297:297 -> a
+    206:212:boolean anyIsReserved(java.util.List):320:326 -> a
+    213:216:boolean anyIsReserved(java.util.List):325:328 -> a
+    217:217:java.lang.Boolean lambda$anyIsReserved$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):326:326 -> a
+    218:218:boolean com.android.tools.r8.naming.MemberNameMinifier$State.isReservedInGlobalState(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.CachedHashValueDexItem):96:96 -> a
+    218:218:java.lang.Boolean lambda$anyIsReserved$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):326 -> a
+    219:219:java.lang.Boolean lambda$anyIsReserved$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):326:326 -> a
+    220:220:java.util.Set getReachableStates(com.android.tools.r8.graph.DexType):336:336 -> a
+    221:221:boolean com.android.tools.r8.naming.MemberNameMinifier$State.useUniqueMemberNames():100:100 -> a
+    221:221:java.util.Set getReachableStates(com.android.tools.r8.graph.DexType):336 -> a
+    222:222:com.android.tools.r8.naming.NamingState com.android.tools.r8.naming.MemberNameMinifier$State.globalState():92:92 -> a
+    222:222:java.util.Set getReachableStates(com.android.tools.r8.graph.DexType):337 -> a
+    223:240:java.util.Set getReachableStates(com.android.tools.r8.graph.DexType):337:354 -> a
+    241:244:void collectSubInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):374:377 -> a
+    245:254:void print(com.android.tools.r8.graph.DexMethod,java.util.Set,java.util.List,java.io.PrintStream):387:396 -> a
+    255:255:void lambda$print$9(java.io.PrintStream,com.android.tools.r8.naming.MethodNameMinifier$MethodNamingState):395:395 -> a
+    1:1:java.util.Map getCallSiteRenamings():77:77 -> b
+    2:9:boolean propagateReservedNames(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.util.Map):209:216 -> b
+    10:10:java.util.Set lambda$addStatesToGlobalMapForMethod$7(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):298:298 -> b
+    11:17:boolean anyIsReserved(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.util.Map):305:311 -> b
+    11:17:boolean lambda$assignNamesToInterfaceMethods$4(java.util.Map,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):175 -> b
+    18:24:void collectSuperInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):361:367 -> b
+    1:1:java.util.Set lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):158:158 -> c
+    2:2:boolean lambda$assignNamesToInterfaceMethods$5(java.util.Map,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):183:183 -> c
+com.android.tools.r8.naming.MemberNameMinifier -> com.android.tools.r8.naming.q:
+    com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet -> b
+    java.util.Map renaming -> d
+    com.android.tools.r8.naming.MemberNameMinifier$State minifierState -> i
+    com.android.tools.r8.naming.NamingState globalState -> e
+    java.util.List dictionary -> c
+    boolean useUniqueMemberNames -> f
+    boolean overloadAggressively -> g
+    boolean useApplyMapping -> h
+    com.android.tools.r8.com.google.common.collect.BiMap states -> j
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy):42:42 -> <init>
+    2:27:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy):29:54 -> <init>
+    28:34:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy):51:57 -> <init>
+    java.util.function.Function getKeyTransform() -> a
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap access$000(com.android.tools.r8.naming.MemberNameMinifier):23:23 -> a
+    2:2:com.android.tools.r8.naming.NamingState computeStateIfAbsent(com.android.tools.r8.graph.DexType,java.util.function.Function):64:64 -> a
+    3:3:boolean alwaysReserveMemberNames(com.android.tools.r8.graph.DexClass):68:68 -> a
+com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy -> com.android.tools.r8.naming.p:
+    boolean breakOnNotAvailable(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString) -> a
+    boolean bypassDictionary() -> a
+    com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.NamingState$InternalState) -> a
+com.android.tools.r8.naming.MemberNameMinifier$State -> com.android.tools.r8.naming.q$a:
+    com.android.tools.r8.naming.MemberNameMinifier this$0 -> a
+    1:1:void <init>(com.android.tools.r8.naming.MemberNameMinifier):73:73 -> <init>
+    1:1:com.android.tools.r8.naming.NamingState getState(com.android.tools.r8.graph.DexType):84:84 -> a
+    2:2:com.android.tools.r8.graph.DexType getStateKey(com.android.tools.r8.naming.NamingState):88:88 -> a
+    3:3:boolean useUniqueMemberNames():100:100 -> a
 com.android.tools.r8.naming.MemberNaming -> com.android.tools.r8.naming.MemberNaming:
     com.android.tools.r8.naming.MemberNaming$Signature signature -> a
     com.android.tools.r8.naming.MemberNaming$Signature renamedSignature -> b
@@ -39334,24 +38720,21 @@
     1:1:int hashCode():188:188 -> hashCode
     1:1:java.lang.String toString():193:193 -> toString
 com.android.tools.r8.naming.MemberNaming$MethodSignature -> com.android.tools.r8.naming.MemberNaming$MethodSignature:
-    boolean $assertionsDisabled -> a
-    1:1:void <clinit>():204:204 -> <clinit>
     1:3:void <init>(java.lang.String,java.lang.String,java.lang.String[]):210:212 -> <init>
     4:6:void <init>(java.lang.String,java.lang.String,java.util.Collection):216:218 -> <init>
     1:8:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):226:233 -> a
-    9:17:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):257:265 -> a
-    18:18:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):262:262 -> a
-    19:19:com.android.tools.r8.naming.MemberNaming$Signature asRenamed(java.lang.String):274:274 -> a
-    20:30:void write(java.io.Writer):311:321 -> a
-    1:1:com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind kind():279:279 -> b
-    1:2:com.android.tools.r8.naming.MemberNaming$MethodSignature toUnqualified():252:253 -> c
-    1:8:boolean equals(java.lang.Object):287:294 -> equals
+    9:17:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):252:260 -> a
+    18:18:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):257:257 -> a
+    19:19:com.android.tools.r8.naming.MemberNaming$Signature asRenamed(java.lang.String):269:269 -> a
+    20:30:void write(java.io.Writer):306:316 -> a
+    1:1:com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind kind():274:274 -> b
+    1:8:boolean equals(java.lang.Object):282:289 -> equals
     1:1:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod):222:222 -> fromDexMethod
     1:10:com.android.tools.r8.naming.MemberNaming$MethodSignature fromSignature(java.lang.String,java.lang.String):238:247 -> fromSignature
-    1:3:int hashCode():299:301 -> hashCode
-    1:1:com.android.tools.r8.naming.MemberNaming$MethodSignature initializer(java.lang.String[]):269:269 -> initializer
-    1:8:java.lang.String toDescriptor():325:332 -> toDescriptor
-    1:1:java.lang.String toString():306:306 -> toString
+    1:3:int hashCode():294:296 -> hashCode
+    1:1:com.android.tools.r8.naming.MemberNaming$MethodSignature initializer(java.lang.String[]):264:264 -> initializer
+    1:8:java.lang.String toDescriptor():320:327 -> toDescriptor
+    1:1:java.lang.String toString():301:301 -> toString
 com.android.tools.r8.naming.MemberNaming$Signature -> com.android.tools.r8.naming.MemberNaming$Signature:
     1:2:void <init>(java.lang.String):102:103 -> <init>
     com.android.tools.r8.naming.MemberNaming$Signature asRenamed(java.lang.String) -> a
@@ -39365,151 +38748,69 @@
     1:2:void <clinit>():133:134 -> <clinit>
     3:3:void <clinit>():132:132 -> <clinit>
     1:1:void <init>(java.lang.String,int):132:132 -> <init>
-com.android.tools.r8.naming.MemberNamingStrategy -> com.android.tools.r8.naming.p:
-    boolean breakOnNotAvailable(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString) -> a
-    boolean bypassDictionary() -> a
-    com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.FieldNamingState$InternalState) -> a
-    com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.MethodNamingState$InternalState) -> a
-    java.util.Set noObfuscation() -> b
 com.android.tools.r8.naming.MethodNameMinifier -> com.android.tools.r8.naming.s:
-    com.android.tools.r8.naming.MethodNamingState globalState -> e
-    com.android.tools.r8.graph.AppView appView -> a
-    java.util.Map renaming -> d
-    boolean $assertionsDisabled -> i
-    com.android.tools.r8.com.google.common.base.Equivalence equivalence -> b
-    com.android.tools.r8.com.google.common.collect.BiMap states -> h
-    com.android.tools.r8.naming.MemberNamingStrategy strategy -> c
-    com.android.tools.r8.naming.MethodNameMinifier$FrontierState frontierState -> g
-    com.android.tools.r8.naming.MethodNameMinifier$State minifierState -> f
-    1:1:void <clinit>():90:90 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):131:131 -> <init>
-    2:19:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):121:138 -> <init>
+    boolean $assertionsDisabled -> n
+    com.android.tools.r8.naming.MethodNameMinifier$FrontierState frontierState -> l
+    com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy strategy -> m
+    com.android.tools.r8.com.google.common.base.Equivalence equivalence -> k
+    1:1:void <clinit>():89:89 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy):98:98 -> <init>
+    2:12:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy):93:103 -> <init>
     java.lang.Object lambda$getKeyTransform$0(com.android.tools.r8.graph.DexProto) -> a
-    1:1:java.util.Map access$000(com.android.tools.r8.naming.MethodNameMinifier):90:90 -> a
-    2:2:boolean access$600(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexClass):90:90 -> a
-    3:3:com.android.tools.r8.naming.MethodNamingState computeStateIfAbsent(com.android.tools.r8.graph.DexType,java.util.function.Function):143:143 -> a
-    3:3:com.android.tools.r8.naming.MethodNamingState access$400(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType,java.util.function.Function):90 -> a
-    4:5:boolean alwaysReserveMemberNames(com.android.tools.r8.graph.DexClass):147:148 -> a
-    6:11:java.util.function.Function getKeyTransform():152:157 -> a
-    12:12:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):181:181 -> a
-    13:14:void reserveNamesInClasses():250:251 -> a
-    13:14:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):182 -> a
-    15:15:void reserveNamesInClasses():250:250 -> a
-    15:15:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):182 -> a
-    16:35:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):183:202 -> a
-    36:40:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,boolean):206:210 -> a
-    41:41:com.android.tools.r8.naming.MethodNamingState computeStateIfAbsent(com.android.tools.r8.graph.DexType,java.util.function.Function):143:143 -> a
-    41:41:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,boolean):211 -> a
-    42:55:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,boolean):212:225 -> a
-    56:56:com.android.tools.r8.naming.MethodNamingState lambda$assignNamesToClassesMethods$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):211:211 -> a
-    57:58:void lambda$assignNamesToClassesMethods$3(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexString):218:219 -> a
-    59:59:void lambda$assignNamesToClassesMethods$4(boolean,com.android.tools.r8.graph.DexType):225:225 -> a
-    60:70:void assignNameToMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState,java.util.Map,boolean):233:243 -> a
-    71:74:void assignNameToMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState,java.util.Map,boolean):242:245 -> a
-    75:75:com.android.tools.r8.graph.DexString lambda$assignNameToMethod$5(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):244:244 -> a
-    76:86:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):256:266 -> a
-    87:87:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):265:265 -> a
-    88:88:java.lang.Iterable shuffleMethods(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):324:324 -> a
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap access$100(com.android.tools.r8.naming.MethodNameMinifier):90:90 -> b
-    2:2:java.lang.Object lambda$getKeyTransform$1(com.android.tools.r8.graph.DexProto):157:157 -> b
-    1:1:com.android.tools.r8.naming.MethodNamingState access$200(com.android.tools.r8.naming.MethodNameMinifier):90:90 -> c
-    1:1:com.android.tools.r8.graph.AppView access$500(com.android.tools.r8.naming.MethodNameMinifier):90:90 -> d
-    1:1:com.android.tools.r8.naming.MemberNamingStrategy access$700(com.android.tools.r8.naming.MethodNameMinifier):90:90 -> e
-    1:1:java.util.function.Function access$800(com.android.tools.r8.naming.MethodNameMinifier):90:90 -> f
-com.android.tools.r8.naming.MethodNameMinifier$1 -> com.android.tools.r8.naming.q:
-com.android.tools.r8.naming.MethodNameMinifier$FrontierState -> com.android.tools.r8.naming.r:
+    1:1:com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy access$100(com.android.tools.r8.naming.MethodNameMinifier):89:89 -> a
+    2:7:java.util.function.Function getKeyTransform():108:113 -> a
+    8:8:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Set,com.android.tools.r8.utils.Timing):136:136 -> a
+    9:10:void reserveNamesInClasses():202:203 -> a
+    9:10:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Set,com.android.tools.r8.utils.Timing):137 -> a
+    11:11:void reserveNamesInClasses():202:202 -> a
+    11:11:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Set,com.android.tools.r8.utils.Timing):137 -> a
+    12:31:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Set,com.android.tools.r8.utils.Timing):138:157 -> a
+    32:49:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,boolean):161:178 -> a
+    50:50:com.android.tools.r8.naming.NamingState lambda$assignNamesToClassesMethods$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):166:166 -> a
+    51:52:void lambda$assignNamesToClassesMethods$3(com.android.tools.r8.naming.NamingState,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexString):173:174 -> a
+    53:53:void lambda$assignNamesToClassesMethods$4(boolean,com.android.tools.r8.graph.DexType):178:178 -> a
+    54:62:void assignNameToMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.NamingState,java.util.Map,boolean):186:194 -> a
+    63:67:void assignNameToMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.NamingState,java.util.Map,boolean):193:197 -> a
+    68:68:com.android.tools.r8.graph.DexString lambda$assignNameToMethod$5(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):196:196 -> a
+    69:79:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingState):208:218 -> a
+    80:80:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingState):217:217 -> a
+    81:81:java.lang.Iterable shuffleMethods(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):338:338 -> a
+    1:1:java.lang.Object lambda$getKeyTransform$1(com.android.tools.r8.graph.DexProto):113:113 -> b
+com.android.tools.r8.naming.MethodNameMinifier$1 -> com.android.tools.r8.naming.r:
+com.android.tools.r8.naming.MethodNameMinifier$FrontierState -> com.android.tools.r8.naming.s$a:
     java.util.Map frontiers -> a
     com.android.tools.r8.naming.MethodNameMinifier this$0 -> b
-    1:1:void <clinit>():270:270 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.naming.MethodNameMinifier):270:272 -> <init>
-    1:21:com.android.tools.r8.naming.MethodNamingState allocateNamingStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):277:297 -> a
-    22:23:void reserveNamesForMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.MethodNamingState):306:307 -> a
-    22:23:com.android.tools.r8.naming.MethodNamingState allocateNamingStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):297 -> a
-    24:25:com.android.tools.r8.naming.MethodNamingState lambda$allocateNamingStateAndReserve$0(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.DexType):285:286 -> a
-    26:26:com.android.tools.r8.graph.DexType get(com.android.tools.r8.graph.DexType):311:311 -> a
-com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming -> com.android.tools.r8.naming.s$a:
+    1:1:void <clinit>():222:222 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.naming.MethodNameMinifier):222:224 -> <init>
+    1:24:com.android.tools.r8.naming.NamingState allocateNamingStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingState):229:252 -> a
+    25:26:void reserveNamesForMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingState):261:262 -> a
+    25:26:com.android.tools.r8.naming.NamingState allocateNamingStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingState):252 -> a
+    27:31:com.android.tools.r8.naming.NamingState lambda$allocateNamingStateAndReserve$0(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexType):237:241 -> a
+    32:38:com.android.tools.r8.naming.NamingState lambda$allocateNamingStateAndReserve$0(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexType):237:243 -> a
+    39:39:com.android.tools.r8.graph.DexType get(com.android.tools.r8.graph.DexType):266:266 -> a
+com.android.tools.r8.naming.MethodNameMinifier$MethodNamingState -> com.android.tools.r8.naming.t:
+    com.android.tools.r8.graph.DexString name -> b
+    com.android.tools.r8.graph.DexProto proto -> c
+    boolean $assertionsDisabled -> e
+    com.android.tools.r8.naming.NamingState parent -> a
+    com.android.tools.r8.graph.DexMethod method -> d
+    1:1:void <clinit>():280:280 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):288:293 -> <init>
+    1:1:com.android.tools.r8.graph.DexString assignNewName():297:297 -> a
+    2:2:void addRenaming(com.android.tools.r8.graph.DexString):309:309 -> a
+    3:9:void print(java.lang.String,java.util.function.Function,java.io.PrintStream):324:330 -> a
+    1:1:boolean isAvailable(com.android.tools.r8.graph.DexString):305:305 -> b
+    2:2:com.android.tools.r8.graph.DexString getName():313:313 -> b
+    1:1:com.android.tools.r8.graph.DexProto getProto():317:317 -> c
+    1:1:boolean isReserved():301:301 -> d
+com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming -> com.android.tools.r8.naming.u:
     java.util.Map renaming -> a
     java.util.Map callSiteRenaming -> b
-    1:3:void <init>(java.util.Map,java.util.Map):167:169 -> <init>
-    4:6:void <init>(java.util.Map,java.util.Map):167:169 -> <init>
-    4:6:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.naming.MethodNameMinifier$1):161 -> <init>
-    1:1:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming empty():173:173 -> a
-com.android.tools.r8.naming.MethodNameMinifier$State -> com.android.tools.r8.naming.t:
-    com.android.tools.r8.naming.MethodNameMinifier this$0 -> a
-    1:1:void <init>(com.android.tools.r8.naming.MethodNameMinifier):94:94 -> <init>
-    1:1:com.android.tools.r8.naming.MethodNamingState getState(com.android.tools.r8.graph.DexType):105:105 -> a
-    2:2:com.android.tools.r8.graph.DexType getStateKey(com.android.tools.r8.naming.MethodNamingState):109:109 -> a
-com.android.tools.r8.naming.MethodNamingState -> com.android.tools.r8.naming.v:
-    java.util.Map usedNames -> c
-    com.android.tools.r8.graph.AppView appView -> a
-    java.util.function.Function keyTransform -> d
-    com.android.tools.r8.naming.MemberNamingStrategy strategy -> e
-    com.android.tools.r8.naming.MethodNamingState parent -> b
-    1:1:void <init>(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.MemberNamingStrategy):46:46 -> <init>
-    2:21:void <init>(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.MemberNamingStrategy):31:50 -> <init>
-    1:1:com.android.tools.r8.naming.MemberNamingStrategy access$400(com.android.tools.r8.naming.MethodNamingState):27:27 -> a
-    2:2:com.android.tools.r8.naming.MethodNamingState createRoot(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.MemberNamingStrategy):39:39 -> a
-    3:3:com.android.tools.r8.naming.MethodNamingState createChild():54:54 -> a
-    4:6:com.android.tools.r8.naming.MethodNamingState$InternalState findInternalStateFor(java.lang.Object):58:60 -> a
-    7:7:com.android.tools.r8.graph.DexString assignNewNameFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):85:85 -> a
-    8:12:com.android.tools.r8.graph.DexString getAssignedNameFor(com.android.tools.r8.graph.DexString,java.lang.Object):77:81 -> a
-    8:12:com.android.tools.r8.graph.DexString assignNewNameFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):86 -> a
-    13:14:com.android.tools.r8.graph.DexString assignNewNameFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):88:89 -> a
-    15:20:boolean isReserved(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):101:106 -> a
-    21:26:boolean isAvailable(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):110:115 -> a
-    27:29:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):119:121 -> a
-    30:44:void printState(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.lang.String,java.io.PrintStream):129:143 -> a
-    1:1:com.android.tools.r8.naming.MethodNamingState access$500(com.android.tools.r8.naming.MethodNamingState):27:27 -> b
-    2:6:com.android.tools.r8.naming.MethodNamingState$InternalState getOrCreateInternalStateFor(java.lang.Object):67:71 -> b
-    7:9:void reserveName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):95:97 -> b
-com.android.tools.r8.naming.MethodNamingState$1 -> com.android.tools.r8.naming.u:
-com.android.tools.r8.naming.MethodNamingState$InternalState -> com.android.tools.r8.naming.v$a:
-    java.util.Iterator dictionaryIterator -> f
-    com.android.tools.r8.naming.MethodNamingState this$0 -> g
-    java.util.Set reservedNames -> c
-    boolean $assertionsDisabled -> h
-    com.android.tools.r8.com.google.common.collect.Table renamings -> d
-    int nameCount -> e
-    com.android.tools.r8.naming.MethodNamingState$InternalState parentInternalState -> b
-    com.android.tools.r8.graph.DexItemFactory itemFactory -> a
-    1:1:void <clinit>():147:147 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MethodNamingState$InternalState):171:173 -> <init>
-    1:3:void <init>(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MethodNamingState$InternalState,com.android.tools.r8.naming.MethodNamingState$1):147 -> <init>
-    4:4:void <init>(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.naming.MethodNamingState$InternalState,java.util.Iterator):161:161 -> <init>
-    4:4:void <init>(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MethodNamingState$InternalState):170 -> <init>
-    4:4:void <init>(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MethodNamingState$InternalState,com.android.tools.r8.naming.MethodNamingState$1):147 -> <init>
-    5:18:void <init>(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.naming.MethodNamingState$InternalState,java.util.Iterator):153:166 -> <init>
-    5:18:void <init>(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MethodNamingState$InternalState):170 -> <init>
-    5:18:void <init>(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MethodNamingState$InternalState,com.android.tools.r8.naming.MethodNamingState$1):147 -> <init>
-    1:1:boolean access$200(com.android.tools.r8.naming.MethodNamingState$InternalState,com.android.tools.r8.graph.DexString):147:147 -> a
-    2:5:void reserveName(com.android.tools.r8.graph.DexString):188:191 -> a
-    6:16:int incrementAndGet():196:206 -> a
-    17:21:com.android.tools.r8.graph.DexString getAssignedNameFor(com.android.tools.r8.graph.DexString,java.lang.Object):211:215 -> a
-    22:25:void addRenaming(com.android.tools.r8.graph.DexString,java.lang.Object,com.android.tools.r8.graph.DexString):229:232 -> a
-    26:29:com.android.tools.r8.graph.DexString nextSuggestedName(com.android.tools.r8.graph.DexMethod):236:239 -> a
-    26:29:com.android.tools.r8.graph.DexString getNewNameFor(com.android.tools.r8.graph.DexMethod):223 -> a
-    26:29:com.android.tools.r8.graph.DexString access$100(com.android.tools.r8.naming.MethodNamingState$InternalState,com.android.tools.r8.graph.DexMethod):147 -> a
-    30:30:com.android.tools.r8.graph.DexString getNewNameFor(com.android.tools.r8.graph.DexMethod):224:224 -> a
-    30:30:com.android.tools.r8.graph.DexString access$100(com.android.tools.r8.naming.MethodNamingState$InternalState,com.android.tools.r8.graph.DexMethod):147 -> a
-    31:39:void printInternalState(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):248:256 -> a
-    40:50:void printLastName(java.lang.String,java.io.PrintStream):267:277 -> a
-    40:50:void printInternalState(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):256 -> a
-    51:51:void printInternalState(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):257:257 -> a
-    52:61:void printReservedNames(java.lang.String,java.io.PrintStream):281:290 -> a
-    52:61:void printInternalState(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):257 -> a
-    62:71:void printReservedNames(java.lang.String,java.io.PrintStream):284:293 -> a
-    62:71:void printInternalState(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):257 -> a
-    72:72:void printInternalState(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):258:258 -> a
-    73:87:void printRenamings(java.lang.String,java.io.PrintStream):297:311 -> a
-    73:87:void printInternalState(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):258 -> a
-    88:103:void printRenamings(java.lang.String,java.io.PrintStream):300:315 -> a
-    88:103:void printInternalState(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):258 -> a
-    104:106:void printInternalState(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):260:262 -> a
-    107:107:void printInternalState(com.android.tools.r8.naming.MethodNamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):261:261 -> a
-    1:1:boolean access$300(com.android.tools.r8.naming.MethodNamingState$InternalState,com.android.tools.r8.graph.DexString):147:147 -> b
-    2:4:boolean isAvailable(com.android.tools.r8.graph.DexString):182:184 -> b
-    1:2:boolean isReserved(com.android.tools.r8.graph.DexString):177:178 -> c
-com.android.tools.r8.naming.MinifiedNameMapPrinter -> com.android.tools.r8.naming.w:
+    1:3:void <init>(java.util.Map,java.util.Map):123:125 -> <init>
+    4:6:void <init>(java.util.Map,java.util.Map):123:125 -> <init>
+    4:6:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.naming.MethodNameMinifier$1):117 -> <init>
+    1:1:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming empty():129:129 -> a
+com.android.tools.r8.naming.MinifiedNameMapPrinter -> com.android.tools.r8.naming.v:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.naming.NamingLens namingLens -> b
     java.util.Set seenTypes -> c
@@ -39529,7 +38830,7 @@
     1:6:void writeMethods(java.util.List,java.lang.StringBuilder):98:103 -> b
     7:10:void writeMethod(com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.String,java.lang.StringBuilder):91:94 -> b
     7:10:void writeMethods(java.util.List,java.lang.StringBuilder):104 -> b
-com.android.tools.r8.naming.MinifiedRenaming -> com.android.tools.r8.naming.x:
+com.android.tools.r8.naming.MinifiedRenaming -> com.android.tools.r8.naming.w:
     java.util.Map packageRenaming -> c
     java.util.Map renaming -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -39539,157 +38840,211 @@
     2:14:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming,com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming,com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming):36:48 -> <init>
     com.android.tools.r8.graph.DexItem lambda$getRenamedItems$1(com.android.tools.r8.graph.DexItem) -> a
     1:1:java.lang.String lookupPackageName(java.lang.String):53:53 -> a
-    2:7:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):63:68 -> a
-    8:8:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):58:58 -> a
-    8:8:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):74 -> a
-    9:15:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):74:80 -> a
-    16:21:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):79:84 -> a
-    22:22:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):58:58 -> a
-    22:22:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):85 -> a
-    23:25:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):85:87 -> a
-    26:26:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):86:86 -> a
-    27:32:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):84:89 -> a
-    33:33:com.android.tools.r8.graph.DexString lookupMethodName(com.android.tools.r8.graph.DexCallSite):99:99 -> a
-    34:35:void forAllRenamedTypes(java.util.function.Consumer):109:110 -> a
-    36:39:java.util.Map getRenamedItems(java.lang.Class,java.util.function.Predicate,java.util.function.Function):116:119 -> a
-    40:40:boolean lambda$getRenamedItems$0(java.lang.Class,java.util.function.Predicate,com.android.tools.r8.graph.DexItem):117:117 -> a
-    41:66:boolean checkTargetCanBeTranslated(com.android.tools.r8.graph.DexMethod):134:159 -> a
-    67:77:void lambda$toString$2(java.lang.StringBuilder,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexString):167:177 -> a
+    2:15:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):63:76 -> a
+    16:16:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):58:58 -> a
+    16:16:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):83 -> a
+    17:29:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):83:95 -> a
+    30:30:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):77:77 -> a
+    31:31:com.android.tools.r8.graph.DexString lookupMethodName(com.android.tools.r8.graph.DexCallSite):105:105 -> a
+    32:33:void forAllRenamedTypes(java.util.function.Consumer):115:116 -> a
+    34:37:java.util.Map getRenamedItems(java.lang.Class,java.util.function.Predicate,java.util.function.Function):122:125 -> a
+    38:38:boolean lambda$getRenamedItems$0(java.lang.Class,java.util.function.Predicate,com.android.tools.r8.graph.DexItem):123:123 -> a
+    39:64:boolean checkTargetCanBeTranslated(com.android.tools.r8.graph.DexMethod):140:165 -> a
+    65:75:void lambda$toString$2(java.lang.StringBuilder,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexString):173:183 -> a
     1:1:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):58:58 -> lookupDescriptor
-    1:1:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod):94:94 -> lookupName
-    2:2:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField):104:104 -> lookupName
-    1:16:java.lang.String toString():164:179 -> toString
+    1:1:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod):100:100 -> lookupName
+    2:2:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField):110:110 -> lookupName
+    1:16:java.lang.String toString():170:185 -> toString
 com.android.tools.r8.naming.Minifier -> com.android.tools.r8.naming.Minifier:
     com.android.tools.r8.graph.AppView appView -> a
-    java.util.Set desugaredCallSites -> b
-    boolean $assertionsDisabled -> c
-    1:1:void <clinit>():29:29 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):34:36 -> <init>
-    1:1:int lambda$run$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):42:42 -> a
-    1:20:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):40:59 -> run
-    21:34:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):57:70 -> run
-    35:48:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):69:82 -> run
+    com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet -> b
+    java.util.Set desugaredCallSites -> c
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():28:28 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.Set):35:38 -> <init>
+    1:16:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):42:57 -> run
+    17:29:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):55:67 -> run
+    30:43:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):66:79 -> run
 com.android.tools.r8.naming.Minifier$MinificationClassNamingStrategy -> com.android.tools.r8.naming.Minifier$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap namespaceCounters -> b
-    java.util.Set noObfuscation -> c
     com.android.tools.r8.graph.DexItemFactory factory -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,java.util.Set):92:92 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory,java.util.Set):89:95 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory):88:88 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):86:90 -> <init>
     boolean bypassDictionary() -> a
-    1:3:com.android.tools.r8.graph.DexString next(com.android.tools.r8.naming.ClassNameMinifier$Namespace,com.android.tools.r8.graph.DexType,char[]):100:102 -> a
-    1:1:java.util.Set noObfuscation():113:113 -> b
+    1:3:com.android.tools.r8.graph.DexString next(com.android.tools.r8.naming.ClassNameMinifier$Namespace,com.android.tools.r8.graph.DexType,char[]):95:97 -> a
 com.android.tools.r8.naming.Minifier$MinificationPackageNamingStrategy -> com.android.tools.r8.naming.Minifier$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap namespaceCounters -> a
-    1:1:void <init>():121:121 -> <init>
-    2:5:void <init>():119:122 -> <init>
+    1:1:void <init>():111:111 -> <init>
+    2:5:void <init>():109:112 -> <init>
     boolean bypassDictionary() -> a
-    1:2:java.lang.String next(com.android.tools.r8.naming.ClassNameMinifier$Namespace,char[]):131:132 -> a
+    1:2:java.lang.String next(com.android.tools.r8.naming.ClassNameMinifier$Namespace,char[]):121:122 -> a
 com.android.tools.r8.naming.Minifier$MinifierMemberNamingStrategy -> com.android.tools.r8.naming.Minifier$c:
-    char[] EMPTY_CHAR_ARRAY -> c
-    java.util.Set noObfuscation -> b
+    char[] EMPTY_CHAR_ARRAY -> b
     com.android.tools.r8.graph.DexItemFactory factory -> a
-    1:1:void <clinit>():143:143 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,java.util.Set):148:150 -> <init>
+    1:1:void <clinit>():133:133 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):137:138 -> <init>
     boolean breakOnNotAvailable(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString) -> a
     boolean bypassDictionary() -> a
-    1:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.MethodNamingState$InternalState):155:156 -> a
-    3:3:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.FieldNamingState$InternalState):161:161 -> a
-    1:1:java.util.Set noObfuscation():176:176 -> b
+    1:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.NamingState$InternalState):143:144 -> a
 com.android.tools.r8.naming.NamingLens -> com.android.tools.r8.naming.NamingLens:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():42:42 -> <clinit>
-    1:1:void <init>():42:42 -> <init>
+    1:1:void <clinit>():45:45 -> <clinit>
+    1:1:void <init>():45:45 -> <init>
     boolean checkTargetCanBeTranslated(com.android.tools.r8.graph.DexMethod) -> a
     void forAllRenamedTypes(java.util.function.Consumer) -> a
     java.util.Map getRenamedItems(java.lang.Class,java.util.function.Predicate,java.util.function.Function) -> a
     com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions) -> a
     com.android.tools.r8.graph.DexString lookupMethodName(com.android.tools.r8.graph.DexCallSite) -> a
     java.lang.String lookupPackageName(java.lang.String) -> a
-    1:9:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):57:65 -> a
-    10:13:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):69:72 -> a
-    14:14:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):69:69 -> a
-    15:18:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):76:79 -> a
-    19:19:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):76:76 -> a
-    20:24:com.android.tools.r8.graph.DexProto lookupProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):83:87 -> a
-    25:25:com.android.tools.r8.graph.DexProto lookupProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):83:83 -> a
-    26:26:com.android.tools.r8.graph.DexType lambda$lookupProto$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):86:86 -> a
-    27:27:com.android.tools.r8.graph.DexType[] lambda$lookupProto$1(int):87:87 -> a
-    28:36:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):91:99 -> a
-    37:37:boolean isIdentityLens():107:107 -> a
-    38:39:java.lang.String lookupInternalName(com.android.tools.r8.graph.DexType):111:112 -> a
-    40:60:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):131:151 -> a
-    1:1:com.android.tools.r8.naming.NamingLens getIdentityLens():103:103 -> getIdentityLens
+    1:6:com.android.tools.r8.graph.DexString lookupSimpleName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):52:57 -> a
+    7:15:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):69:77 -> a
+    16:19:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):81:84 -> a
+    20:20:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):81:81 -> a
+    21:24:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):88:91 -> a
+    25:25:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):88:88 -> a
+    26:30:com.android.tools.r8.graph.DexProto lookupProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):95:99 -> a
+    31:31:com.android.tools.r8.graph.DexProto lookupProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):95:95 -> a
+    32:32:com.android.tools.r8.graph.DexType lambda$lookupProto$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):98:98 -> a
+    33:33:com.android.tools.r8.graph.DexType[] lambda$lookupProto$1(int):99:99 -> a
+    34:34:boolean isIdentityLens():119:119 -> a
+    35:36:java.lang.String lookupInternalName(com.android.tools.r8.graph.DexType):123:124 -> a
+    37:57:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):143:163 -> a
+    1:9:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):103:111 -> b
+    1:1:com.android.tools.r8.naming.NamingLens getIdentityLens():115:115 -> getIdentityLens
+com.android.tools.r8.naming.NamingLens$1 -> com.android.tools.r8.naming.x:
 com.android.tools.r8.naming.NamingLens$IdentityLens -> com.android.tools.r8.naming.NamingLens$a:
-    1:1:void <init>():159:159 -> <init>
-    1:1:void <init>(com.android.tools.r8.naming.NamingLens$1):157 -> <init>
+    1:1:void <init>():171:171 -> <init>
+    1:1:void <init>(com.android.tools.r8.naming.NamingLens$1):169 -> <init>
     boolean checkTargetCanBeTranslated(com.android.tools.r8.graph.DexMethod) -> a
     void forAllRenamedTypes(java.util.function.Consumer) -> a
     java.lang.String lookupPackageName(java.lang.String) -> a
-    1:1:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):170:170 -> a
-    2:2:com.android.tools.r8.graph.DexString lookupMethodName(com.android.tools.r8.graph.DexCallSite):180:180 -> a
-    3:3:java.util.Map getRenamedItems(java.lang.Class,java.util.function.Predicate,java.util.function.Function):201:201 -> a
-    1:1:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):165:165 -> lookupDescriptor
-    1:1:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod):175:175 -> lookupName
-    2:2:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField):185:185 -> lookupName
-com.android.tools.r8.naming.ProguardMap -> com.android.tools.r8.naming.y:
-com.android.tools.r8.naming.ProguardMap$Builder -> com.android.tools.r8.naming.y$a:
+    1:1:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):182:182 -> a
+    2:2:com.android.tools.r8.graph.DexString lookupMethodName(com.android.tools.r8.graph.DexCallSite):192:192 -> a
+    3:3:java.util.Map getRenamedItems(java.lang.Class,java.util.function.Predicate,java.util.function.Function):213:213 -> a
+    1:1:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):177:177 -> lookupDescriptor
+    1:1:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod):187:187 -> lookupName
+    2:2:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField):197:197 -> lookupName
+com.android.tools.r8.naming.NamingState -> com.android.tools.r8.naming.z:
+    java.util.Map usedNames -> b
+    com.android.tools.r8.graph.DexItemFactory itemFactory -> c
+    java.util.List dictionary -> d
+    com.android.tools.r8.naming.NamingState parent -> a
+    java.util.function.Function keyTransform -> e
+    boolean useUniqueMemberNames -> g
+    boolean $assertionsDisabled -> h
+    com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy strategy -> f
+    1:1:void <clinit>():28:28 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.function.Function,com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy,boolean):54:54 -> <init>
+    2:31:void <init>(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.function.Function,com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy,boolean):31:60 -> <init>
+    1:1:boolean access$300(com.android.tools.r8.naming.NamingState):28:28 -> a
+    2:2:com.android.tools.r8.naming.NamingState createRoot(com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.function.Function,com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy,boolean):44:44 -> a
+    3:3:com.android.tools.r8.naming.NamingState createChild():64:64 -> a
+    4:6:com.android.tools.r8.naming.NamingState$InternalState findInternalStateFor(java.lang.Object):69:71 -> a
+    7:7:com.android.tools.r8.graph.DexString assignNewNameFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.CachedHashValueDexItem,boolean):97:97 -> a
+    8:12:com.android.tools.r8.graph.DexString getAssignedNameFor(com.android.tools.r8.graph.DexString,java.lang.Object):88:92 -> a
+    8:12:com.android.tools.r8.graph.DexString assignNewNameFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.CachedHashValueDexItem,boolean):98 -> a
+    13:14:com.android.tools.r8.graph.DexString assignNewNameFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.CachedHashValueDexItem,boolean):100:101 -> a
+    15:20:boolean isReserved(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.CachedHashValueDexItem):113:118 -> a
+    21:23:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.CachedHashValueDexItem,com.android.tools.r8.graph.DexString):137:139 -> a
+    24:38:void printState(com.android.tools.r8.graph.CachedHashValueDexItem,java.util.function.Function,java.lang.String,java.io.PrintStream):147:161 -> a
+    1:1:com.android.tools.r8.naming.MemberNameMinifier$MemberNamingStrategy access$400(com.android.tools.r8.naming.NamingState):28:28 -> b
+    2:6:com.android.tools.r8.naming.NamingState$InternalState getOrCreateInternalStateFor(java.lang.Object):78:82 -> b
+    7:9:void reserveName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.CachedHashValueDexItem):107:109 -> b
+    10:16:boolean isAvailable(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.CachedHashValueDexItem,com.android.tools.r8.graph.DexString):122:128 -> b
+    17:19:boolean isAvailable(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.CachedHashValueDexItem,com.android.tools.r8.graph.DexString):127:129 -> b
+    1:1:com.android.tools.r8.naming.NamingState access$500(com.android.tools.r8.naming.NamingState):28:28 -> c
+com.android.tools.r8.naming.NamingState$1 -> com.android.tools.r8.naming.y:
+com.android.tools.r8.naming.NamingState$InternalState -> com.android.tools.r8.naming.z$a:
+    java.util.Iterator dictionaryIterator -> f
+    java.util.Set reservedNames -> c
+    com.android.tools.r8.naming.NamingState this$0 -> g
+    com.android.tools.r8.naming.NamingState$InternalState parentInternalState -> b
+    boolean $assertionsDisabled -> h
+    com.android.tools.r8.com.google.common.collect.Table renamings -> d
+    int nameCount -> e
+    com.android.tools.r8.graph.DexItemFactory itemFactory -> a
+    1:1:void <clinit>():165:165 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.naming.NamingState$InternalState,java.util.List):189:189 -> <init>
+    1:1:void <init>(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.naming.NamingState$InternalState,java.util.List,com.android.tools.r8.naming.NamingState$1):165 -> <init>
+    2:2:void <init>(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.naming.NamingState$InternalState,java.util.Iterator):179:179 -> <init>
+    2:2:void <init>(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.naming.NamingState$InternalState,java.util.List):189 -> <init>
+    2:2:void <init>(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.naming.NamingState$InternalState,java.util.List,com.android.tools.r8.naming.NamingState$1):165 -> <init>
+    3:16:void <init>(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.naming.NamingState$InternalState,java.util.Iterator):171:184 -> <init>
+    3:16:void <init>(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.naming.NamingState$InternalState,java.util.List):189 -> <init>
+    3:16:void <init>(com.android.tools.r8.naming.NamingState,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.naming.NamingState$InternalState,java.util.List,com.android.tools.r8.naming.NamingState$1):165 -> <init>
+    1:1:boolean access$100(com.android.tools.r8.naming.NamingState$InternalState,com.android.tools.r8.graph.DexString):165:165 -> a
+    2:5:void reserveName(com.android.tools.r8.graph.DexString):204:207 -> a
+    6:6:int incrementAndGet():211:211 -> a
+    7:14:com.android.tools.r8.graph.DexString getAssignedNameFor(com.android.tools.r8.graph.DexString,java.lang.Object):216:223 -> a
+    15:15:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getOnlyElement(java.lang.Iterable,java.lang.Object):280:280 -> a
+    15:15:com.android.tools.r8.graph.DexString getAssignedNameFor(com.android.tools.r8.graph.DexString,java.lang.Object):224 -> a
+    16:16:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getOnlyElement(java.util.Iterator,java.lang.Object):341:341 -> a
+    16:16:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getOnlyElement(java.lang.Iterable,java.lang.Object):280 -> a
+    16:16:com.android.tools.r8.graph.DexString getAssignedNameFor(com.android.tools.r8.graph.DexString,java.lang.Object):224 -> a
+    17:24:com.android.tools.r8.graph.DexString getAssignedNameFor(com.android.tools.r8.graph.DexString,java.lang.Object):224:231 -> a
+    25:25:com.android.tools.r8.graph.DexString getNameFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,java.lang.Object,boolean):238:238 -> a
+    26:29:com.android.tools.r8.graph.DexString nextSuggestedName(com.android.tools.r8.graph.DexReference):259:262 -> a
+    26:29:com.android.tools.r8.graph.DexString getNameFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,java.lang.Object,boolean):243 -> a
+    30:32:com.android.tools.r8.graph.DexString getNameFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,java.lang.Object,boolean):244:246 -> a
+    33:36:void addRenaming(com.android.tools.r8.graph.DexString,java.lang.Object,com.android.tools.r8.graph.DexString):252:255 -> a
+    37:45:void printInternalState(com.android.tools.r8.naming.NamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):271:279 -> a
+    46:56:void printLastName(java.lang.String,java.io.PrintStream):290:300 -> a
+    46:56:void printInternalState(com.android.tools.r8.naming.NamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):279 -> a
+    57:57:void printInternalState(com.android.tools.r8.naming.NamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):280:280 -> a
+    58:67:void printReservedNames(java.lang.String,java.io.PrintStream):304:313 -> a
+    58:67:void printInternalState(com.android.tools.r8.naming.NamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):280 -> a
+    68:77:void printReservedNames(java.lang.String,java.io.PrintStream):307:316 -> a
+    68:77:void printInternalState(com.android.tools.r8.naming.NamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):280 -> a
+    78:78:void printInternalState(com.android.tools.r8.naming.NamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):281:281 -> a
+    79:93:void printRenamings(java.lang.String,java.io.PrintStream):320:334 -> a
+    79:93:void printInternalState(com.android.tools.r8.naming.NamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):281 -> a
+    94:109:void printRenamings(java.lang.String,java.io.PrintStream):323:338 -> a
+    94:109:void printInternalState(com.android.tools.r8.naming.NamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):281 -> a
+    110:112:void printInternalState(com.android.tools.r8.naming.NamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):283:285 -> a
+    113:113:void printInternalState(com.android.tools.r8.naming.NamingState,java.util.function.Function,java.lang.String,java.io.PrintStream):284:284 -> a
+    1:1:boolean access$200(com.android.tools.r8.naming.NamingState$InternalState,com.android.tools.r8.graph.DexString):165:165 -> b
+    2:4:boolean isAvailable(com.android.tools.r8.graph.DexString):198:200 -> b
+    1:2:boolean isReserved(com.android.tools.r8.graph.DexString):193:194 -> c
+com.android.tools.r8.naming.ProguardMap -> com.android.tools.r8.naming.B:
+com.android.tools.r8.naming.ProguardMap$Builder -> com.android.tools.r8.naming.A:
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.naming.ProguardMapError -> com.android.tools.r8.naming.z:
+com.android.tools.r8.naming.ProguardMapError -> com.android.tools.r8.naming.C:
     1:1:void <init>(java.lang.String,com.android.tools.r8.position.Position):21:21 -> <init>
     1:1:com.android.tools.r8.naming.ProguardMapError duplicateSourceClass(java.lang.String,com.android.tools.r8.position.Position):25:25 -> a
     2:3:com.android.tools.r8.naming.ProguardMapError duplicateSourceMember(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):30:31 -> a
     4:5:com.android.tools.r8.naming.ProguardMapError duplicateTargetClass(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.Position):36:37 -> a
     6:7:com.android.tools.r8.naming.ProguardMapError duplicateTargetSignature(com.android.tools.r8.naming.MemberNaming$Signature,com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String,com.android.tools.r8.position.Position):42:43 -> a
-com.android.tools.r8.naming.ProguardMapMinifier -> com.android.tools.r8.naming.C:
+com.android.tools.r8.naming.ProguardMapMinifier -> com.android.tools.r8.naming.D:
     com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.naming.SeedMapper seedMapper -> b
-    java.util.Set desugaredCallSites -> c
-    boolean $assertionsDisabled -> d
+    com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet -> b
+    com.android.tools.r8.naming.SeedMapper seedMapper -> c
+    java.util.Set desugaredCallSites -> d
+    boolean $assertionsDisabled -> e
     1:1:void <clinit>():38:38 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper,java.util.Set):47:50 -> <init>
-    1:17:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):54:70 -> a
-    18:23:void computeDefaultInterfaceMethodMappings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):169:174 -> a
-    18:23:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):72 -> a
-    24:30:void computeDefaultInterfaceMethodMappings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):173:179 -> a
-    24:30:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):72 -> a
-    31:45:void computeDefaultInterfaceMethodMappings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):178:192 -> a
-    31:45:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):72 -> a
-    46:51:void computeDefaultInterfaceMethodMappings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):190:195 -> a
-    46:51:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):72 -> a
-    52:52:void computeDefaultInterfaceMethodMappings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):194:194 -> a
-    52:52:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):72 -> a
-    53:66:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):79:92 -> a
-    67:67:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):91:91 -> a
-    68:135:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):90:157 -> a
-    136:141:void lambda$run$0(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):98:103 -> a
-    142:142:int lambda$run$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):132:132 -> a
+    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.naming.SeedMapper,java.util.Set):49:53 -> <init>
+    1:36:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):57:92 -> a
+    37:37:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):91:91 -> a
+    38:100:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):90:152 -> a
+    101:106:void lambda$run$0(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):98:103 -> a
     1:6:void lambda$run$1(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):107:112 -> b
-com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingClassNamingStrategy -> com.android.tools.r8.naming.A:
+com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingClassNamingStrategy -> com.android.tools.r8.naming.D$a:
     java.util.Map mappings -> a
-    java.util.Set noObfuscation -> b
-    1:1:void <init>(java.util.Map):206:206 -> <init>
-    2:5:void <init>(java.util.Map):204:207 -> <init>
+    1:2:void <init>(java.util.Map):161:162 -> <init>
     boolean bypassDictionary() -> a
-    1:1:com.android.tools.r8.graph.DexString next(com.android.tools.r8.naming.ClassNameMinifier$Namespace,com.android.tools.r8.graph.DexType,char[]):212:212 -> a
-    1:1:java.util.Set noObfuscation():222:222 -> b
-com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingMemberNamingStrategy -> com.android.tools.r8.naming.B:
+    1:1:com.android.tools.r8.graph.DexString next(com.android.tools.r8.naming.ClassNameMinifier$Namespace,com.android.tools.r8.graph.DexType,char[]):167:167 -> a
+com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingMemberNamingStrategy -> com.android.tools.r8.naming.E:
     java.util.Map mappedNames -> a
     com.android.tools.r8.graph.DexItemFactory factory -> b
-    java.util.Set noObfuscation -> d
-    boolean $assertionsDisabled -> e
+    boolean $assertionsDisabled -> d
     com.android.tools.r8.utils.Reporter reporter -> c
-    1:1:void <clinit>():226:226 -> <clinit>
-    1:1:void <init>(java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):235:235 -> <init>
-    2:8:void <init>(java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):232:238 -> <init>
+    1:1:void <clinit>():176:176 -> <clinit>
+    1:4:void <init>(java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):183:186 -> <init>
     boolean bypassDictionary() -> a
-    1:1:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.MethodNamingState$InternalState):243:243 -> a
-    2:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.FieldNamingState$InternalState):248:248 -> a
-    3:9:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexReference):252:258 -> a
-    10:16:boolean breakOnNotAvailable(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):271:277 -> a
-    17:17:boolean breakOnNotAvailable(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):274:274 -> a
-    18:18:boolean breakOnNotAvailable(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):273:273 -> a
-    1:1:java.util.Set noObfuscation():283:283 -> b
-com.android.tools.r8.naming.ProguardMapReader -> com.android.tools.r8.naming.E:
+    1:7:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.NamingState$InternalState):191:197 -> a
+    8:14:boolean breakOnNotAvailable(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):210:216 -> a
+    15:15:boolean breakOnNotAvailable(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):213:213 -> a
+    16:16:boolean breakOnNotAvailable(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):212:212 -> a
+com.android.tools.r8.naming.ProguardMapReader -> com.android.tools.r8.naming.G:
     java.io.BufferedReader reader -> a
     boolean $assertionsDisabled -> f
     int lineNo -> b
@@ -39807,7 +39162,7 @@
     1:1:int peekCodePoint():75:75 -> i
     1:6:boolean skipLine():129:134 -> j
     1:2:void skipWhitespace():143:144 -> k
-com.android.tools.r8.naming.ProguardMapReader$ParseException -> com.android.tools.r8.naming.D:
+com.android.tools.r8.naming.ProguardMapReader$ParseException -> com.android.tools.r8.naming.F:
     int lineOffset -> b
     boolean eol -> c
     int lineNo -> a
@@ -39845,24 +39200,6 @@
     1:6:boolean equals(java.lang.Object):31:36 -> equals
     1:2:int hashCode():41:42 -> hashCode
     1:1:java.lang.String toString():23:23 -> toString
-com.android.tools.r8.naming.ReservedFieldNamingState -> com.android.tools.r8.naming.G:
-    1:1:void <init>(com.android.tools.r8.graph.AppView):21:21 -> <init>
-    1:1:void markReservedDirectly(com.android.tools.r8.graph.DexField):30:30 -> a
-    2:2:void markReservedDirectly(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):34:34 -> a
-    2:2:void markReservedDirectly(com.android.tools.r8.graph.DexField):30 -> a
-    3:3:void markReservedDirectly(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):34:34 -> a
-    4:5:void includeReservations(com.android.tools.r8.naming.ReservedFieldNamingState):38:39 -> a
-    6:6:com.android.tools.r8.naming.ReservedFieldNamingState$InternalState createInternalState():51:51 -> a
-    6:6:java.lang.Object createInternalState():18 -> a
-    1:2:void includeReservationsFromBelow(com.android.tools.r8.naming.ReservedFieldNamingState):44:45 -> b
-com.android.tools.r8.naming.ReservedFieldNamingState$InternalState -> com.android.tools.r8.naming.F:
-    java.util.Set reservedNamesDirect -> a
-    java.util.Set reservedNamesBelow -> b
-    1:4:void <init>():54:57 -> <init>
-    1:1:boolean isReserved(com.android.tools.r8.graph.DexString):60:60 -> a
-    2:2:void includeReservations(com.android.tools.r8.naming.ReservedFieldNamingState$InternalState):68:68 -> a
-    1:1:void markReservedDirectly(com.android.tools.r8.graph.DexString):64:64 -> b
-    2:3:void includeReservationsFromBelow(com.android.tools.r8.naming.ReservedFieldNamingState$InternalState):72:73 -> b
 com.android.tools.r8.naming.SeedMapper -> com.android.tools.r8.naming.SeedMapper:
     com.android.tools.r8.com.google.common.collect.ImmutableMap mappings -> a
     com.android.tools.r8.utils.Reporter reporter -> b
@@ -39876,7 +39213,7 @@
     1:10:void verifyMappingsAreConflictFree():98:107 -> b
     11:11:void verifyMappingsAreConflictFree():104:104 -> b
     12:20:void verifyMappingsAreConflictFree():103:111 -> b
-    21:22:void com.android.tools.r8.naming.ClassNamingForMapApplier.forAllMemberNaming(com.android.tools.r8.utils.ThrowingConsumer):138:139 -> b
+    21:22:void com.android.tools.r8.naming.ClassNamingForMapApplier.forAllMemberNaming(com.android.tools.r8.utils.ThrowingConsumer):129:130 -> b
     21:22:void verifyMappingsAreConflictFree():111 -> b
     23:23:void verifyMappingsAreConflictFree():125:125 -> b
     1:1:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):81:81 -> seedMapperFromFile
@@ -39889,6 +39226,7 @@
     5:7:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):81 -> seedMapperFromFile
     8:12:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):73:77 -> seedMapperFromFile
     8:12:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):81 -> seedMapperFromFile
+com.android.tools.r8.naming.SeedMapper$1 -> com.android.tools.r8.naming.H:
 com.android.tools.r8.naming.SeedMapper$Builder -> com.android.tools.r8.naming.SeedMapper$a:
     java.util.Map map -> a
     com.android.tools.r8.utils.Reporter reporter -> b
@@ -39901,7 +39239,7 @@
     1:4:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):38 -> classNamingBuilder
     5:8:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):51:54 -> classNamingBuilder
     5:8:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):38 -> classNamingBuilder
-com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.naming.H:
+com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.naming.I:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():22:22 -> <clinit>
@@ -39952,7 +39290,7 @@
     12:12:void parseFieldSignature(java.lang.String):116:116 -> parseFieldSignature
     1:11:void parseMethodSignature(java.lang.String):95:105 -> parseMethodSignature
     12:12:void parseMethodSignature(java.lang.String):100:100 -> parseMethodSignature
-com.android.tools.r8.naming.signature.GenericSignatureRewriter -> com.android.tools.r8.naming.signature.c:
+com.android.tools.r8.naming.signature.GenericSignatureRewriter -> com.android.tools.r8.naming.signature.b:
     java.util.Map renaming -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> d
@@ -39972,7 +39310,7 @@
     1:1:java.util.Map access$200(com.android.tools.r8.naming.signature.GenericSignatureRewriter):29:29 -> b
     1:1:com.android.tools.r8.utils.Reporter access$300(com.android.tools.r8.naming.signature.GenericSignatureRewriter):29:29 -> c
 com.android.tools.r8.naming.signature.GenericSignatureRewriter$1 -> com.android.tools.r8.naming.signature.a:
-com.android.tools.r8.naming.signature.GenericSignatureRewriter$GenericSignatureCollector -> com.android.tools.r8.naming.signature.b:
+com.android.tools.r8.naming.signature.GenericSignatureRewriter$GenericSignatureCollector -> com.android.tools.r8.naming.signature.b$a:
     java.lang.StringBuilder renamedSignature -> a
     com.android.tools.r8.naming.signature.GenericSignatureRewriter this$0 -> b
     boolean $assertionsDisabled -> c
@@ -39998,21 +39336,24 @@
     1:1:void start():210:210 -> start
 com.android.tools.r8.optimize.ClassAndMemberPublicizer -> com.android.tools.r8.g.a:
     com.android.tools.r8.graph.DexApplication application -> a
-    com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> c
-    com.android.tools.r8.optimize.PublicizerLense$PublicizedLenseBuilder lenseBuilder -> d
+    com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet -> c
+    com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> d
+    com.android.tools.r8.optimize.PublicizerLense$PublicizedLenseBuilder lenseBuilder -> e
     com.android.tools.r8.graph.AppView appView -> b
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):32:32 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):29:35 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):50:50 -> a
-    2:12:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):56:66 -> a
-    2:12:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):50 -> a
-    13:28:void publicizeType(com.android.tools.r8.graph.DexType):70:85 -> a
-    29:29:void lambda$publicizeType$0(com.android.tools.r8.graph.DexEncodedField):73:73 -> a
-    30:74:boolean publicizeMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):89:133 -> a
-    30:74:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):76 -> a
-    75:75:boolean publicizeMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):94:94 -> a
-    75:75:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):76 -> a
-    76:76:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):77:77 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet):33:33 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet):30:37 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilder$RootSet):53:53 -> a
+    2:6:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):59:63 -> a
+    7:7:void com.android.tools.r8.graph.DexType.forAllInterfaces(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):287:287 -> a
+    7:7:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):63 -> a
+    8:11:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):64:67 -> a
+    12:27:void publicizeType(com.android.tools.r8.graph.DexType):71:86 -> a
+    28:28:void lambda$publicizeType$0(com.android.tools.r8.graph.DexEncodedField):74:74 -> a
+    29:73:boolean publicizeMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):90:134 -> a
+    29:73:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):77 -> a
+    74:74:boolean publicizeMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):95:95 -> a
+    74:74:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):77 -> a
+    75:75:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):78:78 -> a
 com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.g.c:
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind kind -> c
     boolean $assertionsDisabled -> e
@@ -40050,53 +39391,53 @@
     com.android.tools.r8.utils.InternalOptions options -> c
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.GraphLense lense -> b
-    1:1:void <clinit>():29:29 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.graph.AppView):37:42 -> <init>
-    1:13:com.android.tools.r8.graph.DexMethod validTargetFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):46:58 -> a
-    14:31:com.android.tools.r8.graph.DexType firstLibraryClassForInterfaceTarget(java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):79:96 -> a
-    32:37:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):103:108 -> a
-    38:38:com.android.tools.r8.graph.DexEncodedMethod anyLookup(com.android.tools.r8.graph.DexMethod):120:120 -> a
-    39:53:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):127:141 -> a
-    54:57:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):171:174 -> a
-    54:57:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):147 -> a
-    58:58:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):150:150 -> a
-    59:65:com.android.tools.r8.graph.DexEncodedMethod insertBridgeForInterfaceMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,java.util.function.Function):191:197 -> a
-    59:65:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):149 -> a
-    66:67:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):156:157 -> a
-    68:76:com.android.tools.r8.graph.DexEncodedMethod insertBridgeForVisibilityIfNeeded(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.util.function.Function):240:248 -> a
-    68:76:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):160 -> a
-    77:77:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):164:164 -> a
-    78:78:boolean lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):158:158 -> a
-    79:90:boolean mayNeedBridgeForVisibility(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):215:226 -> a
-    79:90:boolean lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):158 -> a
-    91:100:com.android.tools.r8.graph.DexProgramClass findHolderForInterfaceMethodBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):202:211 -> a
-    101:123:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):256:278 -> a
-    124:139:void computeFieldRebinding(java.util.Map,java.util.function.BiFunction,java.util.function.BiFunction):287:302 -> a
-    140:151:com.android.tools.r8.graph.DexField validTargetFor(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,java.util.function.BiFunction):63:74 -> a
-    140:151:void computeFieldRebinding(java.util.Map,java.util.function.BiFunction,java.util.function.BiFunction):303 -> a
-    152:152:void computeFieldRebinding(java.util.Map,java.util.function.BiFunction,java.util.function.BiFunction):303:303 -> a
-    153:153:void computeFieldRebinding(java.util.Map,java.util.function.BiFunction,java.util.function.BiFunction):302:302 -> a
-    154:154:boolean lambda$computeFieldRebinding$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):297:297 -> a
-    155:166:boolean isMemberVisibleFromOriginalContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):310:321 -> a
-    167:175:java.util.Map mergeFieldAccessContexts(java.util.Map,java.util.Map):327:335 -> a
-    176:189:com.android.tools.r8.graph.GraphLense run():339:352 -> a
-    190:194:com.android.tools.r8.graph.GraphLense run():351:355 -> a
-    195:199:com.android.tools.r8.graph.GraphLense run():354:358 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMethod classLookup(com.android.tools.r8.graph.DexMethod):112:112 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod interfaceLookup(com.android.tools.r8.graph.DexMethod):116:116 -> c
-com.android.tools.r8.optimize.MemberRebindingLense -> com.android.tools.r8.g.f:
+    1:1:void <clinit>():30:30 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.graph.AppView):38:43 -> <init>
+    1:13:com.android.tools.r8.graph.DexMethod validTargetFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):47:59 -> a
+    14:31:com.android.tools.r8.graph.DexType firstLibraryClassForInterfaceTarget(java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):80:97 -> a
+    32:37:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):104:109 -> a
+    38:38:com.android.tools.r8.graph.DexEncodedMethod anyLookup(com.android.tools.r8.graph.DexMethod):121:121 -> a
+    39:53:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):128:142 -> a
+    54:57:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):172:175 -> a
+    54:57:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):148 -> a
+    58:58:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):151:151 -> a
+    59:65:com.android.tools.r8.graph.DexEncodedMethod insertBridgeForInterfaceMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,java.util.function.Function):192:198 -> a
+    59:65:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):150 -> a
+    66:67:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):157:158 -> a
+    68:76:com.android.tools.r8.graph.DexEncodedMethod insertBridgeForVisibilityIfNeeded(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.util.function.Function):241:249 -> a
+    68:76:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):161 -> a
+    77:77:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):165:165 -> a
+    78:78:boolean lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):159:159 -> a
+    79:90:boolean mayNeedBridgeForVisibility(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):216:227 -> a
+    79:90:boolean lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):159 -> a
+    91:100:com.android.tools.r8.graph.DexProgramClass findHolderForInterfaceMethodBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):203:212 -> a
+    101:123:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):257:279 -> a
+    124:139:void computeFieldRebinding(java.util.Map,java.util.function.BiFunction,java.util.function.BiFunction):288:303 -> a
+    140:151:com.android.tools.r8.graph.DexField validTargetFor(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,java.util.function.BiFunction):64:75 -> a
+    140:151:void computeFieldRebinding(java.util.Map,java.util.function.BiFunction,java.util.function.BiFunction):304 -> a
+    152:152:void computeFieldRebinding(java.util.Map,java.util.function.BiFunction,java.util.function.BiFunction):304:304 -> a
+    153:153:void computeFieldRebinding(java.util.Map,java.util.function.BiFunction,java.util.function.BiFunction):303:303 -> a
+    154:154:boolean lambda$computeFieldRebinding$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):298:298 -> a
+    155:166:boolean isMemberVisibleFromOriginalContext(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):314:325 -> a
+    167:175:java.util.Map mergeFieldAccessContexts(java.util.Map,java.util.Map):331:339 -> a
+    176:189:com.android.tools.r8.graph.GraphLense run():343:356 -> a
+    190:194:com.android.tools.r8.graph.GraphLense run():355:359 -> a
+    195:199:com.android.tools.r8.graph.GraphLense run():358:362 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod classLookup(com.android.tools.r8.graph.DexMethod):113:113 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod interfaceLookup(com.android.tools.r8.graph.DexMethod):117:117 -> c
+com.android.tools.r8.optimize.MemberRebindingLense -> com.android.tools.r8.g.e:
     com.android.tools.r8.graph.AppView appView -> k
     1:7:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map,com.android.tools.r8.graph.GraphLense):44:50 -> <init>
     8:16:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map,com.android.tools.r8.graph.GraphLense):43:51 -> <init>
     1:1:com.android.tools.r8.optimize.MemberRebindingLense$Builder builder(com.android.tools.r8.graph.AppView):55:55 -> 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):60:60 -> b
-com.android.tools.r8.optimize.MemberRebindingLense$Builder -> com.android.tools.r8.g.e:
+com.android.tools.r8.optimize.MemberRebindingLense$Builder -> com.android.tools.r8.g.e$a:
     com.android.tools.r8.graph.AppView appView -> f
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():19:19 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):23:24 -> <init>
     1:5:com.android.tools.r8.graph.GraphLense build(com.android.tools.r8.graph.GraphLense):28:32 -> a
-com.android.tools.r8.optimize.PublicizerLense -> com.android.tools.r8.g.i:
+com.android.tools.r8.optimize.PublicizerLense -> com.android.tools.r8.g.h:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.AppView appView -> k
     java.util.Set publicizedMethods -> l
@@ -40111,8 +39452,8 @@
     14:16:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):49:51 -> a
     boolean isLegitimateToHaveEmptyMappings() -> d
     1:1:com.android.tools.r8.optimize.PublicizerLense$PublicizedLenseBuilder createBuilder():67:67 -> e
-com.android.tools.r8.optimize.PublicizerLense$1 -> com.android.tools.r8.g.g:
-com.android.tools.r8.optimize.PublicizerLense$PublicizedLenseBuilder -> com.android.tools.r8.g.h:
+com.android.tools.r8.optimize.PublicizerLense$1 -> com.android.tools.r8.g.f:
+com.android.tools.r8.optimize.PublicizerLense$PublicizedLenseBuilder -> com.android.tools.r8.g.g:
     java.util.Set publicizedMethods -> a
     1:1:void <init>():73:73 -> <init>
     1:1:void <init>(com.android.tools.r8.optimize.PublicizerLense$1):70 -> <init>
@@ -40120,7 +39461,7 @@
     2:2:void <init>(com.android.tools.r8.optimize.PublicizerLense$1):70 -> <init>
     1:4:com.android.tools.r8.graph.GraphLense build(com.android.tools.r8.graph.AppView):77:80 -> a
     5:5:void add(com.android.tools.r8.graph.DexMethod):84:84 -> a
-com.android.tools.r8.optimize.VisibilityBridgeRemover -> com.android.tools.r8.g.j:
+com.android.tools.r8.optimize.VisibilityBridgeRemover -> com.android.tools.r8.g.i:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():18:18 -> <clinit>
@@ -40136,13 +39477,13 @@
     36:42:void run():94 -> a
 com.android.tools.r8.org.objectweb.asm.AnnotationVisitor -> com.android.tools.r8.h.a.a.a:
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor av -> a
-    1:1:void <init>(int):56:56 -> <init>
-    2:7:void <init>(int,com.android.tools.r8.org.objectweb.asm.AnnotationVisitor):67:72 -> <init>
-    1:2:void visit(java.lang.String,java.lang.Object):87:88 -> a
-    3:4:void visitEnum(java.lang.String,java.lang.String,java.lang.String):100:101 -> a
-    5:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):115:116 -> a
-    7:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):133:134 -> a
-    9:10:void visitEnd():141:142 -> a
+    1:1:void <init>(int):57:57 -> <init>
+    2:10:void <init>(int,com.android.tools.r8.org.objectweb.asm.AnnotationVisitor):69:77 -> <init>
+    1:2:void visit(java.lang.String,java.lang.Object):92:93 -> a
+    3:4:void visitEnum(java.lang.String,java.lang.String,java.lang.String):105:106 -> a
+    5:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):120:121 -> a
+    7:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):138:139 -> a
+    9:10:void visitEnd():146:147 -> a
 com.android.tools.r8.org.objectweb.asm.AnnotationWriter -> com.android.tools.r8.h.a.a.b:
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter nextAnnotation -> h
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter previousAnnotation -> g
@@ -40152,30 +39493,16 @@
     int numElementValuePairsOffset -> e
     boolean useNamedValues -> c
     1:9:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,boolean,com.android.tools.r8.org.objectweb.asm.ByteVector,com.android.tools.r8.org.objectweb.asm.AnnotationWriter):115:123 -> <init>
-    1:4:com.android.tools.r8.org.objectweb.asm.AnnotationWriter create(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter):142:145 -> a
-    5:5:com.android.tools.r8.org.objectweb.asm.AnnotationWriter create(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter):173:173 -> a
-    6:6:void com.android.tools.r8.org.objectweb.asm.TypeReference.putTarget(int,com.android.tools.r8.org.objectweb.asm.ByteVector):433:433 -> a
-    6:6:com.android.tools.r8.org.objectweb.asm.AnnotationWriter create(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter):175 -> a
-    7:25:void com.android.tools.r8.org.objectweb.asm.TypeReference.putTarget(int,com.android.tools.r8.org.objectweb.asm.ByteVector):412:430 -> a
-    7:25:com.android.tools.r8.org.objectweb.asm.AnnotationWriter create(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter):175 -> a
-    26:26:void com.android.tools.r8.org.objectweb.asm.TypeReference.putTarget(int,com.android.tools.r8.org.objectweb.asm.ByteVector):407:407 -> a
-    26:26:com.android.tools.r8.org.objectweb.asm.AnnotationWriter create(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter):175 -> a
-    27:30:com.android.tools.r8.org.objectweb.asm.AnnotationWriter create(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter):176:179 -> a
-    31:98:void visit(java.lang.String,java.lang.Object):191:258 -> a
-    99:105:void visitEnum(java.lang.String,java.lang.String,java.lang.String):266:272 -> a
-    106:112:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):279:285 -> a
-    113:125:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):292:304 -> a
-    126:129:void visitEnd():309:312 -> a
-    130:145:int computeAnnotationsSize(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):373:388 -> a
-    146:158:void putAnnotations(int,com.android.tools.r8.org.objectweb.asm.ByteVector):410:422 -> a
-    159:159: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):455:455 -> a
-    160:165: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):454:459 -> a
-    166:171: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):458:463 -> a
-    172:177: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):462:467 -> a
-    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):466:466 -> a
-    179:181:int computeParameterAnnotationsSize(java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter[],int):496:498 -> a
-    182:205:void putParameterAnnotations(int,com.android.tools.r8.org.objectweb.asm.AnnotationWriter[],int,com.android.tools.r8.org.objectweb.asm.ByteVector):524:547 -> a
-    1:8:int computeAnnotationsSize(java.lang.String):332:339 -> b
+    10:10:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,com.android.tools.r8.org.objectweb.asm.ByteVector,com.android.tools.r8.org.objectweb.asm.AnnotationWriter):142:142 -> <init>
+    1:68:void visit(java.lang.String,java.lang.Object):153:220 -> a
+    69:75:void visitEnum(java.lang.String,java.lang.String,java.lang.String):228:234 -> a
+    76:82:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):241:247 -> a
+    83:95:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):254:266 -> a
+    96:99:void visitEnd():271:274 -> a
+    100:112:void putAnnotations(int,com.android.tools.r8.org.objectweb.asm.ByteVector):322:334 -> a
+    113:115:int computeParameterAnnotationsSize(java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter[],int):363:365 -> a
+    116:139:void putParameterAnnotations(int,com.android.tools.r8.org.objectweb.asm.AnnotationWriter[],int,com.android.tools.r8.org.objectweb.asm.ByteVector):391:414 -> a
+    1:8:int computeAnnotationsSize(java.lang.String):294:301 -> b
 com.android.tools.r8.org.objectweb.asm.Attribute -> com.android.tools.r8.h.a.a.d:
     byte[] content -> b
     java.lang.String type -> a
@@ -40184,34 +39511,32 @@
     1:3:com.android.tools.r8.org.objectweb.asm.Attribute read(com.android.tools.r8.org.objectweb.asm.ClassReader,int,int,char[],int,com.android.tools.r8.org.objectweb.asm.Label[]):128:130 -> a
     4:4:int getAttributeCount():172:172 -> a
     5:5:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable):191:191 -> a
-    6:10:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int):219:223 -> a
+    6:10:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int):218:222 -> a
     11:11:com.android.tools.r8.org.objectweb.asm.ByteVector write(com.android.tools.r8.org.objectweb.asm.ClassWriter,byte[],int,int,int):159:159 -> a
-    11:11:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int):224 -> a
+    11:11:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int):223 -> a
     12:12:void com.android.tools.r8.org.objectweb.asm.ByteVector.<init>(byte[]):65:65 -> a
     12:12:com.android.tools.r8.org.objectweb.asm.ByteVector write(com.android.tools.r8.org.objectweb.asm.ClassWriter,byte[],int,int,int):159 -> a
-    12:12:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int):224 -> a
-    13:13:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int):225:225 -> a
-    14:27:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int):247:260 -> a
-    28:28:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,com.android.tools.r8.org.objectweb.asm.ByteVector):279:279 -> a
-    29:29:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):307:307 -> a
-    30:30:com.android.tools.r8.org.objectweb.asm.ByteVector write(com.android.tools.r8.org.objectweb.asm.ClassWriter,byte[],int,int,int):159:159 -> a
-    30:30:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):311 -> a
-    31:31:void com.android.tools.r8.org.objectweb.asm.ByteVector.<init>(byte[]):65:65 -> a
-    31:31:com.android.tools.r8.org.objectweb.asm.ByteVector write(com.android.tools.r8.org.objectweb.asm.ClassWriter,byte[],int,int,int):159 -> a
-    31:31:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):311 -> a
-    32:34:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):313:315 -> a
-    35:45:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):336:346 -> a
+    12:12:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int):223 -> a
+    13:13:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int):224:224 -> a
+    14:14:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,com.android.tools.r8.org.objectweb.asm.ByteVector):242:242 -> a
+    15:15:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):269:269 -> a
+    16:16:com.android.tools.r8.org.objectweb.asm.ByteVector write(com.android.tools.r8.org.objectweb.asm.ClassWriter,byte[],int,int,int):159:159 -> a
+    16:16:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):273 -> a
+    17:17:void com.android.tools.r8.org.objectweb.asm.ByteVector.<init>(byte[]):65:65 -> a
+    17:17:com.android.tools.r8.org.objectweb.asm.ByteVector write(com.android.tools.r8.org.objectweb.asm.ClassWriter,byte[],int,int,int):159 -> a
+    17:17:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):273 -> a
+    18:20:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):275:277 -> a
     boolean isCodeAttribute() -> b
 com.android.tools.r8.org.objectweb.asm.Attribute$Set -> com.android.tools.r8.h.a.a.c:
     com.android.tools.r8.org.objectweb.asm.Attribute[] data -> b
     int size -> a
-    1:6:void <init>():351:356 -> <init>
-    1:2:com.android.tools.r8.org.objectweb.asm.Attribute[] toArray():369:370 -> a
-    3:4:boolean contains(com.android.tools.r8.org.objectweb.asm.Attribute):375:376 -> a
-    3:4:void addAttributes(com.android.tools.r8.org.objectweb.asm.Attribute):361 -> a
-    5:10:void 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
+    1:6:void <init>():282:287 -> <init>
+    1:2:com.android.tools.r8.org.objectweb.asm.Attribute[] toArray():300:301 -> a
+    3:4:boolean contains(com.android.tools.r8.org.objectweb.asm.Attribute):306:307 -> a
+    3:4:void addAttributes(com.android.tools.r8.org.objectweb.asm.Attribute):292 -> a
+    5:10:void add(com.android.tools.r8.org.objectweb.asm.Attribute):315:320 -> a
+    5:10:void addAttributes(com.android.tools.r8.org.objectweb.asm.Attribute):293 -> a
+    11:11:void addAttributes(com.android.tools.r8.org.objectweb.asm.Attribute):295:295 -> a
 com.android.tools.r8.org.objectweb.asm.ByteVector -> com.android.tools.r8.h.a.a.e:
     byte[] data -> a
     int length -> b
@@ -40221,225 +39546,221 @@
     7:14:com.android.tools.r8.org.objectweb.asm.ByteVector put11(int,int):92:99 -> a
     15:24:com.android.tools.r8.org.objectweb.asm.ByteVector put112(int,int,int):152:161 -> a
     25:40:com.android.tools.r8.org.objectweb.asm.ByteVector putLong(long):216:231 -> a
-    41:65:com.android.tools.r8.org.objectweb.asm.ByteVector putUTF8(java.lang.String):244:268 -> a
-    66:66:com.android.tools.r8.org.objectweb.asm.ByteVector putUTF8(java.lang.String):246:246 -> a
-    67:105:com.android.tools.r8.org.objectweb.asm.ByteVector encodeUtf8(java.lang.String,int,int):285:323 -> a
-    106:106:com.android.tools.r8.org.objectweb.asm.ByteVector encodeUtf8(java.lang.String,int,int):298:298 -> a
-    107:113:com.android.tools.r8.org.objectweb.asm.ByteVector putByteArray(byte[],int,int):339:345 -> a
+    41:65:com.android.tools.r8.org.objectweb.asm.ByteVector putUTF8(java.lang.String):243:267 -> a
+    66:66:com.android.tools.r8.org.objectweb.asm.ByteVector putUTF8(java.lang.String):245:245 -> a
+    67:105:com.android.tools.r8.org.objectweb.asm.ByteVector encodeUTF8(java.lang.String,int,int):284:322 -> a
+    106:106:com.android.tools.r8.org.objectweb.asm.ByteVector encodeUTF8(java.lang.String,int,int):297:297 -> a
+    107:113:com.android.tools.r8.org.objectweb.asm.ByteVector putByteArray(byte[],int,int):338:344 -> a
     1:9:com.android.tools.r8.org.objectweb.asm.ByteVector put12(int,int):130:138 -> b
     10:19:com.android.tools.r8.org.objectweb.asm.ByteVector putInt(int):172:181 -> b
     20:30:com.android.tools.r8.org.objectweb.asm.ByteVector put122(int,int,int):195:205 -> b
     1:8:com.android.tools.r8.org.objectweb.asm.ByteVector putShort(int):110:117 -> c
-    1:5:void enlarge(int):355:359 -> d
+    1:5:void enlarge(int):354:358 -> d
 com.android.tools.r8.org.objectweb.asm.ClassReader -> com.android.tools.r8.h.a.a.f:
-    int[] bootstrapMethodOffsets -> f
-    byte[] classFileBuffer -> b
     byte[] b -> a
-    int[] cpInfoOffsets -> c
-    com.android.tools.r8.org.objectweb.asm.ConstantDynamic[] constantDynamicValues -> e
-    int header -> h
-    java.lang.String[] constantUtf8Values -> d
-    int maxStringLength -> g
-    1:1:void <init>(byte[]):162:162 -> <init>
-    2:2:void <init>(byte[],int,int):176:176 -> <init>
-    2:2:void <init>(byte[]):162 -> <init>
-    3:73:void <init>(byte[],int,boolean):188:258 -> <init>
-    74:102:void <init>(byte[],int,boolean):239:267 -> <init>
-    103:127:int[] readBootstrapMethodsAttribute(int):3241:3265 -> <init>
-    103:127:void <init>(byte[],int,boolean):271 -> <init>
-    128:128:void <init>(byte[],int,boolean):271:271 -> <init>
-    1:114:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):421:534 -> a
-    115:121:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):533:539 -> a
-    122:122:void readModuleAttributes(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):716:716 -> a
-    122:122:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):544 -> a
-    123:123:java.lang.String readStringish(int,char[]):3493:3493 -> a
-    123:123:java.lang.String readModule(int,char[]):3523 -> a
-    123:123:void readModuleAttributes(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):720 -> a
-    123:123:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):544 -> a
-    124:225:void readModuleAttributes(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):721:822 -> a
-    124:225:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):544 -> a
-    226:249:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):550:573 -> a
-    250:269:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):572:591 -> a
-    270:291:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):590:611 -> a
-    292:317:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):610:635 -> a
-    318:358:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):634:674 -> a
-    359:369:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):670:680 -> a
-    370:457:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):835:922 -> a
-    370:457:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
-    458:477:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):921:940 -> a
-    458:477:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
-    478:499:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):939:960 -> a
-    478:499:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
-    500:525:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):959:984 -> a
-    500:525:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
-    526:548:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):983:1005 -> a
-    526:548:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
-    549:549:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):685:685 -> a
-    550:657:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1019:1126 -> a
-    550:657:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    658:678:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1122:1142 -> a
-    658:678:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    679:699:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1138:1158 -> a
-    679:699:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    700:727:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1156:1183 -> a
-    700:727:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    728:747:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1182:1201 -> a
-    728:747:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    748:769:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1200:1221 -> a
-    748:769:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    770:795:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1220:1245 -> a
-    770:795:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    796:839:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1244:1287 -> a
-    796:839:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    840:840:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):692:692 -> a
-    841:1142:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1308:1609 -> a
-    1143:1196:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1511:1564 -> a
-    1197:1202:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1546:1551 -> a
-    1203:1471:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1490:1758 -> a
-    1472:1527:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2964:3019 -> a
-    1472:1527:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1760 -> a
-    1528:1546:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2997:3015 -> a
-    1528:1546:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1760 -> a
-    1547:1547:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2991:2991 -> a
-    1547:1547:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1760 -> a
-    1548:1554:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2988:2994 -> a
-    1548:1554:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1760 -> a
-    1555:1555:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2985:2985 -> a
-    1555:1555:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1760 -> a
-    1556:1627:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1770:1841 -> a
-    1628:1628:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1834:1834 -> a
-    1629:1704:int readStackMapFrame(int,boolean,boolean,com.android.tools.r8.org.objectweb.asm.Context):3045:3120 -> a
-    1629:1704:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1854 -> a
-    1705:1705:int readStackMapFrame(int,boolean,boolean,com.android.tools.r8.org.objectweb.asm.Context):3117:3117 -> a
-    1705:1705:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1854 -> a
-    1706:2106:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1863:2263 -> a
-    2107:2107:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2110:2110 -> a
-    2108:2108:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2109:2109 -> a
-    2109:2120:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2088:2099 -> a
-    2121:2121:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2091:2091 -> a
-    2122:2122:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2056:2056 -> a
-    2123:2328:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2054:2259 -> a
-    2329:2329:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2258:2258 -> a
-    2330:2333:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2118:2121 -> a
-    2334:2463:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2120:2249 -> a
-    2464:2479:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2225:2240 -> a
-    2480:2490:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2204:2214 -> a
-    2491:2501:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2150:2160 -> a
-    2502:2511:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2133:2142 -> a
-    2512:2512:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2049:2049 -> a
-    2513:2718:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2048:2253 -> a
-    2719:2719:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2027:2027 -> a
-    2720:2909:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2003:2192 -> a
-    2910:2910:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2187:2187 -> a
-    2911:2911:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2183:2183 -> a
-    2912:2912:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2179:2179 -> a
-    2913:3214:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1979:2280 -> a
-    3215:3244:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2279:2308 -> a
-    3245:3316:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2307:2378 -> a
-    3317:3346:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2377:2406 -> a
-    3347:3373:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2405:2431 -> a
-    3374:3374:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2475:2475 -> a
-    3375:3378:com.android.tools.r8.org.objectweb.asm.Label readLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2445:2448 -> a
-    3375:3378:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2476 -> a
-    3379:3379:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2476:2476 -> a
-    3380:3385:int getTypeAnnotationBytecodeOffset(int[],int):2603:2608 -> a
-    3386:3444:int readTypeAnnotationTarget(com.android.tools.r8.org.objectweb.asm.Context,int):2624:2682 -> a
-    3445:3491:int readTypeAnnotationTarget(com.android.tools.r8.org.objectweb.asm.Context,int):2641:2687 -> a
-    3492:3505:void readParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2710:2723 -> a
-    3506:3506:void readParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2722:2722 -> a
-    3507:3524:int readElementValues(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,boolean,char[]):2752:2769 -> a
-    3525:3531:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2791:2797 -> a
-    3532:3685:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2795:2948 -> a
-    3686:3693:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2836:2843 -> a
-    3694:3717:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2840:2863 -> a
-    3718:3796:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2862:2940 -> a
-    3797:3797:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2939:2939 -> a
-    3798:3835:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2878:2915 -> a
-    3836:3856:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2902:2922 -> a
-    3857:3868:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2921:2932 -> a
-    3869:3873:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2931:2935 -> a
-    3874:3879:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2894:2899 -> a
-    3880:3885:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2870:2875 -> a
-    3886:3888:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2828:2830 -> a
-    3889:3889:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2828:2828 -> a
-    3890:3891:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2822:2823 -> a
-    3892:3892:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2822:2822 -> a
-    3893:3893:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2818:2818 -> a
-    3894:3894:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2817:2817 -> a
-    3895:3896:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2809:2810 -> a
-    3897:3897:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2809:2809 -> a
-    3898:3899:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2804:2805 -> a
-    3900:3949:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2804:2853 -> a
-    3950:3950:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2852:2852 -> a
-    3951:3983:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3145:3177 -> a
-    3984:3984:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3173:3173 -> a
-    3985:3985:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3169:3169 -> a
-    3986:3986:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3166:3166 -> a
-    3987:3987:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3163:3163 -> a
-    3988:3988:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3160:3160 -> a
-    3989:3989:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3157:3157 -> a
-    3990:3990:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3154:3154 -> a
-    3991:3991:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3151:3151 -> a
-    3992:3992:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3148:3148 -> a
-    3993:4022:int getFirstAttributeOffset():3196:3225 -> a
-    4023:4029:com.android.tools.r8.org.objectweb.asm.Attribute readAttribute(com.android.tools.r8.org.objectweb.asm.Attribute[],java.lang.String,int,int,char[],int,com.android.tools.r8.org.objectweb.asm.Label[]):3296:3302 -> a
-    4030:4030:int getItem(int):3329:3329 -> a
-    4031:4047:java.lang.String readUtf(int,int,char[]):3458:3474 -> a
-    4048:4048:java.lang.String readStringish(int,char[]):3493:3493 -> a
-    4048:4048:java.lang.String readClass(int,char[]):3508 -> a
-    1:4:com.android.tools.r8.org.objectweb.asm.Label readLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2445:2448 -> b
-    1:4:com.android.tools.r8.org.objectweb.asm.Label createLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2461 -> b
-    5:5:com.android.tools.r8.org.objectweb.asm.Label createLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2462:2462 -> b
-    6:59:int[] readTypeAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2503:2556 -> b
-    60:112:int[] readTypeAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2519:2571 -> b
-    113:127:int[] readTypeAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2570:2584 -> b
-    128:128:int getItemCount():3315:3315 -> b
-    129:129:int readByte(int):3351:3351 -> b
-    130:159:java.lang.Object readConst(int,char[]):3587:3616 -> b
-    160:176:com.android.tools.r8.org.objectweb.asm.ConstantDynamic readConstantDynamic(int,char[]):3552:3568 -> b
-    160:176:java.lang.Object readConst(int,char[]):3614 -> b
-    177:187:java.lang.Object readConst(int,char[]):3602:3612 -> b
-    188:188:java.lang.Object readConst(int,char[]):3600:3600 -> b
-    189:189:java.lang.Object readConst(int,char[]):3598:3598 -> b
-    190:190:java.lang.Object readConst(int,char[]):3596:3596 -> b
-    191:191:java.lang.Object readConst(int,char[]):3594:3594 -> b
-    192:192:java.lang.Object readConst(int,char[]):3592:3592 -> b
-    193:193:java.lang.Object readConst(int,char[]):3590:3590 -> b
-    1:1:int getMaxStringLength():3340:3340 -> c
-    2:3:int readInt(int):3386:3387 -> c
-    4:4:java.lang.String readStringish(int,char[]):3493:3493 -> c
-    4:4:java.lang.String readModule(int,char[]):3523 -> c
-    1:2:long readLong(int):3401:3402 -> d
-    3:3:java.lang.String readStringish(int,char[]):3493:3493 -> d
-    3:3:java.lang.String readPackage(int,char[]):3538 -> d
-    1:2:short readShort(int):3374:3375 -> e
-    3:7:java.lang.String readUTF8(int,char[]):3419:3423 -> e
-    1:2:int readUnsignedShort(int):3362:3363 -> f
-    3:9:java.lang.String readUtf(int,char[]):3436:3442 -> f
+    java.lang.Object[] cpInfoValues -> c
+    int[] cpInfoOffsets -> b
+    int[] bootstrapMethodOffsets -> d
+    int header -> f
+    int maxStringLength -> e
+    1:1:void <init>(byte[]):146:146 -> <init>
+    2:2:void <init>(byte[],int,int):158:158 -> <init>
+    2:2:void <init>(byte[]):146 -> <init>
+    3:63:void <init>(byte[],int,boolean):170:230 -> <init>
+    64:114:void <init>(byte[],int,boolean):211:261 -> <init>
+    1:115:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):412:526 -> a
+    116:122:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):525:531 -> a
+    123:123:void readModule(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):707:707 -> a
+    123:123:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):536 -> a
+    124:124:java.lang.String readStringish(int,char[]):3445:3445 -> a
+    124:124:java.lang.String readModule(int,char[]):3473 -> a
+    124:124:void readModule(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):711 -> a
+    124:124:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):536 -> a
+    125:226:void readModule(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):712:813 -> a
+    125:226:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):536 -> a
+    227:250:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):541:564 -> a
+    251:270:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):563:582 -> a
+    271:292:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):581:602 -> a
+    293:318:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):601:626 -> a
+    319:359:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):625:665 -> a
+    360:370:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):661:671 -> a
+    371:458:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):826:913 -> a
+    371:458:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):674 -> a
+    459:478:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):912:931 -> a
+    459:478:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):674 -> a
+    479:500:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):930:951 -> a
+    479:500:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):674 -> a
+    501:526:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):950:975 -> a
+    501:526:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):674 -> a
+    527:549:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):974:996 -> a
+    527:549:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):674 -> a
+    550:550:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):676:676 -> a
+    551:658:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1010:1117 -> a
+    551:658:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):679 -> a
+    659:681:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1113:1135 -> a
+    659:681:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):679 -> a
+    682:703:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1129:1150 -> a
+    682:703:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):679 -> a
+    704:731:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1148:1175 -> a
+    704:731:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):679 -> a
+    732:751:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1174:1193 -> a
+    732:751:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):679 -> a
+    752:773:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1192:1213 -> a
+    752:773:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):679 -> a
+    774:799:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1212:1237 -> a
+    774:799:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):679 -> a
+    800:843:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1236:1279 -> a
+    800:843:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):679 -> a
+    844:844:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683:683 -> a
+    845:1146:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1300:1601 -> a
+    1147:1200:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1503:1556 -> a
+    1201:1206:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1538:1543 -> a
+    1207:1478:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1482:1753 -> a
+    1479:1534:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2962:3017 -> a
+    1479:1534:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1755 -> a
+    1535:1553:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2995:3013 -> a
+    1535:1553:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1755 -> a
+    1554:1554:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2989:2989 -> a
+    1554:1554:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1755 -> a
+    1555:1561:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2986:2992 -> a
+    1555:1561:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1755 -> a
+    1562:1562:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2983:2983 -> a
+    1562:1562:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1755 -> a
+    1563:1634:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1765:1836 -> a
+    1635:1635:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1829:1829 -> a
+    1636:1711:int readStackMapFrame(int,boolean,boolean,com.android.tools.r8.org.objectweb.asm.Context):3043:3118 -> a
+    1636:1711:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1849 -> a
+    1712:1712:int readStackMapFrame(int,boolean,boolean,com.android.tools.r8.org.objectweb.asm.Context):3115:3115 -> a
+    1712:1712:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1849 -> a
+    1713:2116:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1858:2261 -> a
+    2117:2117:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2106:2106 -> a
+    2118:2118:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2105:2105 -> a
+    2119:2130:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2083:2094 -> a
+    2131:2131:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2086:2086 -> a
+    2132:2132:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2051:2051 -> a
+    2133:2341:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2049:2257 -> a
+    2342:2342:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2256:2256 -> a
+    2343:2346:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2115:2118 -> a
+    2347:2477:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2117:2247 -> a
+    2478:2493:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2223:2238 -> a
+    2494:2504:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2202:2212 -> a
+    2505:2515:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2147:2157 -> a
+    2516:2525:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2130:2139 -> a
+    2526:2526:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2044:2044 -> a
+    2527:2735:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2043:2251 -> a
+    2736:2736:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2022:2022 -> a
+    2737:2929:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1998:2190 -> a
+    2930:2931:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2184:2185 -> a
+    2932:2932:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2184:2184 -> a
+    2933:2933:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2180:2180 -> a
+    2934:2934:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2176:2176 -> a
+    2935:3239:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1974:2278 -> a
+    3240:3269:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2277:2306 -> a
+    3270:3341:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2305:2376 -> a
+    3342:3371:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2375:2404 -> a
+    3372:3398:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2403:2429 -> a
+    3399:3399:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2473:2473 -> a
+    3400:3403:com.android.tools.r8.org.objectweb.asm.Label readLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2443:2446 -> a
+    3400:3403:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2474 -> a
+    3404:3404:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2474:2474 -> a
+    3405:3410:int getTypeAnnotationBytecodeOffset(int[],int):2601:2606 -> a
+    3411:3469:int readTypeAnnotationTarget(com.android.tools.r8.org.objectweb.asm.Context,int):2622:2680 -> a
+    3470:3516:int readTypeAnnotationTarget(com.android.tools.r8.org.objectweb.asm.Context,int):2639:2685 -> a
+    3517:3530:void readParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2708:2721 -> a
+    3531:3531:void readParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2720:2720 -> a
+    3532:3549:int readElementValues(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,boolean,char[]):2750:2767 -> a
+    3550:3556:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2789:2795 -> a
+    3557:3710:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2793:2946 -> a
+    3711:3718:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2834:2841 -> a
+    3719:3742:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2838:2861 -> a
+    3743:3821:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2860:2938 -> a
+    3822:3822:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2937:2937 -> a
+    3823:3860:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2876:2913 -> a
+    3861:3881:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2900:2920 -> a
+    3882:3893:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2919:2930 -> a
+    3894:3898:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2929:2933 -> a
+    3899:3904:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2892:2897 -> a
+    3905:3910:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2868:2873 -> a
+    3911:3913:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2826:2828 -> a
+    3914:3914:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2826:2826 -> a
+    3915:3916:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2820:2821 -> a
+    3917:3917:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2820:2820 -> a
+    3918:3918:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2816:2816 -> a
+    3919:3919:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2815:2815 -> a
+    3920:3921:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2807:2808 -> a
+    3922:3922:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2807:2807 -> a
+    3923:3924:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2802:2803 -> a
+    3925:3974:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2802:2851 -> a
+    3975:3975:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2850:2850 -> a
+    3976:4008:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3143:3175 -> a
+    4009:4009:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3171:3171 -> a
+    4010:4010:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3167:3167 -> a
+    4011:4011:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3164:3164 -> a
+    4012:4012:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3161:3161 -> a
+    4013:4013:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3158:3158 -> a
+    4014:4014:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3155:3155 -> a
+    4015:4015:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3152:3152 -> a
+    4016:4016:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3149:3149 -> a
+    4017:4017:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3146:3146 -> a
+    4018:4047:int getFirstAttributeOffset():3188:3217 -> a
+    4048:4054:com.android.tools.r8.org.objectweb.asm.Attribute readAttribute(com.android.tools.r8.org.objectweb.asm.Attribute[],java.lang.String,int,int,char[],int,com.android.tools.r8.org.objectweb.asm.Label[]):3251:3257 -> a
+    4055:4055:int getItem(int):3283:3283 -> a
+    4056:4072:java.lang.String readUTF(int,int,char[]):3411:3427 -> a
+    4073:4073:java.lang.String readStringish(int,char[]):3445:3445 -> a
+    4073:4073:java.lang.String readClass(int,char[]):3459 -> a
+    1:4:com.android.tools.r8.org.objectweb.asm.Label readLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2443:2446 -> b
+    1:4:com.android.tools.r8.org.objectweb.asm.Label createLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2459 -> b
+    5:5:com.android.tools.r8.org.objectweb.asm.Label createLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2460:2460 -> b
+    6:59:int[] readTypeAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2501:2554 -> b
+    60:112:int[] readTypeAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2517:2569 -> b
+    113:127:int[] readTypeAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2568:2582 -> b
+    128:128:int getItemCount():3270:3270 -> b
+    129:129:int readByte(int):3305:3305 -> b
+    130:159:java.lang.Object readConst(int,char[]):3536:3565 -> b
+    160:177:com.android.tools.r8.org.objectweb.asm.ConstantDynamic readConstantDynamic(int,char[]):3501:3518 -> b
+    160:177:java.lang.Object readConst(int,char[]):3563 -> b
+    178:188:java.lang.Object readConst(int,char[]):3551:3561 -> b
+    189:189:java.lang.Object readConst(int,char[]):3549:3549 -> b
+    190:190:java.lang.Object readConst(int,char[]):3547:3547 -> b
+    191:191:java.lang.Object readConst(int,char[]):3545:3545 -> b
+    192:192:java.lang.Object readConst(int,char[]):3543:3543 -> b
+    193:193:java.lang.Object readConst(int,char[]):3541:3541 -> b
+    194:194:java.lang.Object readConst(int,char[]):3539:3539 -> b
+    1:1:int getMaxStringLength():3294:3294 -> c
+    2:3:int readInt(int):3340:3341 -> c
+    4:4:java.lang.String readStringish(int,char[]):3445:3445 -> c
+    4:4:java.lang.String readModule(int,char[]):3473 -> c
+    1:2:long readLong(int):3355:3356 -> d
+    3:3:java.lang.String readStringish(int,char[]):3445:3445 -> d
+    3:3:java.lang.String readPackage(int,char[]):3487 -> d
+    1:2:short readShort(int):3328:3329 -> e
+    3:9:java.lang.String readUTF(int,char[]):3388:3394 -> e
+    1:2:int readUnsignedShort(int):3316:3317 -> f
+    3:7:java.lang.String readUTF8(int,char[]):3371:3375 -> f
 com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.h.a.a.g:
-    1:1:void <init>(java.lang.String,int):49:49 -> <init>
+    1:1:void <init>(java.lang.String,int):48:48 -> <init>
 com.android.tools.r8.org.objectweb.asm.ClassVisitor -> com.android.tools.r8.h.a.a.h:
     com.android.tools.r8.org.objectweb.asm.ClassVisitor cv -> b
     int api -> a
-    1:6:void <init>(int,com.android.tools.r8.org.objectweb.asm.ClassVisitor):68:73 -> <init>
-    1:6:void <init>(int):57 -> <init>
+    1:9:void <init>(int,com.android.tools.r8.org.objectweb.asm.ClassVisitor):70:78 -> <init>
+    1:9:void <init>(int):58 -> <init>
     com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]) -> a
-    1:2:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):99:100 -> a
-    3:4:void visitSource(java.lang.String,java.lang.String):113:114 -> a
-    5:9:com.android.tools.r8.org.objectweb.asm.ModuleVisitor visitModule(java.lang.String,int,java.lang.String):129:133 -> a
-    10:10:com.android.tools.r8.org.objectweb.asm.ModuleVisitor visitModule(java.lang.String,int,java.lang.String):130:130 -> a
-    11:15:void visitNestHost(java.lang.String):149:153 -> a
-    16:16:void visitNestHost(java.lang.String):150:150 -> a
-    17:18:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):168:169 -> a
-    19:20:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):182:183 -> a
-    21:25:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):205:209 -> a
-    26:26:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):206:206 -> a
-    27:28:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):220:221 -> a
-    29:30:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):257:258 -> a
-    31:32:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):286:287 -> a
-    33:34:void visitEnd():325:326 -> a
-    1:5:void visitNestMember(java.lang.String):235:239 -> b
-    6:6:void visitNestMember(java.lang.String):236:236 -> b
+    1:2:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):104:105 -> a
+    3:4:void visitSource(java.lang.String,java.lang.String):118:119 -> a
+    5:9:com.android.tools.r8.org.objectweb.asm.ModuleVisitor visitModule(java.lang.String,int,java.lang.String):134:138 -> a
+    10:10:com.android.tools.r8.org.objectweb.asm.ModuleVisitor visitModule(java.lang.String,int,java.lang.String):135:135 -> a
+    11:15:void visitNestHostExperimental(java.lang.String):157:161 -> a
+    16:16:void visitNestHostExperimental(java.lang.String):158:158 -> a
+    17:18:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):176:177 -> a
+    19:20:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):190:191 -> a
+    21:25:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):213:217 -> a
+    26:26:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):214:214 -> a
+    27:28:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):228:229 -> a
+    29:30:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):269:270 -> a
+    31:32:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):298:299 -> a
+    33:34:void visitEnd():337:338 -> a
+    1:5:void visitNestMemberExperimental(java.lang.String):247:251 -> b
+    6:6:void visitNestMemberExperimental(java.lang.String):248:248 -> b
 com.android.tools.r8.org.objectweb.asm.ClassWriter -> com.android.tools.r8.h.a.a.i:
     int numberOfInnerClasses -> n
     com.android.tools.r8.org.objectweb.asm.FieldWriter firstField -> j
@@ -40475,42 +39796,46 @@
     1:16:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):260:275 -> a
     17:20:void visitSource(java.lang.String,java.lang.String):282:285 -> a
     21:26:com.android.tools.r8.org.objectweb.asm.ModuleVisitor visitModule(java.lang.String,int,java.lang.String):292:297 -> a
-    27:27:void visitNestHost(java.lang.String):302:302 -> a
+    27:27:void visitNestHostExperimental(java.lang.String):302:302 -> a
     28:30:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):308:310 -> a
-    31:35:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):317:321 -> a
-    36:41:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):329:334 -> a
-    42:43:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):342:343 -> a
-    44:60:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):358:374 -> a
-    61:68:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):387:394 -> a
-    69:76:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):404:411 -> a
-    77:77:int newConst(java.lang.Object):714:714 -> a
-    1:5:void visitNestMember(java.lang.String):348:352 -> b
-    6:210:byte[] toByteArray():435:639 -> b
-    211:223:com.android.tools.r8.org.objectweb.asm.Attribute[] getAttributePrototypes():685:697 -> b
-    211:223:byte[] replaceAsmInstructions(byte[],boolean):656 -> b
-    211:223:byte[] toByteArray():639 -> b
-    224:243:byte[] replaceAsmInstructions(byte[],boolean):657:676 -> b
-    224:243:byte[] toByteArray():639 -> b
-    244:244:byte[] toByteArray():641:641 -> b
-    245:245:byte[] toByteArray():538:538 -> b
-    246:246:java.lang.ClassLoader getClassLoader():963:963 -> b
-    246:246:java.lang.String getCommonSuperClass(java.lang.String,java.lang.String):926 -> b
-    247:269:java.lang.String getCommonSuperClass(java.lang.String,java.lang.String):929:951 -> b
-    270:270:java.lang.String getCommonSuperClass(java.lang.String,java.lang.String):937:937 -> b
-    271:271:java.lang.String getCommonSuperClass(java.lang.String,java.lang.String):931:931 -> b
+    31:38:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):318:325 -> a
+    39:49:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):335:345 -> a
+    50:51:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):353:354 -> a
+    52:68:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):369:385 -> a
+    69:76:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):399:406 -> a
+    77:84:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):416:423 -> a
+    85:85:int newConst(java.lang.Object):735:735 -> a
+    1:5:void visitNestMemberExperimental(java.lang.String):359:363 -> b
+    6:182:byte[] toByteArray():447:623 -> b
+    183:188:byte[] toByteArray():622:627 -> b
+    189:194:byte[] toByteArray():626:631 -> b
+    195:200:byte[] toByteArray():630:635 -> b
+    201:227:byte[] toByteArray():634:660 -> b
+    228:240:com.android.tools.r8.org.objectweb.asm.Attribute[] getAttributePrototypes():706:718 -> b
+    228:240:byte[] replaceAsmInstructions(byte[],boolean):677 -> b
+    228:240:byte[] toByteArray():660 -> b
+    241:260:byte[] replaceAsmInstructions(byte[],boolean):678:697 -> b
+    241:260:byte[] toByteArray():660 -> b
+    261:261:byte[] toByteArray():662:662 -> b
+    262:262:byte[] toByteArray():550:550 -> b
+    263:263:java.lang.ClassLoader getClassLoader():983:983 -> b
+    263:263:java.lang.String getCommonSuperClass(java.lang.String,java.lang.String):946 -> b
+    264:286:java.lang.String getCommonSuperClass(java.lang.String,java.lang.String):949:971 -> b
+    287:287:java.lang.String getCommonSuperClass(java.lang.String,java.lang.String):957:957 -> b
+    288:288:java.lang.String getCommonSuperClass(java.lang.String,java.lang.String):951:951 -> b
 com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.h.a.a.j:
     java.lang.Object[] bootstrapMethodArguments -> d
     java.lang.String name -> a
     java.lang.String descriptor -> b
     com.android.tools.r8.org.objectweb.asm.Handle bootstrapMethod -> c
-    1:5:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):67:71 -> <init>
-    1:1:com.android.tools.r8.org.objectweb.asm.Handle getBootstrapMethod():98:98 -> a
-    1:1:java.lang.Object[] getBootstrapMethodArgumentsUnsafe():132:132 -> b
-    1:1:java.lang.String getDescriptor():89:89 -> c
-    1:1:java.lang.String getName():80:80 -> d
-    1:8:boolean equals(java.lang.Object):155:162 -> equals
-    1:4:int hashCode():167:170 -> hashCode
-    1:7:java.lang.String toString():175:181 -> toString
+    1:5:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):69:73 -> <init>
+    1:1:com.android.tools.r8.org.objectweb.asm.Handle getBootstrapMethod():100:100 -> a
+    1:1:java.lang.Object[] getBootstrapMethodArguments():111:111 -> b
+    1:1:java.lang.String getDescriptor():91:91 -> c
+    1:1:java.lang.String getName():82:82 -> d
+    1:8:boolean equals(java.lang.Object):119:126 -> equals
+    1:4:int hashCode():131:134 -> hashCode
+    1:7:java.lang.String toString():139:145 -> toString
 com.android.tools.r8.org.objectweb.asm.Context -> com.android.tools.r8.h.a.a.k:
     int currentFrameType -> n
     java.lang.String currentMethodDescriptor -> f
@@ -40542,12 +39867,12 @@
     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.h.a.a.n:
     com.android.tools.r8.org.objectweb.asm.FieldVisitor fv -> a
-    1:6:void <init>(int,com.android.tools.r8.org.objectweb.asm.FieldVisitor):66:71 -> <init>
-    1:6:void <init>(int):55 -> <init>
+    1:9:void <init>(int,com.android.tools.r8.org.objectweb.asm.FieldVisitor):68:76 -> <init>
+    1:9:void <init>(int):56 -> <init>
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean) -> a
     void visitEnd() -> a
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
-    1:2:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):119:120 -> a
+    1:2:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):124:125 -> a
 com.android.tools.r8.org.objectweb.asm.FieldWriter -> com.android.tools.r8.h.a.a.o:
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> h
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleAnnotation -> i
@@ -40562,12 +39887,16 @@
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleTypeAnnotation -> k
     1:10:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):127:136 -> <init>
     void visitEnd() -> a
-    1:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):147:151 -> a
-    6:11:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):159:164 -> a
-    12:13:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):172:173 -> a
-    14:66:void putFieldInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):220:272 -> a
-    67:67:void collectAttributePrototypes(com.android.tools.r8.org.objectweb.asm.Attribute$Set):282:282 -> a
-    1:14:int computeFieldInfoSize():195:208 -> b
+    1:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):148:155 -> a
+    9:19:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):165:175 -> a
+    20:21:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):183:184 -> a
+    22:79:void putFieldInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):262:319 -> a
+    80:85:void putFieldInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):318:323 -> a
+    86:91:void putFieldInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):322:327 -> a
+    92:97:void putFieldInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):326:331 -> a
+    98:102:void putFieldInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):330:334 -> a
+    103:103:void collectAttributePrototypes(com.android.tools.r8.org.objectweb.asm.Attribute$Set):344:344 -> a
+    1:45:int computeFieldInfoSize():206:250 -> b
 com.android.tools.r8.org.objectweb.asm.Frame -> com.android.tools.r8.h.a.a.p:
     short outputStackTop -> g
     short outputStackStart -> f
@@ -40578,94 +39907,93 @@
     int initializationCount -> h
     int[] outputStack -> e
     com.android.tools.r8.org.objectweb.asm.Label owner -> a
-    1:2:void <init>(com.android.tools.r8.org.objectweb.asm.Label):242:243 -> <init>
-    1:8:void copyFrom(com.android.tools.r8.org.objectweb.asm.Frame):255:262 -> a
-    9:16:int getAbstractTypeFromApiFormat(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.Object):281:288 -> a
-    17:17:int getAbstractTypeFromInternalName(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String):302:302 -> a
-    18:76:int getAbstractTypeFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,int):316:374 -> a
-    77:111:int getAbstractTypeFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,int):336:370 -> a
-    112:113:int getAbstractTypeFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,int):366:367 -> a
-    114:115:int getAbstractTypeFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,int):332:333 -> a
-    116:136:void setInputFrameFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.String,int):397:417 -> a
-    137:160:void setInputFrameFromApiFormat(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.Object[],int,java.lang.Object[]):440:463 -> a
-    161:161:int getInputStackSize():467:467 -> a
-    162:171:int getLocal(int):481:490 -> a
-    172:178:void pop(java.lang.String):597:603 -> a
-    179:179:void pop(java.lang.String):601:601 -> a
-    180:195:int getInitializedType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int):645:660 -> a
-    196:196:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1106:1106 -> a
-    197:198:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1102:1103 -> a
-    199:204:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1093:1098 -> a
-    205:210:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1084:1089 -> a
-    211:238:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1053:1080 -> a
-    239:239:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1077:1077 -> a
-    240:240:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1068:1068 -> a
-    241:241:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1065:1065 -> a
-    242:254:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1062:1074 -> a
-    255:255:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1071:1071 -> a
-    256:256:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1059:1059 -> a
-    257:257:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1056:1056 -> a
-    258:258:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1050:1050 -> a
-    259:260:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1046:1047 -> a
-    261:264:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1036:1039 -> a
-    265:276:void addInitializedType(int):619:630 -> a
-    265:276:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1040 -> a
-    277:277:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1043:1043 -> a
-    278:279:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1029:1030 -> a
-    280:281:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1025:1026 -> a
-    282:282:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1022:1022 -> a
-    283:283:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1019:1019 -> a
-    284:284:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1017:1017 -> a
-    285:286:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1012:1013 -> a
-    287:288:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1006:1007 -> a
-    289:291:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):999:1001 -> a
-    292:293:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):994:995 -> a
-    294:296:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):989:991 -> a
-    297:297:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):985:985 -> a
-    298:300:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):980:982 -> a
-    301:303:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):973:975 -> a
-    304:306:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):953:955 -> a
-    307:310:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):918:921 -> a
-    311:320:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):906:915 -> a
-    321:328:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):896:903 -> a
-    329:334:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):888:893 -> a
-    335:341:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):879:885 -> a
-    342:346:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):872:876 -> a
-    347:349:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):867:869 -> a
-    350:350:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):864:864 -> a
-    351:351:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):851:851 -> a
-    352:352:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):832:832 -> a
-    353:353:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):828:828 -> a
-    354:366:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):806:818 -> a
-    367:367:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):813:813 -> a
-    368:378:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):790:800 -> a
-    379:379:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):795:795 -> a
-    380:382:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):783:785 -> a
-    383:571:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):778:966 -> a
-    572:743:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):772:943 -> a
-    744:744:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):768:768 -> a
-    745:776:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):733:764 -> a
-    777:777:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):761:761 -> a
-    778:781:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):755:758 -> a
-    782:782:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):752:752 -> a
-    783:783:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):749:749 -> a
-    784:785:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):745:746 -> a
-    786:790:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):738:742 -> a
-    791:791:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):735:735 -> a
-    792:793:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):729:730 -> a
-    794:794:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):724:724 -> a
-    795:796:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):717:718 -> a
-    797:797:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):712:712 -> a
-    798:798:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):700:700 -> a
-    799:809:int getConcreteOutputType(int,int):1129:1139 -> a
-    810:885:boolean merge(com.android.tools.r8.org.objectweb.asm.SymbolTable,com.android.tools.r8.org.objectweb.asm.Frame,int):1169:1244 -> a
-    886:953:boolean merge(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int[],int):1268:1335 -> a
-    954:991:void accept(com.android.tools.r8.org.objectweb.asm.MethodWriter):1356:1393 -> a
-    1:11:void setLocal(int,int):504:514 -> b
-    12:17:void push(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String):551:556 -> b
-    18:22:int pop():567:571 -> b
-    23:29:void pop(int):581:587 -> b
-    1:16:void push(int):524:539 -> c
+    1:2:void <init>(com.android.tools.r8.org.objectweb.asm.Label):348:349 -> <init>
+    1:8:int getAbstractTypeFromApiFormat(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.Object):242:249 -> a
+    9:9:int getAbstractTypeFromInternalName(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String):263:263 -> a
+    10:68:int getAbstractTypeFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,int):277:335 -> a
+    69:103:int getAbstractTypeFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,int):297:331 -> a
+    104:105:int getAbstractTypeFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,int):327:328 -> a
+    106:107:int getAbstractTypeFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,int):293:294 -> a
+    108:115:void copyFrom(com.android.tools.r8.org.objectweb.asm.Frame):361:368 -> a
+    116:136:void setInputFrameFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.String,int):390:410 -> a
+    137:160:void setInputFrameFromApiFormat(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.Object[],int,java.lang.Object[]):433:456 -> a
+    161:161:int getInputStackSize():460:460 -> a
+    162:171:int getLocal(int):474:483 -> a
+    172:182:void setLocal(int,int):497:507 -> a
+    183:189:void pop(java.lang.String):589:595 -> a
+    190:190:void pop(java.lang.String):593:593 -> a
+    191:206:int getInitializedType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int):637:652 -> a
+    207:207:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1098:1098 -> a
+    208:209:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1094:1095 -> a
+    210:215:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1085:1090 -> a
+    216:221:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1076:1081 -> a
+    222:249:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1045:1072 -> a
+    250:250:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1069:1069 -> a
+    251:251:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1060:1060 -> a
+    252:252:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1057:1057 -> a
+    253:265:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1054:1066 -> a
+    266:266:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1063:1063 -> a
+    267:267:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1051:1051 -> a
+    268:268:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1048:1048 -> a
+    269:269:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1042:1042 -> a
+    270:271:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1038:1039 -> a
+    272:275:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1028:1031 -> a
+    276:287:void addInitializedType(int):611:622 -> a
+    276:287:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1032 -> a
+    288:288:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1035:1035 -> a
+    289:290:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1021:1022 -> a
+    291:292:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1017:1018 -> a
+    293:293:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1014:1014 -> a
+    294:294:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1011:1011 -> a
+    295:295:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1009:1009 -> a
+    296:297:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1004:1005 -> a
+    298:299:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):998:999 -> a
+    300:302:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):991:993 -> a
+    303:304:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):986:987 -> a
+    305:307:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):981:983 -> a
+    308:308:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):977:977 -> a
+    309:311:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):972:974 -> a
+    312:314:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):965:967 -> a
+    315:317:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):945:947 -> a
+    318:321:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):910:913 -> a
+    322:331:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):898:907 -> a
+    332:339:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):888:895 -> a
+    340:345:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):880:885 -> a
+    346:352:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):871:877 -> a
+    353:357:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):864:868 -> a
+    358:360:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):859:861 -> a
+    361:361:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):856:856 -> a
+    362:362:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):843:843 -> a
+    363:363:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):824:824 -> a
+    364:364:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):820:820 -> a
+    365:377:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):798:810 -> a
+    378:378:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):805:805 -> a
+    379:389:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):782:792 -> a
+    390:390:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):787:787 -> a
+    391:393:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):775:777 -> a
+    394:582:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):770:958 -> a
+    583:754:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):764:935 -> a
+    755:755:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):760:760 -> a
+    756:787:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):725:756 -> a
+    788:788:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):753:753 -> a
+    789:792:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):747:750 -> a
+    793:793:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):744:744 -> a
+    794:794:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):741:741 -> a
+    795:796:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):737:738 -> a
+    797:801:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):730:734 -> a
+    802:802:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):727:727 -> a
+    803:804:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):721:722 -> a
+    805:805:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):716:716 -> a
+    806:807:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):709:710 -> a
+    808:808:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):704:704 -> a
+    809:809:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):692:692 -> a
+    810:923:boolean merge(com.android.tools.r8.org.objectweb.asm.SymbolTable,com.android.tools.r8.org.objectweb.asm.Frame,int):1125:1238 -> a
+    924:991:boolean merge(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int[],int):1262:1329 -> a
+    992:1029:void accept(com.android.tools.r8.org.objectweb.asm.MethodWriter):1350:1387 -> a
+    1:6:void push(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String):543:548 -> b
+    7:11:int pop():559:563 -> b
+    12:18:void pop(int):573:579 -> b
+    1:16:void push(int):517:532 -> c
 com.android.tools.r8.org.objectweb.asm.Handle -> com.android.tools.r8.h.a.a.q:
     boolean isInterface -> e
     java.lang.String name -> c
@@ -40722,224 +40050,226 @@
     1:13:com.android.tools.r8.org.objectweb.asm.Label pushSuccessors(com.android.tools.r8.org.objectweb.asm.Label):591:603 -> b
     1:1:java.lang.String toString():619:619 -> toString
 com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.h.a.a.t:
-    1:1:void <init>(java.lang.String,java.lang.String,java.lang.String,int):57:57 -> <init>
+    1:1:void <init>(java.lang.String,java.lang.String,java.lang.String,int):56:56 -> <init>
 com.android.tools.r8.org.objectweb.asm.MethodVisitor -> com.android.tools.r8.h.a.a.u:
-    int api -> h
-    com.android.tools.r8.org.objectweb.asm.MethodVisitor mv -> i
-    1:1:void <init>(int):69:69 -> <init>
-    2:7:void <init>(int,com.android.tools.r8.org.objectweb.asm.MethodVisitor):80:85 -> <init>
-    1:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():117:118 -> a
-    3:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):132:133 -> a
-    5:6:void visitAnnotableParameterCount(int,boolean):180:181 -> a
-    7:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):201:202 -> a
-    9:10:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):213:214 -> a
-    11:12:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):288:289 -> a
-    13:14:void visitInsn(int):312:313 -> a
-    15:16:void visitTypeInsn(int,java.lang.String):362:363 -> a
-    17:18:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):379:380 -> a
-    19:19:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):419:419 -> a
-    20:21:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):398:399 -> a
-    20:21:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):423 -> a
-    22:28:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):421:427 -> a
-    29:33:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):447:451 -> a
-    34:34:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):448:448 -> a
-    35:36:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):466:467 -> a
-    37:38:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):477:478 -> a
-    39:48:void visitLdcInsn(java.lang.Object):530:539 -> a
-    49:50:void visitIincInsn(int,int):550:551 -> a
-    51:52:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):566:567 -> a
-    53:54:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):580:581 -> a
-    55:56:void visitMultiANewArrayInsn(java.lang.String,int):592:593 -> a
-    57:61:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):618:622 -> a
-    62:62:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):619:619 -> a
-    63:64: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):644:645 -> a
-    65:66: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):696:697 -> a
-    67: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):729:733 -> a
-    72:72: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):730:730 -> a
-    1:5:void visitParameter(java.lang.String,int):100:104 -> b
-    6:6:void visitParameter(java.lang.String,int):101:101 -> b
-    7:8:void visitCode():220:221 -> b
-    9:10:void visitIntInsn(int,int):332:333 -> b
-    11:15:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):666:670 -> b
-    16:16:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):667:667 -> b
-    17:18:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):749:750 -> 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):156:160 -> 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):157:157 -> c
-    7:8:void visitMaxs(int,int):761:762 -> c
-    9:10:void visitEnd():771:772 -> c
-    1:2:void visitVarInsn(int,int):347:348 -> d
+    com.android.tools.r8.org.objectweb.asm.MethodVisitor mv -> b
+    int api -> a
+    1:1:void <init>(int):70:70 -> <init>
+    2:10:void <init>(int,com.android.tools.r8.org.objectweb.asm.MethodVisitor):82:90 -> <init>
+    1:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():122:123 -> a
+    3:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):137:138 -> a
+    5:6:void visitAnnotableParameterCount(int,boolean):185:186 -> a
+    7:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):206:207 -> a
+    9:10:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):218:219 -> a
+    11:12:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):293:294 -> a
+    13:14:void visitInsn(int):317:318 -> a
+    15:16:void visitTypeInsn(int,java.lang.String):367:368 -> a
+    17:18:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):384:385 -> a
+    19:23:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):430:434 -> a
+    24:30:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):432:438 -> a
+    31:35:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):458:462 -> a
+    36:36:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):459:459 -> a
+    37:38:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):477:478 -> a
+    39:40:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):488:489 -> a
+    41:50:void visitLdcInsn(java.lang.Object):541:550 -> a
+    51:52:void visitIincInsn(int,int):561:562 -> a
+    53:54:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):577:578 -> a
+    55:56:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):591:592 -> a
+    57:58:void visitMultiANewArrayInsn(java.lang.String,int):603:604 -> a
+    59:63: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
+    64:64: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
+    65:66: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
+    67:68: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
+    69:73: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
+    74:74: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):105:109 -> b
+    6:6:void visitParameter(java.lang.String,int):106:106 -> b
+    7:8:void visitCode():225:226 -> b
+    9:10:void visitIntInsn(int,int):337:338 -> b
+    11:17:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):403:409 -> b
+    18:22:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):677:681 -> b
+    23:23:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):678:678 -> b
+    24:25: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):161:165 -> 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):162:162 -> c
+    7:8:void visitMaxs(int,int):772:773 -> c
+    9:10:void visitEnd():782:783 -> c
+    1:2:void visitVarInsn(int,int):352:353 -> d
 com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.h.a.a.v:
-    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> I
-    int nameIndex -> l
-    com.android.tools.r8.org.objectweb.asm.ByteVector defaultValue -> Q
-    com.android.tools.r8.org.objectweb.asm.ByteVector code -> r
-    int visibleAnnotableParameterCount -> K
-    com.android.tools.r8.org.objectweb.asm.Label currentBasicBlock -> X
-    com.android.tools.r8.org.objectweb.asm.ByteVector lineNumberTable -> v
-    com.android.tools.r8.org.objectweb.asm.ByteVector localVariableTypeTable -> z
-    int[] previousFrame -> ca
-    boolean hasAsmInstructions -> fa
-    int previousFrameOffset -> ba
-    int sourceOffset -> ha
-    int localVariableTypeTableLength -> y
-    com.android.tools.r8.org.objectweb.asm.Attribute firstAttribute -> T
-    int lineNumberTableLength -> u
-    int maxLocals -> q
-    java.lang.String name -> m
-    int signatureIndex -> H
-    com.android.tools.r8.org.objectweb.asm.Label lastBasicBlock -> W
-    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleAnnotation -> J
-    com.android.tools.r8.org.objectweb.asm.AnnotationWriter[] lastRuntimeVisibleParameterAnnotations -> L
-    int relativeStackSize -> Y
-    int compute -> U
-    int descriptorIndex -> n
-    int invisibleAnnotableParameterCount -> M
-    int[] STACK_SIZE_DELTA -> ja
-    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastCodeRuntimeVisibleTypeAnnotation -> C
-    com.android.tools.r8.org.objectweb.asm.Label firstBasicBlock -> V
-    int[] currentFrame -> da
-    com.android.tools.r8.org.objectweb.asm.ByteVector parameters -> S
-    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleTypeAnnotation -> O
-    int currentLocals -> aa
-    com.android.tools.r8.org.objectweb.asm.ByteVector localVariableTable -> x
-    int stackMapTableNumberOfEntries -> A
-    boolean hasSubroutines -> ea
-    int[] exceptionIndexTable -> G
-    int maxRelativeStackSize -> Z
-    int sourceLength -> ia
-    com.android.tools.r8.org.objectweb.asm.ByteVector stackMapTableEntries -> B
-    int lastBytecodeOffset -> ga
-    int localVariableTableLength -> w
-    com.android.tools.r8.org.objectweb.asm.Handler lastHandler -> t
-    int parametersCount -> R
-    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastCodeRuntimeInvisibleTypeAnnotation -> D
-    int accessFlags -> k
-    java.lang.String descriptor -> o
-    com.android.tools.r8.org.objectweb.asm.Attribute firstCodeAttribute -> E
-    int numberOfExceptions -> F
-    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleTypeAnnotation -> P
-    com.android.tools.r8.org.objectweb.asm.SymbolTable symbolTable -> j
-    com.android.tools.r8.org.objectweb.asm.AnnotationWriter[] lastRuntimeInvisibleParameterAnnotations -> N
-    com.android.tools.r8.org.objectweb.asm.Handler firstHandler -> s
-    int maxStack -> p
+    int[] previousFrame -> V
+    java.lang.String name -> f
+    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleTypeAnnotation -> I
+    int parametersCount -> K
+    int accessFlags -> d
+    boolean hasSubroutines -> X
+    int[] STACK_SIZE_DELTA -> ca
+    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastCodeRuntimeVisibleTypeAnnotation -> v
+    int sourceLength -> ba
+    int numberOfExceptions -> y
+    int currentLocals -> T
+    com.android.tools.r8.org.objectweb.asm.AnnotationWriter[] lastRuntimeVisibleParameterAnnotations -> E
+    com.android.tools.r8.org.objectweb.asm.Label firstBasicBlock -> O
+    com.android.tools.r8.org.objectweb.asm.ByteVector parameters -> L
+    com.android.tools.r8.org.objectweb.asm.ByteVector localVariableTable -> q
+    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> B
+    int maxStack -> i
+    com.android.tools.r8.org.objectweb.asm.ByteVector stackMapTableEntries -> u
+    int visibleAnnotableParameterCount -> D
+    int nameIndex -> e
+    int[] exceptionIndexTable -> z
+    com.android.tools.r8.org.objectweb.asm.Handler lastHandler -> m
+    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastCodeRuntimeInvisibleTypeAnnotation -> w
+    boolean hasAsmInstructions -> Y
+    com.android.tools.r8.org.objectweb.asm.Attribute firstCodeAttribute -> x
+    int previousFrameOffset -> U
+    int localVariableTypeTableLength -> r
+    int lineNumberTableLength -> n
+    java.lang.String descriptor -> h
+    int maxLocals -> j
+    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleAnnotation -> C
+    int sourceOffset -> aa
+    int signatureIndex -> A
+    com.android.tools.r8.org.objectweb.asm.Handler firstHandler -> l
+    int lastBytecodeOffset -> Z
+    com.android.tools.r8.org.objectweb.asm.SymbolTable symbolTable -> c
+    com.android.tools.r8.org.objectweb.asm.AnnotationWriter[] lastRuntimeInvisibleParameterAnnotations -> G
+    com.android.tools.r8.org.objectweb.asm.Label currentBasicBlock -> Q
+    int relativeStackSize -> R
+    com.android.tools.r8.org.objectweb.asm.ByteVector defaultValue -> J
+    com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleTypeAnnotation -> H
+    com.android.tools.r8.org.objectweb.asm.Attribute firstAttribute -> M
+    int compute -> N
+    int[] currentFrame -> W
+    com.android.tools.r8.org.objectweb.asm.ByteVector code -> k
+    com.android.tools.r8.org.objectweb.asm.ByteVector lineNumberTable -> o
+    int invisibleAnnotableParameterCount -> F
+    int descriptorIndex -> g
+    com.android.tools.r8.org.objectweb.asm.ByteVector localVariableTypeTable -> s
+    int stackMapTableNumberOfEntries -> t
+    com.android.tools.r8.org.objectweb.asm.Label lastBasicBlock -> P
+    int maxRelativeStackSize -> S
+    int localVariableTableLength -> p
     1:1:void <clinit>():81:81 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],int):595:595 -> <init>
-    2:306:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],int):320:624 -> <init>
-    1:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():651:652 -> a
-    3:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):658:662 -> a
-    8:10:void visitAnnotableParameterCount(int,boolean):683:685 -> a
-    11:24:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):693:706 -> a
-    25:30:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):716:721 -> a
-    31:128:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):737:834 -> a
-    129:135:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):825:831 -> a
-    136:138:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):818:820 -> a
-    139:140:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):813:814 -> a
-    141:144:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):806:809 -> a
-    145:204:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):795:854 -> a
-    205:217:void visitInsn(int):859:871 -> a
-    218:227:void visitInsn(int):865:874 -> a
-    228:242:void visitTypeInsn(int,java.lang.String):967:981 -> a
-    243:243:void visitTypeInsn(int,java.lang.String):974:974 -> a
-    244:267:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):989:1012 -> a
-    268:268:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):1008:1008 -> a
-    269:269:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):1005:1005 -> a
-    270:286:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):1002:1018 -> a
-    287:287:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):996:996 -> a
-    288:313:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):1030:1055 -> a
-    314:314:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):1042:1042 -> a
-    315:333:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1066:1084 -> a
-    334:334:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1076:1076 -> a
-    335:434:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):1091:1190 -> a
-    435:505:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):1198:1268 -> a
-    506:533:void visitLdcInsn(java.lang.Object):1274:1301 -> a
-    534:534:void visitLdcInsn(java.lang.Object):1295:1295 -> a
-    535:540:void visitIincInsn(int,int):1308:1313 -> a
-    541:553:void visitIincInsn(int,int):1311:1323 -> a
-    554:563:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):1331:1340 -> a
-    564:574:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):1345:1355 -> a
-    575:595:void visitSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):1359:1379 -> a
-    596:607:void visitMultiANewArrayInsn(java.lang.String,int):1385:1396 -> a
-    608:608:void visitMultiANewArrayInsn(java.lang.String,int):1392:1392 -> a
-    609:618:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1405:1414 -> a
-    619:627: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):1426:1434 -> a
-    628:653: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):1460:1485 -> a
-    654:674: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):1501:1521 -> a
-    675:680:int visitFrameStart(int,int,int):1818:1823 -> a
-    681:699:boolean canCopyMethodAttributes(com.android.tools.r8.org.objectweb.asm.ClassReader,boolean,boolean,int,int,int):2023:2041 -> a
-    700:804:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2178:2282 -> a
-    805:805:int com.android.tools.r8.org.objectweb.asm.Handler.getExceptionTableLength(com.android.tools.r8.org.objectweb.asm.Handler):163:163 -> a
-    805:805: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
-    805:805:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2282 -> a
-    806:814: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
-    806:814:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2282 -> a
-    815:820:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2283:2288 -> a
-    821:851:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2287:2317 -> a
-    852:857:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2316:2321 -> a
-    858:885:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2320:2347 -> a
-    886:896:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2346:2356 -> a
-    897:919:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2355:2377 -> a
-    920:921:void collectAttributePrototypes(com.android.tools.r8.org.objectweb.asm.Attribute$Set):2387:2388 -> a
+    1:1:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],int):594:594 -> <init>
+    2:305:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],int):320:623 -> <init>
+    1:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():650:651 -> a
+    3:10:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):658:665 -> a
+    11:13:void visitAnnotableParameterCount(int,boolean):693:695 -> a
+    14:30:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):704:720 -> a
+    31:36:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):729:734 -> a
+    37:135:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):750:848 -> a
+    136:142:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):839:845 -> a
+    143:145:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):832:834 -> a
+    146:147:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):827:828 -> a
+    148:151:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):820:823 -> a
+    152:211:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):809:868 -> a
+    212:224:void visitInsn(int):873:885 -> a
+    225:234:void visitInsn(int):879:888 -> a
+    235:249:void visitTypeInsn(int,java.lang.String):981:995 -> a
+    250:250:void visitTypeInsn(int,java.lang.String):988:988 -> a
+    251:274:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):1003:1026 -> a
+    275:275:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):1022:1022 -> a
+    276:276:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):1019:1019 -> a
+    277:293:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):1016:1032 -> a
+    294:294:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):1010:1010 -> a
+    295:320:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):1044:1069 -> a
+    321:321:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):1056:1056 -> a
+    322:340:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1080:1098 -> a
+    341:341:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1090:1090 -> a
+    342:441:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):1105:1204 -> a
+    442:512:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):1212:1282 -> a
+    513:536:void visitLdcInsn(java.lang.Object):1288:1311 -> a
+    537:537:void visitLdcInsn(java.lang.Object):1305:1305 -> a
+    538:543:void visitIincInsn(int,int):1318:1323 -> a
+    544:556:void visitIincInsn(int,int):1321:1333 -> a
+    557:566:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):1341:1350 -> a
+    567:577:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):1355:1365 -> a
+    578:598:void visitSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):1369:1389 -> a
+    599:610:void visitMultiANewArrayInsn(java.lang.String,int):1395:1406 -> a
+    611:611:void visitMultiANewArrayInsn(java.lang.String,int):1402:1402 -> a
+    612:622:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1416:1426 -> a
+    623:631: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):1434:1442 -> a
+    632:657: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):1474:1499 -> a
+    658:674: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):1515:1531 -> a
+    675:680:int visitFrameStart(int,int,int):1824:1829 -> a
+    681:709:boolean canCopyMethodAttributes(com.android.tools.r8.org.objectweb.asm.ClassReader,int,int,boolean,boolean,int,int,int):2030:2058 -> a
+    710:814:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2200:2304 -> a
+    815:815:int com.android.tools.r8.org.objectweb.asm.Handler.getExceptionTableLength(com.android.tools.r8.org.objectweb.asm.Handler):163:163 -> a
+    815:815: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
+    815:815:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2304 -> a
+    816:824: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
+    816:824:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2304 -> a
+    825:830:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2305:2310 -> a
+    831:861:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2309:2339 -> a
+    862:867:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2338:2343 -> a
+    868:899:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2342:2373 -> a
+    900:905:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2372:2377 -> a
+    906:911:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2376:2381 -> a
+    912:922:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2380:2390 -> a
+    923:933:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2389:2399 -> a
+    934:939:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2398:2403 -> a
+    940:957:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2402:2419 -> a
+    958:959:void collectAttributePrototypes(com.android.tools.r8.org.objectweb.asm.Attribute$Set):2429:2430 -> a
     void visitCode() -> b
-    1:5:void visitParameter(java.lang.String,int):642:646 -> b
-    6:23:void visitIntInsn(int,int):881:898 -> b
-    24:24:void visitIntInsn(int,int):891:891 -> b
-    25:30:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1441:1446 -> b
-    31:36:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):1532:1537 -> b
-    37:46:void putFrameType(java.lang.Object):1971:1980 -> b
+    1:5:void visitParameter(java.lang.String,int):641:645 -> b
+    6:23:void visitIntInsn(int,int):895:912 -> b
+    24:24:void visitIntInsn(int,int):905:905 -> b
+    25:35:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1450:1460 -> b
+    36:41:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):1538:1543 -> b
+    42:51:void putFrameType(java.lang.Object):1972:1981 -> 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:7:void visitMaxs(int,int):1542:1542 -> c
-    8:104:void computeAllFrames():1557:1653 -> c
-    8:104:void visitMaxs(int,int):1543 -> c
-    105:206:void computeMaxStackAndLocal():1659:1760 -> c
-    105:206:void visitMaxs(int,int):1545 -> c
-    207:210:void visitMaxs(int,int):1547:1550 -> c
-    211:211:void addSuccessorToCurrentBasicBlock(int,com.android.tools.r8.org.objectweb.asm.Label):1779:1779 -> c
-    1:31:void visitVarInsn(int,int):905:935 -> d
-    32:70:void visitVarInsn(int,int):923:961 -> d
-    71:120:int computeMethodInfoSize():2074:2123 -> d
-    121:204:int computeMethodInfoSize():2083:2166 -> d
-    1:1:boolean hasAsmInstructions():633:633 -> e
-    2:3:void setMethodAttributesSource(int,int):2062:2063 -> e
-    1:1:boolean hasFrames():629:629 -> f
-    2:2:void visitAbstractType(int,int):1834:1834 -> f
-    1:3:void visitFrameEnd():1843:1845 -> g
-    4:90:void putFrame():1856:1942 -> g
-    4:90:void visitFrameEnd():1847 -> g
-    91:94:void putFrame():1932:1935 -> g
-    91:94:void visitFrameEnd():1847 -> g
-    95:100:void putFrame():1924:1929 -> g
-    95:100:void visitFrameEnd():1847 -> g
-    101:104:void putFrame():1918:1921 -> g
-    101:104:void visitFrameEnd():1847 -> g
-    105:106:void putFrame():1914:1915 -> g
-    105:106:void visitFrameEnd():1847 -> g
-    107:107:void putFrame():1911:1911 -> g
-    107:107:void visitFrameEnd():1847 -> g
-    108:111:void visitFrameEnd():1848:1851 -> g
-    112:112:void putAbstractTypes(int,int):1956:1956 -> g
-    113:116:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1422:1425 -> g
-    113:116:void putAbstractTypes(int,int):1956 -> g
-    117:118:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1418:1419 -> g
-    117:118:void putAbstractTypes(int,int):1956 -> g
-    119:170:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1414:1465 -> g
-    119:170:void putAbstractTypes(int,int):1956 -> g
-    171:171:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1450:1450 -> g
-    171:171:void putAbstractTypes(int,int):1956 -> g
-    172:172:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1447:1447 -> g
-    172:172:void putAbstractTypes(int,int):1956 -> g
-    173:173:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1444:1444 -> g
-    173:173:void putAbstractTypes(int,int):1956 -> g
-    174:195:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1441:1462 -> g
-    174:195:void putAbstractTypes(int,int):1956 -> g
-    196:196:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1456:1456 -> g
-    196:196:void putAbstractTypes(int,int):1956 -> g
-    197:214:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1453:1470 -> g
-    197:214:void putAbstractTypes(int,int):1956 -> g
-    1:10:void endCurrentBasicBlockWithNoSuccessor():1791:1800 -> h
+    1:11:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):675:685 -> c
+    12:12:void visitMaxs(int,int):1548:1548 -> c
+    13:109:void computeAllFrames():1563:1659 -> c
+    13:109:void visitMaxs(int,int):1549 -> c
+    110:211:void computeMaxStackAndLocal():1665:1766 -> c
+    110:211:void visitMaxs(int,int):1551 -> c
+    212:215:void visitMaxs(int,int):1553:1556 -> c
+    216:216:void addSuccessorToCurrentBasicBlock(int,com.android.tools.r8.org.objectweb.asm.Label):1785:1785 -> c
+    1:31:void visitVarInsn(int,int):919:949 -> d
+    32:70:void visitVarInsn(int,int):937:975 -> d
+    71:120:int computeMethodInfoSize():2070:2119 -> d
+    121:230:int computeMethodInfoSize():2079:2188 -> d
+    1:1:boolean hasAsmInstructions():632:632 -> e
+    2:2:void visitAbstractType(int,int):1840:1840 -> e
+    1:1:boolean hasFrames():628:628 -> f
+    2:2:void putAbstractTypes(int,int):1957:1957 -> f
+    3:6:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1416:1419 -> f
+    3:6:void putAbstractTypes(int,int):1957 -> f
+    7:8:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1412:1413 -> f
+    7:8:void putAbstractTypes(int,int):1957 -> f
+    9:60:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1408:1459 -> f
+    9:60:void putAbstractTypes(int,int):1957 -> f
+    61:61:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1444:1444 -> f
+    61:61:void putAbstractTypes(int,int):1957 -> f
+    62:62:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1441:1441 -> f
+    62:62:void putAbstractTypes(int,int):1957 -> f
+    63:63:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1438:1438 -> f
+    63:63:void putAbstractTypes(int,int):1957 -> f
+    64:85:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1435:1456 -> f
+    64:85:void putAbstractTypes(int,int):1957 -> f
+    86:86:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1450:1450 -> f
+    86:86:void putAbstractTypes(int,int):1957 -> f
+    87:104:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1447:1464 -> f
+    87:104:void putAbstractTypes(int,int):1957 -> f
+    1:3:void visitFrameEnd():1849:1851 -> g
+    4:86:void putFrame():1862:1944 -> g
+    4:86:void visitFrameEnd():1853 -> g
+    87:88:void putFrame():1936:1937 -> g
+    87:88:void visitFrameEnd():1853 -> g
+    89:92:void putFrame():1930:1933 -> g
+    89:92:void visitFrameEnd():1853 -> g
+    93:96:void putFrame():1924:1927 -> g
+    93:96:void visitFrameEnd():1853 -> g
+    97:98:void putFrame():1920:1921 -> g
+    97:98:void visitFrameEnd():1853 -> g
+    99:99:void putFrame():1917:1917 -> g
+    99:99:void visitFrameEnd():1853 -> g
+    100:103:void visitFrameEnd():1854:1857 -> g
+    1:10:void endCurrentBasicBlockWithNoSuccessor():1797:1806 -> h
 com.android.tools.r8.org.objectweb.asm.ModuleVisitor -> com.android.tools.r8.h.a.a.w:
-    1:3:void <init>(int,com.android.tools.r8.org.objectweb.asm.ModuleVisitor):66:68 -> <init>
-    1:3:void <init>(int):55 -> <init>
+    1:3:void <init>(int,com.android.tools.r8.org.objectweb.asm.ModuleVisitor):67:69 -> <init>
+    1:3:void <init>(int):56 -> <init>
     void visitExport(java.lang.String,int,java.lang.String[]) -> a
     void visitMainClass(java.lang.String) -> a
     void visitProvide(java.lang.String,java.lang.String[]) -> a
@@ -40984,7 +40314,7 @@
     java.lang.Integer UNINITIALIZED_THIS -> g
     java.lang.Integer TOP -> a
     java.lang.Integer INTEGER -> b
-    1:7:void <clinit>():376:382 -> <clinit>
+    1:7:void <clinit>():179:185 -> <clinit>
 com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.h.a.a.A:
     com.android.tools.r8.org.objectweb.asm.ClassWriter classWriter -> a
     int typeCount -> k
@@ -40998,85 +40328,85 @@
     com.android.tools.r8.org.objectweb.asm.ClassReader sourceClassReader -> b
     java.lang.String className -> d
     com.android.tools.r8.org.objectweb.asm.ByteVector constantPool -> h
-    1:6:void <init>(com.android.tools.r8.org.objectweb.asm.ClassWriter):121:126 -> <init>
-    1:2:int setMajorVersionAndClassName(int,java.lang.String):318:319 -> a
-    3:3:com.android.tools.r8.org.objectweb.asm.Symbol addConstantClass(java.lang.String):513:513 -> a
-    3:3:int setMajorVersionAndClassName(int,java.lang.String):320 -> a
-    4:4:int setMajorVersionAndClassName(int,java.lang.String):320:320 -> a
-    5:7:int computeBootstrapMethodsSize():358:360 -> a
-    8:13:void putBootstrapMethods(com.android.tools.r8.org.objectweb.asm.ByteVector):373:378 -> a
-    14:31:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):457:474 -> a
-    32:32:com.android.tools.r8.org.objectweb.asm.Symbol addConstantString(java.lang.String):604:604 -> a
-    32:32:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):474 -> a
-    33:39:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):475:481 -> a
-    40:40:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodType(java.lang.String):865:865 -> a
-    40:40:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):481 -> a
-    41:50:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):483:492 -> a
-    51:63:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):487:499 -> a
-    64:65:com.android.tools.r8.org.objectweb.asm.Symbol addConstantDynamic(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):884:885 -> a
-    64:65:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):495 -> a
-    66:66:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):501:501 -> a
-    67:67:com.android.tools.r8.org.objectweb.asm.Symbol addConstantClass(java.lang.String):513:513 -> a
-    68:68:com.android.tools.r8.org.objectweb.asm.Symbol addConstantFieldref(java.lang.String,java.lang.String,java.lang.String):526:526 -> a
-    69:69:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodref(java.lang.String,java.lang.String,java.lang.String,boolean):542:542 -> a
-    70:70:com.android.tools.r8.org.objectweb.asm.Symbol addConstantInteger(int):615:615 -> a
-    71:71:com.android.tools.r8.org.objectweb.asm.Symbol addConstantFloat(float):626:626 -> a
-    72:72:com.android.tools.r8.org.objectweb.asm.Symbol addConstantLong(long):670:670 -> a
-    73:73:com.android.tools.r8.org.objectweb.asm.Symbol addConstantDouble(double):681:681 -> a
-    74:84:com.android.tools.r8.org.objectweb.asm.Symbol addConstantLongOrDouble(int,long):694:704 -> a
-    85:102:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):811:828 -> a
-    103:106:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):827:830 -> a
-    107:108:com.android.tools.r8.org.objectweb.asm.Symbol addConstantInvokeDynamic(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):905:906 -> a
-    109:122:com.android.tools.r8.org.objectweb.asm.Symbol addConstantDynamicOrInvokeDynamicReference(int,java.lang.String,java.lang.String,int):924:937 -> a
-    123:146:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1040:1063 -> a
-    147:147:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1058:1058 -> a
-    148:166:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1057:1075 -> a
-    167:167:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(int,int,int):1094:1094 -> a
-    167:167:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1080 -> a
-    168:168:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry get(int):394:394 -> a
-    168:168:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(int,int,int):1095 -> a
-    168:168:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1080 -> a
-    169:185:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(int,int,int):1097:1113 -> a
-    169:185:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1080 -> a
-    186:197:int addMergedType(int,int):1190:1201 -> a
-    198:207:int addTypeInternal(com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry):1214:1223 -> a
-    208:208:int hash(int,java.lang.String,int):1243:1243 -> a
-    208:208:int addUninitializedType(java.lang.String,int):1159 -> a
-    209:219:int addUninitializedType(java.lang.String,int):1160:1170 -> a
-    220:220:int hash(int,java.lang.String,java.lang.String):1247:1247 -> a
-    220:220:int addConstantNameAndType(java.lang.String,java.lang.String):729 -> a
-    221:232:int addConstantNameAndType(java.lang.String,java.lang.String):730:741 -> a
-    233:233:int hash(int,java.lang.String,java.lang.String,java.lang.String):1257:1257 -> a
-    233:233:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):559 -> a
-    234:245:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):560:571 -> a
-    246:246:com.android.tools.r8.org.objectweb.asm.Symbol addConstantClass(java.lang.String):513:513 -> a
-    246:246:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):572 -> a
-    247:247:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):572:572 -> a
-    248:250:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):571:573 -> a
-    251:251:int hash(int,java.lang.String,java.lang.String,java.lang.String,int):1266:1266 -> 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:22:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry put(com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry):407:426 -> b
-    23:32:com.android.tools.r8.org.objectweb.asm.Symbol addConstantIntegerOrFloat(int,int):638:647 -> b
-    33:33:com.android.tools.r8.org.objectweb.asm.Symbol addConstantModule(java.lang.String):972:972 -> b
-    34:34:com.android.tools.r8.org.objectweb.asm.Symbol getType(int):1127:1127 -> b
-    35:35:int hash(int,java.lang.String):1239:1239 -> b
-    35:35:com.android.tools.r8.org.objectweb.asm.Symbol addConstantUtf8Reference(int,java.lang.String):999 -> b
-    36:44:com.android.tools.r8.org.objectweb.asm.Symbol addConstantUtf8Reference(int,java.lang.String):1000:1008 -> b
-    45:45:int hash(int,java.lang.String,java.lang.String,int):1252:1252 -> b
+    1:6:void <init>(com.android.tools.r8.org.objectweb.asm.ClassWriter):173:178 -> <init>
+    1:2:int setMajorVersionAndClassName(int,java.lang.String):342:343 -> a
+    3:3:com.android.tools.r8.org.objectweb.asm.Symbol addConstantClass(java.lang.String):527:527 -> a
+    3:3:int setMajorVersionAndClassName(int,java.lang.String):344 -> a
+    4:4:int setMajorVersionAndClassName(int,java.lang.String):344:344 -> a
+    5:7:int computeBootstrapMethodsSize():374:376 -> a
+    8:13:void putBootstrapMethods(com.android.tools.r8.org.objectweb.asm.ByteVector):389:394 -> a
+    14:31:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):471:488 -> a
+    32:32:com.android.tools.r8.org.objectweb.asm.Symbol addConstantString(java.lang.String):618:618 -> a
+    32:32:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):488 -> a
+    33:39:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):489:495 -> a
+    40:40:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodType(java.lang.String):878:878 -> a
+    40:40:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):495 -> a
+    41:50:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):497:506 -> a
+    51:63:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):501:513 -> a
+    64:65:com.android.tools.r8.org.objectweb.asm.Symbol addConstantDynamic(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):897:898 -> a
+    64:65:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):509 -> a
+    66:66:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):515:515 -> a
+    67:67:com.android.tools.r8.org.objectweb.asm.Symbol addConstantClass(java.lang.String):527:527 -> a
+    68:68:com.android.tools.r8.org.objectweb.asm.Symbol addConstantFieldref(java.lang.String,java.lang.String,java.lang.String):540:540 -> a
+    69:69:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodref(java.lang.String,java.lang.String,java.lang.String,boolean):556:556 -> a
+    70:70:com.android.tools.r8.org.objectweb.asm.Symbol addConstantInteger(int):629:629 -> a
+    71:71:com.android.tools.r8.org.objectweb.asm.Symbol addConstantFloat(float):640:640 -> a
+    72:72:com.android.tools.r8.org.objectweb.asm.Symbol addConstantLong(long):684:684 -> a
+    73:73:com.android.tools.r8.org.objectweb.asm.Symbol addConstantDouble(double):695:695 -> a
+    74:84:com.android.tools.r8.org.objectweb.asm.Symbol addConstantLong(int,long):708:718 -> a
+    85:102:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):824:841 -> a
+    103:106:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):840:843 -> a
+    107:108:com.android.tools.r8.org.objectweb.asm.Symbol addConstantInvokeDynamic(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):918:919 -> a
+    109:122:com.android.tools.r8.org.objectweb.asm.Symbol addConstantDynamicOrInvokeDynamicReference(int,java.lang.String,java.lang.String,int):937:950 -> a
+    123:146:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1053:1076 -> a
+    147:147:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1071:1071 -> a
+    148:166:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1070:1088 -> a
+    167:167:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(int,int,int):1107:1107 -> a
+    167:167:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1093 -> a
+    168:168:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry get(int):408:408 -> a
+    168:168:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(int,int,int):1108 -> a
+    168:168:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1093 -> a
+    169:185:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(int,int,int):1110:1126 -> a
+    169:185:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1093 -> a
+    186:197:int addMergedType(int,int):1199:1210 -> a
+    198:207:int addType(com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry):1223:1232 -> a
+    208:208:int hash(int,java.lang.String,int):1252:1252 -> a
+    208:208:int addUninitializedType(java.lang.String,int):1170 -> a
+    209:219:int addUninitializedType(java.lang.String,int):1171:1181 -> a
+    220:220:int hash(int,java.lang.String,java.lang.String):1256:1256 -> a
+    220:220:int addConstantNameAndType(java.lang.String,java.lang.String):742 -> a
+    221:232:int addConstantNameAndType(java.lang.String,java.lang.String):743:754 -> a
+    233:233:int hash(int,java.lang.String,java.lang.String,java.lang.String):1266:1266 -> a
+    233:233:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):573 -> a
+    234:245:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):574:585 -> a
+    246:246:com.android.tools.r8.org.objectweb.asm.Symbol addConstantClass(java.lang.String):527:527 -> a
+    246:246:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):586 -> a
+    247:247:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):586:586 -> a
+    248:250:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):585:587 -> a
+    251:251:int hash(int,java.lang.String,java.lang.String,java.lang.String,int):1275:1275 -> a
+    1:1:java.lang.String getClassName():330:330 -> b
+    2:2:void putConstantPool(com.android.tools.r8.org.objectweb.asm.ByteVector):364:364 -> b
+    3:22:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry put(com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry):421:440 -> b
+    23:32:com.android.tools.r8.org.objectweb.asm.Symbol addConstantInteger(int,int):652:661 -> b
+    33:33:com.android.tools.r8.org.objectweb.asm.Symbol addConstantModule(java.lang.String):985:985 -> b
+    34:34:com.android.tools.r8.org.objectweb.asm.Symbol getType(int):1138:1138 -> b
+    35:35:int hash(int,java.lang.String):1248:1248 -> b
+    35:35:com.android.tools.r8.org.objectweb.asm.Symbol addConstantUtf8Reference(int,java.lang.String):1012 -> b
+    36:44:com.android.tools.r8.org.objectweb.asm.Symbol addConstantUtf8Reference(int,java.lang.String):1013:1021 -> b
+    45:45:int hash(int,java.lang.String,java.lang.String,int):1261:1261 -> b
     int hash(int,int) -> c
-    1:1:int getConstantPoolCount():329:329 -> c
-    2:2:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry get(int):394:394 -> c
-    3:3:com.android.tools.r8.org.objectweb.asm.Symbol addConstantPackage(java.lang.String):983:983 -> c
-    1:1:int getConstantPoolLength():338:338 -> d
-    2:2:int hash(int,java.lang.String):1239:1239 -> d
-    2:2:int addConstantUtf8(java.lang.String):764 -> d
-    3:13:int addConstantUtf8(java.lang.String):765:775 -> d
-    1:1:int getMajorVersion():297:297 -> e
-    2:2:int hash(int,java.lang.String):1239:1239 -> e
-    2:2:int addType(java.lang.String):1138 -> e
-    3:10:int addType(java.lang.String):1139:1146 -> e
-    1:1:com.android.tools.r8.org.objectweb.asm.ClassReader getSource():288:288 -> f
+    1:1:int getConstantPoolCount():349:349 -> c
+    2:2:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry get(int):408:408 -> c
+    3:3:com.android.tools.r8.org.objectweb.asm.Symbol addConstantPackage(java.lang.String):996:996 -> c
+    1:1:int getConstantPoolLength():354:354 -> d
+    2:2:int hash(int,java.lang.String):1248:1248 -> d
+    2:2:int addConstantUtf8(java.lang.String):777 -> d
+    3:13:int addConstantUtf8(java.lang.String):778:788 -> d
+    1:1:int getMajorVersion():325:325 -> e
+    2:2:int hash(int,java.lang.String):1248:1248 -> e
+    2:2:int addType(java.lang.String):1149 -> e
+    3:10:int addType(java.lang.String):1150:1157 -> e
+    1:1:com.android.tools.r8.org.objectweb.asm.ClassReader getSource():320:320 -> f
 com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry -> com.android.tools.r8.h.a.a.z:
     long com.android.tools.r8.org.objectweb.asm.Symbol.data -> f
     int hashCode -> h
@@ -41087,22 +40417,22 @@
     java.lang.String com.android.tools.r8.org.objectweb.asm.Symbol.value -> e
     int com.android.tools.r8.org.objectweb.asm.Symbol.index -> a
     java.lang.String com.android.tools.r8.org.objectweb.asm.Symbol.name -> d
-    1:7: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>
-    1:7:void <init>(int,int,long,int):1316 -> <init>
-    8:8:void <init>(int,int,long,int):1317:1317 -> <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,int):1300 -> <init>
-    16:16:void <init>(int,int,java.lang.String,int):1301:1301 -> <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,long,int):1305 -> <init>
-    24:24:void <init>(int,int,java.lang.String,long,int):1306:1306 -> <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,java.lang.String,int):1311 -> <init>
-    32:32:void <init>(int,int,java.lang.String,java.lang.String,int):1312:1312 -> <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,java.lang.String,java.lang.String,long,int):1295 -> <init>
-    40:40:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,long,int):1296:1296 -> <init>
-    1:4:int com.android.tools.r8.org.objectweb.asm.Symbol.getArgumentsAndReturnSizes():238:241 -> a
+    1:7:void com.android.tools.r8.org.objectweb.asm.Symbol.<init>(int,int,java.lang.String,java.lang.String,java.lang.String,long):219:225 -> <init>
+    1:7:void <init>(int,int,long,int):89 -> <init>
+    8:8:void <init>(int,int,long,int):90:90 -> <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):219:225 -> <init>
+    9:15:void <init>(int,int,java.lang.String,int):73 -> <init>
+    16:16:void <init>(int,int,java.lang.String,int):74:74 -> <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):219:225 -> <init>
+    17:23:void <init>(int,int,java.lang.String,long,int):78 -> <init>
+    24:24:void <init>(int,int,java.lang.String,long,int):79:79 -> <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):219:225 -> <init>
+    25:31:void <init>(int,int,java.lang.String,java.lang.String,int):84 -> <init>
+    32:32:void <init>(int,int,java.lang.String,java.lang.String,int):85:85 -> <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):219:225 -> <init>
+    33:39:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,long,int):68 -> <init>
+    40:40:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,long,int):69:69 -> <init>
+    1:4:int com.android.tools.r8.org.objectweb.asm.Symbol.getArgumentsAndReturnSizes():235:238 -> a
     1:4:int com.android.tools.r8.org.objectweb.asm.Symbol.getArgumentsAndReturnSizes():0 -> a
 com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.h.a.a.B:
     com.android.tools.r8.org.objectweb.asm.Type FLOAT_TYPE -> k
@@ -41119,35 +40449,33 @@
     com.android.tools.r8.org.objectweb.asm.Type SHORT_TYPE -> i
     com.android.tools.r8.org.objectweb.asm.Type BYTE_TYPE -> h
     1:26:void <clinit>():85:110 -> <clinit>
-    1:5:void <init>(int,java.lang.String,int,int):159:163 -> <init>
-    1:28:com.android.tools.r8.org.objectweb.asm.Type[] getArgumentTypes(java.lang.String):302:329 -> a
-    29:55:com.android.tools.r8.org.objectweb.asm.Type getTypeInternal(java.lang.String,int,int):414:440 -> a
-    56:56:com.android.tools.r8.org.objectweb.asm.Type getTypeInternal(java.lang.String,int,int):434:434 -> a
-    57:57:com.android.tools.r8.org.objectweb.asm.Type getTypeInternal(java.lang.String,int,int):418:418 -> a
-    58:78:com.android.tools.r8.org.objectweb.asm.Type getTypeInternal(java.lang.String,int,int):416:436 -> a
-    79:79:com.android.tools.r8.org.objectweb.asm.Type getTypeInternal(java.lang.String,int,int):430:430 -> a
-    80:86:com.android.tools.r8.org.objectweb.asm.Type getTypeInternal(java.lang.String,int,int):426:432 -> a
-    87:105:com.android.tools.r8.org.objectweb.asm.Type getTypeInternal(java.lang.String,int,int):420:438 -> a
-    106:135:java.lang.String getClassName():455:484 -> a
-    136:136:java.lang.String getClassName():482:482 -> a
-    137:137:java.lang.String getClassName():475:475 -> a
-    138:139:com.android.tools.r8.org.objectweb.asm.Type getElementType():241:242 -> a
-    138:139:java.lang.String getClassName():475 -> a
-    140:144:java.lang.String getClassName():475:479 -> a
-    1:6:java.lang.String getDescriptor():516:521 -> b
-    7:25:int getArgumentsAndReturnSizes(java.lang.String):728:746 -> b
-    1:1:com.android.tools.r8.org.objectweb.asm.Type getMethodType(java.lang.String):264:264 -> c
-    2:2:int getDimensions():668:668 -> c
-    1:2:com.android.tools.r8.org.objectweb.asm.Type getObjectType(java.lang.String):252:253 -> d
-    3:3:java.lang.String getInternalName():496:496 -> d
-    1:1:com.android.tools.r8.org.objectweb.asm.Type getReturnType(java.lang.String):367:367 -> e
-    2:2:com.android.tools.r8.org.objectweb.asm.Type getReturnType(java.lang.String):366:366 -> e
-    3:3:int getSort():657:657 -> e
-    1:17:boolean equals(java.lang.Object):843:859 -> equals
-    1:7:int getReturnTypeOffset(java.lang.String):390:396 -> f
-    1:1:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String):177:177 -> g
-    1:4:int hashCode():873:876 -> hashCode
-    1:1:java.lang.String toString():889:889 -> toString
+    1:5:void <init>(int,java.lang.String,int,int):163:167 -> <init>
+    1:30:com.android.tools.r8.org.objectweb.asm.Type[] getArgumentTypes(java.lang.String):281:310 -> a
+    31:57:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String,int,int):416:442 -> a
+    58:58:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String,int,int):436:436 -> a
+    59:59:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String,int,int):420:420 -> a
+    60:80:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String,int,int):418:438 -> a
+    81:81:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String,int,int):432:432 -> a
+    82:88:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String,int,int):428:434 -> a
+    89:107:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String,int,int):422:440 -> a
+    108:137:java.lang.String getClassName():493:522 -> a
+    138:138:java.lang.String getClassName():520:520 -> a
+    139:139:java.lang.String getClassName():513:513 -> a
+    140:141:com.android.tools.r8.org.objectweb.asm.Type getElementType():482:483 -> a
+    140:141:java.lang.String getClassName():513 -> a
+    142:146:java.lang.String getClassName():513:517 -> a
+    1:20:int getArgumentsAndReturnSizes(java.lang.String):376:395 -> b
+    21:30:java.lang.String getDescriptor():580:589 -> b
+    1:1:com.android.tools.r8.org.objectweb.asm.Type getMethodType(java.lang.String):199:199 -> c
+    2:2:int getDimensions():469:469 -> c
+    1:2:com.android.tools.r8.org.objectweb.asm.Type getObjectType(java.lang.String):187:188 -> d
+    3:3:java.lang.String getInternalName():534:534 -> d
+    1:11:com.android.tools.r8.org.objectweb.asm.Type getReturnType(java.lang.String):340:350 -> e
+    12:12:int getSort():458:458 -> e
+    1:17:boolean equals(java.lang.Object):858:874 -> equals
+    1:1:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String):177:177 -> f
+    1:4:int hashCode():888:891 -> hashCode
+    1:1:java.lang.String toString():904:904 -> toString
 com.android.tools.r8.org.objectweb.asm.TypePath -> com.android.tools.r8.h.a.a.C:
     byte[] typePathContainer -> a
     int typePathOffset -> b
@@ -41169,6 +40497,10 @@
     int targetTypeAndInfo -> a
     1:2:void <init>(int):193:194 -> <init>
     1:1:int getExceptionIndex():359:359 -> a
+    2:2:void putTarget(int,com.android.tools.r8.org.objectweb.asm.ByteVector):433:433 -> a
+    3:3:void putTarget(int,com.android.tools.r8.org.objectweb.asm.ByteVector):419:419 -> a
+    4:22:void putTarget(int,com.android.tools.r8.org.objectweb.asm.ByteVector):412:430 -> a
+    23:23:void putTarget(int,com.android.tools.r8.org.objectweb.asm.ByteVector):407:407 -> a
     1:1:int getFormalParameterIndex():348:348 -> b
     1:1:int getSort():303:303 -> c
     1:1:int getSuperTypeIndex():338:338 -> d
@@ -41177,44 +40509,44 @@
     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.h.a.a.a.b:
-    java.util.BitSet mainSubroutineInsns -> F
-    java.util.BitSet sharedSubroutineInsns -> H
-    java.util.Map subroutinesInsns -> G
+    java.util.BitSet mainSubroutineInsns -> y
+    java.util.Map subroutinesInsns -> z
+    java.util.BitSet sharedSubroutineInsns -> A
     1:1:void <init>(int,com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):129:129 -> <init>
-    1:1:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):101 -> <init>
-    2:67:void <init>(int,com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):65:130 -> <init>
-    2:67:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):101 -> <init>
-    68:69:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):102:103 -> <init>
+    1:1:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):100 -> <init>
+    2:68:void <init>(int,com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):64:130 -> <init>
+    2:68:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):100 -> <init>
+    69:70:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):101:102 -> <init>
     1:4:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):135:138 -> a
-    5:27:void findReachableInsns(int,java.util.BitSet,java.util.BitSet):231:253 -> a
-    28:36:void findReachableInsns(int,java.util.BitSet,java.util.BitSet):252:260 -> a
-    37:45:void findReachableInsns(int,java.util.BitSet,java.util.BitSet):259:267 -> a
+    5:28:void findReachableInsns(int,java.util.BitSet,java.util.BitSet):231:254 -> a
+    29:37:void findReachableInsns(int,java.util.BitSet,java.util.BitSet):253:261 -> a
+    38:46:void findReachableInsns(int,java.util.BitSet,java.util.BitSet):260:268 -> a
     1:20:void findSubroutineInsns(int,java.util.BitSet,java.util.BitSet):181:200 -> b
     1:1:void visitEnd():144:144 -> c
     2:8:void findSubroutinesInsns():157:163 -> c
     2:8:void visitEnd():146 -> c
-    9:18:void emitCode():294:303 -> c
+    9:18:void emitCode():295:304 -> c
     9:18:void visitEnd():147 -> c
-    19:23:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):332:336 -> c
-    19:23:void emitCode():304 -> c
+    19:23:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):333:337 -> c
+    19:23:void emitCode():305 -> c
     19:23:void visitEnd():147 -> c
-    24:24:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.getClonedLabel(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):538:538 -> c
-    24:24:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):337 -> c
-    24:24:void emitCode():304 -> c
+    24:24:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.getClonedLabel(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):539:539 -> c
+    24:24:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):338 -> c
+    24:24:void emitCode():305 -> c
     24:24:void visitEnd():147 -> c
-    25:43:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):339:357 -> c
-    25:43:void emitCode():304 -> c
+    25:43:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):340:358 -> c
+    25:43:void emitCode():305 -> c
     25:43:void visitEnd():147 -> c
-    44:55:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):355:366 -> c
-    44:55:void emitCode():304 -> c
+    44:55:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):356:367 -> c
+    44:55:void emitCode():305 -> c
     44:55:void visitEnd():147 -> c
-    56:90:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):363:397 -> c
-    56:90:void emitCode():304 -> c
+    56:90:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):364:398 -> c
+    56:90:void emitCode():305 -> c
     56:90:void visitEnd():147 -> c
-    91:102:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):395:406 -> c
-    91:102:void emitCode():304 -> c
+    91:102:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):396:407 -> c
+    91:102:void emitCode():305 -> c
     91:102:void visitEnd():147 -> c
-    103:105:void emitCode():307:309 -> c
+    103:105:void emitCode():308:310 -> c
     103:105:void visitEnd():147 -> c
     106:107:void visitEnd():149:150 -> c
 com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> com.android.tools.r8.h.a.a.a.a:
@@ -41223,17 +40555,17 @@
     java.util.BitSet subroutineInsns -> b
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode returnLabel -> d
     com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter this$0 -> e
-    1:5:void <init>(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter,com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.BitSet):446:450 -> <init>
-    6:29:void <init>(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter,com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.BitSet):449:472 -> <init>
-    1:1:com.android.tools.r8.org.objectweb.asm.tree.LabelNode getClonedLabel(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):538:538 -> a
-    1:1:com.android.tools.r8.org.objectweb.asm.tree.LabelNode getClonedLabelForJumpInsn(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):526:526 -> b
-    1:11:com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation findOwner(int):499:509 -> c
-    12:12:com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation findOwner(int):508:508 -> c
-    1:1:java.util.Set entrySet():545:545 -> entrySet
-    1:1:boolean equals(java.lang.Object):555:555 -> equals
-    1:1:com.android.tools.r8.org.objectweb.asm.tree.LabelNode get(java.lang.Object):550:550 -> get
-    1:1:java.lang.Object get(java.lang.Object):419 -> get
-    1:1:int hashCode():560:560 -> hashCode
+    1:5:void <init>(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter,com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.BitSet):447:451 -> <init>
+    6:29:void <init>(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter,com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.BitSet):450:473 -> <init>
+    1:1:com.android.tools.r8.org.objectweb.asm.tree.LabelNode getClonedLabel(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):539:539 -> a
+    1:1:com.android.tools.r8.org.objectweb.asm.tree.LabelNode getClonedLabelForJumpInsn(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):527:527 -> b
+    1:11:com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation findOwner(int):500:510 -> c
+    12:12:com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation findOwner(int):509:509 -> c
+    1:1:java.util.Set entrySet():546:546 -> entrySet
+    1:1:boolean equals(java.lang.Object):556:556 -> equals
+    1:1:com.android.tools.r8.org.objectweb.asm.tree.LabelNode get(java.lang.Object):551:551 -> get
+    1:1:java.lang.Object get(java.lang.Object):420 -> get
+    1:1:int hashCode():561:561 -> hashCode
 com.android.tools.r8.org.objectweb.asm.signature.SignatureReader -> com.android.tools.r8.h.a.a.b.a:
     java.lang.String signatureValue -> a
     1:2:void <init>(java.lang.String):49:50 -> <init>
@@ -41247,7 +40579,7 @@
     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.h.a.a.b.b:
-    1:3:void <init>(int):74:76 -> <init>
+    1:6:void <init>(int):75:80 -> <init>
     com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitArrayType() -> a
     void visitBaseType(char) -> a
     void visitClassType(java.lang.String) -> a
@@ -41286,44 +40618,44 @@
 com.android.tools.r8.org.objectweb.asm.tree.AnnotationNode -> com.android.tools.r8.h.a.a.c.b:
     java.util.List values -> c
     java.lang.String desc -> b
-    1:1:void com.android.tools.r8.org.objectweb.asm.AnnotationVisitor.<init>(int):56:56 -> <init>
-    1:1:void <init>(int,java.lang.String):77 -> <init>
-    2:2:void <init>(int,java.lang.String):78:78 -> <init>
-    3:3:void com.android.tools.r8.org.objectweb.asm.AnnotationVisitor.<init>(int):56:56 -> <init>
-    3:3:void <init>(int,java.lang.String):77 -> <init>
+    1:1:void com.android.tools.r8.org.objectweb.asm.AnnotationVisitor.<init>(int):57:57 -> <init>
+    1:1:void <init>(int,java.lang.String):78 -> <init>
+    2:2:void <init>(int,java.lang.String):79:79 -> <init>
+    3:3:void com.android.tools.r8.org.objectweb.asm.AnnotationVisitor.<init>(int):57:57 -> <init>
+    3:3:void <init>(int,java.lang.String):78 -> <init>
     3:3:void <init>(java.lang.String):63 -> <init>
-    4:4:void <init>(int,java.lang.String):78:78 -> <init>
+    4:4:void <init>(int,java.lang.String):79:79 -> <init>
     4:4:void <init>(java.lang.String):63 -> <init>
     5:6:void <init>(java.lang.String):64:65 -> <init>
-    7:8:void <init>(java.util.List):87:88 -> <init>
+    7:8:void <init>(java.util.List):88:89 -> <init>
     void visitEnd() -> a
-    1:8:void visit(java.lang.String,java.lang.Object):97:104 -> a
+    1:8:void visit(java.lang.String,java.lang.Object):98:105 -> a
     9:13:java.util.List com.android.tools.r8.org.objectweb.asm.tree.Util.asArrayList(byte[]):64:68 -> a
-    9:13:void visit(java.lang.String,java.lang.Object):104 -> a
-    14:16:void visit(java.lang.String,java.lang.Object):104:106 -> a
+    9:13:void visit(java.lang.String,java.lang.Object):105 -> a
+    14:16:void visit(java.lang.String,java.lang.Object):105:107 -> a
     17:21:java.util.List com.android.tools.r8.org.objectweb.asm.tree.Util.asArrayList(boolean[]):75:79 -> a
-    17:21:void visit(java.lang.String,java.lang.Object):106 -> a
-    22:24:void visit(java.lang.String,java.lang.Object):106:108 -> a
+    17:21:void visit(java.lang.String,java.lang.Object):107 -> a
+    22:24:void visit(java.lang.String,java.lang.Object):107:109 -> a
     25:29:java.util.List com.android.tools.r8.org.objectweb.asm.tree.Util.asArrayList(short[]):86:90 -> a
-    25:29:void visit(java.lang.String,java.lang.Object):108 -> a
-    30:32:void visit(java.lang.String,java.lang.Object):108:110 -> a
+    25:29:void visit(java.lang.String,java.lang.Object):109 -> a
+    30:32:void visit(java.lang.String,java.lang.Object):109:111 -> a
     33:37:java.util.List com.android.tools.r8.org.objectweb.asm.tree.Util.asArrayList(char[]):97:101 -> a
-    33:37:void visit(java.lang.String,java.lang.Object):110 -> a
-    38:42:void visit(java.lang.String,java.lang.Object):110:114 -> a
+    33:37:void visit(java.lang.String,java.lang.Object):111 -> a
+    38:42:void visit(java.lang.String,java.lang.Object):111:115 -> a
     43:47:java.util.List com.android.tools.r8.org.objectweb.asm.tree.Util.asArrayList(long[]):130:134 -> a
-    43:47:void visit(java.lang.String,java.lang.Object):114 -> a
-    48:50:void visit(java.lang.String,java.lang.Object):114:116 -> a
+    43:47:void visit(java.lang.String,java.lang.Object):115 -> a
+    48:50:void visit(java.lang.String,java.lang.Object):115:117 -> a
     51:55:java.util.List com.android.tools.r8.org.objectweb.asm.tree.Util.asArrayList(float[]):119:123 -> a
-    51:55:void visit(java.lang.String,java.lang.Object):116 -> a
-    56:58:void visit(java.lang.String,java.lang.Object):116:118 -> a
+    51:55:void visit(java.lang.String,java.lang.Object):117 -> a
+    56:58:void visit(java.lang.String,java.lang.Object):117:119 -> a
     59:63:java.util.List com.android.tools.r8.org.objectweb.asm.tree.Util.asArrayList(double[]):141:145 -> a
-    59:63:void visit(java.lang.String,java.lang.Object):118 -> a
-    64:66:void visit(java.lang.String,java.lang.Object):118:120 -> a
-    67:73:void visitEnum(java.lang.String,java.lang.String,java.lang.String):126:132 -> a
-    74:81:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):137:144 -> a
-    82:90:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):150:158 -> a
-    91:98:void accept(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor):189:196 -> a
-    99:115:void accept(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,java.lang.Object):210:226 -> a
+    59:63:void visit(java.lang.String,java.lang.Object):119 -> a
+    64:66:void visit(java.lang.String,java.lang.Object):119:121 -> a
+    67:73:void visitEnum(java.lang.String,java.lang.String,java.lang.String):127:133 -> a
+    74:81:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):138:145 -> a
+    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.FieldInsnNode -> com.android.tools.r8.h.a.a.c.c:
     java.lang.String owner -> g
     java.lang.String desc -> i
@@ -41370,16 +40702,16 @@
     2:8:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode get(int):93:99 -> a
     9:9:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode get(int):94:94 -> a
     10:13:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):142:145 -> a
-    14:24:void add(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):225:235 -> a
-    25:36:void insert(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):313:324 -> a
+    14:25:void add(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):225:236 -> a
+    26:37:void insert(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):314:325 -> a
     1:1:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode getLast():79:79 -> b
     2:5:int indexOf(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):130:133 -> b
-    6:17:void insertBefore(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):363:374 -> b
+    6:17:void insertBefore(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):364:375 -> b
     1:1:java.util.ListIterator iterator(int):166:166 -> c
     1:1:java.util.ListIterator iterator():155 -> c
     2:25:void set(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):193:216 -> c
-    26:49:void remove(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):411:434 -> c
-    1:6:void resetLabels():469:474 -> d
+    26:49:void remove(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):412:435 -> c
+    1:6:void resetLabels():470:475 -> d
     1:1:int size():61:61 -> e
     1:6:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode[] toArray():176:181 -> f
 com.android.tools.r8.org.objectweb.asm.tree.InsnList$InsnListIterator -> com.android.tools.r8.h.a.a.c.f:
@@ -41387,18 +40719,17 @@
     com.android.tools.r8.org.objectweb.asm.tree.InsnList this$0 -> d
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode previousInsn -> b
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode remove -> c
-    1:7:void <init>(com.android.tools.r8.org.objectweb.asm.tree.InsnList,int):488:494 -> <init>
-    1:9:void add(java.lang.Object):571:579 -> add
+    1:7:void <init>(com.android.tools.r8.org.objectweb.asm.tree.InsnList,int):489:495 -> <init>
+    1:9:void add(java.lang.Object):561:569 -> add
     1:1:boolean hasNext():500:500 -> hasNext
-    1:1:boolean hasPrevious():532:532 -> hasPrevious
-    1:7:java.lang.Object next():505:511 -> next
-    8:8:java.lang.Object next():506:506 -> next
-    1:7:int nextIndex():549:555 -> nextIndex
-    1:7:java.lang.Object previous():537:543 -> previous
-    8:8:java.lang.Object previous():538:538 -> previous
-    1:7:int previousIndex():560:566 -> previousIndex
-    1:10:void remove():517:526 -> remove
-    1:9:void set(java.lang.Object):584:592 -> set
+    1:1:boolean hasPrevious():529:529 -> hasPrevious
+    1:7:java.lang.Object next():504:510 -> next
+    8:8:java.lang.Object next():505:505 -> next
+    1:7:int nextIndex():541:547 -> nextIndex
+    1:4:java.lang.Object previous():533:536 -> previous
+    1:7:int previousIndex():551:557 -> previousIndex
+    1:10:void remove():515:524 -> remove
+    1:9:void set(java.lang.Object):573:581 -> set
 com.android.tools.r8.org.objectweb.asm.tree.InsnNode -> com.android.tools.r8.h.a.a.c.h:
     1:1:void <init>(int):55:55 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):65:66 -> a
@@ -41431,11 +40762,11 @@
 com.android.tools.r8.org.objectweb.asm.tree.LabelNode -> com.android.tools.r8.h.a.a.c.l:
     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
-    2:2:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):73:73 -> a
+    1:1:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):62:62 -> a
+    2:2:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):67:67 -> a
     int getType() -> d
-    1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():60:63 -> e
-    1:1:void resetLabel():77:77 -> f
+    1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():54:57 -> e
+    1:1:void resetLabel():71:71 -> f
 com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode -> com.android.tools.r8.h.a.a.c.m:
     java.lang.Object cst -> g
     1:2:void <init>(java.lang.Object):55:56 -> <init>
@@ -41456,10 +40787,10 @@
     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):115:118 -> <init>
+    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:4:void <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 -> <init>
-    1:10:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor,boolean):128:137 -> a
-    11:11:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor,boolean):136:136 -> a
+    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.h.a.a.c.p:
     int index -> f
     java.lang.String name -> a
@@ -41484,103 +40815,107 @@
     java.lang.String desc -> i
     java.lang.String name -> h
     boolean itf -> j
-    1:5:void <init>(int,java.lang.String,java.lang.String,java.lang.String,boolean):91:95 -> <init>
-    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
+    1:5:void <init>(int,java.lang.String,java.lang.String,java.lang.String,boolean):93:97 -> <init>
+    1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):117:118 -> a
+    3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):123:123 -> a
     int getType() -> d
 com.android.tools.r8.org.objectweb.asm.tree.MethodNode -> com.android.tools.r8.h.a.a.c.t:
-    java.util.List attrs -> r
-    java.util.List invisibleTypeAnnotations -> q
-    com.android.tools.r8.org.objectweb.asm.tree.InsnList instructions -> x
-    java.util.List visibleTypeAnnotations -> p
-    java.util.List invisibleAnnotations -> o
-    int access -> j
-    java.lang.String name -> k
-    java.lang.String desc -> l
-    java.lang.Object annotationDefault -> s
-    java.util.List tryCatchBlocks -> y
-    int maxLocals -> A
-    java.util.List localVariables -> B
-    java.util.List[] visibleParameterAnnotations -> u
-    int maxStack -> z
-    java.util.List[] invisibleParameterAnnotations -> w
-    java.util.List invisibleLocalVariableAnnotations -> D
-    java.util.List visibleLocalVariableAnnotations -> C
-    int invisibleAnnotableParameterCount -> v
-    boolean visited -> E
-    int visibleAnnotableParameterCount -> t
-    java.util.List visibleAnnotations -> n
-    java.util.List parameters -> m
-    1:1:void com.android.tools.r8.org.objectweb.asm.MethodVisitor.<init>(int):69:69 -> <init>
-    1:1:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):220 -> <init>
-    2:11:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):221:230 -> <init>
-    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():248:248 -> a
-    2:12:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):260:270 -> a
-    13:15:void visitAnnotableParameterCount(int,boolean):296:298 -> a
-    16:34:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):306:324 -> a
-    35:38:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):331:334 -> a
-    39:45:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):349:355 -> a
-    46:46:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):349:349 -> a
-    47:47:void visitInsn(int):360:360 -> a
-    48:48:void visitTypeInsn(int,java.lang.String):375:375 -> a
-    49:49:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):381:381 -> a
-    50:57:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):391:398 -> a
-    58:58:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):407:407 -> a
-    59:59:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):414:414 -> a
-    60:60:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):419:419 -> a
-    61:61:void visitLdcInsn(java.lang.Object):424:424 -> a
-    62:62:void visitIincInsn(int,int):429:429 -> a
-    63:63:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):435:435 -> a
-    64:64:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):440:440 -> a
-    65:65:void visitMultiANewArrayInsn(java.lang.String,int):445:445 -> a
-    66:66:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):452:452 -> a
-    67:67:int com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.getOpcode():137:137 -> a
-    67:67:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):453 -> a
-    68:81:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):454:467 -> a
-    82:86: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):475:479 -> a
-    87:87: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):478:478 -> a
-    88:93: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):509:514 -> a
-    94:94: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):512:512 -> a
-    95:107: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):526:538 -> a
-    108:110:com.android.tools.r8.org.objectweb.asm.tree.LabelNode[] getLabelNodes(com.android.tools.r8.org.objectweb.asm.Label[]):575:577 -> a
-    111:117:java.lang.Object[] getLabelNodes(java.lang.Object[]):583:589 -> a
-    118:120:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):693:695 -> a
-    121:121:void com.android.tools.r8.org.objectweb.asm.tree.ParameterNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:66 -> a
-    121:121:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):695 -> a
-    122:145:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):699:722 -> a
-    146:155:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):721:730 -> a
-    156:206:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):729:779 -> a
-    207:214:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.updateIndex(int):89:96 -> a
-    207:214:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):779 -> a
-    215:215:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):780:780 -> a
-    216:217:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):107:108 -> a
-    216:217:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):780 -> a
-    218:224:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):107:113 -> a
-    218:224:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):780 -> a
-    225:234:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):112:121 -> a
-    225:234:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):780 -> a
-    235:235:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):120:120 -> a
-    235:235:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):780 -> a
-    236:240:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):784:788 -> a
-    241:242:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):89:90 -> a
-    241:242:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):788 -> a
-    243:243:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):89:89 -> a
-    243:243:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):788 -> a
-    244:257:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):792:805 -> a
+    java.util.List tryCatchBlocks -> r
+    int invisibleAnnotableParameterCount -> o
+    int visibleAnnotableParameterCount -> m
+    java.util.List visibleLocalVariableAnnotations -> v
+    java.util.List localVariables -> u
+    com.android.tools.r8.org.objectweb.asm.tree.InsnList instructions -> q
+    java.util.List invisibleLocalVariableAnnotations -> w
+    boolean visited -> x
+    int access -> c
+    java.util.List[] visibleParameterAnnotations -> n
+    java.lang.Object annotationDefault -> l
+    java.util.List[] invisibleParameterAnnotations -> p
+    java.util.List parameters -> f
+    java.util.List invisibleTypeAnnotations -> j
+    java.util.List visibleTypeAnnotations -> i
+    java.util.List invisibleAnnotations -> h
+    int maxLocals -> t
+    java.util.List visibleAnnotations -> g
+    int maxStack -> s
+    java.lang.String desc -> e
+    java.lang.String name -> d
+    java.util.List attrs -> k
+    1:1:void com.android.tools.r8.org.objectweb.asm.MethodVisitor.<init>(int):70:70 -> <init>
+    1:1:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):222 -> <init>
+    2:11:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):223:232 -> <init>
+    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():250:250 -> a
+    2:12:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):262:272 -> a
+    13:15:void visitAnnotableParameterCount(int,boolean):298:300 -> a
+    16:34:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):308:326 -> a
+    35:38:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):333:336 -> a
+    39:45:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):351:357 -> a
+    46:46:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):351:351 -> a
+    47:47:void visitInsn(int):362:362 -> a
+    48:48:void visitTypeInsn(int,java.lang.String):377:377 -> a
+    49:49:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):383:383 -> a
+    50:54:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):405:409 -> a
+    55:55:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):418:418 -> a
+    56:56:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):425:425 -> a
+    57:57:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):430:430 -> a
+    58:58:void visitLdcInsn(java.lang.Object):435:435 -> a
+    59:59:void visitIincInsn(int,int):440:440 -> a
+    60:60:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):446:446 -> a
+    61:61:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):451:451 -> a
+    62:62:void visitMultiANewArrayInsn(java.lang.String,int):456:456 -> a
+    63:63:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):463:463 -> a
+    64:64:int com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.getOpcode():137:137 -> a
+    64:64:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):464 -> a
+    65:78:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):465:478 -> a
+    79:80: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):486:487 -> a
+    81: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):486:486 -> a
+    82:84: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):517:519 -> a
+    85: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):517:517 -> a
+    86: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):531:543 -> a
+    99:101:com.android.tools.r8.org.objectweb.asm.tree.LabelNode[] getLabelNodes(com.android.tools.r8.org.objectweb.asm.Label[]):580:582 -> a
+    102:108:java.lang.Object[] getLabelNodes(java.lang.Object[]):588:594 -> a
+    109:111:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):699:701 -> a
+    112:112:void com.android.tools.r8.org.objectweb.asm.tree.ParameterNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):67:67 -> a
+    112:112:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):701 -> a
+    113:136:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):705:728 -> a
+    137:146:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):727:736 -> a
+    147:197:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):735:785 -> a
+    198:205:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.updateIndex(int):87:94 -> a
+    198:205:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):785 -> a
+    206:206:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):786:786 -> a
+    207:208:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):105:106 -> a
+    207:208:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):786 -> a
+    209:215:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):105:111 -> a
+    209:215:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):786 -> a
+    216:225:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):110:119 -> a
+    216:225:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):786 -> a
+    226:226:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):118:118 -> a
+    226:226:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):786 -> a
+    227:231:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):790:794 -> a
+    232:233:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):89:90 -> a
+    232:233:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):794 -> a
+    234:234:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):89:89 -> a
+    234:234:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):794 -> a
+    235:248:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):798:811 -> a
     void visitCode() -> b
-    1:4:void visitParameter(java.lang.String,int):239:242 -> b
-    5:5:void visitIntInsn(int,int):365:365 -> b
-    6:17:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):485:496 -> b
-    18:18:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):545:545 -> b
-    19:22:com.android.tools.r8.org.objectweb.asm.tree.LabelNode getLabelNode(com.android.tools.r8.org.objectweb.asm.Label):568:571 -> b
+    1:4:void visitParameter(java.lang.String,int):241:244 -> b
+    5:5:void visitIntInsn(int,int):367:367 -> b
+    6:10:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):391:395 -> b
+    11:11:void com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode.<init>(int,java.lang.String,java.lang.String,java.lang.String):73:73 -> b
+    11:11:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):395 -> b
+    12:12:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):395:395 -> b
+    13:24:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):493:504 -> b
+    25:25:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):550:550 -> b
+    26:29:com.android.tools.r8.org.objectweb.asm.tree.LabelNode getLabelNode(com.android.tools.r8.org.objectweb.asm.Label):573:576 -> b
     void visitEnd() -> c
-    1:11:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):278:288 -> c
-    12:13:void visitMaxs(int,int):550:551 -> c
-    1:1:void visitVarInsn(int,int):370:370 -> d
+    1:11:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):280:290 -> c
+    12:13:void visitMaxs(int,int):555:556 -> c
+    1:1:void visitVarInsn(int,int):372:372 -> d
 com.android.tools.r8.org.objectweb.asm.tree.MethodNode$1 -> com.android.tools.r8.h.a.a.c.s:
     com.android.tools.r8.org.objectweb.asm.tree.MethodNode this$0 -> a
-    1:1:void <init>(com.android.tools.r8.org.objectweb.asm.tree.MethodNode,int):249:249 -> <init>
-    1:2:boolean add(java.lang.Object):252:253 -> add
+    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.MultiANewArrayInsnNode -> com.android.tools.r8.h.a.a.c.u:
     java.lang.String desc -> g
     int dims -> h
@@ -41591,7 +40926,7 @@
 com.android.tools.r8.org.objectweb.asm.tree.ParameterNode -> com.android.tools.r8.h.a.a.c.v:
     java.lang.String name -> a
     int access -> b
-    1:3:void <init>(java.lang.String,int):55:57 -> <init>
+    1:3:void <init>(java.lang.String,int):56:58 -> <init>
 com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode -> com.android.tools.r8.h.a.a.c.w:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> i
     int max -> h
@@ -41611,12 +40946,12 @@
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode handler -> c
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode end -> b
     java.lang.String type -> d
-    1:5:void <init>(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.lang.String):73:77 -> <init>
+    1:5:void <init>(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.lang.String):71:75 -> <init>
 com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> com.android.tools.r8.h.a.a.c.y:
     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):81:83 -> <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.h.a.a.c.z:
     java.lang.String desc -> g
     1:2:void <init>(int,java.lang.String):56:57 -> <init>
@@ -41639,8 +40974,8 @@
     java.lang.StringBuilder stringBuilder -> b
     java.lang.String[] OPCODES -> d
     int api -> a
-    1:224:void <clinit>():53:276 -> <clinit>
-    1:4:void <init>(int):323:326 -> <init>
+    1:224:void <clinit>():52:275 -> <clinit>
+    1:5:void <init>(int):330:334 -> <init>
     void visit(java.lang.String,java.lang.Object) -> a
     com.android.tools.r8.org.objectweb.asm.util.Printer visitAnnotation(java.lang.String,java.lang.String) -> a
     com.android.tools.r8.org.objectweb.asm.util.Printer visitArray(java.lang.String) -> a
@@ -41653,11 +40988,12 @@
     void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean) -> a
     com.android.tools.r8.org.objectweb.asm.util.Printer visitParameterAnnotation(int,java.lang.String,boolean) -> a
     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:1:java.util.List getText():1120:1120 -> a
-    2:2:void print(java.io.PrintWriter):1129:1129 -> a
-    3:7:void printList(java.io.PrintWriter,java.util.List):1140:1144 -> a
-    8:30:void appendString(java.lang.StringBuilder,java.lang.String):1156:1178 -> a
-    31:44:void appendString(java.lang.StringBuilder,java.lang.String):1168:1181 -> a
+    1:6:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):895:900 -> a
+    7:7:java.util.List getText():1147:1147 -> a
+    8:8:void print(java.io.PrintWriter):1156:1156 -> a
+    9:13:void printList(java.io.PrintWriter,java.util.List):1167:1171 -> a
+    14:36:void appendString(java.lang.StringBuilder,java.lang.String):1197:1219 -> a
+    37:50:void appendString(java.lang.StringBuilder,java.lang.String):1209:1222 -> a
     com.android.tools.r8.org.objectweb.asm.util.Printer visitAnnotationDefault() -> b
     void visitAnnotationEnd() -> c
     void visitCode() -> d
@@ -41670,139 +41006,153 @@
     java.lang.String tab3 -> h
     int access -> k
     java.util.Map labelNames -> j
-    java.util.List FRAME_TYPES -> m
-    1:2:void <clinit>():104:105 -> <clinit>
-    1:3:void <init>():135:137 -> <init>
-    4:4:void <init>(int):148:148 -> <init>
-    5:14:void <init>(int):108:117 -> <init>
-    1:3:void visit(java.lang.String,java.lang.Object):542:544 -> a
-    4:4:void visitString(java.lang.String):652:652 -> a
-    4:4:void visit(java.lang.String,java.lang.Object):544 -> a
-    5:6:void visit(java.lang.String,java.lang.Object):545:546 -> a
-    7:7:void visitType(com.android.tools.r8.org.objectweb.asm.Type):656:656 -> a
-    7:7:void visit(java.lang.String,java.lang.Object):546 -> a
-    8:9:void visit(java.lang.String,java.lang.Object):547:548 -> a
-    10:10:void visitByte(byte):644:644 -> a
-    10:10:void visit(java.lang.String,java.lang.Object):548 -> a
-    11:12:void visit(java.lang.String,java.lang.Object):549:550 -> a
-    13:13:void visitBoolean(boolean):648:648 -> a
-    13:13:void visit(java.lang.String,java.lang.Object):550 -> a
-    14:15:void visit(java.lang.String,java.lang.Object):551:552 -> a
-    16:16:void visitShort(short):640:640 -> a
-    16:16:void visit(java.lang.String,java.lang.Object):552 -> a
-    17:18:void visit(java.lang.String,java.lang.Object):553:554 -> a
-    19:19:void visitChar(char):636:636 -> a
-    19:19:void visit(java.lang.String,java.lang.Object):554 -> a
-    20:21:void visit(java.lang.String,java.lang.Object):555:556 -> a
-    22:22:void visitInt(int):620:620 -> a
-    22:22:void visit(java.lang.String,java.lang.Object):556 -> a
-    23:24:void visit(java.lang.String,java.lang.Object):557:558 -> a
-    25:25:void visitFloat(float):628:628 -> a
-    25:25:void visit(java.lang.String,java.lang.Object):558 -> a
-    26:27:void visit(java.lang.String,java.lang.Object):559:560 -> a
-    28:28:void visitLong(long):624:624 -> a
-    28:28:void visit(java.lang.String,java.lang.Object):560 -> a
-    29:30:void visit(java.lang.String,java.lang.Object):561:562 -> a
-    31:31:void visitDouble(double):632:632 -> a
-    31:31:void visit(java.lang.String,java.lang.Object):562 -> a
-    32:38:void visit(java.lang.String,java.lang.Object):563:569 -> a
-    39:39:void visitByte(byte):644:644 -> a
-    39:39:void visit(java.lang.String,java.lang.Object):569 -> a
-    40:44:void visit(java.lang.String,java.lang.Object):571:575 -> a
-    45:45:void visitBoolean(boolean):648:648 -> a
-    45:45:void visit(java.lang.String,java.lang.Object):575 -> a
-    46:50:void visit(java.lang.String,java.lang.Object):577:581 -> a
-    51:51:void visitShort(short):640:640 -> a
-    51:51:void visit(java.lang.String,java.lang.Object):581 -> a
-    52:56:void visit(java.lang.String,java.lang.Object):583:587 -> a
-    57:57:void visitChar(char):636:636 -> a
-    57:57:void visit(java.lang.String,java.lang.Object):587 -> a
-    58:62:void visit(java.lang.String,java.lang.Object):589:593 -> a
-    63:63:void visitInt(int):620:620 -> a
-    63:63:void visit(java.lang.String,java.lang.Object):593 -> a
-    64:68:void visit(java.lang.String,java.lang.Object):595:599 -> a
-    69:69:void visitLong(long):624:624 -> a
-    69:69:void visit(java.lang.String,java.lang.Object):599 -> a
-    70:74:void visit(java.lang.String,java.lang.Object):601:605 -> a
-    75:75:void visitFloat(float):628:628 -> a
-    75:75:void visit(java.lang.String,java.lang.Object):605 -> a
-    76:80:void visit(java.lang.String,java.lang.Object):607:611 -> a
-    81:81:void visitDouble(double):632:632 -> a
-    81:81:void visit(java.lang.String,java.lang.Object):611 -> a
-    82:84:void visit(java.lang.String,java.lang.Object):614:616 -> a
-    85:88:void visitEnum(java.lang.String,java.lang.String,java.lang.String):661:664 -> a
-    89:94:com.android.tools.r8.org.objectweb.asm.util.Textifier visitAnnotation(java.lang.String,java.lang.String):669:674 -> a
-    89:94:com.android.tools.r8.org.objectweb.asm.util.Printer visitAnnotation(java.lang.String,java.lang.String):51 -> a
-    95:98:com.android.tools.r8.org.objectweb.asm.util.Textifier visitArray(java.lang.String):679:682 -> a
-    95:98:com.android.tools.r8.org.objectweb.asm.util.Printer visitArray(java.lang.String):51 -> a
-    99:110:com.android.tools.r8.org.objectweb.asm.util.Textifier visitParameterAnnotation(int,java.lang.String,boolean):766:777 -> a
-    99:110:com.android.tools.r8.org.objectweb.asm.util.Printer visitParameterAnnotation(int,java.lang.String,boolean):51 -> a
-    111:139:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):797:825 -> a
-    140:141:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):821:822 -> a
-    142:142:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):818:818 -> a
-    143:143:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):815:815 -> a
-    144:146:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):810:812 -> a
-    147:172:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):803:828 -> a
-    173:182:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):885:894 -> a
-    183:204:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):903:924 -> a
-    205:205:void visitType(com.android.tools.r8.org.objectweb.asm.Type):656:656 -> a
-    205:205:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):926 -> a
-    206:217:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):928:939 -> a
-    218:229:com.android.tools.r8.org.objectweb.asm.util.Printer visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1053:1064 -> a
-    230:242: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):1075:1087 -> a
-    243:255:void appendJavaDeclaration(java.lang.String,java.lang.String):1307:1319 -> a
-    243:255: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):1088 -> a
-    256:256: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):1090:1090 -> a
-    257:275:com.android.tools.r8.org.objectweb.asm.util.Printer 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):1102:1120 -> a
-    276:281:com.android.tools.r8.org.objectweb.asm.util.Textifier visitAnnotation(java.lang.String,boolean):1161:1166 -> a
-    276:281:com.android.tools.r8.org.objectweb.asm.util.Textifier visitMethodAnnotation(java.lang.String,boolean):744 -> a
-    276:281:com.android.tools.r8.org.objectweb.asm.util.Printer visitMethodAnnotation(java.lang.String,boolean):51 -> a
-    282:282:void appendDescriptor(int,java.lang.String):1296:1296 -> a
-    283:283:void appendDescriptor(int,java.lang.String):1293:1293 -> a
-    284:292:void appendLabel(com.android.tools.r8.org.objectweb.asm.Label):1329:1337 -> a
-    293:330:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1346:1383 -> a
-    331:347:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1363:1379 -> a
-    348:356:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1367:1375 -> a
-    357:357:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1360:1360 -> a
-    358:358:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1357:1357 -> a
-    359:359:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1354:1354 -> a
-    360:407:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1351:1398 -> a
-    408:497:void appendTypeReference(int):1420:1509 -> a
-    498:500:void appendTypeReference(int):1504:1506 -> a
-    501:503:void appendTypeReference(int):1499:1501 -> a
-    504:506:void appendTypeReference(int):1494:1496 -> a
-    507:509:void appendTypeReference(int):1489:1491 -> a
-    510:510:void appendTypeReference(int):1486:1486 -> a
-    511:511:void appendTypeReference(int):1483:1483 -> a
-    512:512:void appendTypeReference(int):1480:1480 -> a
-    513:513:void appendTypeReference(int):1477:1477 -> a
-    514:514:void appendTypeReference(int):1474:1474 -> a
-    515:515:void appendTypeReference(int):1471:1471 -> a
-    516:516:void appendTypeReference(int):1468:1468 -> a
-    517:517:void appendTypeReference(int):1465:1465 -> a
-    518:518:void appendTypeReference(int):1462:1462 -> a
-    519:521:void appendTypeReference(int):1457:1459 -> a
-    522:522:void appendTypeReference(int):1454:1454 -> a
-    523:523:void appendTypeReference(int):1451:1451 -> a
-    524:524:void appendTypeReference(int):1448:1448 -> a
-    525:529:void appendTypeReference(int):1441:1445 -> a
-    530:534:void appendTypeReference(int):1434:1438 -> a
-    535:535:void appendTypeReference(int):1431:1431 -> a
-    536:538:void appendTypeReference(int):1426:1428 -> a
-    539:539:void appendTypeReference(int):1423:1423 -> a
-    540:552:void appendFrameTypes(int,java.lang.Object[]):1523:1535 -> a
-    1:2:com.android.tools.r8.org.objectweb.asm.util.Textifier visitAnnotationDefault():738:739 -> b
-    1:2:com.android.tools.r8.org.objectweb.asm.util.Printer visitAnnotationDefault():51 -> b
-    3:14:com.android.tools.r8.org.objectweb.asm.util.Textifier visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1182:1193 -> b
-    15:15:void maybeAppendComma(int):1410:1410 -> b
-    16:16:com.android.tools.r8.org.objectweb.asm.util.Textifier createTextifier():1561:1561 -> b
-    16:16:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1547 -> b
-    17:17:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1548:1548 -> b
-    18:18:java.util.List com.android.tools.r8.org.objectweb.asm.util.Printer.getText():1120:1120 -> b
-    18:18:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1548 -> b
-    19:21:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1548:1550 -> b
+    1:1:void <init>(int):125:125 -> <init>
+    1:1:void <init>():111 -> <init>
+    2:11:void <init>(int):84:93 -> <init>
+    2:11:void <init>():111 -> <init>
+    12:13:void <init>():112:113 -> <init>
+    1:3:void visit(java.lang.String,java.lang.Object):515:517 -> a
+    4:4:void visitString(java.lang.String):625:625 -> a
+    4:4:void visit(java.lang.String,java.lang.Object):517 -> a
+    5:6:void visit(java.lang.String,java.lang.Object):518:519 -> a
+    7:7:void visitType(com.android.tools.r8.org.objectweb.asm.Type):629:629 -> a
+    7:7:void visit(java.lang.String,java.lang.Object):519 -> a
+    8:9:void visit(java.lang.String,java.lang.Object):520:521 -> a
+    10:10:void visitByte(byte):617:617 -> a
+    10:10:void visit(java.lang.String,java.lang.Object):521 -> a
+    11:12:void visit(java.lang.String,java.lang.Object):522:523 -> a
+    13:13:void visitBoolean(boolean):621:621 -> a
+    13:13:void visit(java.lang.String,java.lang.Object):523 -> a
+    14:15:void visit(java.lang.String,java.lang.Object):524:525 -> a
+    16:16:void visitShort(short):613:613 -> a
+    16:16:void visit(java.lang.String,java.lang.Object):525 -> a
+    17:18:void visit(java.lang.String,java.lang.Object):526:527 -> a
+    19:19:void visitChar(char):609:609 -> a
+    19:19:void visit(java.lang.String,java.lang.Object):527 -> a
+    20:21:void visit(java.lang.String,java.lang.Object):528:529 -> a
+    22:22:void visitInt(int):593:593 -> a
+    22:22:void visit(java.lang.String,java.lang.Object):529 -> a
+    23:24:void visit(java.lang.String,java.lang.Object):530:531 -> a
+    25:25:void visitFloat(float):601:601 -> a
+    25:25:void visit(java.lang.String,java.lang.Object):531 -> a
+    26:27:void visit(java.lang.String,java.lang.Object):532:533 -> a
+    28:28:void visitLong(long):597:597 -> a
+    28:28:void visit(java.lang.String,java.lang.Object):533 -> a
+    29:30:void visit(java.lang.String,java.lang.Object):534:535 -> a
+    31:31:void visitDouble(double):605:605 -> a
+    31:31:void visit(java.lang.String,java.lang.Object):535 -> a
+    32:38:void visit(java.lang.String,java.lang.Object):536:542 -> a
+    39:39:void visitByte(byte):617:617 -> a
+    39:39:void visit(java.lang.String,java.lang.Object):542 -> a
+    40:44:void visit(java.lang.String,java.lang.Object):544:548 -> a
+    45:45:void visitBoolean(boolean):621:621 -> a
+    45:45:void visit(java.lang.String,java.lang.Object):548 -> a
+    46:50:void visit(java.lang.String,java.lang.Object):550:554 -> a
+    51:51:void visitShort(short):613:613 -> a
+    51:51:void visit(java.lang.String,java.lang.Object):554 -> a
+    52:56:void visit(java.lang.String,java.lang.Object):556:560 -> a
+    57:57:void visitChar(char):609:609 -> a
+    57:57:void visit(java.lang.String,java.lang.Object):560 -> a
+    58:62:void visit(java.lang.String,java.lang.Object):562:566 -> a
+    63:63:void visitInt(int):593:593 -> a
+    63:63:void visit(java.lang.String,java.lang.Object):566 -> a
+    64:68:void visit(java.lang.String,java.lang.Object):568:572 -> a
+    69:69:void visitLong(long):597:597 -> a
+    69:69:void visit(java.lang.String,java.lang.Object):572 -> a
+    70:74:void visit(java.lang.String,java.lang.Object):574:578 -> a
+    75:75:void visitFloat(float):601:601 -> a
+    75:75:void visit(java.lang.String,java.lang.Object):578 -> a
+    76:80:void visit(java.lang.String,java.lang.Object):580:584 -> a
+    81:81:void visitDouble(double):605:605 -> a
+    81:81:void visit(java.lang.String,java.lang.Object):584 -> a
+    82:84:void visit(java.lang.String,java.lang.Object):587:589 -> a
+    85:88:void visitEnum(java.lang.String,java.lang.String,java.lang.String):634:637 -> a
+    89:94:com.android.tools.r8.org.objectweb.asm.util.Textifier visitAnnotation(java.lang.String,java.lang.String):642:647 -> a
+    89:94:com.android.tools.r8.org.objectweb.asm.util.Printer visitAnnotation(java.lang.String,java.lang.String):47 -> a
+    95:98:com.android.tools.r8.org.objectweb.asm.util.Textifier visitArray(java.lang.String):652:655 -> a
+    95:98:com.android.tools.r8.org.objectweb.asm.util.Printer visitArray(java.lang.String):47 -> a
+    99:110:com.android.tools.r8.org.objectweb.asm.util.Textifier visitParameterAnnotation(int,java.lang.String,boolean):739:750 -> a
+    99:110:com.android.tools.r8.org.objectweb.asm.util.Printer visitParameterAnnotation(int,java.lang.String,boolean):47 -> a
+    111:139:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):782:810 -> a
+    140:141:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):806:807 -> a
+    142:142:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):803:803 -> a
+    143:143:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):800:800 -> a
+    144:146:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):795:797 -> a
+    147:172:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):788:813 -> a
+    173:177:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):868:872 -> a
+    178:178:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):882:882 -> a
+    179:179:void com.android.tools.r8.org.objectweb.asm.util.Printer.visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):924:924 -> a
+    179:179:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):883 -> a
+    180:185:void com.android.tools.r8.org.objectweb.asm.util.Printer.visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):922:927 -> a
+    180:185:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):883 -> a
+    186:186:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):886:886 -> a
+    187:209:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):913:935 -> a
+    210:210:void visitType(com.android.tools.r8.org.objectweb.asm.Type):629:629 -> a
+    210:210:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):937 -> a
+    211:222:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):939:950 -> a
+    223:234:com.android.tools.r8.org.objectweb.asm.util.Printer visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1064:1075 -> a
+    235:247: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):1086:1098 -> a
+    248:259:void appendJavaDeclaration(java.lang.String):1315:1326 -> a
+    248:259: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):1099 -> a
+    260:260: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):1101:1101 -> a
+    261:279:com.android.tools.r8.org.objectweb.asm.util.Printer 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):1113:1131 -> a
+    280:285:com.android.tools.r8.org.objectweb.asm.util.Textifier visitAnnotation(java.lang.String,boolean):1171:1176 -> a
+    280:285:com.android.tools.r8.org.objectweb.asm.util.Textifier visitMethodAnnotation(java.lang.String,boolean):717 -> a
+    280:285:com.android.tools.r8.org.objectweb.asm.util.Printer visitMethodAnnotation(java.lang.String,boolean):47 -> a
+    286:286:void appendDescriptor(int,java.lang.String):1305:1305 -> a
+    287:287:void appendDescriptor(int,java.lang.String):1302:1302 -> a
+    288:296:void appendLabel(com.android.tools.r8.org.objectweb.asm.Label):1336:1344 -> a
+    297:334:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1353:1390 -> a
+    335:351:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1370:1386 -> a
+    352:360:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1374:1382 -> a
+    361:361:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1367:1367 -> a
+    362:362:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1364:1364 -> a
+    363:363:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1361:1361 -> a
+    364:411:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1358:1405 -> a
+    412:501:void appendTypeReference(int):1427:1516 -> a
+    502:504:void appendTypeReference(int):1511:1513 -> a
+    505:507:void appendTypeReference(int):1506:1508 -> a
+    508:510:void appendTypeReference(int):1501:1503 -> a
+    511:513:void appendTypeReference(int):1496:1498 -> a
+    514:514:void appendTypeReference(int):1493:1493 -> a
+    515:515:void appendTypeReference(int):1490:1490 -> a
+    516:516:void appendTypeReference(int):1487:1487 -> a
+    517:517:void appendTypeReference(int):1484:1484 -> a
+    518:518:void appendTypeReference(int):1481:1481 -> a
+    519:519:void appendTypeReference(int):1478:1478 -> a
+    520:520:void appendTypeReference(int):1475:1475 -> a
+    521:521:void appendTypeReference(int):1472:1472 -> a
+    522:522:void appendTypeReference(int):1469:1469 -> a
+    523:525:void appendTypeReference(int):1464:1466 -> a
+    526:526:void appendTypeReference(int):1461:1461 -> a
+    527:527:void appendTypeReference(int):1458:1458 -> a
+    528:528:void appendTypeReference(int):1455:1455 -> a
+    529:533:void appendTypeReference(int):1448:1452 -> a
+    534:538:void appendTypeReference(int):1441:1445 -> a
+    539:539:void appendTypeReference(int):1438:1438 -> a
+    540:542:void appendTypeReference(int):1433:1435 -> a
+    543:543:void appendTypeReference(int):1430:1430 -> a
+    544:577:void appendFrameTypes(int,java.lang.Object[]):1530:1563 -> a
+    578:578:void appendFrameTypes(int,java.lang.Object[]):1560:1560 -> a
+    579:579:void appendFrameTypes(int,java.lang.Object[]):1557:1557 -> a
+    580:580:void appendFrameTypes(int,java.lang.Object[]):1554:1554 -> a
+    581:581:void appendFrameTypes(int,java.lang.Object[]):1551:1551 -> a
+    582:582:void appendFrameTypes(int,java.lang.Object[]):1548:1548 -> a
+    583:583:void appendFrameTypes(int,java.lang.Object[]):1545:1545 -> a
+    584:608:void appendFrameTypes(int,java.lang.Object[]):1542:1566 -> a
+    1:2:com.android.tools.r8.org.objectweb.asm.util.Textifier visitAnnotationDefault():711:712 -> b
+    1:2:com.android.tools.r8.org.objectweb.asm.util.Printer visitAnnotationDefault():47 -> b
+    3:12:void doVisitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):895:904 -> b
+    13:24:com.android.tools.r8.org.objectweb.asm.util.Textifier visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1192:1203 -> b
+    25:25:void maybeAppendComma(int):1417:1417 -> b
+    26:26:com.android.tools.r8.org.objectweb.asm.util.Textifier createTextifier():1592:1592 -> b
+    26:26:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1578 -> b
+    27:27:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1579:1579 -> b
+    28:28:java.util.List com.android.tools.r8.org.objectweb.asm.util.Printer.getText():1147:1147 -> b
+    28:28:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1579 -> b
+    29:31:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1579:1581 -> b
     void visitAnnotationEnd() -> c
-    1:4:void visitAnnotationValue(java.lang.String):691:694 -> c
+    1:4:void visitAnnotationValue(java.lang.String):664:667 -> c
     void visitCode() -> d
     void visitMethodEnd() -> e
 com.android.tools.r8.org.objectweb.asm.util.TraceAnnotationVisitor -> com.android.tools.r8.h.a.a.d.c:
@@ -41814,110 +41164,107 @@
     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.h.a.a.d.d:
-    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:2:void <init>(com.android.tools.r8.org.objectweb.asm.util.Printer):55 -> <init>
-    1:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):77:79 -> a
-    4:4:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):92:92 -> a
-    5:18:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):1202:1215 -> a
-    5:18:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMethodAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):782 -> a
-    5:18:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):92 -> a
-    19:19:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):93:93 -> a
-    20:21:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():98:99 -> a
-    22:22:void visitAnnotableParameterCount(int,boolean):104:104 -> a
-    23:27:com.android.tools.r8.org.objectweb.asm.util.Textifier com.android.tools.r8.org.objectweb.asm.util.Textifier.visitAnnotableParameterCount(int,boolean):755:759 -> a
-    23:27:com.android.tools.r8.org.objectweb.asm.util.Printer com.android.tools.r8.org.objectweb.asm.util.Textifier.visitAnnotableParameterCount(int,boolean):51 -> a
-    23:27:void visitAnnotableParameterCount(int,boolean):104 -> a
-    28:28:void visitAnnotableParameterCount(int,boolean):105:105 -> a
-    29:31:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):111:113 -> a
-    32:33:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):129:130 -> a
-    34:34:void visitInsn(int):135:135 -> a
-    35:37:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitInsn(int):833:835 -> a
-    35:37:void visitInsn(int):135 -> a
-    38:38:void visitInsn(int):136:136 -> a
-    39:39:void visitTypeInsn(int,java.lang.String):153:153 -> a
-    40:44:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitTypeInsn(int,java.lang.String):859:863 -> a
-    40:44:void visitTypeInsn(int,java.lang.String):153 -> a
-    45:45:void visitTypeInsn(int,java.lang.String):154:154 -> a
-    46:46:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):160:160 -> a
-    47:53:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):869:875 -> a
-    47:53:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):160 -> a
-    54:54:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):161:161 -> a
-    55:63:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):173:181 -> a
-    64:64:void com.android.tools.r8.org.objectweb.asm.util.Printer.visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):880:880 -> a
-    64:64:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):181 -> a
-    65:76:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):175:186 -> a
-    77:78:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):196:197 -> a
-    79:79:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):202:202 -> a
-    80:84:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):944:948 -> a
-    80:84:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):202 -> a
-    85:85:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):203:203 -> a
-    86:86:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):208:208 -> a
-    87:91:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLabel(com.android.tools.r8.org.objectweb.asm.Label):953:957 -> a
-    87:91:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):208 -> a
-    92:92:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):209:209 -> a
-    93:93:void visitLdcInsn(java.lang.Object):214:214 -> a
-    94:104:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLdcInsn(java.lang.Object):962:972 -> a
-    94:104:void visitLdcInsn(java.lang.Object):214 -> a
-    105:105:void visitLdcInsn(java.lang.Object):215:215 -> a
-    106:106:void visitIincInsn(int,int):220:220 -> a
-    107:115:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitIincInsn(int,int):977:985 -> a
-    107:115:void visitIincInsn(int,int):220 -> a
-    116:116:void visitIincInsn(int,int):221:221 -> a
-    117:117:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):227:227 -> a
-    118:128: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[]):991:1001 -> a
-    118:128:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):227 -> a
-    129:129:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):228:228 -> a
-    130:130:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):233:233 -> a
-    131:141: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[]):1006:1016 -> a
-    131:141:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):233 -> a
-    142:142:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):234:234 -> a
-    143:143:void visitMultiANewArrayInsn(java.lang.String,int):239:239 -> a
-    144:148:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMultiANewArrayInsn(java.lang.String,int):1021:1025 -> a
-    144:148:void visitMultiANewArrayInsn(java.lang.String,int):239 -> a
-    149:149:void visitMultiANewArrayInsn(java.lang.String,int):240:240 -> a
-    150:150: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
-    151:151: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):1031:1031 -> a
-    151:151:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):246 -> a
-    152:153: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
-    154:154: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
-    155:165: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):1037:1047 -> a
-    155:165: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
-    166:166: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
-    167:168: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:275 -> a
-    169:172: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:3:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitParameter(java.lang.String,int):729:730 -> b
-    2:3:void visitParameter(java.lang.String,int):71 -> b
-    4:40:void com.android.tools.r8.org.objectweb.asm.util.Textifier.appendAccess(int):1229:1265 -> b
-    4:40:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitParameter(java.lang.String,int):731 -> b
-    4:40:void visitParameter(java.lang.String,int):71 -> b
-    41:42:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitParameter(java.lang.String,int):732:733 -> b
-    41:42:void visitParameter(java.lang.String,int):71 -> b
-    43:43:void visitParameter(java.lang.String,int):72:72 -> b
-    44:45:void visitCode():118:119 -> b
-    46:46:void visitIntInsn(int,int):141:141 -> b
-    47:54:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitIntInsn(int,int):840:847 -> b
-    47:54:void visitIntInsn(int,int):141 -> b
-    55:55:void visitIntInsn(int,int):142:142 -> b
-    56:58:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):261:263 -> b
-    59:59:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):297:297 -> b
-    60:64:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):1125:1129 -> b
-    60:64:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):297 -> b
-    65:65:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):298:298 -> b
-    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):85:85 -> c
-    2:2:com.android.tools.r8.org.objectweb.asm.util.Printer com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMethodTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):750:750 -> c
-    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
-    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 visitMaxs(int,int):303:303 -> c
-    6:12:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMaxs(int,int):1134:1140 -> c
-    6:12:void visitMaxs(int,int):303 -> c
-    13:13:void visitMaxs(int,int):304:304 -> c
-    14:15:void visitEnd():309:310 -> c
-    1:1:void visitVarInsn(int,int):147:147 -> d
-    2:4:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitVarInsn(int,int):852:854 -> d
-    2:4:void visitVarInsn(int,int):147 -> d
-    5:5:void visitVarInsn(int,int):148:148 -> d
+    com.android.tools.r8.org.objectweb.asm.util.Printer p -> c
+    1:2:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.util.Printer):64:65 -> <init>
+    1:2:void <init>(com.android.tools.r8.org.objectweb.asm.util.Printer):54 -> <init>
+    1:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):76:78 -> a
+    4:4:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):91:91 -> a
+    5:17:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMethodAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):755:767 -> a
+    5:17:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):91 -> a
+    18:18:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):92:92 -> a
+    19:20:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():97:98 -> a
+    21:21:void visitAnnotableParameterCount(int,boolean):103:103 -> a
+    22:26:com.android.tools.r8.org.objectweb.asm.util.Textifier com.android.tools.r8.org.objectweb.asm.util.Textifier.visitAnnotableParameterCount(int,boolean):728:732 -> a
+    22:26:com.android.tools.r8.org.objectweb.asm.util.Printer com.android.tools.r8.org.objectweb.asm.util.Textifier.visitAnnotableParameterCount(int,boolean):47 -> a
+    22:26:void visitAnnotableParameterCount(int,boolean):103 -> a
+    27:27:void visitAnnotableParameterCount(int,boolean):104:104 -> a
+    28:30:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):110:112 -> a
+    31:32:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):128:129 -> a
+    33:33:void visitInsn(int):134:134 -> a
+    34:36:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitInsn(int):818:820 -> a
+    34:36:void visitInsn(int):134 -> a
+    37:37:void visitInsn(int):135:135 -> a
+    38:38:void visitTypeInsn(int,java.lang.String):152:152 -> a
+    39:43:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitTypeInsn(int,java.lang.String):844:848 -> a
+    39:43:void visitTypeInsn(int,java.lang.String):152 -> a
+    44:44:void visitTypeInsn(int,java.lang.String):153:153 -> a
+    45:45:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):159:159 -> a
+    46:52:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):854:860 -> a
+    46:52:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):159 -> a
+    53:53:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):160:160 -> a
+    54:60:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):185:191 -> a
+    61:62:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):201:202 -> a
+    63:63:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):207:207 -> a
+    64:68:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):955:959 -> a
+    64:68:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):207 -> a
+    69:69:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):208:208 -> a
+    70:70:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):213:213 -> a
+    71:75:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLabel(com.android.tools.r8.org.objectweb.asm.Label):964:968 -> a
+    71:75:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):213 -> a
+    76:76:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):214:214 -> a
+    77:77:void visitLdcInsn(java.lang.Object):219:219 -> a
+    78:88:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLdcInsn(java.lang.Object):973:983 -> a
+    78:88:void visitLdcInsn(java.lang.Object):219 -> a
+    89:89:void visitLdcInsn(java.lang.Object):220:220 -> a
+    90:90:void visitIincInsn(int,int):225:225 -> a
+    91:99:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitIincInsn(int,int):988:996 -> a
+    91:99:void visitIincInsn(int,int):225 -> a
+    100:100:void visitIincInsn(int,int):226:226 -> a
+    101:101:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):232:232 -> a
+    102:112: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[]):1002:1012 -> a
+    102:112:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):232 -> a
+    113:113:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):233:233 -> a
+    114:114:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):238:238 -> a
+    115:125: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[]):1017:1027 -> a
+    115:125:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):238 -> a
+    126:126:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):239:239 -> a
+    127:127:void visitMultiANewArrayInsn(java.lang.String,int):244:244 -> a
+    128:132:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMultiANewArrayInsn(java.lang.String,int):1032:1036 -> a
+    128:132:void visitMultiANewArrayInsn(java.lang.String,int):244 -> a
+    133:133:void visitMultiANewArrayInsn(java.lang.String,int):245:245 -> a
+    134:134:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):251:251 -> a
+    135:135: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):1042:1042 -> a
+    135:135:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):251 -> a
+    136:137:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):252:253 -> a
+    138:138: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):259:259 -> a
+    139:149: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):1048:1058 -> a
+    139:149: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):259 -> a
+    150:150: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):260:260 -> a
+    151:152: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):279:280 -> a
+    153:156: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):292:295 -> a
+    1:1:void visitParameter(java.lang.String,int):70:70 -> b
+    2:3:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitParameter(java.lang.String,int):702:703 -> b
+    2:3:void visitParameter(java.lang.String,int):70 -> b
+    4:40:void com.android.tools.r8.org.objectweb.asm.util.Textifier.appendAccess(int):1238:1274 -> b
+    4:40:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitParameter(java.lang.String,int):704 -> b
+    4:40:void visitParameter(java.lang.String,int):70 -> b
+    41:42:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitParameter(java.lang.String,int):705:706 -> b
+    41:42:void visitParameter(java.lang.String,int):70 -> b
+    43:43:void visitParameter(java.lang.String,int):71:71 -> b
+    44:45:void visitCode():117:118 -> b
+    46:46:void visitIntInsn(int,int):140:140 -> b
+    47:54:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitIntInsn(int,int):825:832 -> b
+    47:54:void visitIntInsn(int,int):140 -> b
+    55:55:void visitIntInsn(int,int):141:141 -> b
+    56:62:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):168:174 -> b
+    63:65:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):266:268 -> b
+    66:66:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):302:302 -> b
+    67:71:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):1136:1140 -> b
+    67:71:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):302 -> b
+    72:72:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):303:303 -> b
+    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):84:84 -> c
+    2:2:com.android.tools.r8.org.objectweb.asm.util.Printer com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMethodTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):723:723 -> c
+    2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):84 -> c
+    3:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):85:86 -> c
+    5:5:void visitMaxs(int,int):308:308 -> c
+    6:12:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMaxs(int,int):1145:1151 -> c
+    6:12:void visitMaxs(int,int):308 -> c
+    13:13:void visitMaxs(int,int):309:309 -> c
+    14:15:void visitEnd():314:315 -> c
+    1:1:void visitVarInsn(int,int):146:146 -> d
+    2:4:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitVarInsn(int,int):837:839 -> d
+    2:4:void visitVarInsn(int,int):146 -> d
+    5:5:void visitVarInsn(int,int):147:147 -> d
 com.android.tools.r8.org.objectweb.asm.util.TraceSignatureVisitor -> com.android.tools.r8.h.a.a.d.e:
     int arrayStack -> j
     java.lang.String separator -> k
@@ -41926,39 +41273,41 @@
     boolean formalTypeParameterVisited -> e
     boolean interfaceBoundVisited -> f
     boolean parameterTypeVisited -> g
-    java.util.Map BASE_TYPES -> l
     boolean interfaceVisited -> h
     boolean isInterface -> a
     java.lang.StringBuilder exceptions -> d
     java.lang.StringBuilder returnType -> c
-    1:11:void <clinit>():52:62 -> <clinit>
-    1:1:void <init>(int):112:112 -> <init>
-    2:12:void <init>(int):104:114 -> <init>
-    13:13:void <init>(java.lang.StringBuilder):118:118 -> <init>
-    14:30:void <init>(java.lang.StringBuilder):104:120 -> <init>
-    1:6:void visitBaseType(char):203:208 -> a
-    7:7:void visitBaseType(char):205:205 -> a
-    8:9:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitArrayType():220:221 -> a
-    10:21:void visitClassType(java.lang.String):227:238 -> a
-    1:3:void visitFormalTypeParameter(java.lang.String):125:127 -> b
-    4:5:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitClassBound():132:133 -> b
-    6:19:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitTypeArgument(char):266:279 -> b
-    1:8:void visitInnerClassType(java.lang.String):243:250 -> c
-    9:13:void visitEnd():285:289 -> c
-    1:6:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitExceptionType():193:198 -> d
-    7:9:void visitTypeVariable(java.lang.String):213:215 -> d
-    1:7:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitInterface():155:161 -> e
-    1:3:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitInterfaceBound():139:141 -> f
-    1:8:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitParameterType():167:174 -> g
-    1:9:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitReturnType():180:188 -> h
-    1:3:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitSuperclass():147:149 -> i
-    1:7:void visitTypeArgument():255:261 -> j
-    1:1:java.lang.String getDeclaration():300:300 -> k
-    1:1:java.lang.String getExceptions():318:318 -> l
-    1:1:java.lang.String getReturnType():309:309 -> m
-    1:3:void endFormals():324:326 -> n
-    1:6:void endType():335:340 -> o
-    1:1:void startType():331:331 -> p
+    1:1:void <init>(int):93:93 -> <init>
+    2:12:void <init>(int):85:95 -> <init>
+    13:13:void <init>(java.lang.StringBuilder):99:99 -> <init>
+    14:30:void <init>(java.lang.StringBuilder):85:101 -> <init>
+    1:1:void visitBaseType(char):213:213 -> a
+    2:2:void visitBaseType(char):195:195 -> a
+    3:18:void visitBaseType(char):186:201 -> a
+    19:37:void visitBaseType(char):192:210 -> a
+    38:38:void visitBaseType(char):204:204 -> a
+    39:65:void visitBaseType(char):189:215 -> a
+    66:67:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitArrayType():227:228 -> a
+    68:79:void visitClassType(java.lang.String):234:245 -> a
+    1:3:void visitFormalTypeParameter(java.lang.String):106:108 -> b
+    4:5:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitClassBound():113:114 -> b
+    6:19:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitTypeArgument(char):273:286 -> b
+    1:8:void visitInnerClassType(java.lang.String):250:257 -> c
+    9:13:void visitEnd():292:296 -> c
+    1:6:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitExceptionType():174:179 -> d
+    7:9:void visitTypeVariable(java.lang.String):220:222 -> d
+    1:7:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitInterface():136:142 -> e
+    1:3:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitInterfaceBound():120:122 -> f
+    1:8:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitParameterType():148:155 -> g
+    1:9:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitReturnType():161:169 -> h
+    1:3:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitSuperclass():128:130 -> i
+    1:7:void visitTypeArgument():262:268 -> j
+    1:1:java.lang.String getDeclaration():303:303 -> k
+    1:1:java.lang.String getExceptions():317:317 -> l
+    1:1:java.lang.String getReturnType():310:310 -> m
+    1:3:void endFormals():323:325 -> n
+    1:6:void endType():334:339 -> o
+    1:1:void startType():330:330 -> p
 com.android.tools.r8.origin.ArchiveEntryOrigin -> com.android.tools.r8.origin.ArchiveEntryOrigin:
     java.lang.String entryName -> e
     1:2:void <init>(java.lang.String,com.android.tools.r8.origin.Origin):18:19 -> <init>
@@ -41980,7 +41329,7 @@
     1:2:void <init>():67:68 -> <init>
     1:2:void <init>(com.android.tools.r8.origin.Origin$1):27 -> <init>
     3:5:void <init>(com.android.tools.r8.origin.Origin):71:73 -> <init>
-    1:2:java.util.List buildParts(int):87:88 -> c
+    1:2:java.util.List buildParts(int):87:88 -> b
     1:1:int compareTo(java.lang.Object):26:26 -> compareTo
     2:11:int compareTo(com.android.tools.r8.origin.Origin):130:139 -> compareTo
     1:8:boolean equals(java.lang.Object):115:122 -> equals
@@ -41991,13 +41340,13 @@
     1:1:com.android.tools.r8.origin.Origin root():58:58 -> root
     1:1:java.lang.String toString():153:153 -> toString
     1:1:com.android.tools.r8.origin.Origin unknown():62:62 -> unknown
-com.android.tools.r8.origin.Origin$1 -> com.android.tools.r8.origin.Origin$1:
+com.android.tools.r8.origin.Origin$1 -> com.android.tools.r8.origin.b:
     1:1:void <init>():30:30 -> <init>
-    1:1:java.util.List buildParts(int):38:38 -> c
+    1:1:java.util.List buildParts(int):38:38 -> b
     1:1:int compareTo(java.lang.Object):30:30 -> compareTo
-com.android.tools.r8.origin.Origin$2 -> com.android.tools.r8.origin.Origin$2:
+com.android.tools.r8.origin.Origin$2 -> com.android.tools.r8.origin.c:
     1:1:void <init>():43:43 -> <init>
-    1:2:java.util.List buildParts(int):51:52 -> c
+    1:2:java.util.List buildParts(int):51:52 -> b
     1:1:int compareTo(java.lang.Object):43:43 -> compareTo
 com.android.tools.r8.origin.PathOrigin -> com.android.tools.r8.origin.PathOrigin:
     java.nio.file.Path path -> e
@@ -42006,7 +41355,7 @@
     1:3:void <init>(java.nio.file.Path):19:21 -> <init>
     1:1:java.nio.file.Path getPath():30:30 -> getPath
     1:1:java.lang.String part():26:26 -> part
-com.android.tools.r8.origin.StandardOutOrigin -> com.android.tools.r8.origin.b:
+com.android.tools.r8.origin.StandardOutOrigin -> com.android.tools.r8.origin.d:
     com.android.tools.r8.origin.StandardOutOrigin INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -42028,7 +41377,7 @@
     1:1:java.lang.String toString():48:48 -> toString
 com.android.tools.r8.position.Position -> com.android.tools.r8.position.Position:
     1:1:void <clinit>():19:19 -> <clinit>
-com.android.tools.r8.position.Position$1 -> com.android.tools.r8.position.Position$1:
+com.android.tools.r8.position.Position$1 -> com.android.tools.r8.position.a:
     1:1:void <init>():19:19 -> <init>
 com.android.tools.r8.position.TextPosition -> com.android.tools.r8.position.TextPosition:
     long offset -> a
@@ -42118,21 +41467,21 @@
     1:1:void <init>():76:76 -> <init>
     1:1:void <init>(com.android.tools.r8.references.PrimitiveReference$1):10 -> <init>
     1:1:int hashCode():117:117 -> hashCode
-com.android.tools.r8.references.PrimitiveReference$1 -> com.android.tools.r8.references.PrimitiveReference$1:
+com.android.tools.r8.references.PrimitiveReference$1 -> com.android.tools.r8.references.a:
     1:1:void <init>():13:13 -> <init>
-com.android.tools.r8.references.PrimitiveReference$2 -> com.android.tools.r8.references.PrimitiveReference$2:
+com.android.tools.r8.references.PrimitiveReference$2 -> com.android.tools.r8.references.b:
     1:1:void <init>():21:21 -> <init>
-com.android.tools.r8.references.PrimitiveReference$3 -> com.android.tools.r8.references.PrimitiveReference$3:
+com.android.tools.r8.references.PrimitiveReference$3 -> com.android.tools.r8.references.c:
     1:1:void <init>():29:29 -> <init>
-com.android.tools.r8.references.PrimitiveReference$4 -> com.android.tools.r8.references.PrimitiveReference$4:
+com.android.tools.r8.references.PrimitiveReference$4 -> com.android.tools.r8.references.d:
     1:1:void <init>():37:37 -> <init>
-com.android.tools.r8.references.PrimitiveReference$5 -> com.android.tools.r8.references.PrimitiveReference$5:
+com.android.tools.r8.references.PrimitiveReference$5 -> com.android.tools.r8.references.e:
     1:1:void <init>():45:45 -> <init>
-com.android.tools.r8.references.PrimitiveReference$6 -> com.android.tools.r8.references.PrimitiveReference$6:
+com.android.tools.r8.references.PrimitiveReference$6 -> com.android.tools.r8.references.f:
     1:1:void <init>():53:53 -> <init>
-com.android.tools.r8.references.PrimitiveReference$7 -> com.android.tools.r8.references.PrimitiveReference$7:
+com.android.tools.r8.references.PrimitiveReference$7 -> com.android.tools.r8.references.g:
     1:1:void <init>():61:61 -> <init>
-com.android.tools.r8.references.PrimitiveReference$8 -> com.android.tools.r8.references.PrimitiveReference$8:
+com.android.tools.r8.references.PrimitiveReference$8 -> com.android.tools.r8.references.h:
     1:1:void <init>():69:69 -> <init>
 com.android.tools.r8.references.Reference -> com.android.tools.r8.references.Reference:
     com.android.tools.r8.references.Reference instance -> e
@@ -42174,201 +41523,88 @@
 com.android.tools.r8.references.TypeReference -> com.android.tools.r8.references.TypeReference:
     1:1:java.lang.String getTypeName():35:35 -> getTypeName
 com.android.tools.r8.shaking.AbstractMethodRemover -> com.android.tools.r8.shaking.a:
-    com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> a
+    com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness appInfo -> a
     boolean $assertionsDisabled -> c
     com.android.tools.r8.shaking.ScopedDexMethodSet scope -> b
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):27:27 -> <init>
-    2:5:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):25:28 -> <init>
-    1:2:void run():32:33 -> a
-    3:6:void processClass(com.android.tools.r8.graph.DexType):37:40 -> a
-    7:19:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):55:67 -> a
-    7:19:void processClass(com.android.tools.r8.graph.DexType):40 -> a
-    20:35:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):61:76 -> a
-    20:35:void processClass(com.android.tools.r8.graph.DexType):40 -> a
-    36:40:void processClass(com.android.tools.r8.graph.DexType):42:46 -> a
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness):28:28 -> <init>
+    2:5:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness):26:29 -> <init>
+    1:2:void run():33:34 -> a
+    3:6:void processClass(com.android.tools.r8.graph.DexType):38:41 -> a
+    7:19:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):56:68 -> a
+    7:19:void processClass(com.android.tools.r8.graph.DexType):41 -> a
+    20:35:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):62:77 -> a
+    20:35:void processClass(com.android.tools.r8.graph.DexType):41 -> a
+    36:40:void processClass(com.android.tools.r8.graph.DexType):43:47 -> a
 com.android.tools.r8.shaking.AnnotationRemover -> com.android.tools.r8.shaking.b:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set classesToRetainInnerClassAttributeFor -> c
     com.android.tools.r8.shaking.ProguardKeepAttributes keep -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):35:38 -> <init>
-    1:9:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):55:63 -> a
+    1:1:void <clinit>():30:30 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):37:40 -> <init>
+    1:9:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):57:65 -> a
     10:10:boolean com.android.tools.r8.graph.DexAnnotation.isMemberClassesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):113:113 -> a
-    10:10:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):63 -> a
-    11:12:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):63:64 -> a
+    10:10:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):65 -> a
+    11:12:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):65:66 -> a
     13:13:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingMethodAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):104:104 -> a
-    13:13:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):64 -> a
-    14:15:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):64:65 -> a
+    13:13:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):66 -> a
+    14:15:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):66:67 -> a
     16:16:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):99:99 -> a
-    16:16:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):65 -> a
-    17:18:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):65:66 -> a
+    16:16:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):67 -> a
+    17:18:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):67:68 -> a
     19:19:boolean com.android.tools.r8.graph.DexAnnotation.isThrowingAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):244:244 -> a
-    19:19:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):66 -> a
-    20:23:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):69:72 -> a
+    19:19:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):68 -> a
+    20:23:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):71:74 -> a
     24:24:boolean com.android.tools.r8.graph.DexAnnotation.isSourceDebugExtension(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):261:261 -> a
-    24:24:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):73 -> a
-    25:25:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):76:76 -> a
+    24:24:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):75 -> a
+    25:25:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):78:78 -> a
     26:26:boolean com.android.tools.r8.graph.DexAnnotation.isParameterNameAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):266:266 -> a
-    26:26:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):77 -> a
+    26:26:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):79 -> a
     27:27:boolean com.android.tools.r8.graph.DexAnnotation.isAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):255:255 -> a
-    27:27:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):80 -> a
-    28:28:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):104:104 -> a
-    29:29:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):88:88 -> a
+    27:27:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):82 -> a
+    28:28:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):106:106 -> a
+    29:29:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):90:90 -> a
     30:30:boolean com.android.tools.r8.graph.DexAnnotation.isSynthesizedClassMapAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):376:376 -> a
-    30:30:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):94 -> a
-    31:31:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):98:98 -> a
-    32:46:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):124:138 -> a
-    47:59:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):128:140 -> a
-    60:60:com.android.tools.r8.shaking.AnnotationRemover ensureValid(com.android.tools.r8.shaking.ProguardConfiguration$Builder):144:144 -> a
-    61:73:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):187:199 -> a
-    74:75:boolean hasSignatureAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):165:166 -> a
-    74:75:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):199 -> a
-    76:103:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):200:227 -> a
-    104:108:boolean hasGenericEnclosingClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.Set):153:157 -> a
-    104:108:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):228 -> a
-    109:109:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):229:229 -> a
-    110:110:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):189:189 -> a
-    111:115:void run():236:240 -> a
-    116:118:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):245:247 -> a
-    119:119:void processField(com.android.tools.r8.graph.DexEncodedField):251:251 -> a
-    120:122:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):264:266 -> a
-    123:123:com.android.tools.r8.graph.DexAnnotationElement lambda$rewriteEncodedAnnotation$0(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):268:268 -> a
-    124:132:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):273:281 -> a
-    133:133:boolean lambda$rewriteAnnotationElement$1(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexEncodedMethod):281:281 -> a
-    134:135:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):307:308 -> a
-    136:138:boolean enclosingMethodPinned(com.android.tools.r8.graph.DexClass):286:288 -> a
-    136:138:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):309 -> a
-    139:145:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):309:315 -> a
-    146:147:boolean hasInnerClassesFromSet(com.android.tools.r8.graph.DexProgramClass,java.util.Set):292:293 -> a
-    146:147:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):316 -> a
-    148:149:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):350:351 -> a
-    150:159:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):319:328 -> a
-    160:171:boolean lambda$stripAttributes$2(boolean,com.android.tools.r8.graph.DexProgramClass,boolean,com.android.tools.r8.graph.InnerClassAttribute):330:341 -> a
-    1:9:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):109:117 -> b
-    1:1:boolean filterAnnotations(com.android.tools.r8.graph.DexAnnotation):46:46 -> c
-    1:1:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):256 -> c
-    2:2:boolean filterAnnotations(com.android.tools.r8.graph.DexAnnotation):45:45 -> c
-    2:2:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):256 -> c
-    3:3:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):260:260 -> c
-com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.shaking.AppInfoWithLiveness:
-    java.util.SortedMap instanceFieldWrites -> z
-    java.util.Set neverMerge -> T
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> V
-    java.util.SortedSet staticFieldsWrittenOnlyInEnclosingStaticInitializer -> x
-    java.util.SortedSet fieldsRead -> v
-    java.util.Map switchMaps -> X
-    java.util.SortedSet virtualMethodsTargetedByInvokeDirect -> t
-    java.util.Set callSites -> H
-    java.util.SortedSet bootstrapMethods -> r
-    java.util.IdentityHashMap indirectlyInstantiatedTypes -> p
-    java.util.Set pinnedItems -> J
-    boolean $assertionsDisabled -> aa
-    java.util.SortedSet instantiatedAppServices -> n
-    com.android.tools.r8.com.google.common.collect.ImmutableSortedSet instantiatedLambdas -> Z
-    java.util.SortedSet liveTypes -> l
-    java.util.SortedMap staticInvokes -> G
-    java.util.Set neverInline -> P
-    java.util.SortedMap superInvokes -> E
-    java.util.Map noSideEffects -> L
-    java.util.Set keepUnusedArguments -> R
-    java.util.SortedMap virtualInvokes -> C
-    java.util.SortedSet brokenSuperInvokes -> I
-    java.util.SortedMap staticFieldReads -> A
-    java.util.Set alwaysInline -> N
-    java.util.Set prunedTypes -> W
-    java.util.Map assumedValues -> M
-    java.util.Set neverClassInline -> S
-    java.util.Set neverPropagateValue -> U
-    java.util.SortedMap instanceFieldReads -> y
-    java.util.Map ordinalsMaps -> Y
-    java.util.SortedSet fieldsWritten -> w
-    java.util.SortedSet liveMethods -> u
-    java.util.SortedSet methodsTargetedByInvokeDynamic -> s
-    java.util.SortedSet targetedMethods -> q
-    java.util.SortedSet instantiatedTypes -> o
-    java.util.SortedMap directInvokes -> F
-    java.util.Set forceInline -> O
-    java.util.SortedSet instantiatedAnnotationTypes -> m
-    java.util.SortedMap interfaceInvokes -> D
-    java.util.Map mayHaveSideEffects -> K
-    java.util.Set keepConstantArguments -> Q
-    java.util.SortedMap staticFieldWrites -> B
-    1:1:void <clinit>():48:48 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableSortedSet):303:303 -> <init>
-    2:283:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableSortedSet):65:346 -> <init>
-    284:324:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):357:397 -> <init>
-    325:328:java.util.Set com.android.tools.r8.utils.CollectionUtils.mergeSets(java.util.Collection,java.util.Collection):13:16 -> <init>
-    325:328:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):397 -> <init>
-    329:329:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):397:397 -> <init>
-    330:330:void <init>(com.android.tools.r8.graph.DexApplication,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableSortedSet):215:215 -> <init>
-    330:330:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):357 -> <init>
-    331:524:void <init>(com.android.tools.r8.graph.DexApplication,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableSortedSet):65:258 -> <init>
-    331:524:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):357 -> <init>
-    525:526:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):401:402 -> <init>
-    527:538:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):616:627 -> <init>
-    527:538:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):402 -> <init>
-    539:540:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):403:404 -> <init>
-    541:541:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):409:409 -> <init>
-    542:944:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):65:467 -> <init>
-    945:961:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):463:479 -> <init>
-    962:977:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):475:490 -> <init>
-    978:987:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):486:495 -> <init>
-    988:988:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):502:502 -> <init>
-    989:1468:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):65:544 -> <init>
-    1:33:java.util.Collection computeReachableInterfaces(java.util.Set):548:580 -> a
-    34:34:boolean lambda$withoutStaticFieldsWrites$0(java.util.Set,com.android.tools.r8.graph.DexField):591:591 -> a
-    35:37:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):600:602 -> a
-    38:38:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):600:600 -> a
-    39:44:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):703:708 -> a
-    45:54:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):727:736 -> a
-    55:55:java.util.Set lambda$rewriteKeysConservativelyWhileMergingValues$2(com.android.tools.r8.graph.PresortedComparable):732:732 -> a
-    56:57:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection):773:774 -> a
-    58:59:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):779:780 -> a
-    60:75:com.android.tools.r8.graph.DexEncodedMethod lookup(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):798:813 -> a
-    76:76:com.android.tools.r8.graph.DexEncodedMethod lookup(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):811:811 -> a
-    77:77:com.android.tools.r8.graph.DexEncodedMethod lookup(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):809:809 -> a
-    78:78:com.android.tools.r8.graph.DexEncodedMethod lookup(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):807:807 -> a
-    79:79:com.android.tools.r8.graph.DexEncodedMethod lookup(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):805:805 -> a
-    80:118:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):903:941 -> a
-    119:128:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):957:966 -> a
-    129:154:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):980:1005 -> a
-    155:155:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    155:155:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1004 -> a
-    156:183:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1006:1033 -> a
-    184:186:com.android.tools.r8.shaking.AppInfoWithLiveness addEnumOrdinalMaps(java.util.Map):1044:1046 -> a
-    1:5:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):586:590 -> b
-    6:6:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):350:350 -> b
-    6:6:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):590 -> b
-    7:10:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):591:594 -> b
-    11:18:java.util.SortedMap rewriteKeysWhileMergingValues(java.util.Map,java.util.function.Function):714:721 -> b
-    19:19:java.util.Set lambda$rewriteKeysWhileMergingValues$1(com.android.tools.r8.graph.PresortedComparable):718:718 -> b
-    20:21:boolean isPinned(com.android.tools.r8.graph.DexReference):758:759 -> b
-    22:71:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):826:875 -> b
-    72:80:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):871:879 -> b
-    81:81:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):857:857 -> b
-    82:83:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod):974:975 -> b
-    84:86:com.android.tools.r8.shaking.AppInfoWithLiveness addSwitchMaps(java.util.Map):1037:1039 -> b
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMapFor(com.android.tools.r8.graph.DexField):611:612 -> c
-    3:4:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):692:693 -> c
-    1:7:boolean isFieldRead(com.android.tools.r8.graph.DexField):666:672 -> d
-    1:7:boolean isFieldWritten(com.android.tools.r8.graph.DexField):676:682 -> e
-    8:8:boolean hasLiveness():747:747 -> e
-    1:3:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexField):686:688 -> f
-    1:2:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexField):697:698 -> g
-    3:4:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):741:742 -> g
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():753:753 -> j
-    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod):821:822 -> lookupSingleVirtualTarget
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap getOrdinalsMapFor(com.android.tools.r8.graph.DexType):606:607 -> n
-    1:6:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexType):633:638 -> o
-    7:8:java.lang.Iterable getPinnedItems():763:764 -> o
-    1:3:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):660:662 -> p
-    4:5:java.util.Set getPrunedTypes():793:794 -> p
-    1:15:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexType):642:656 -> q
-    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):788:789 -> r
-com.android.tools.r8.shaking.ClassInlineRule -> com.android.tools.r8.shaking.e:
-    com.android.tools.r8.shaking.ClassInlineRule$Type type -> o
+    30:30:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):96 -> a
+    31:31:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):100:100 -> a
+    32:46:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):126:140 -> a
+    47:59:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):130:142 -> a
+    60:60:com.android.tools.r8.shaking.AnnotationRemover ensureValid(com.android.tools.r8.shaking.ProguardConfiguration$Builder):146:146 -> a
+    61:73:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.utils.InternalOptions):189:201 -> a
+    74:75:boolean hasSignatureAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):167:168 -> a
+    74:75:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.utils.InternalOptions):201 -> a
+    76:89:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.utils.InternalOptions):202:215 -> a
+    90:94:boolean hasGenericEnclosingClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.Set):155:159 -> a
+    90:94:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.utils.InternalOptions):216 -> a
+    95:95:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.utils.InternalOptions):217:217 -> a
+    96:96:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.utils.InternalOptions):191:191 -> a
+    97:101:void run():224:228 -> a
+    102:104:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):233:235 -> a
+    105:105:void processField(com.android.tools.r8.graph.DexEncodedField):239:239 -> a
+    106:108:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):252:254 -> a
+    109:109:com.android.tools.r8.graph.DexAnnotationElement lambda$rewriteEncodedAnnotation$0(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):256:256 -> a
+    110:118:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):261:269 -> a
+    119:119:boolean lambda$rewriteAnnotationElement$1(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexEncodedMethod):269:269 -> a
+    120:121:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):309:310 -> a
+    122:124:boolean enclosingMethodPinned(com.android.tools.r8.graph.DexClass):274:276 -> a
+    122:124:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):311 -> a
+    125:131:boolean innerClassPinned(com.android.tools.r8.graph.DexClass):280:286 -> a
+    125:131:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):312 -> a
+    132:138:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):312:318 -> a
+    139:140:boolean hasInnerClassesFromSet(com.android.tools.r8.graph.DexProgramClass,java.util.Set):294:295 -> a
+    139:140:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):319 -> a
+    141:142:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):347:348 -> a
+    143:152:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):322:331 -> a
+    153:158:boolean lambda$stripAttributes$2(boolean,com.android.tools.r8.graph.DexProgramClass,boolean,com.android.tools.r8.graph.InnerClassAttribute):333:338 -> a
+    1:9:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):111:119 -> b
+    1:1:boolean filterAnnotations(com.android.tools.r8.graph.DexAnnotation):48:48 -> c
+    1:1:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):244 -> c
+    2:2:boolean filterAnnotations(com.android.tools.r8.graph.DexAnnotation):47:47 -> c
+    2:2:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):244 -> c
+    3:3:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):248:248 -> c
+com.android.tools.r8.shaking.ClassInlineRule -> com.android.tools.r8.shaking.d:
+    com.android.tools.r8.shaking.ClassInlineRule$Type type -> a
     1:15:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ClassInlineRule$Type):72:86 -> <init>
     1:1:com.android.tools.r8.shaking.ClassInlineRule$Builder builder():90:90 -> builder
     1:1:com.android.tools.r8.shaking.ClassInlineRule$Type getType():94:94 -> getType
@@ -42376,20 +41612,20 @@
 com.android.tools.r8.shaking.ClassInlineRule$1 -> com.android.tools.r8.shaking.c:
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassInlineRule$Type -> a
     1:1:void <clinit>():99:99 -> <clinit>
-com.android.tools.r8.shaking.ClassInlineRule$Builder -> com.android.tools.r8.shaking.d:
+com.android.tools.r8.shaking.ClassInlineRule$Builder -> com.android.tools.r8.shaking.d$a:
     com.android.tools.r8.shaking.ClassInlineRule$Type type -> o
     1:1:void <init>():20:20 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ClassInlineRule$1):17 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> g
-com.android.tools.r8.shaking.ClassInlineRule$Type -> com.android.tools.r8.shaking.e$a:
+com.android.tools.r8.shaking.ClassInlineRule$Type -> com.android.tools.r8.shaking.e:
     com.android.tools.r8.shaking.ClassInlineRule$Type NEVER -> a
     com.android.tools.r8.shaking.ClassInlineRule$Type[] $VALUES -> b
     1:1:void <clinit>():14:14 -> <clinit>
     2:2:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):13:13 -> <init>
     1:1:com.android.tools.r8.shaking.ClassInlineRule$Type[] values():13:13 -> a
-com.android.tools.r8.shaking.ClassMergingRule -> com.android.tools.r8.shaking.h:
-    com.android.tools.r8.shaking.ClassMergingRule$Type type -> o
+com.android.tools.r8.shaking.ClassMergingRule -> com.android.tools.r8.shaking.g:
+    com.android.tools.r8.shaking.ClassMergingRule$Type type -> a
     1:4:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ClassMergingRule$Type):60:63 -> <init>
     1:4:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.shaking.ClassMergingRule$1):11 -> <init>
     1:1:com.android.tools.r8.shaking.ClassMergingRule$Builder builder():67:67 -> builder
@@ -42398,12 +41634,12 @@
 com.android.tools.r8.shaking.ClassMergingRule$1 -> com.android.tools.r8.shaking.f:
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassMergingRule$Type -> a
     1:1:void <clinit>():76:76 -> <clinit>
-com.android.tools.r8.shaking.ClassMergingRule$Builder -> com.android.tools.r8.shaking.g:
+com.android.tools.r8.shaking.ClassMergingRule$Builder -> com.android.tools.r8.shaking.g$a:
     com.android.tools.r8.shaking.ClassMergingRule$Type type -> o
     1:1:void <init>():20:20 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ClassMergingRule$1):17 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> g
-com.android.tools.r8.shaking.ClassMergingRule$Type -> com.android.tools.r8.shaking.h$a:
+com.android.tools.r8.shaking.ClassMergingRule$Type -> com.android.tools.r8.shaking.h:
     com.android.tools.r8.shaking.ClassMergingRule$Type NEVER -> a
     com.android.tools.r8.shaking.ClassMergingRule$Type[] $VALUES -> b
     1:1:void <clinit>():14:14 -> <clinit>
@@ -42420,20 +41656,20 @@
     1:1:java.util.Set lambda$acceptEdge$1(com.android.tools.r8.experimental.graphinfo.GraphNode):32:32 -> b
     1:1:java.util.Map getSourcesTargeting(com.android.tools.r8.experimental.graphinfo.GraphNode):44:44 -> getSourcesTargeting
     1:1:java.util.Set getTargets():40:40 -> getTargets
-com.android.tools.r8.shaking.ConstantArgumentRule -> com.android.tools.r8.shaking.k:
+com.android.tools.r8.shaking.ConstantArgumentRule -> com.android.tools.r8.shaking.j:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ConstantArgumentRule$1):10 -> <init>
     1:1:com.android.tools.r8.shaking.ConstantArgumentRule$Builder builder():74:74 -> builder
 com.android.tools.r8.shaking.ConstantArgumentRule$1 -> com.android.tools.r8.shaking.i:
-com.android.tools.r8.shaking.ConstantArgumentRule$Builder -> com.android.tools.r8.shaking.j:
+com.android.tools.r8.shaking.ConstantArgumentRule$Builder -> com.android.tools.r8.shaking.j$a:
     1:1:void <init>():16:16 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ConstantArgumentRule$1):12 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> g
-com.android.tools.r8.shaking.DexStringCache -> com.android.tools.r8.shaking.l:
+com.android.tools.r8.shaking.DexStringCache -> com.android.tools.r8.shaking.k:
     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.shaking.m:
+com.android.tools.r8.shaking.DiscardedChecker -> com.android.tools.r8.shaking.l:
     java.util.List classes -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.utils.InternalOptions options -> d
@@ -42499,304 +41735,291 @@
     com.android.tools.r8.shaking.Enqueuer$SetWithReason instantiatedTypes -> F
     java.util.Map superInvokes -> j
     java.util.Set callSites -> r
-    1:1:void <clinit>():104:104 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer):279:279 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):286:286 -> <init>
-    3:124:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):107:228 -> <init>
+    1:1:void <clinit>():113:113 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer):288:288 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):295:295 -> <init>
+    3:124:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):116:237 -> <init>
     125:125:java.util.ArrayDeque com.android.tools.r8.com.google.common.collect.Queues.newArrayDeque():66:66 -> <init>
-    125:125:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):234 -> <init>
-    126:126:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):234:234 -> <init>
+    125:125:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):243 -> <init>
+    126:126:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):243:243 -> <init>
     127:127:java.util.ArrayDeque com.android.tools.r8.com.google.common.collect.Queues.newArrayDeque():66:66 -> <init>
-    127:127:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):239 -> <init>
-    128:128:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):239:239 -> <init>
+    127:127:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):248 -> <init>
+    128:128:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):248:248 -> <init>
     129:129:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet():347:347 -> <init>
-    129:129:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):244 -> <init>
-    130:179:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):244:293 -> <init>
+    129:129:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):253 -> <init>
+    130:179:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):253:302 -> <init>
+    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason access$4800(com.android.tools.r8.shaking.Enqueuer):113:113 -> A
+    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason access$4900(com.android.tools.r8.shaking.Enqueuer):113:113 -> B
+    1:1:java.util.Map access$500(com.android.tools.r8.shaking.Enqueuer):113:113 -> C
+    1:1:java.util.Set access$5100(com.android.tools.r8.shaking.Enqueuer):113:113 -> D
+    1:1:java.util.Set access$5200(com.android.tools.r8.shaking.Enqueuer):113:113 -> E
+    1:1:java.util.Set access$5300(com.android.tools.r8.shaking.Enqueuer):113:113 -> F
+    1:1:com.android.tools.r8.shaking.RootSetBuilder$RootSet access$5400(com.android.tools.r8.shaking.Enqueuer):113:113 -> G
+    1:1:java.util.Queue access$700(com.android.tools.r8.shaking.Enqueuer):113:113 -> H
+    1:1:java.util.Map access$800(com.android.tools.r8.shaking.Enqueuer):113:113 -> I
     void lambda$newSetWithoutReasonReporter$0(java.lang.Object,com.android.tools.r8.shaking.KeepReason) -> a
-    1:1:java.util.Map access$1000(com.android.tools.r8.shaking.Enqueuer):104:104 -> a
-    2:2:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):104:104 -> a
-    3:3:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):104:104 -> a
-    4:4:void access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedField):104:104 -> a
-    5:5:void access$2400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):104:104 -> a
-    6:6:void access$3300(com.android.tools.r8.shaking.Enqueuer,java.lang.Iterable,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):104:104 -> a
-    7:7:void access$3400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):104:104 -> a
-    8:8:void access$3600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexClass):104:104 -> a
-    9:9:void access$4100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):104:104 -> a
-    10:10:boolean access$600(com.android.tools.r8.shaking.Enqueuer,java.util.Map,com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod):104:104 -> a
-    11:11:com.android.tools.r8.shaking.Enqueuer$SetWithReason newSetWithoutReasonReporter():322:322 -> a
-    12:14:void enqueueRootItem(java.util.Map$Entry):330:332 -> a
-    15:22:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):340:347 -> a
-    23:33:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):359:369 -> a
-    34:34:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):367:367 -> a
-    35:51:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):366:382 -> a
-    52:52:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):380:380 -> a
-    53:64:void enqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Map):402:413 -> a
-    65:77:boolean registerItemWithTargetAndContext(java.util.Map,com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod):442:454 -> a
-    78:88:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):814:824 -> a
-    78:88:com.android.tools.r8.graph.DexMethod access$1300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):104 -> a
-    89:89:boolean lambda$markTypeAsLive$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexAnnotation):882:882 -> a
-    90:90:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):897:897 -> a
-    91:91:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):903:903 -> a
-    91:91:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):898 -> a
-    92:92:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):903:903 -> a
-    92:92:void lambda$markMethodAsTargeted$8(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1018 -> a
-    93:105:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):907:919 -> a
-    106:106:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.annotatedOn(com.android.tools.r8.graph.DexDefinition):22:22 -> a
-    106:106:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):919 -> a
-    107:110:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):919:922 -> a
-    111:126:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):944:959 -> a
-    127:127:void lambda$handleInvokeOfDirectTarget$7(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):949:949 -> a
-    128:148:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):965:985 -> a
-    149:149:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):983:983 -> a
-    150:159:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1111:1120 -> a
-    160:164:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1119:1123 -> a
-    165:171:void transitionNonAbstractMethodsToLiveAndShadow(java.lang.Iterable,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1129:1135 -> a
-    172:172:void transitionNonAbstractMethodsToLiveAndShadow(java.lang.Iterable,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1134:1134 -> a
-    173:173:void markStaticFieldAsLive(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason):1168:1168 -> a
-    173:173:void access$1900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason):104 -> a
-    174:206:void markStaticFieldAsLive(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedField):1175:1207 -> a
-    207:230:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1241:1264 -> a
-    207:230:void access$2600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):104 -> a
-    231:239:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1270:1278 -> a
-    240:262:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason):1305:1327 -> a
-    263:311:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1334:1382 -> a
-    312:330:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1381:1399 -> a
-    331:338:void fillWorkList(java.util.Deque,com.android.tools.r8.graph.DexType):1431:1438 -> a
-    339:347:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1448:1456 -> a
-    348:348:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.targetedBySuperFrom(com.android.tools.r8.graph.DexEncodedMethod):82:82 -> a
-    348:348:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1458 -> a
-    349:369:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1458:1478 -> a
-    370:376:java.util.SortedSet traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1487:1493 -> a
-    377:396:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):1514:1533 -> a
-    397:409:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):1532:1544 -> a
-    410:417:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):1542:1549 -> a
-    418:425:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):1547:1554 -> a
-    426:439:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):1552:1565 -> a
-    440:445:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):1601:1606 -> a
-    440:445:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):1578 -> a
-    446:450:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):1580:1584 -> a
-    451:453:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):1583:1585 -> a
-    454:454:void lambda$createAppInfo$12(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):1516:1516 -> a
-    455:455:boolean lambda$createAppInfo$13(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedField):1546:1546 -> a
-    456:461:java.util.SortedSet toSortedDescriptorSet(java.util.Set):1591:1596 -> a
-    462:497:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1612:1647 -> a
-    498:498:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1644:1644 -> a
-    499:499:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1641:1641 -> a
-    500:500:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1638:1638 -> a
-    501:501:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1634:1634 -> a
-    502:502:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1631:1631 -> a
-    503:503:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1628:1628 -> a
-    504:504:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1625:1625 -> a
-    505:539:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1622:1656 -> a
-    540:540:void com.android.tools.r8.shaking.RootSetBuilder.<init>(com.android.tools.r8.graph.AppView,java.util.Collection):103:103 -> a
-    540:540:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1656 -> a
-    541:545:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1657:1661 -> a
-    546:603:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1658:1715 -> a
-    604:608:void unpinLambdaMethods():1721:1725 -> a
-    604:608:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1717 -> a
-    609:636:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1688:1715 -> a
-    637:642:void lambda$trace$15(com.android.tools.r8.graph.DexReference,java.util.Map):1670:1675 -> a
-    643:649:void markFieldAsKept(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1762:1768 -> a
-    650:655:void markAllLibraryVirtualMethodsReachable(com.android.tools.r8.graph.DexClass):1773:1778 -> a
-    656:656:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.isLibraryMethod():54:54 -> a
-    656:656:void markAllLibraryVirtualMethodsReachable(com.android.tools.r8.graph.DexClass):1779 -> a
-    657:658:void markAllLibraryVirtualMethodsReachable(com.android.tools.r8.graph.DexClass):1779:1780 -> a
-    659:659:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.isLibraryMethod():54:54 -> a
-    659:659:void markAllLibraryVirtualMethodsReachable(com.android.tools.r8.graph.DexClass):1781 -> a
-    660:660:void markAllLibraryVirtualMethodsReachable(com.android.tools.r8.graph.DexClass):1780:1780 -> a
-    661:670:java.util.SortedMap collectDescriptors(java.util.Map):1832:1841 -> a
-    671:671:java.util.Set lambda$collectDescriptors$17(com.android.tools.r8.graph.Descriptor):1837:1837 -> a
-    672:675:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1845:1848 -> a
-    676:681:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1872:1877 -> a
-    682:688:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1883:1889 -> a
-    682:688:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    689:696:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):1966:1973 -> a
-    689:696:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1890 -> a
-    689:696:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    697:711:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):1972:1986 -> a
-    697:711:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1890 -> a
-    697:711:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    712:712:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1893:1893 -> a
-    712:712:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    713:733:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):1994:2014 -> a
-    713:733:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1894 -> a
-    713:733:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    734:782:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2013:2061 -> a
-    734:782:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1894 -> a
-    734:782:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    783:808:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2060:2085 -> a
-    783:808:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1894 -> a
-    783:808:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    809:809:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1897:1897 -> a
-    809:809:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    810:814:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2133:2137 -> a
-    810:814:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1898 -> a
-    810:814:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    815:819:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):1409:1413 -> a
-    815:819:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1421 -> a
-    815:819:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2137 -> a
-    815:819:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1898 -> a
-    815:819:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    820:825:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):1412:1417 -> a
-    820:825:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1421 -> a
-    820:825:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2137 -> a
-    820:825:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1898 -> a
-    820:825:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    826:826:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1421:1421 -> a
-    826:826:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2137 -> a
-    826:826:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1898 -> a
-    826:826:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    827:830:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):351:354 -> a
-    827:830:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1425 -> a
-    827:830:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2137 -> a
-    827:830:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1898 -> a
-    827:830:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    831:831:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1426:1426 -> a
-    831:831:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2137 -> a
-    831:831:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1898 -> a
-    831:831:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    832:832:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1901:1901 -> a
-    832:832:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    833:860:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2096:2123 -> a
-    833:860:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1902 -> a
-    833:860:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    861:861:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1905:1905 -> a
-    861:861:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    862:889:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2143:2170 -> a
-    862:889:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1906 -> a
-    862:889:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    890:903:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1909:1922 -> a
-    890:903:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    904:941:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1921:1958 -> a
-    904:941:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    942:942:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1956:1956 -> a
-    942:942:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    943:943:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1955:1955 -> a
-    943:943:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1878 -> a
-    944:956:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2176:2188 -> a
-    957:957:void registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):2408:2408 -> a
-    958:958:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):2445:2445 -> a
-    958:958:void registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):2408 -> a
-    959:963:void registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):2408:2412 -> a
-    964:964:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):2445:2445 -> a
-    964:964:void registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):2437 -> a
-    965:966:void registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):2439:2440 -> a
-    967:976:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):2449:2458 -> a
-    977:977:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):2462:2462 -> a
-    978:978:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo lambda$getEdgeInfo$18(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):2462:2462 -> a
-    979:979:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):2466:2466 -> a
-    980:983:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$19(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):2467:2470 -> a
-    984:984:com.android.tools.r8.experimental.graphinfo.ClassGraphNode getClassGraphNode(com.android.tools.r8.graph.DexType):2475:2475 -> a
-    985:985:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):2486:2486 -> a
-    986:999:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$21(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):2489:2502 -> a
-    1000:1000:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$21(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):2496:2496 -> a
-    1001:1001:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):2507:2507 -> a
-    1002:1008:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$22(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):2510:2516 -> a
-    1009:1009:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$22(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):2513:2513 -> a
-    1010:1010:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.shaking.ProguardKeepRule):2521:2521 -> a
+    1:1:java.util.Map access$1000(com.android.tools.r8.shaking.Enqueuer):113:113 -> a
+    2:2:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):113:113 -> a
+    3:3:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):113:113 -> a
+    4:4:void access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedField):113:113 -> a
+    5:5:void access$2400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):113:113 -> a
+    6:6:void access$3300(com.android.tools.r8.shaking.Enqueuer,java.lang.Iterable,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):113:113 -> a
+    7:7:void access$3400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):113:113 -> a
+    8:8:void access$3600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexClass):113:113 -> a
+    9:9:java.util.SortedSet access$5000(com.android.tools.r8.shaking.Enqueuer,java.util.Set,java.util.Set):113:113 -> a
+    10:10:void access$5600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):113:113 -> a
+    11:11:boolean access$600(com.android.tools.r8.shaking.Enqueuer,java.util.Map,com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod):113:113 -> a
+    12:12:com.android.tools.r8.shaking.Enqueuer$SetWithReason newSetWithoutReasonReporter():331:331 -> a
+    13:15:void enqueueRootItem(java.util.Map$Entry):339:341 -> a
+    16:23:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):349:356 -> a
+    24:34:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):368:378 -> a
+    35:35:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):376:376 -> a
+    36:52:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):375:391 -> a
+    53:53:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):389:389 -> a
+    54:65:void enqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Map):411:422 -> a
+    66:78:boolean registerItemWithTargetAndContext(java.util.Map,com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod):451:463 -> a
+    79:89:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):816:826 -> a
+    79:89:com.android.tools.r8.graph.DexMethod access$1300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):113 -> a
+    90:90:boolean lambda$markTypeAsLive$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexAnnotation):884:884 -> a
+    91:91:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):899:899 -> a
+    92:92:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):905:905 -> a
+    92:92:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):900 -> a
+    93:93:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):905:905 -> a
+    93:93:void lambda$markMethodAsTargeted$8(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1020 -> a
+    94:106:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):909:921 -> a
+    107:107:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.annotatedOn(com.android.tools.r8.graph.DexDefinition):22:22 -> a
+    107:107:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):921 -> a
+    108:111:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):921:924 -> a
+    112:127:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):946:961 -> a
+    128:128:void lambda$handleInvokeOfDirectTarget$7(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):951:951 -> a
+    129:149:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):967:987 -> a
+    150:150:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):985:985 -> a
+    151:162:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1041:1052 -> a
+    163:199:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType):1072:1108 -> a
+    163:199:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1052 -> a
+    200:200:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1054:1054 -> a
+    201:215:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexType):1150:1164 -> a
+    201:215:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1054 -> a
+    216:216:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1056:1056 -> a
+    217:226:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1114:1123 -> a
+    227:231:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1122:1126 -> a
+    232:238:void transitionNonAbstractMethodsToLiveAndShadow(java.lang.Iterable,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1132:1138 -> a
+    239:239:void transitionNonAbstractMethodsToLiveAndShadow(java.lang.Iterable,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1137:1137 -> a
+    240:240:void markStaticFieldAsLive(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason):1168:1168 -> a
+    240:240:void access$1900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason):113 -> a
+    241:267:void markStaticFieldAsLive(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedField):1175:1201 -> a
+    268:291:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1234:1257 -> a
+    268:291:void access$2600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):113 -> a
+    292:300:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1263:1271 -> a
+    301:320:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason):1298:1317 -> a
+    321:369:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1324:1372 -> a
+    370:388:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1371:1389 -> a
+    389:396:void fillWorkList(java.util.Deque,com.android.tools.r8.graph.DexType):1421:1428 -> a
+    397:405:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1438:1446 -> a
+    406:406:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.targetedBySuperFrom(com.android.tools.r8.graph.DexEncodedMethod):82:82 -> a
+    406:406:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1448 -> a
+    407:427:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1448:1468 -> a
+    428:434:java.util.SortedSet traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1477:1483 -> a
+    435:470:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1503:1538 -> a
+    471:471:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1535:1535 -> a
+    472:472:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1532:1532 -> a
+    473:473:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1529:1529 -> a
+    474:491:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1620:1637 -> a
+    474:491:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1529 -> a
+    492:492:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1525:1525 -> a
+    493:493:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1522:1522 -> a
+    494:494:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1519:1519 -> a
+    495:495:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1516:1516 -> a
+    496:530:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1513:1547 -> a
+    531:531:void com.android.tools.r8.shaking.RootSetBuilder.<init>(com.android.tools.r8.graph.AppView,java.util.Collection):105:105 -> a
+    531:531:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1547 -> a
+    532:536:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1548:1552 -> a
+    537:594:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1549:1606 -> a
+    595:599:void unpinLambdaMethods():1612:1616 -> a
+    595:599:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1608 -> a
+    600:627:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1579:1606 -> a
+    628:633:void lambda$trace$12(com.android.tools.r8.graph.DexReference,java.util.Map):1561:1566 -> a
+    634:640:void markFieldAsKept(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1643:1649 -> a
+    641:646:void markAllLibraryVirtualMethodsReachable(com.android.tools.r8.graph.DexClass):1654:1659 -> a
+    647:647:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.isLibraryMethod():54:54 -> a
+    647:647:void markAllLibraryVirtualMethodsReachable(com.android.tools.r8.graph.DexClass):1660 -> a
+    648:649:void markAllLibraryVirtualMethodsReachable(com.android.tools.r8.graph.DexClass):1660:1661 -> a
+    650:650:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.isLibraryMethod():54:54 -> a
+    650:650:void markAllLibraryVirtualMethodsReachable(com.android.tools.r8.graph.DexClass):1662 -> a
+    651:651:void markAllLibraryVirtualMethodsReachable(com.android.tools.r8.graph.DexClass):1661:1661 -> a
+    652:661:java.util.SortedMap collectDescriptors(java.util.Map):1713:1722 -> a
+    662:662:java.util.Set lambda$collectDescriptors$14(com.android.tools.r8.graph.Descriptor):1718:1718 -> a
+    663:666:java.util.Set collectReachedFields(java.util.Set,java.util.function.Function):1727:1730 -> a
+    667:671:java.util.SortedSet mergeFieldAccesses(java.util.Set,java.util.Set):1745:1749 -> a
+    672:672:java.util.SortedSet mergeFieldAccesses(java.util.Set,java.util.Set):1747:1747 -> a
+    673:673:java.util.SortedSet mergeFieldAccesses(java.util.Set,java.util.Set):1745:1745 -> a
+    674:679:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1779:1784 -> a
+    680:685:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1790:1795 -> a
+    680:685:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    686:690:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):1863:1867 -> a
+    686:690:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1796 -> a
+    686:690:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    691:695:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):1399:1403 -> a
+    691:695:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1411 -> a
+    691:695:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):1867 -> a
+    691:695:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1796 -> a
+    691:695:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    696:701:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):1402:1407 -> a
+    696:701:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1411 -> a
+    696:701:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):1867 -> a
+    696:701:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1796 -> a
+    696:701:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    702:702:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1411:1411 -> a
+    702:702:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):1867 -> a
+    702:702:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1796 -> a
+    702:702:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    703:706:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason):360:363 -> a
+    703:706:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1415 -> a
+    703:706:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):1867 -> a
+    703:706:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1796 -> a
+    703:706:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    707:707:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1416:1416 -> a
+    707:707:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):1867 -> a
+    707:707:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1796 -> a
+    707:707:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    708:708:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1799:1799 -> a
+    708:708:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    709:736:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):1873:1900 -> a
+    709:736:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1800 -> a
+    709:736:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    737:750:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1803:1816 -> a
+    737:750:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    751:788:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1815:1852 -> a
+    751:788:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    789:789:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1850:1850 -> a
+    789:789:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    790:790:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):1849:1849 -> a
+    790:790:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):1785 -> a
+    791:802:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1906:1917 -> a
+    803:805:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1753:1755 -> a
+    803:805:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1918 -> a
+    806:806:void registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):3068:3068 -> a
+    807:807:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):3105:3105 -> a
+    807:807:void registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):3068 -> a
+    808:812:void registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):3068:3072 -> a
+    813:813:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):3105:3105 -> a
+    813:813:void registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3097 -> a
+    814:815:void registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3099:3100 -> a
+    816:825:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):3109:3118 -> a
+    826:826:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):3122:3122 -> a
+    827:827:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo lambda$getEdgeInfo$15(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):3122:3122 -> a
+    828:828:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):3126:3126 -> a
+    829:832:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$16(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):3127:3130 -> a
+    833:833:com.android.tools.r8.experimental.graphinfo.ClassGraphNode getClassGraphNode(com.android.tools.r8.graph.DexType):3135:3135 -> a
+    834:834:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):3146:3146 -> a
+    835:848:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$18(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3149:3162 -> a
+    849:849:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$18(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3156:3156 -> a
+    850:850:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):3167:3167 -> a
+    851:857:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$19(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3170:3176 -> a
+    858:858:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$19(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3173:3173 -> a
+    859:859:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.shaking.ProguardKeepRule):3181:3181 -> a
     void reportMissingClass(com.android.tools.r8.graph.DexType) -> b
-    1:1:java.util.Map access$1200(com.android.tools.r8.shaking.Enqueuer):104:104 -> b
-    2:2:void access$3100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):104:104 -> b
-    3:3:void access$4000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason):104:104 -> b
-    4:4:void access$4200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):104:104 -> b
-    5:5:void access$900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):104:104 -> b
-    6:6:void enqueueRootItems(java.util.Map):326:326 -> b
-    7:7:void lambda$markTypeAsLive$4(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexAnnotation):883:883 -> b
-    8:8:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):903:903 -> b
-    8:8:void lambda$processNewlyLiveMethod$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1809 -> b
-    9:18:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):928:937 -> b
-    19:19:void lambda$handleInvokeOfStaticTarget$6(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):933:933 -> b
-    20:31:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1038:1049 -> b
-    32:68:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType):1069:1105 -> b
-    32:68:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1049 -> b
-    69:69:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1051:1051 -> b
-    70:87:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexType):1147:1164 -> b
-    70:87:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1051 -> b
-    88:88:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1053:1053 -> b
-    89:89:void markStaticFieldAsLive(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason):1168:1168 -> b
-    90:101:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1211:1222 -> b
-    102:113:void markInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1226:1237 -> b
-    114:115:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexType):1297:1298 -> b
-    116:116:java.util.Set lambda$markSuperMethodAsReachable$11(com.android.tools.r8.graph.DexEncodedMethod):1474:1474 -> b
-    117:117:boolean lambda$createAppInfo$14(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedField):1551:1551 -> b
-    118:145:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1729:1756 -> b
-    146:147:void collectProguardCompatibilityRule(com.android.tools.r8.shaking.KeepReason):1825:1826 -> b
-    148:150:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexClass):1853:1855 -> b
-    151:156:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexClass):1854:1859 -> b
-    157:157:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexClass):1858:1858 -> b
-    158:158:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexClass):1857:1857 -> b
-    1:1:java.util.Map access$1400(com.android.tools.r8.shaking.Enqueuer):104:104 -> c
-    2:22:java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer():297:317 -> c
-    23:23:java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer():313:313 -> c
-    24:41:void markMethodAsTargeted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1010:1027 -> c
-    42:46:void markMethodAsKeptWithCompatRule(com.android.tools.r8.graph.DexEncodedMethod):1864:1868 -> c
-    42:46:void markMethodAsTargeted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1028 -> c
-    47:47:void markMethodAsKeptWithCompatRule(com.android.tools.r8.graph.DexEncodedMethod):1867:1867 -> c
-    47:47:void markMethodAsTargeted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1028 -> c
-    48:51:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):1818:1821 -> c
-    52:52:void registerType(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2400:2400 -> c
-    53:53:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):2445:2445 -> c
-    53:53:void registerType(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2400 -> c
-    54:58:void registerType(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2400:2404 -> c
-    59:59:void registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2429:2429 -> c
-    60:60:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):2445:2445 -> c
-    60:60:void registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2429 -> c
-    61:65:void registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2429:2433 -> c
-    66:69:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$20(com.android.tools.r8.graph.DexType):2478:2481 -> c
-    1:1:java.util.Map access$1500(com.android.tools.r8.shaking.Enqueuer):104:104 -> d
-    2:2:java.util.Set lambda$handleAnnotation$5(com.android.tools.r8.graph.DexType):915:915 -> d
-    3:7:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1283:1287 -> d
-    8:15:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1285:1292 -> d
-    1:1:java.util.Map access$1600(com.android.tools.r8.shaking.Enqueuer):104:104 -> e
-    2:2:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$9(com.android.tools.r8.graph.DexType):1326:1326 -> e
-    3:30:void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1786:1813 -> e
-    1:1:java.util.Map access$1800(com.android.tools.r8.shaking.Enqueuer):104:104 -> f
-    2:2:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markVirtualMethodAsReachable$10(com.android.tools.r8.graph.DexType):1371:1371 -> f
-    3:8:void registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2416:2421 -> f
-    9:9:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):2445:2445 -> f
-    9:9:void registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2421 -> f
-    10:14:void registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2421:2425 -> f
-    1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.shaking.Enqueuer):104:104 -> g
-    2:2:java.util.Set lambda$registerItemWithTargetAndContext$2(com.android.tools.r8.graph.DexType):453:453 -> g
-    1:1:java.util.Map access$2000(com.android.tools.r8.shaking.Enqueuer):104:104 -> h
-    2:40:void markTypeAsLive(com.android.tools.r8.graph.DexType):832:870 -> h
-    41:48:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):386:393 -> h
-    41:48:void markTypeAsLive(com.android.tools.r8.graph.DexType):871 -> h
-    49:67:void markTypeAsLive(com.android.tools.r8.graph.DexType):874:892 -> h
-    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping access$2100(com.android.tools.r8.shaking.Enqueuer):104:104 -> i
-    1:1:java.util.Set access$2200(com.android.tools.r8.shaking.Enqueuer):104:104 -> j
-    1:1:java.util.Set access$2500(com.android.tools.r8.shaking.Enqueuer):104:104 -> k
-    1:1:com.android.tools.r8.utils.InternalOptions access$2700(com.android.tools.r8.shaking.Enqueuer):104:104 -> l
-    1:1:java.util.Set access$2800(com.android.tools.r8.shaking.Enqueuer):104:104 -> m
-    1:1:java.util.Set access$2900(com.android.tools.r8.shaking.Enqueuer):104:104 -> n
-    1:1:java.util.Set access$300(com.android.tools.r8.shaking.Enqueuer):104:104 -> o
-    1:1:java.util.Set access$3000(com.android.tools.r8.shaking.Enqueuer):104:104 -> p
-    1:1:java.util.Map access$3200(com.android.tools.r8.shaking.Enqueuer):104:104 -> q
-    1:1:boolean access$3500(com.android.tools.r8.shaking.Enqueuer):104:104 -> r
-    1:1:java.util.Set access$400(com.android.tools.r8.shaking.Enqueuer):104:104 -> s
-    1:1:java.util.Map access$500(com.android.tools.r8.shaking.Enqueuer):104:104 -> t
-    1:8:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1502:1509 -> traceApplication
-    1:1:java.util.Queue access$700(com.android.tools.r8.shaking.Enqueuer):104:104 -> u
-    1:1:java.util.Map access$800(com.android.tools.r8.shaking.Enqueuer):104:104 -> v
-com.android.tools.r8.shaking.Enqueuer$1 -> com.android.tools.r8.shaking.Enqueuer$1:
+    1:1:java.util.Map access$1200(com.android.tools.r8.shaking.Enqueuer):113:113 -> b
+    2:2:void access$3100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):113:113 -> b
+    3:3:void access$5500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason):113:113 -> b
+    4:4:void access$5700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):113:113 -> b
+    5:5:void access$900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):113:113 -> b
+    6:6:void enqueueRootItems(java.util.Map):335:335 -> b
+    7:7:void lambda$markTypeAsLive$4(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexAnnotation):885:885 -> b
+    8:8:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):905:905 -> b
+    8:8:void lambda$processNewlyLiveMethod$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1690 -> b
+    9:18:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):930:939 -> b
+    19:19:void lambda$handleInvokeOfStaticTarget$6(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):935:935 -> b
+    20:38:void markMethodAsTargeted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1012:1030 -> b
+    39:43:void markMethodAsKeptWithCompatRule(com.android.tools.r8.graph.DexEncodedMethod):1771:1775 -> b
+    39:43:void markMethodAsTargeted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1031 -> b
+    44:44:void markMethodAsKeptWithCompatRule(com.android.tools.r8.graph.DexEncodedMethod):1774:1774 -> b
+    44:44:void markMethodAsTargeted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1031 -> b
+    45:45:void markStaticFieldAsLive(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason):1168:1168 -> b
+    46:56:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1205:1215 -> b
+    57:68:void markInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1219:1230 -> b
+    69:70:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexType):1290:1291 -> b
+    71:71:java.util.Set lambda$markSuperMethodAsReachable$11(com.android.tools.r8.graph.DexEncodedMethod):1464:1464 -> b
+    72:73:void collectProguardCompatibilityRule(com.android.tools.r8.shaking.KeepReason):1706:1707 -> b
+    74:75:com.android.tools.r8.graph.DexField tryLookupInstanceField(com.android.tools.r8.graph.DexField):1734:1735 -> b
+    76:78:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexClass):1760:1762 -> b
+    79:84:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexClass):1761:1766 -> b
+    85:85:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexClass):1765:1765 -> b
+    86:86:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexClass):1764:1764 -> b
+    1:1:java.util.Map access$1400(com.android.tools.r8.shaking.Enqueuer):113:113 -> c
+    2:22:java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer():306:326 -> c
+    23:23:java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer():322:322 -> c
+    24:28:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1276:1280 -> c
+    29:36:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1278:1285 -> c
+    37:40:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):1699:1702 -> c
+    41:42:com.android.tools.r8.graph.DexField tryLookupStaticField(com.android.tools.r8.graph.DexField):1739:1740 -> c
+    43:43:void registerType(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):3060:3060 -> c
+    44:44:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):3105:3105 -> c
+    44:44:void registerType(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):3060 -> c
+    45:49:void registerType(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):3060:3064 -> c
+    50:50:void registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):3089:3089 -> c
+    51:51:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):3105:3105 -> c
+    51:51:void registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):3089 -> c
+    52:56:void registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):3089:3093 -> c
+    57:60:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$17(com.android.tools.r8.graph.DexType):3138:3141 -> c
+    1:1:java.util.Map access$1500(com.android.tools.r8.shaking.Enqueuer):113:113 -> d
+    2:2:java.util.Set lambda$handleAnnotation$5(com.android.tools.r8.graph.DexType):917:917 -> d
+    3:30:void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1667:1694 -> d
+    1:1:java.util.Map access$1600(com.android.tools.r8.shaking.Enqueuer):113:113 -> e
+    2:2:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$9(com.android.tools.r8.graph.DexType):1316:1316 -> e
+    3:8:void registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3076:3081 -> e
+    9:9:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):3105:3105 -> e
+    9:9:void registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3081 -> e
+    10:14:void registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3081:3085 -> e
+    1:1:java.util.Map access$1800(com.android.tools.r8.shaking.Enqueuer):113:113 -> f
+    2:2:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markVirtualMethodAsReachable$10(com.android.tools.r8.graph.DexType):1361:1361 -> f
+    1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.shaking.Enqueuer):113:113 -> g
+    2:2:java.util.Set lambda$registerItemWithTargetAndContext$2(com.android.tools.r8.graph.DexType):462:462 -> g
+    1:1:java.util.Map access$2000(com.android.tools.r8.shaking.Enqueuer):113:113 -> h
+    2:40:void markTypeAsLive(com.android.tools.r8.graph.DexType):834:872 -> h
+    41:48:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):395:402 -> h
+    41:48:void markTypeAsLive(com.android.tools.r8.graph.DexType):873 -> h
+    49:67:void markTypeAsLive(com.android.tools.r8.graph.DexType):876:894 -> h
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping access$2100(com.android.tools.r8.shaking.Enqueuer):113:113 -> i
+    1:1:java.util.Set access$2200(com.android.tools.r8.shaking.Enqueuer):113:113 -> j
+    1:1:java.util.Set access$2500(com.android.tools.r8.shaking.Enqueuer):113:113 -> k
+    1:1:com.android.tools.r8.utils.InternalOptions access$2700(com.android.tools.r8.shaking.Enqueuer):113:113 -> l
+    1:1:java.util.Set access$2800(com.android.tools.r8.shaking.Enqueuer):113:113 -> m
+    1:1:java.util.Set access$2900(com.android.tools.r8.shaking.Enqueuer):113:113 -> n
+    1:1:java.util.Set access$300(com.android.tools.r8.shaking.Enqueuer):113:113 -> o
+    1:1:java.util.Set access$3000(com.android.tools.r8.shaking.Enqueuer):113:113 -> p
+    1:1:java.util.Map access$3200(com.android.tools.r8.shaking.Enqueuer):113:113 -> q
+    1:1:boolean access$3500(com.android.tools.r8.shaking.Enqueuer):113:113 -> r
+    1:1:java.util.Set access$400(com.android.tools.r8.shaking.Enqueuer):113:113 -> s
+    1:1:java.util.Set access$4100(com.android.tools.r8.shaking.Enqueuer):113:113 -> t
+    1:8:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1492:1499 -> traceApplication
+    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason access$4200(com.android.tools.r8.shaking.Enqueuer):113:113 -> u
+    1:1:java.util.Set access$4300(com.android.tools.r8.shaking.Enqueuer):113:113 -> v
+    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason access$4400(com.android.tools.r8.shaking.Enqueuer):113:113 -> w
+    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason access$4500(com.android.tools.r8.shaking.Enqueuer):113:113 -> x
+    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason access$4600(com.android.tools.r8.shaking.Enqueuer):113:113 -> y
+    1:1:java.util.Set access$4700(com.android.tools.r8.shaking.Enqueuer):113:113 -> z
+com.android.tools.r8.shaking.Enqueuer$1 -> com.android.tools.r8.shaking.m:
     int[] $SwitchMap$com$android$tools$r8$shaking$Enqueuer$Action$Kind -> b
+    int[] $SwitchMap$com$android$tools$r8$ir$code$Invoke$Type -> c
     int[] $SwitchMap$com$android$tools$r8$graph$DexMethodHandle$MethodHandleType -> a
-    1:1:void <clinit>():1620:1620 -> <clinit>
-    2:2:void <clinit>():725:725 -> <clinit>
+    1:1:void <clinit>():2669:2669 -> <clinit>
+    2:2:void <clinit>():1511:1511 -> <clinit>
+    3:3:void <clinit>():727:727 -> <clinit>
 com.android.tools.r8.shaking.Enqueuer$Action -> com.android.tools.r8.shaking.Enqueuer$a:
     com.android.tools.r8.shaking.KeepReason reason -> d
     com.android.tools.r8.graph.DexItem target -> b
     com.android.tools.r8.graph.DexItem context -> c
     com.android.tools.r8.shaking.Enqueuer$Action$Kind kind -> a
-    1:5:void <init>(com.android.tools.r8.shaking.Enqueuer$Action$Kind,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem,com.android.tools.r8.shaking.KeepReason):2200:2204 -> <init>
-    1:1:com.android.tools.r8.shaking.Enqueuer$Action markReachableInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):2212:2212 -> a
-    2:2:com.android.tools.r8.shaking.Enqueuer$Action markReachableSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2216:2216 -> a
-    3:3:com.android.tools.r8.shaking.Enqueuer$Action markReachableField(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason):2220:2220 -> a
-    4:4:com.android.tools.r8.shaking.Enqueuer$Action markInstantiated(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):2224:2224 -> a
-    5:5:com.android.tools.r8.shaking.Enqueuer$Action markMethodKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2232:2232 -> a
-    6:6:com.android.tools.r8.shaking.Enqueuer$Action markFieldKept(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2236:2236 -> a
-    1:1:com.android.tools.r8.shaking.Enqueuer$Action markReachableVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):2208:2208 -> b
-    2:2:com.android.tools.r8.shaking.Enqueuer$Action markMethodLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2228:2228 -> b
+    1:5:void <init>(com.android.tools.r8.shaking.Enqueuer$Action$Kind,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem,com.android.tools.r8.shaking.KeepReason):1930:1934 -> <init>
+    1:1:com.android.tools.r8.shaking.Enqueuer$Action markReachableInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1942:1942 -> a
+    2:2:com.android.tools.r8.shaking.Enqueuer$Action markReachableSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1946:1946 -> a
+    3:3:com.android.tools.r8.shaking.Enqueuer$Action markReachableField(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepReason):1950:1950 -> a
+    4:4:com.android.tools.r8.shaking.Enqueuer$Action markInstantiated(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.KeepReason):1954:1954 -> a
+    5:5:com.android.tools.r8.shaking.Enqueuer$Action markMethodKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1962:1962 -> a
+    6:6:com.android.tools.r8.shaking.Enqueuer$Action markFieldKept(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1966:1966 -> a
+    1:1:com.android.tools.r8.shaking.Enqueuer$Action markReachableVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1938:1938 -> b
+    2:2:com.android.tools.r8.shaking.Enqueuer$Action markMethodLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1958:1958 -> b
 com.android.tools.r8.shaking.Enqueuer$Action$Kind -> com.android.tools.r8.shaking.Enqueuer$a$a:
     com.android.tools.r8.shaking.Enqueuer$Action$Kind MARK_INSTANTIATED -> e
     com.android.tools.r8.shaking.Enqueuer$Action$Kind MARK_METHOD_LIVE -> f
@@ -42807,103 +42030,224 @@
     com.android.tools.r8.shaking.Enqueuer$Action$Kind MARK_REACHABLE_INTERFACE -> b
     com.android.tools.r8.shaking.Enqueuer$Action$Kind MARK_REACHABLE_SUPER -> c
     com.android.tools.r8.shaking.Enqueuer$Action$Kind MARK_REACHABLE_FIELD -> d
-    1:8:void <clinit>():2240:2247 -> <clinit>
-    9:9:void <clinit>():2239:2239 -> <clinit>
-    1:1:void <init>(java.lang.String,int):2239:2239 -> <init>
-    1:1:com.android.tools.r8.shaking.Enqueuer$Action$Kind[] values():2239:2239 -> a
+    1:8:void <clinit>():1970:1977 -> <clinit>
+    9:9:void <clinit>():1969:1969 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1969:1969 -> <init>
+    1:1:com.android.tools.r8.shaking.Enqueuer$Action$Kind[] values():1969:1969 -> a
 com.android.tools.r8.shaking.Enqueuer$AnnotationReferenceMarker -> com.android.tools.r8.shaking.Enqueuer$b:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.DexItem annotationHolder -> a
     com.android.tools.r8.shaking.Enqueuer this$0 -> c
-    1:3:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory):2313:2315 -> <init>
-    1:3:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.Enqueuer$1):2308 -> <init>
+    1:3:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory):2973:2975 -> <init>
+    1:3:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.Enqueuer$1):2968 -> <init>
     boolean addCallSite(com.android.tools.r8.graph.DexCallSite) -> a
     boolean addClass(com.android.tools.r8.graph.DexProgramClass) -> a
     boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle) -> a
     boolean addProto(com.android.tools.r8.graph.DexProto) -> a
     boolean addString(com.android.tools.r8.graph.DexString) -> a
-    1:15:boolean addField(com.android.tools.r8.graph.DexField):2325:2339 -> b
-    16:25:boolean addMethod(com.android.tools.r8.graph.DexMethod):2347:2356 -> b
-    26:33:boolean addMethod(com.android.tools.r8.graph.DexMethod):2355:2362 -> b
-    34:35:boolean addType(com.android.tools.r8.graph.DexType):2392:2393 -> b
+    1:15:boolean addField(com.android.tools.r8.graph.DexField):2985:2999 -> a
+    16:25:boolean addMethod(com.android.tools.r8.graph.DexMethod):3007:3016 -> a
+    26:33:boolean addMethod(com.android.tools.r8.graph.DexMethod):3015:3022 -> a
+    34:35:boolean addType(com.android.tools.r8.graph.DexType):3052:3053 -> a
+com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness -> com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness:
+    java.util.SortedMap staticFieldReads -> z
+    java.util.Set neverPropagateValue -> T
+    java.util.SortedMap instanceFieldReads -> x
+    java.util.Set prunedTypes -> V
+    java.util.SortedSet fieldsWritten -> v
+    java.util.Map ordinalsMaps -> X
+    java.util.SortedSet liveFields -> t
+    java.util.IdentityHashMap indirectlyInstantiatedTypes -> n
+    java.util.SortedSet virtualMethodsTargetedByInvokeDirect -> r
+    java.util.SortedSet bootstrapMethods -> p
+    boolean $assertionsDisabled -> Z
+    java.util.SortedSet instantiatedAppServices -> l
+    java.util.Map mayHaveSideEffects -> J
+    java.util.Set keepConstantArguments -> P
+    java.util.SortedSet liveTypes -> j
+    java.util.SortedMap directInvokes -> E
+    java.util.Map assumedValues -> L
+    java.util.Set neverClassInline -> R
+    java.util.SortedMap interfaceInvokes -> C
+    java.util.SortedMap staticFieldWrites -> A
+    java.util.Set forceInline -> N
+    java.util.Set neverMerge -> S
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> U
+    java.util.SortedMap instanceFieldWrites -> y
+    java.util.Map switchMaps -> W
+    java.util.SortedSet staticFieldsWrittenOnlyInEnclosingStaticInitializer -> w
+    java.util.Set callSites -> G
+    java.util.SortedSet fieldsRead -> u
+    java.util.Set pinnedItems -> I
+    java.util.SortedSet liveMethods -> s
+    java.util.SortedSet methodsTargetedByInvokeDynamic -> q
+    com.android.tools.r8.com.google.common.collect.ImmutableSortedSet instantiatedLambdas -> Y
+    java.util.SortedSet targetedMethods -> o
+    java.util.SortedMap staticInvokes -> F
+    java.util.Set neverInline -> O
+    java.util.SortedSet instantiatedTypes -> m
+    java.util.SortedMap superInvokes -> D
+    java.util.Map noSideEffects -> K
+    java.util.Set keepUnusedArguments -> Q
+    java.util.SortedSet instantiatedAnnotationTypes -> k
+    java.util.SortedMap virtualInvokes -> B
+    java.util.SortedSet brokenSuperInvokes -> H
+    java.util.Set alwaysInline -> M
+    1:1:void <clinit>():1984:1984 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.Enqueuer$1):1984:1984 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2167:2167 -> <init>
+    3:167:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2005:2169 -> <init>
+    168:170:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2168:2170 -> <init>
+    171:171:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSortedSet.orderedBy(java.util.Comparator):416:416 -> <init>
+    171:171:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2171 -> <init>
+    172:176:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2172:2176 -> <init>
+    177:180:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2175:2178 -> <init>
+    181:185:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2177:2181 -> <init>
+    186:193:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2180:2187 -> <init>
+    194:198:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2186:2190 -> <init>
+    199:214:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2189:2204 -> <init>
+    215:239:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2202:2226 -> <init>
+    240:245:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):2549:2554 -> <init>
+    240:245:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2225 -> <init>
+    246:253:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.shaking.Enqueuer):2225:2232 -> <init>
+    254:254:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):2243:2243 -> <init>
+    255:514:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):2005:2264 -> <init>
+    515:526:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):2465:2476 -> <init>
+    515:526:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):2264 -> <init>
+    527:550:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):2265:2288 -> <init>
+    551:554:java.util.Set com.android.tools.r8.utils.CollectionUtils.mergeSets(java.util.Collection,java.util.Collection):13:16 -> <init>
+    551:554:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):2288 -> <init>
+    555:559:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection):2288:2292 -> <init>
+    560:560:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):2299:2299 -> <init>
+    561:909:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):2005:2353 -> <init>
+    910:926:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):2349:2365 -> <init>
+    927:943:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):2361:2377 -> <init>
+    944:953:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):2373:2382 -> <init>
+    954:954:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,java.util.Map,java.util.Map):2388:2388 -> <init>
+    955:1381:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,java.util.Map,java.util.Map):2005:2431 -> <init>
+    1:1:void lambda$new$0(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):2172:2172 -> a
+    2:6:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):2435:2439 -> a
+    7:7:void <init>(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication):2236:2236 -> a
+    7:7:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):2439 -> a
+    8:11:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):2440:2443 -> a
+    12:12:boolean lambda$withoutStaticFieldsWrites$1(java.util.Set,com.android.tools.r8.graph.DexField):2440:2440 -> a
+    13:15:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):2449:2451 -> a
+    16:16:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):2449:2449 -> a
+    17:22:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):2571:2576 -> a
+    23:31:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):2594:2602 -> a
+    32:32:java.util.Set lambda$rewriteKeysConservativelyWhileMergingValues$3(com.android.tools.r8.graph.PresortedComparable):2598:2598 -> a
+    33:34:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection):2639:2640 -> a
+    35:36:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):2645:2646 -> a
+    37:52:com.android.tools.r8.graph.DexEncodedMethod lookup(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2664:2679 -> a
+    53:53:com.android.tools.r8.graph.DexEncodedMethod lookup(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2677:2677 -> a
+    54:54:com.android.tools.r8.graph.DexEncodedMethod lookup(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2675:2675 -> a
+    55:55:com.android.tools.r8.graph.DexEncodedMethod lookup(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2673:2673 -> a
+    56:56:com.android.tools.r8.graph.DexEncodedMethod lookup(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2671:2671 -> a
+    57:95:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):2764:2802 -> a
+    96:105:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):2818:2827 -> a
+    106:131:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2841:2866 -> a
+    132:132:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    132:132:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2865 -> a
+    133:160:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2867:2894 -> a
+    161:163:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness addEnumOrdinalMaps(java.util.Map):2905:2907 -> a
+    1:6:java.util.SortedSet toSortedDescriptorSet(java.util.Set):2561:2566 -> b
+    7:13:java.util.SortedMap rewriteKeysWhileMergingValues(java.util.Map,java.util.function.Function):2582:2588 -> b
+    14:14:java.util.Set lambda$rewriteKeysWhileMergingValues$2(com.android.tools.r8.graph.PresortedComparable):2585:2585 -> b
+    15:16:boolean isPinned(com.android.tools.r8.graph.DexReference):2624:2625 -> b
+    17:62:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2695:2740 -> b
+    63:67:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2739:2743 -> b
+    68:68:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2726:2726 -> b
+    69:70:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod):2835:2836 -> b
+    71:73:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness addSwitchMaps(java.util.Map):2898:2900 -> b
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMapFor(com.android.tools.r8.graph.DexField):2460:2461 -> c
+    1:8:boolean isFieldRead(com.android.tools.r8.graph.DexField):2515:2522 -> d
+    9:10:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):2607:2608 -> d
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap getOrdinalsMapFor(com.android.tools.r8.graph.DexType):2455:2456 -> e
+    3:10:boolean isFieldWritten(com.android.tools.r8.graph.DexField):2526:2533 -> e
+    11:11:boolean hasLiveness():2613:2613 -> e
+    1:6:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexType):2482:2487 -> f
+    7:9:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexField):2537:2539 -> f
+    1:3:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):2509:2511 -> g
+    4:5:boolean isLibraryField(com.android.tools.r8.graph.DexField):2543:2544 -> g
+    1:15:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexType):2491:2505 -> h
+    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):2654:2655 -> i
+    1:1:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness withLiveness():2619:2619 -> j
+    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod):2689:2690 -> lookupSingleVirtualTarget
+    1:2:java.lang.Iterable getPinnedItems():2629:2630 -> n
+    1:2:java.util.Set getPrunedTypes():2659:2660 -> o
 com.android.tools.r8.shaking.Enqueuer$SetWithReason -> com.android.tools.r8.shaking.Enqueuer$c:
     java.util.Set items -> a
     java.util.function.BiConsumer register -> b
-    1:1:void <init>(java.util.function.BiConsumer):2257:2257 -> <init>
-    2:7:void <init>(java.util.function.BiConsumer):2253:2258 -> <init>
-    1:1:java.util.Set access$3800(com.android.tools.r8.shaking.Enqueuer$SetWithReason):2251:2251 -> a
-    2:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):2262:2263 -> a
-    4:4:boolean contains(java.lang.Object):2267:2267 -> a
-    5:5:java.util.Set getItems():2271:2271 -> a
+    1:1:void <init>(java.util.function.BiConsumer):2917:2917 -> <init>
+    2:7:void <init>(java.util.function.BiConsumer):2913:2918 -> <init>
+    1:1:java.util.Set access$3900(com.android.tools.r8.shaking.Enqueuer$SetWithReason):2911:2911 -> a
+    2:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):2922:2923 -> a
+    4:4:boolean contains(java.lang.Object):2927:2927 -> a
+    5:5:java.util.Set getItems():2931:2931 -> a
 com.android.tools.r8.shaking.Enqueuer$TargetWithContext -> com.android.tools.r8.shaking.Enqueuer$d:
     com.android.tools.r8.graph.Descriptor target -> a
     com.android.tools.r8.graph.DexEncodedMethod context -> b
-    1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod):2280:2282 -> <init>
-    1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$1):2275 -> <init>
-    1:1:com.android.tools.r8.graph.Descriptor access$000(com.android.tools.r8.shaking.Enqueuer$TargetWithContext):2275:2275 -> a
-    2:2:com.android.tools.r8.graph.DexEncodedMethod getContext():2290:2290 -> a
-    1:1:com.android.tools.r8.graph.Descriptor getTarget():2286:2286 -> b
-    1:5:boolean equals(java.lang.Object):2300:2304 -> equals
-    1:1:int hashCode():2295:2295 -> hashCode
+    1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod):2940:2942 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$1):2935 -> <init>
+    1:1:com.android.tools.r8.graph.Descriptor access$000(com.android.tools.r8.shaking.Enqueuer$TargetWithContext):2935:2935 -> a
+    2:2:com.android.tools.r8.graph.DexEncodedMethod getContext():2950:2950 -> a
+    1:1:com.android.tools.r8.graph.Descriptor getTarget():2946:2946 -> b
+    1:5:boolean equals(java.lang.Object):2960:2964 -> equals
+    1:1:int hashCode():2955:2955 -> hashCode
 com.android.tools.r8.shaking.Enqueuer$UseRegistry -> com.android.tools.r8.shaking.Enqueuer$e:
     com.android.tools.r8.shaking.Enqueuer this$0 -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexEncodedMethod currentMethod -> c
-    1:1:void <clinit>():457:457 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexEncodedMethod):461:463 -> <init>
-    1:3:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$1):457 -> <init>
+    1:1:void <clinit>():466:466 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexEncodedMethod):470:472 -> <init>
+    1:3:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$1):466 -> <init>
     1:35:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):60:94 -> a
-    1:35:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):663 -> a
+    1:35:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):665 -> a
     36:36:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):88:88 -> a
-    36:36:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):663 -> a
+    36:36:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):665 -> a
     37:43:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):85:91 -> a
-    37:43:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):663 -> a
+    37:43:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):665 -> a
     44:46:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):80:82 -> a
-    44:46:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):663 -> a
+    44:46:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):665 -> a
     47:50:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):74:77 -> a
-    47:50:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):663 -> a
+    47:50:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):665 -> a
     51:60:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):62:71 -> a
-    51:60:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):663 -> a
-    61:64:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):670:673 -> a
+    51:60:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):665 -> a
+    61:64:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):672:675 -> a
     65:65:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.methodHandleReferencedIn(com.android.tools.r8.graph.DexEncodedMethod):90:90 -> a
-    65:65:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):673 -> a
-    66:66:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):673:673 -> a
-    67:67:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):493:493 -> a
-    68:74:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):497:503 -> a
-    75:81:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):588:594 -> a
-    82:82:boolean registerCheckCast(com.android.tools.r8.graph.DexType):652:652 -> a
-    83:145:void registerCallSite(com.android.tools.r8.graph.DexCallSite):680:742 -> a
-    146:155:void registerCallSite(com.android.tools.r8.graph.DexCallSite):730:739 -> a
-    156:156:boolean registerNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):604:604 -> a
-    156:156:void registerCallSite(com.android.tools.r8.graph.DexCallSite):739 -> a
-    157:157:void registerCallSite(com.android.tools.r8.graph.DexCallSite):733:733 -> a
-    158:201:void registerCallSite(com.android.tools.r8.graph.DexCallSite):727:770 -> a
-    202:221:void registerCallSite(com.android.tools.r8.graph.DexCallSite):769:788 -> a
-    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):544:544 -> b
-    2:8:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):548:554 -> b
-    9:16:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):575:582 -> b
-    17:17:boolean registerConstClass(com.android.tools.r8.graph.DexType):647:647 -> b
-    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):509:509 -> c
-    2:27:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):513:538 -> c
-    28:28:boolean registerNewInstance(com.android.tools.r8.graph.DexType):600:600 -> c
-    29:29:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.DexEncodedMethod):34:34 -> c
-    29:29:boolean registerNewInstance(com.android.tools.r8.graph.DexType):600 -> c
-    30:30:boolean registerNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):604:604 -> c
-    30:30:boolean registerNewInstance(com.android.tools.r8.graph.DexType):600 -> c
-    31:37:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):610:616 -> c
-    1:8:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):472:479 -> d
-    9:22:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):474:487 -> d
-    23:30:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):562:569 -> d
-    31:49:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):622:640 -> d
-    50:50:boolean registerTypeReference(com.android.tools.r8.graph.DexType):657:657 -> d
-    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):468:468 -> e
-    2:11:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):793:802 -> e
-    12:12:boolean registerTypeReference(com.android.tools.r8.graph.DexType):657:657 -> e
-    12:12:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):808 -> e
-com.android.tools.r8.shaking.EnqueuerUtils -> com.android.tools.r8.shaking.n:
-    1:1:boolean lambda$extractProgramFieldDefinitions$0(com.android.tools.r8.graph.AppInfo,java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedField):27:27 -> a
-    2:16:java.util.SortedSet extractFieldDefinitions(java.util.Set,java.util.Set,com.android.tools.r8.graph.AppInfo,java.util.function.Predicate):35:49 -> a
-    1:1:java.util.SortedSet extractProgramFieldDefinitions(java.util.Set,java.util.Set,com.android.tools.r8.graph.AppInfo,java.util.function.Predicate):23:23 -> b
+    65:65:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):675 -> a
+    66:66:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):675:675 -> a
+    67:67:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):499:499 -> a
+    68:74:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):503:509 -> a
+    75:81:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):590:596 -> a
+    82:82:boolean registerCheckCast(com.android.tools.r8.graph.DexType):654:654 -> a
+    83:145:void registerCallSite(com.android.tools.r8.graph.DexCallSite):682:744 -> a
+    146:155:void registerCallSite(com.android.tools.r8.graph.DexCallSite):732:741 -> a
+    156:156:boolean registerNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):606:606 -> a
+    156:156:void registerCallSite(com.android.tools.r8.graph.DexCallSite):741 -> a
+    157:157:void registerCallSite(com.android.tools.r8.graph.DexCallSite):735:735 -> a
+    158:201:void registerCallSite(com.android.tools.r8.graph.DexCallSite):729:772 -> a
+    202:221:void registerCallSite(com.android.tools.r8.graph.DexCallSite):771:790 -> a
+    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):546:546 -> b
+    2:8:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):550:556 -> b
+    9:16:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):577:584 -> b
+    17:17:boolean registerConstClass(com.android.tools.r8.graph.DexType):649:649 -> b
+    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):515:515 -> c
+    2:23:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):519:540 -> c
+    24:24:boolean registerNewInstance(com.android.tools.r8.graph.DexType):602:602 -> c
+    25:25:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.DexEncodedMethod):34:34 -> c
+    25:25:boolean registerNewInstance(com.android.tools.r8.graph.DexType):602 -> c
+    26:26:boolean registerNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):606:606 -> c
+    26:26:boolean registerNewInstance(com.android.tools.r8.graph.DexType):602 -> c
+    27:33:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):612:618 -> c
+    1:13:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):481:493 -> d
+    14:21:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):564:571 -> d
+    22:40:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):624:642 -> d
+    41:41:boolean registerTypeReference(com.android.tools.r8.graph.DexType):659:659 -> d
+    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):477:477 -> e
+    2:11:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):795:804 -> e
+    12:12:boolean registerTypeReference(com.android.tools.r8.graph.DexType):659:659 -> e
+    12:12:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):810 -> e
 com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.shaking.FilteredClassPath:
     java.nio.file.Path path -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList pattern -> b
@@ -42916,24 +42260,24 @@
     1:1:boolean isUnfiltered():119:119 -> b
     1:7:boolean matchesFile(java.lang.String):51:57 -> matchesFile
     1:16:java.lang.String toString():124:139 -> toString
-com.android.tools.r8.shaking.InlineRule -> com.android.tools.r8.shaking.q:
-    com.android.tools.r8.origin.Origin checkDiscardOrigin -> p
-    boolean $assertionsDisabled -> q
-    com.android.tools.r8.shaking.InlineRule$Type type -> o
+com.android.tools.r8.shaking.InlineRule -> com.android.tools.r8.shaking.o:
+    com.android.tools.r8.origin.Origin checkDiscardOrigin -> b
+    com.android.tools.r8.shaking.InlineRule$Type type -> a
+    boolean $assertionsDisabled -> c
     1:3:void <clinit>():11:13 -> <clinit>
     1:4:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.InlineRule$Type):67:70 -> <init>
     1:1:com.android.tools.r8.shaking.InlineRule$Builder builder():74:74 -> builder
     1:1:com.android.tools.r8.shaking.InlineRule$Type getType():78:78 -> getType
     1:14:com.android.tools.r8.shaking.ProguardCheckDiscardRule asProguardCheckDiscardRule():82:95 -> h
     1:9:java.lang.String typeString():100:108 -> typeString
-com.android.tools.r8.shaking.InlineRule$1 -> com.android.tools.r8.shaking.o:
+com.android.tools.r8.shaking.InlineRule$1 -> com.android.tools.r8.shaking.n:
     1:1:void <init>(com.android.tools.r8.origin.Origin):13:13 -> <init>
-com.android.tools.r8.shaking.InlineRule$Builder -> com.android.tools.r8.shaking.p:
+com.android.tools.r8.shaking.InlineRule$Builder -> com.android.tools.r8.shaking.o$a:
     com.android.tools.r8.shaking.InlineRule$Type type -> o
     1:1:void <init>():27:27 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.InlineRule$1):24 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> g
-com.android.tools.r8.shaking.InlineRule$Type -> com.android.tools.r8.shaking.q$a:
+com.android.tools.r8.shaking.InlineRule$Type -> com.android.tools.r8.shaking.p:
     com.android.tools.r8.shaking.InlineRule$Type[] $VALUES -> d
     com.android.tools.r8.shaking.InlineRule$Type NEVER -> c
     com.android.tools.r8.shaking.InlineRule$Type FORCE -> b
@@ -42942,7 +42286,7 @@
     2:2:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(java.lang.String,int):20:20 -> <init>
     1:1:com.android.tools.r8.shaking.InlineRule$Type[] values():20:20 -> a
-com.android.tools.r8.shaking.KeepReason -> com.android.tools.r8.shaking.H:
+com.android.tools.r8.shaking.KeepReason -> com.android.tools.r8.shaking.r:
     1:1:void <init>():15:15 -> <init>
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind() -> a
     com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer) -> a
@@ -42960,8 +42304,8 @@
     boolean isDueToReflectiveUse() -> e
     1:1:com.android.tools.r8.shaking.KeepReason invokedViaSuperFrom(com.android.tools.r8.graph.DexEncodedMethod):38:38 -> e
     1:1:com.android.tools.r8.shaking.KeepReason reflectiveUseIn(com.android.tools.r8.graph.DexEncodedMethod):86:86 -> f
-com.android.tools.r8.shaking.KeepReason$1 -> com.android.tools.r8.shaking.r:
-com.android.tools.r8.shaking.KeepReason$AnnotatedOn -> com.android.tools.r8.shaking.s:
+com.android.tools.r8.shaking.KeepReason$1 -> com.android.tools.r8.shaking.q:
+com.android.tools.r8.shaking.KeepReason$AnnotatedOn -> com.android.tools.r8.shaking.r$a:
     com.android.tools.r8.graph.DexDefinition holder -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():310:310 -> <clinit>
@@ -42969,12 +42313,12 @@
     1:2:void <init>(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason$1):310 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():320:320 -> a
     2:8:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):325:331 -> a
-com.android.tools.r8.shaking.KeepReason$BasedOnOtherMethod -> com.android.tools.r8.shaking.t:
+com.android.tools.r8.shaking.KeepReason$BasedOnOtherMethod -> com.android.tools.r8.shaking.s:
     com.android.tools.r8.graph.DexEncodedMethod method -> a
     1:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):142:143 -> <init>
     1:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):138 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):150:150 -> a
-com.android.tools.r8.shaking.KeepReason$DueToKeepRule -> com.android.tools.r8.shaking.u:
+com.android.tools.r8.shaking.KeepReason$DueToKeepRule -> com.android.tools.r8.shaking.r$b:
     com.android.tools.r8.shaking.ProguardKeepRule keepRule -> a
     1:2:void <init>(com.android.tools.r8.shaking.ProguardKeepRule):97:98 -> <init>
     1:2:void <init>(com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.KeepReason$1):93 -> <init>
@@ -42982,58 +42326,58 @@
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):118:118 -> a
     1:1:com.android.tools.r8.shaking.ProguardKeepRule getProguardKeepRule():113:113 -> b
     boolean isDueToKeepRule() -> c
-com.android.tools.r8.shaking.KeepReason$DueToProguardCompatibilityKeepRule -> com.android.tools.r8.shaking.v:
+com.android.tools.r8.shaking.KeepReason$DueToProguardCompatibilityKeepRule -> com.android.tools.r8.shaking.r$c:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardKeepRule):124:124 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.KeepReason$1):122 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():129:129 -> a
     boolean isDueToProguardCompatibility() -> d
-com.android.tools.r8.shaking.KeepReason$InstatiatedIn -> com.android.tools.r8.shaking.w:
+com.android.tools.r8.shaking.KeepReason$InstatiatedIn -> com.android.tools.r8.shaking.r$d:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):154 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():162:162 -> a
-com.android.tools.r8.shaking.KeepReason$InvokedFrom -> com.android.tools.r8.shaking.x:
+com.android.tools.r8.shaking.KeepReason$InvokedFrom -> com.android.tools.r8.shaking.r$e:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):208:208 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):205 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():213:213 -> a
-com.android.tools.r8.shaking.KeepReason$InvokedFromLambdaCreatedIn -> com.android.tools.r8.shaking.y:
+com.android.tools.r8.shaking.KeepReason$InvokedFromLambdaCreatedIn -> com.android.tools.r8.shaking.r$f:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):225:225 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):222 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():230:230 -> a
-com.android.tools.r8.shaking.KeepReason$InvokedViaSuper -> com.android.tools.r8.shaking.z:
+com.android.tools.r8.shaking.KeepReason$InvokedViaSuper -> com.android.tools.r8.shaking.r$g:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):174:174 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):171 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():179:179 -> a
-com.android.tools.r8.shaking.KeepReason$IsLibraryMethod -> com.android.tools.r8.shaking.A:
+com.android.tools.r8.shaking.KeepReason$IsLibraryMethod -> com.android.tools.r8.shaking.r$h:
     1:1:void <init>():277:277 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.KeepReason$1):275 -> <init>
     com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer) -> a
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():282:282 -> a
-com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom -> com.android.tools.r8.shaking.B:
+com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom -> com.android.tools.r8.shaking.r$i:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):361:361 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):358 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():366:366 -> a
-com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType -> com.android.tools.r8.shaking.C:
+com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType -> com.android.tools.r8.shaking.r$j:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):260:261 -> <init>
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):256 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():266:266 -> a
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):271:271 -> a
-com.android.tools.r8.shaking.KeepReason$ReferencedFrom -> com.android.tools.r8.shaking.D:
+com.android.tools.r8.shaking.KeepReason$ReferencedFrom -> com.android.tools.r8.shaking.r$k:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):242:242 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):239 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():247:247 -> a
-com.android.tools.r8.shaking.KeepReason$ReferencedInAnnotation -> com.android.tools.r8.shaking.E:
+com.android.tools.r8.shaking.KeepReason$ReferencedInAnnotation -> com.android.tools.r8.shaking.r$l:
     com.android.tools.r8.graph.DexItem holder -> a
     1:2:void <init>(com.android.tools.r8.graph.DexItem):295:296 -> <init>
     1:2:void <init>(com.android.tools.r8.graph.DexItem,com.android.tools.r8.shaking.KeepReason$1):291 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():301:301 -> a
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):306:306 -> a
-com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom -> com.android.tools.r8.shaking.F:
+com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom -> com.android.tools.r8.shaking.r$m:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):339:339 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):336 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():349:349 -> a
     boolean isDueToReflectiveUse() -> e
-com.android.tools.r8.shaking.KeepReason$TargetedBySuper -> com.android.tools.r8.shaking.G:
+com.android.tools.r8.shaking.KeepReason$TargetedBySuper -> com.android.tools.r8.shaking.r$n:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):191:191 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):188 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():196:196 -> a
@@ -43042,34 +42386,35 @@
     java.util.Set roots -> a
     java.util.Set dependencies -> b
     boolean $assertionsDisabled -> d
-    1:3:void <clinit>():18:20 -> <clinit>
-    1:1:void <init>(java.util.Set,java.util.Set,com.android.tools.r8.shaking.MainDexClasses$1):18:18 -> <init>
-    2:6:void <init>(java.util.Set,java.util.Set):70:74 -> <init>
-    1:1:java.util.Set getClasses():91:91 -> a
-    2:2:void collectTypesMatching(java.util.Set,java.util.function.Predicate,java.util.function.Consumer):96:96 -> a
-    3:4:void lambda$collectTypesMatching$0(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexType):98:99 -> a
-    5:9:com.android.tools.r8.shaking.MainDexClasses prunedCopy(com.android.tools.r8.shaking.AppInfoWithLiveness):105:109 -> a
-    10:10:com.android.tools.r8.shaking.MainDexClasses$Builder builder(com.android.tools.r8.graph.AppInfo):113:113 -> a
-    1:1:java.util.Set getDependencies():87:87 -> b
-    1:1:java.util.Set getRoots():83:83 -> c
-    1:2:boolean isEmpty():78:79 -> d
+    1:3:void <clinit>():19:21 -> <clinit>
+    1:1:void <init>(java.util.Set,java.util.Set,com.android.tools.r8.shaking.MainDexClasses$1):19:19 -> <init>
+    2:6:void <init>(java.util.Set,java.util.Set):71:75 -> <init>
+    1:1:java.util.Set getClasses():92:92 -> a
+    2:2:void collectTypesMatching(java.util.Set,java.util.function.Predicate,java.util.function.Consumer):97:97 -> a
+    3:4:void lambda$collectTypesMatching$0(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexType):99:100 -> a
+    5:9:com.android.tools.r8.shaking.MainDexClasses prunedCopy(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness):106:110 -> a
+    10:10:com.android.tools.r8.shaking.MainDexClasses$Builder builder(com.android.tools.r8.graph.AppInfo):114:114 -> a
+    1:1:java.util.Set getDependencies():88:88 -> b
+    1:1:java.util.Set getRoots():84:84 -> c
+    1:2:boolean isEmpty():79:80 -> d
+com.android.tools.r8.shaking.MainDexClasses$1 -> com.android.tools.r8.shaking.t:
 com.android.tools.r8.shaking.MainDexClasses$Builder -> com.android.tools.r8.shaking.MainDexClasses$a:
     java.util.Set dependencies -> c
     java.util.Set roots -> b
     com.android.tools.r8.graph.AppInfo appInfo -> a
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppInfo):27:27 -> <init>
-    1:1:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.shaking.MainDexClasses$1):22 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.AppInfo):24:28 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.shaking.MainDexClasses$1):22 -> <init>
-    1:2:com.android.tools.r8.shaking.MainDexClasses$Builder addRoots(java.util.Collection):38:39 -> a
-    3:4:com.android.tools.r8.shaking.MainDexClasses$Builder addDependency(com.android.tools.r8.graph.DexType):44:45 -> a
-    5:5:com.android.tools.r8.shaking.MainDexClasses build():54:54 -> a
-    1:2:com.android.tools.r8.shaking.MainDexClasses$Builder addRoot(com.android.tools.r8.graph.DexType):32:33 -> b
-    1:1:boolean contains(com.android.tools.r8.graph.DexType):50:50 -> c
-    1:2:boolean isProgramClass(com.android.tools.r8.graph.DexType):58:59 -> d
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.shaking.M:
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppInfo):28:28 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.shaking.MainDexClasses$1):23 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.AppInfo):25:29 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.shaking.MainDexClasses$1):23 -> <init>
+    1:2:com.android.tools.r8.shaking.MainDexClasses$Builder addRoots(java.util.Collection):39:40 -> a
+    3:4:com.android.tools.r8.shaking.MainDexClasses$Builder addDependency(com.android.tools.r8.graph.DexType):45:46 -> a
+    5:5:com.android.tools.r8.shaking.MainDexClasses build():55:55 -> a
+    1:2:com.android.tools.r8.shaking.MainDexClasses$Builder addRoot(com.android.tools.r8.graph.DexType):33:34 -> b
+    1:1:boolean contains(com.android.tools.r8.graph.DexType):51:51 -> c
+    1:2:boolean isProgramClass(com.android.tools.r8.graph.DexType):59:60 -> d
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.shaking.y:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector codeDirectReferenceCollector -> b
     java.util.function.Consumer consumer -> d
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> c
@@ -43092,26 +42437,26 @@
     20:20:boolean hasReferencesOutsideFromCode(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):81:81 -> a
     21:25:void lambda$hasReferencesOutsideFromCode$2(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$BooleanBox,com.android.tools.r8.graph.DexType):71:75 -> a
     26:29:void traceMethodDirectDependencies(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):89:92 -> a
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1 -> com.android.tools.r8.shaking.I:
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.shaking.J:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1 -> com.android.tools.r8.shaking.u:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.shaking.v:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> a
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer):172:172 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):172 -> <init>
     boolean addString(com.android.tools.r8.graph.DexString) -> a
     1:1:boolean addClass(com.android.tools.r8.graph.DexProgramClass):176:176 -> a
-    2:4:boolean addProto(com.android.tools.r8.graph.DexProto):201:203 -> a
-    5:5:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):216:216 -> a
-    6:6:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):221:221 -> a
-    1:2:boolean addField(com.android.tools.r8.graph.DexField):182:183 -> b
-    3:4:boolean addMethod(com.android.tools.r8.graph.DexMethod):189:190 -> b
-    5:7:boolean addProto(com.android.tools.r8.graph.DexProto):201:203 -> b
-    5:7:boolean addMethod(com.android.tools.r8.graph.DexMethod):190 -> b
-    8:8:boolean addType(com.android.tools.r8.graph.DexType):210:210 -> b
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$BooleanBox -> com.android.tools.r8.shaking.K:
+    2:3:boolean addField(com.android.tools.r8.graph.DexField):182:183 -> a
+    4:5:boolean addMethod(com.android.tools.r8.graph.DexMethod):189:190 -> a
+    6:8:boolean addProto(com.android.tools.r8.graph.DexProto):201:203 -> a
+    6:8:boolean addMethod(com.android.tools.r8.graph.DexMethod):190 -> a
+    9:11:boolean addProto(com.android.tools.r8.graph.DexProto):201:203 -> a
+    12:12:boolean addType(com.android.tools.r8.graph.DexType):210:210 -> a
+    13:13:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):216:216 -> a
+    14:14:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):221:221 -> a
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$BooleanBox -> com.android.tools.r8.shaking.w:
     boolean value -> a
     1:2:void <init>():59:60 -> <init>
     1:2:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):59 -> <init>
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.shaking.L:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.shaking.x:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> c
     1:2:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.DexItemFactory):98:99 -> <init>
     1:2:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):96 -> <init>
@@ -43128,7 +42473,7 @@
     1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):104:104 -> e
     2:3:boolean registerFieldAccess(com.android.tools.r8.graph.DexField):154:155 -> e
     1:2:boolean registerInvoke(com.android.tools.r8.graph.DexMethod):128:129 -> f
-com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.shaking.N:
+com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.shaking.z:
     java.util.Map annotationTypeContainEnum -> c
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> b
     boolean $assertionsDisabled -> f
@@ -43167,22 +42512,22 @@
     13:13:void traceRuntimeAnnotationsWithEnumForMainDex():73 -> c
     14:14:void traceRuntimeAnnotationsWithEnumForMainDex():78:78 -> c
     15:16:boolean isProgramClass(com.android.tools.r8.graph.DexType):128:129 -> c
-com.android.tools.r8.shaking.MemberValuePropagationRule -> com.android.tools.r8.shaking.Q:
-    com.android.tools.r8.shaking.MemberValuePropagationRule$Type type -> o
+com.android.tools.r8.shaking.MemberValuePropagationRule -> com.android.tools.r8.shaking.B:
+    com.android.tools.r8.shaking.MemberValuePropagationRule$Type type -> a
     1:4:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.MemberValuePropagationRule$Type):61:64 -> <init>
     1:4:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.shaking.MemberValuePropagationRule$1):11 -> <init>
     1:1:com.android.tools.r8.shaking.MemberValuePropagationRule$Builder builder():68:68 -> builder
     1:1:com.android.tools.r8.shaking.MemberValuePropagationRule$Type getType():72:72 -> getType
     1:5:java.lang.String typeString():77:81 -> typeString
-com.android.tools.r8.shaking.MemberValuePropagationRule$1 -> com.android.tools.r8.shaking.O:
+com.android.tools.r8.shaking.MemberValuePropagationRule$1 -> com.android.tools.r8.shaking.A:
     int[] $SwitchMap$com$android$tools$r8$shaking$MemberValuePropagationRule$Type -> a
     1:1:void <clinit>():77:77 -> <clinit>
-com.android.tools.r8.shaking.MemberValuePropagationRule$Builder -> com.android.tools.r8.shaking.P:
+com.android.tools.r8.shaking.MemberValuePropagationRule$Builder -> com.android.tools.r8.shaking.B$a:
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type type -> o
     1:1:void <init>():21:21 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.MemberValuePropagationRule$1):17 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> g
-com.android.tools.r8.shaking.MemberValuePropagationRule$Type -> com.android.tools.r8.shaking.Q$a:
+com.android.tools.r8.shaking.MemberValuePropagationRule$Type -> com.android.tools.r8.shaking.C:
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type[] $VALUES -> b
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type NEVER -> a
     1:1:void <clinit>():14:14 -> <clinit>
@@ -43190,66 +42535,65 @@
     1:1:void <init>(java.lang.String,int):13:13 -> <init>
     1:1:com.android.tools.r8.shaking.MemberValuePropagationRule$Type[] values():13:13 -> a
 com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.shaking.ProguardAccessFlags:
-    java.util.List NAMES -> c
-    int PPP_MASK -> b
+    java.util.List NAMES -> b
     int flags -> a
-    1:7:void <clinit>():15:21 -> <clinit>
-    1:6:void <init>():13:18 -> <init>
-    1:1:void setFlags(com.android.tools.r8.graph.AccessFlags):77:77 -> a
-    2:7:void setVisibility(com.android.tools.r8.graph.ClassAccessFlags):108:113 -> a
-    8:8:boolean isAbstract():138:138 -> a
-    9:9:boolean isSet(int):198:198 -> a
-    1:1:boolean isBridge():194:194 -> b
-    2:2:void set(int):202:202 -> b
-    1:1:boolean isFinal():130:130 -> c
-    1:1:boolean containsAll(com.android.tools.r8.graph.AccessFlags):69:69 -> containsAll
-    2:2:boolean containsAll(int):57:57 -> containsAll
-    2:2:boolean containsAll(com.android.tools.r8.graph.AccessFlags):69 -> containsAll
-    1:1:boolean containsNone(com.android.tools.r8.graph.AccessFlags):73:73 -> containsNone
-    2:2:boolean containsNone(int):65:65 -> containsNone
-    2:2:boolean containsNone(com.android.tools.r8.graph.AccessFlags):73 -> containsNone
-    1:1:boolean isNative():170:170 -> d
-    1:1:boolean isPrivate():95:95 -> e
-    1:1:boolean isPublic():86:86 -> f
-    1:1:boolean isStatic():122:122 -> g
-    1:1:boolean isStrict():178:178 -> h
-    1:1:boolean isSynchronized():162:162 -> i
-    1:1:boolean isProtected():104:104 -> isProtected
-    1:1:boolean isSynthetic():186:186 -> j
-    1:1:boolean isTransient():154:154 -> k
-    1:1:boolean isVolatile():146:146 -> l
-    1:1:void setAbstract():134:134 -> m
-    1:1:void setBridge():190:190 -> n
-    1:1:void setFinal():126:126 -> o
-    1:1:void setNative():166:166 -> p
-    1:1:com.android.tools.r8.shaking.ProguardAccessFlags setPrivate():90:90 -> q
-    1:1:com.android.tools.r8.shaking.ProguardAccessFlags setProtected():99:99 -> r
-    1:1:com.android.tools.r8.shaking.ProguardAccessFlags setPublic():81:81 -> s
-    1:1:void setStatic():118:118 -> t
-    1:14:java.lang.String toString():207:220 -> toString
-    1:1:void setStrict():174:174 -> u
-    1:1:void setSynchronized():158:158 -> v
-    1:1:void setSynthetic():182:182 -> w
-    1:1:void setTransient():150:150 -> x
-    1:1:void setVolatile():142:142 -> y
-    1:1:java.util.List getPredicates():39:39 -> z
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule -> com.android.tools.r8.shaking.U:
+    1:1:void <clinit>():18:18 -> <clinit>
+    1:3:void <init>():13:15 -> <init>
+    1:1:void setFlags(com.android.tools.r8.graph.AccessFlags):69:69 -> a
+    2:7:void setVisibility(com.android.tools.r8.graph.ClassAccessFlags):97:102 -> a
+    8:8:boolean isAbstract():127:127 -> a
+    9:9:boolean isSet(int):187:187 -> a
+    1:1:boolean isBridge():183:183 -> b
+    2:2:void set(int):191:191 -> b
+    1:1:boolean isFinal():119:119 -> c
+    1:1:boolean containsAll(com.android.tools.r8.graph.AccessFlags):61:61 -> containsAll
+    2:2:boolean containsAll(int):53:53 -> containsAll
+    2:2:boolean containsAll(com.android.tools.r8.graph.AccessFlags):61 -> containsAll
+    1:1:boolean containsNone(com.android.tools.r8.graph.AccessFlags):65:65 -> containsNone
+    2:2:boolean containsNone(int):57:57 -> containsNone
+    2:2:boolean containsNone(com.android.tools.r8.graph.AccessFlags):65 -> containsNone
+    1:1:boolean isNative():159:159 -> d
+    1:1:boolean isPrivate():85:85 -> e
+    1:1:boolean isPublic():77:77 -> f
+    1:1:boolean isStatic():111:111 -> g
+    1:1:boolean isStrict():167:167 -> h
+    1:1:boolean isSynchronized():151:151 -> i
+    1:1:boolean isProtected():93:93 -> isProtected
+    1:1:boolean isSynthetic():175:175 -> j
+    1:1:boolean isTransient():143:143 -> k
+    1:1:boolean isVolatile():135:135 -> l
+    1:1:void setAbstract():123:123 -> m
+    1:1:void setBridge():179:179 -> n
+    1:1:void setFinal():115:115 -> o
+    1:1:void setNative():155:155 -> p
+    1:1:void setPrivate():81:81 -> q
+    1:1:void setProtected():89:89 -> r
+    1:1:void setPublic():73:73 -> s
+    1:1:void setStatic():107:107 -> t
+    1:14:java.lang.String toString():196:209 -> toString
+    1:1:void setStrict():163:163 -> u
+    1:1:void setSynchronized():147:147 -> v
+    1:1:void setSynthetic():171:171 -> w
+    1:1:void setTransient():139:139 -> x
+    1:1:void setVolatile():131:131 -> y
+    1:1:java.util.List getPredicates():36:36 -> z
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule -> com.android.tools.r8.shaking.E:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1):10 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder builder():75:75 -> builder
-    boolean applyToNonProgramClasses() -> f
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1 -> com.android.tools.r8.shaking.S:
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder -> com.android.tools.r8.shaking.T:
+    boolean applyToLibraryClasses() -> f
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1 -> com.android.tools.r8.shaking.D:
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder -> com.android.tools.r8.shaking.E$a:
     1:1:void <init>():16:16 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1):12 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> g
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule -> com.android.tools.r8.shaking.X:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule -> com.android.tools.r8.shaking.G:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):46:46 -> <init>
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1):10 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder builder():55:55 -> builder
-    boolean applyToNonProgramClasses() -> f
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1 -> com.android.tools.r8.shaking.V:
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder -> com.android.tools.r8.shaking.W:
+    boolean applyToLibraryClasses() -> f
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1 -> com.android.tools.r8.shaking.F:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder -> com.android.tools.r8.shaking.G$a:
     1:1:void <init>():16:16 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1):12 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> g
@@ -43257,17 +42601,18 @@
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):46:46 -> <init>
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardAssumeValuesRule$1):10 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder builder():55:55 -> builder
+com.android.tools.r8.shaking.ProguardAssumeValuesRule$1 -> com.android.tools.r8.shaking.H:
 com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder -> com.android.tools.r8.shaking.ProguardAssumeValuesRule$a:
     1:1:void <init>():16:16 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardAssumeValuesRule$1):12 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardAssumeValuesRule build():26:26 -> build
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> g
-com.android.tools.r8.shaking.ProguardCheckDiscardRule -> com.android.tools.r8.shaking.aa:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule -> com.android.tools.r8.shaking.J:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):46:46 -> <init>
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardCheckDiscardRule$1):10 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder builder():52:52 -> builder
-com.android.tools.r8.shaking.ProguardCheckDiscardRule$1 -> com.android.tools.r8.shaking.Y:
-com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder -> com.android.tools.r8.shaking.Z:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule$1 -> com.android.tools.r8.shaking.I:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder -> com.android.tools.r8.shaking.J$a:
     1:1:void <init>():16:16 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardCheckDiscardRule$1):12 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardCheckDiscardRule build():26:26 -> build
@@ -43286,6 +42631,7 @@
     1:1:com.android.tools.r8.shaking.ProguardClassFilter$Builder builder():18:18 -> builder
     1:1:com.android.tools.r8.shaking.ProguardClassFilter empty():42:42 -> empty
     1:2:boolean matches(com.android.tools.r8.graph.DexType):50:51 -> matches
+com.android.tools.r8.shaking.ProguardClassFilter$1 -> com.android.tools.r8.shaking.K:
 com.android.tools.r8.shaking.ProguardClassFilter$Builder -> com.android.tools.r8.shaking.ProguardClassFilter$Builder:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder patterns -> a
     1:1:void <init>():24:24 -> <init>
@@ -43305,6 +42651,7 @@
     1:1:java.lang.Iterable getWildcards():79:79 -> getWildcards
     1:1:com.android.tools.r8.shaking.ProguardClassNameList singletonList(com.android.tools.r8.shaking.ProguardTypeMatcher):30:30 -> singletonList
     1:3:java.lang.String toString():69:71 -> toString
+com.android.tools.r8.shaking.ProguardClassNameList$1 -> com.android.tools.r8.shaking.L:
 com.android.tools.r8.shaking.ProguardClassNameList$Builder -> com.android.tools.r8.shaking.ProguardClassNameList$Builder:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap matchers -> a
     1:1:void <init>():42:42 -> <init>
@@ -43312,7 +42659,10 @@
     2:2:void <init>():40:40 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.ProguardClassNameList$1):35 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardClassNameList$Builder addClassName(boolean,com.android.tools.r8.shaking.ProguardTypeMatcher):46:46 -> addClassName
-    1:8:com.android.tools.r8.shaking.ProguardClassNameList build():51:58 -> build
+    1:6:com.android.tools.r8.shaking.ProguardClassNameList build():51:56 -> build
+    7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getOnlyElement(java.lang.Iterable):266:266 -> build
+    7:7:com.android.tools.r8.shaking.ProguardClassNameList build():56 -> build
+    8:10:com.android.tools.r8.shaking.ProguardClassNameList build():56:58 -> build
 com.android.tools.r8.shaking.ProguardClassNameList$MixedClassNameList -> com.android.tools.r8.shaking.ProguardClassNameList$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap classNames -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):229:230 -> <init>
@@ -43449,109 +42799,109 @@
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.shaking.ProguardClassType$1):9 -> <init>
     boolean matches(com.android.tools.r8.graph.DexClass) -> a
     1:9:java.lang.String toString():43:51 -> toString
-com.android.tools.r8.shaking.ProguardClassType$1 -> com.android.tools.r8.shaking.ProguardClassType$1:
+com.android.tools.r8.shaking.ProguardClassType$1 -> com.android.tools.r8.shaking.M:
     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.shaking.ProguardClassType$2:
+com.android.tools.r8.shaking.ProguardClassType$2 -> com.android.tools.r8.shaking.N:
     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.shaking.ProguardClassType$3:
+com.android.tools.r8.shaking.ProguardClassType$3 -> com.android.tools.r8.shaking.O:
     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.shaking.ProguardClassType$4:
+com.android.tools.r8.shaking.ProguardClassType$4 -> com.android.tools.r8.shaking.P:
     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.shaking.ProguardClassType$5:
+com.android.tools.r8.shaking.ProguardClassType$5 -> com.android.tools.r8.shaking.Q:
     1:1:void <init>(java.lang.String,int):34:34 -> <init>
     boolean matches(com.android.tools.r8.graph.DexClass) -> a
 com.android.tools.r8.shaking.ProguardConfiguration -> com.android.tools.r8.shaking.ProguardConfiguration:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.lang.String packagePrefix -> f
     boolean optimizing -> i
-    com.android.tools.r8.shaking.ProguardClassFilter dontNotePatterns -> x
     boolean shrinking -> k
+    com.android.tools.r8.shaking.ProguardClassFilter dontWarnPatterns -> v
     java.nio.file.Path printConfigurationFile -> m
     com.android.tools.r8.shaking.ProguardPathFilter keepDirectories -> J
     java.nio.file.Path printMappingFile -> q
+    com.android.tools.r8.com.google.common.collect.ImmutableList obfuscationDictionary -> B
     java.nio.file.Path printUsageFile -> o
     boolean verbose -> s
-    com.android.tools.r8.com.google.common.collect.ImmutableList classObfuscationDictionary -> D
+    com.android.tools.r8.com.google.common.collect.ImmutableList packageObfuscationDictionary -> D
     com.android.tools.r8.com.google.common.collect.ImmutableList injars -> c
     java.lang.String renameSourceFileAttribute -> t
     java.nio.file.Path applyMappingFile -> r
+    boolean printSeeds -> y
     com.android.tools.r8.shaking.ProguardClassFilter adaptClassStrings -> G
     com.android.tools.r8.shaking.ProguardPathFilter adaptResourceFileContents -> I
+    boolean useUniqueClassMemberNames -> E
     java.lang.String parsedConfiguration -> a
     boolean ignoreWarnings -> h
-    com.android.tools.r8.shaking.ProguardPackageNameList keepPackageNamesPatterns -> v
+    java.nio.file.Path seedFile -> z
+    boolean overloadAggressively -> A
     boolean printUsage -> n
     com.android.tools.r8.shaking.ProguardKeepAttributes keepAttributes -> u
     boolean printMapping -> p
     boolean obfuscating -> j
-    com.android.tools.r8.shaking.ProguardClassFilter dontWarnPatterns -> w
-    com.android.tools.r8.com.google.common.collect.ImmutableList rules -> y
+    com.android.tools.r8.shaking.ProguardClassFilter dontNotePatterns -> w
     boolean printConfiguration -> l
-    com.android.tools.r8.com.google.common.collect.ImmutableList packageObfuscationDictionary -> E
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryjars -> d
-    com.android.tools.r8.com.google.common.collect.ImmutableList obfuscationDictionary -> C
+    com.android.tools.r8.com.google.common.collect.ImmutableList classObfuscationDictionary -> C
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode packageObfuscationMode -> e
-    boolean printSeeds -> z
     com.android.tools.r8.shaking.ProguardPathFilter adaptResourceFilenames -> H
     boolean keepParameterNames -> F
     boolean allowAccessModification -> g
-    java.nio.file.Path seedFile -> A
-    boolean overloadAggressively -> B
-    1:37:void <init>(java.lang.String,com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.List,com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode,java.lang.String,boolean,boolean,boolean,boolean,boolean,boolean,java.nio.file.Path,boolean,java.nio.file.Path,boolean,java.nio.file.Path,java.nio.file.Path,boolean,java.lang.String,com.android.tools.r8.shaking.ProguardKeepAttributes,com.android.tools.r8.shaking.ProguardPackageNameList,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardClassFilter,java.util.Set,boolean,java.nio.file.Path,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,boolean,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter):433:469 -> <init>
-    1:37:void <init>(java.lang.String,com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.List,com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode,java.lang.String,boolean,boolean,boolean,boolean,boolean,boolean,java.nio.file.Path,boolean,java.nio.file.Path,boolean,java.nio.file.Path,java.nio.file.Path,boolean,java.lang.String,com.android.tools.r8.shaking.ProguardKeepAttributes,com.android.tools.r8.shaking.ProguardPackageNameList,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardClassFilter,java.util.Set,boolean,java.nio.file.Path,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,boolean,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardConfiguration$1):20 -> <init>
-    1:1:java.util.List getClassObfuscationDictionary():593:593 -> a
-    1:1:java.util.List getInjars():489:489 -> b
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder builder(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):477:477 -> builder
-    1:1:java.util.List getObfuscationDictionary():589:589 -> c
-    1:1:java.util.List getPackageObfuscationDictionary():597:597 -> d
-    1:1:java.lang.String getParsedConfiguration():481:481 -> e
-    1:1:boolean isAccessModificationAllowed():505:505 -> f
-    1:1:boolean isIgnoreWarnings():525:525 -> g
-    1:1:com.android.tools.r8.shaking.ProguardClassFilter getAdaptClassStrings():605:605 -> getAdaptClassStrings
-    1:1:com.android.tools.r8.shaking.ProguardPathFilter getAdaptResourceFileContents():613:613 -> getAdaptResourceFileContents
-    1:1:com.android.tools.r8.shaking.ProguardPathFilter getAdaptResourceFilenames():609:609 -> getAdaptResourceFilenames
-    1:1:java.nio.file.Path getApplyMappingFile():521:521 -> getApplyMappingFile
-    1:1:com.android.tools.r8.graph.DexItemFactory getDexItemFactory():485:485 -> getDexItemFactory
-    1:1:com.android.tools.r8.shaking.ProguardClassFilter getDontNotePatterns():577:577 -> getDontNotePatterns
-    1:1:com.android.tools.r8.shaking.ProguardClassFilter getDontWarnPatterns():573:573 -> getDontWarnPatterns
-    1:1:com.android.tools.r8.shaking.ProguardKeepAttributes getKeepAttributes():565:565 -> getKeepAttributes
-    1:1:com.android.tools.r8.shaking.ProguardPathFilter getKeepDirectories():617:617 -> getKeepDirectories
-    1:1:com.android.tools.r8.shaking.ProguardPackageNameList getKeepPackageNamesPatterns():569:569 -> getKeepPackageNamesPatterns
-    1:1:java.util.List getLibraryjars():493:493 -> getLibraryjars
-    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode getPackageObfuscationMode():497:497 -> getPackageObfuscationMode
-    1:1:java.lang.String getPackagePrefix():501:501 -> getPackagePrefix
-    1:1:java.nio.file.Path getPrintConfigurationFile():545:545 -> getPrintConfigurationFile
-    1:1:java.nio.file.Path getPrintMappingFile():513:513 -> getPrintMappingFile
-    1:1:java.nio.file.Path getPrintUsageFile():553:553 -> getPrintUsageFile
-    1:1:java.lang.String getRenameSourceFileAttribute():561:561 -> getRenameSourceFileAttribute
-    1:1:java.util.List getRules():581:581 -> getRules
-    1:1:java.nio.file.Path getSeedFile():625:625 -> getSeedFile
-    1:1:boolean isOverloadAggressively():585:585 -> h
-    1:1:boolean hasApplyMappingFile():517:517 -> hasApplyMappingFile
-    1:1:boolean isPrintMapping():509:509 -> i
-    1:1:boolean isKeepParameterNames():601:601 -> isKeepParameterNames
-    1:1:boolean isObfuscating():533:533 -> isObfuscating
-    1:1:boolean isOptimizing():529:529 -> isOptimizing
-    1:1:boolean isPrintConfiguration():541:541 -> isPrintConfiguration
-    1:1:boolean isPrintSeeds():621:621 -> isPrintSeeds
-    1:1:boolean isPrintUsage():549:549 -> isPrintUsage
-    1:1:boolean isShrinking():537:537 -> isShrinking
-    1:1:boolean isVerbose():557:557 -> isVerbose
-    1:10:java.lang.String toString():630:639 -> toString
+    com.android.tools.r8.com.google.common.collect.ImmutableList rules -> x
+    1:37:void <init>(java.lang.String,com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.List,com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode,java.lang.String,boolean,boolean,boolean,boolean,boolean,boolean,java.nio.file.Path,boolean,java.nio.file.Path,boolean,java.nio.file.Path,java.nio.file.Path,boolean,java.lang.String,com.android.tools.r8.shaking.ProguardKeepAttributes,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardClassFilter,java.util.Set,boolean,java.nio.file.Path,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,boolean,boolean,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter):435:471 -> <init>
+    1:37:void <init>(java.lang.String,com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.List,com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode,java.lang.String,boolean,boolean,boolean,boolean,boolean,boolean,java.nio.file.Path,boolean,java.nio.file.Path,boolean,java.nio.file.Path,java.nio.file.Path,boolean,java.lang.String,com.android.tools.r8.shaking.ProguardKeepAttributes,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardClassFilter,java.util.Set,boolean,java.nio.file.Path,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,boolean,boolean,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardConfiguration$1):20 -> <init>
+    1:1:java.util.List getClassObfuscationDictionary():591:591 -> a
+    1:1:java.util.List getInjars():491:491 -> b
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder builder(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):479:479 -> builder
+    1:1:java.util.List getObfuscationDictionary():587:587 -> c
+    1:1:java.util.List getPackageObfuscationDictionary():595:595 -> d
+    1:1:java.lang.String getParsedConfiguration():483:483 -> e
+    1:1:boolean isAccessModificationAllowed():507:507 -> f
+    1:1:boolean isIgnoreWarnings():527:527 -> g
+    1:1:com.android.tools.r8.shaking.ProguardClassFilter getAdaptClassStrings():607:607 -> getAdaptClassStrings
+    1:1:com.android.tools.r8.shaking.ProguardPathFilter getAdaptResourceFileContents():615:615 -> getAdaptResourceFileContents
+    1:1:com.android.tools.r8.shaking.ProguardPathFilter getAdaptResourceFilenames():611:611 -> getAdaptResourceFilenames
+    1:1:java.nio.file.Path getApplyMappingFile():523:523 -> getApplyMappingFile
+    1:1:com.android.tools.r8.graph.DexItemFactory getDexItemFactory():487:487 -> getDexItemFactory
+    1:1:com.android.tools.r8.shaking.ProguardClassFilter getDontNotePatterns():575:575 -> getDontNotePatterns
+    1:1:com.android.tools.r8.shaking.ProguardClassFilter getDontWarnPatterns():571:571 -> getDontWarnPatterns
+    1:1:com.android.tools.r8.shaking.ProguardKeepAttributes getKeepAttributes():567:567 -> getKeepAttributes
+    1:1:com.android.tools.r8.shaking.ProguardPathFilter getKeepDirectories():619:619 -> getKeepDirectories
+    1:1:java.util.List getLibraryjars():495:495 -> getLibraryjars
+    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode getPackageObfuscationMode():499:499 -> getPackageObfuscationMode
+    1:1:java.lang.String getPackagePrefix():503:503 -> getPackagePrefix
+    1:1:java.nio.file.Path getPrintConfigurationFile():547:547 -> getPrintConfigurationFile
+    1:1:java.nio.file.Path getPrintMappingFile():515:515 -> getPrintMappingFile
+    1:1:java.nio.file.Path getPrintUsageFile():555:555 -> getPrintUsageFile
+    1:1:java.lang.String getRenameSourceFileAttribute():563:563 -> getRenameSourceFileAttribute
+    1:1:java.util.List getRules():579:579 -> getRules
+    1:1:java.nio.file.Path getSeedFile():627:627 -> getSeedFile
+    1:1:boolean isOverloadAggressivelyWithoutUseUniqueClassMemberNames():583:583 -> h
+    1:1:boolean hasApplyMappingFile():519:519 -> hasApplyMappingFile
+    1:1:boolean isPrintMapping():511:511 -> i
+    1:1:boolean isKeepParameterNames():603:603 -> isKeepParameterNames
+    1:1:boolean isObfuscating():535:535 -> isObfuscating
+    1:1:boolean isOptimizing():531:531 -> isOptimizing
+    1:1:boolean isPrintConfiguration():543:543 -> isPrintConfiguration
+    1:1:boolean isPrintSeeds():623:623 -> isPrintSeeds
+    1:1:boolean isPrintUsage():551:551 -> isPrintUsage
+    1:1:boolean isShrinking():539:539 -> isShrinking
+    1:1:boolean isUseUniqueClassMemberNames():599:599 -> isUseUniqueClassMemberNames
+    1:1:boolean isVerbose():559:559 -> isVerbose
+    1:10:java.lang.String toString():632:641 -> toString
+com.android.tools.r8.shaking.ProguardConfiguration$1 -> com.android.tools.r8.shaking.S:
 com.android.tools.r8.shaking.ProguardConfiguration$Builder -> com.android.tools.r8.shaking.ProguardConfiguration$Builder:
     java.lang.String packagePrefix -> f
-    java.nio.file.Path classObfuscationDictionary -> D
+    java.nio.file.Path packageObfuscationDictionary -> D
     boolean overloadAggressively -> N
-    java.util.Set rules -> y
     boolean $assertionsDisabled -> P
-    java.nio.file.Path seedFile -> B
+    java.nio.file.Path obfuscationDictionary -> B
     boolean optimizing -> i
     boolean shrinking -> k
-    com.android.tools.r8.shaking.ProguardClassFilter$Builder dontWarnPatterns -> w
+    com.android.tools.r8.shaking.ProguardClassFilter$Builder dontNotePatterns -> w
     java.nio.file.Path printConfigurationFile -> m
     com.android.tools.r8.origin.Origin keepParameterNamesOptionOrigin -> G
     com.android.tools.r8.position.Position keepParameterNamesOptionPosition -> H
@@ -43563,85 +42913,88 @@
     com.android.tools.r8.shaking.ProguardPathFilter$Builder adaptResourceFilenames -> J
     com.android.tools.r8.shaking.ProguardPathFilter$Builder keepDirectories -> L
     java.nio.file.Path applyMappingFile -> r
+    com.android.tools.r8.graph.DexItemFactory dexItemFactory -> y
+    boolean useUniqueClassMemberNames -> E
     boolean ignoreWarnings -> h
-    boolean printSeeds -> A
-    com.android.tools.r8.shaking.ProguardClassFilter$Builder dontNotePatterns -> x
-    java.nio.file.Path packageObfuscationDictionary -> E
     boolean forceProguardCompatibility -> M
     boolean printUsage -> n
-    java.nio.file.Path obfuscationDictionary -> C
+    java.util.Set rules -> x
+    java.nio.file.Path classObfuscationDictionary -> C
     boolean keepRuleSynthesisForRecompilation -> O
     boolean printMapping -> p
     boolean obfuscating -> j
     java.util.List keepAttributePatterns -> u
+    com.android.tools.r8.shaking.ProguardClassFilter$Builder dontWarnPatterns -> v
     boolean printConfiguration -> l
     com.android.tools.r8.utils.Reporter reporter -> d
-    com.android.tools.r8.graph.DexItemFactory dexItemFactory -> z
-    com.android.tools.r8.shaking.ProguardPackageNameList$Builder keepPackageNamesPatterns -> v
     java.util.List parsedConfiguration -> a
     com.android.tools.r8.shaking.ProguardClassFilter$Builder adaptClassStrings -> I
     com.android.tools.r8.shaking.ProguardPathFilter$Builder adaptResourceFileContents -> K
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode packageObfuscationMode -> e
+    boolean printSeeds -> z
     java.util.List libraryjars -> c
     boolean keepParameterNames -> F
     boolean allowAccessModification -> g
+    java.nio.file.Path seedFile -> A
     1:1:void <clinit>():22:22 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):72:72 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):71:71 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.shaking.ProguardConfiguration$1):22 -> <init>
-    2:52:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):24:74 -> <init>
-    2:52:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.shaking.ProguardConfiguration$1):22 -> <init>
-    1:1:void addParsedConfiguration(java.lang.String):78:78 -> a
-    2:2:void addInjars(java.util.List):82:82 -> a
-    3:3:void setAllowAccessModification(boolean):104:104 -> a
-    4:4:void setApplyMappingFile(java.nio.file.Path):165:165 -> a
-    5:5:void addKeepPackageNamesPattern(boolean,com.android.tools.r8.shaking.ProguardPackageMatcher):186:186 -> a
-    6:9:void setKeepParameterNames(boolean,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):223:226 -> a
-    10:10:void addAdaptClassStringsPattern(com.android.tools.r8.shaking.ProguardClassNameList):242:242 -> a
-    11:11:void addAdaptResourceFileContents(com.android.tools.r8.shaking.ProguardPathList):250:250 -> a
-    12:12:java.lang.String[] lambda$synthesizeKeepRulesForRecompilation$0(int):287:287 -> a
-    13:52:com.android.tools.r8.shaking.ProguardConfiguration buildRaw():292:331 -> a
-    53:55:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):346:348 -> a
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder addKeepAttributePatterns(java.util.List):177:177 -> addKeepAttributePatterns
-    1:1:void addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):182:182 -> addRule
-    1:1:void addLibraryJars(java.util.List):86:86 -> b
-    2:3:void setFlattenPackagePrefix(java.lang.String):99:100 -> b
-    4:4:void addDontNotePattern(com.android.tools.r8.shaking.ProguardClassNameList):194:194 -> b
-    5:5:void setClassObfuscationDictionary(java.nio.file.Path):210:210 -> b
-    6:6:void addAdaptResourceFilenames(com.android.tools.r8.shaking.ProguardPathList):246:246 -> b
-    7:7:void enableKeepDirectories():254:254 -> b
-    8:8:void setForceProguardCompatibility(boolean):262:262 -> b
-    1:20:com.android.tools.r8.shaking.ProguardConfiguration build():337:356 -> build
-    1:2:void setPackagePrefix(java.lang.String):94:95 -> c
-    3:3:void setPrintConfiguration(boolean):139:139 -> c
-    4:4:void addDontWarnPattern(com.android.tools.r8.shaking.ProguardClassNameList):190:190 -> c
-    5:5:void setObfuscationDictionary(java.nio.file.Path):206:206 -> c
-    6:6:void addKeepDirectories(com.android.tools.r8.shaking.ProguardPathList):258:258 -> c
-    7:7:void enableKeepRuleSynthesisForRecompilation():270:270 -> c
-    1:1:void setPrintUsage(boolean):148:148 -> d
-    2:2:void setPackageObfuscationDictionary(java.nio.file.Path):214:214 -> d
-    3:3:com.android.tools.r8.origin.Origin getKeepParameterNamesOptionOrigin():234:234 -> d
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableObfuscation():117:117 -> disableObfuscation
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableOptimization():112:112 -> disableOptimization
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableShrinking():134:134 -> disableShrinking
-    1:2:void setPrintConfigurationFile(java.nio.file.Path):143:144 -> e
-    3:3:void setVerbose(boolean):169:169 -> e
-    4:4:com.android.tools.r8.position.Position getKeepParameterNamesOptionPosition():238:238 -> e
-    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode getPackageObfuscationMode():90:90 -> f
-    2:2:void setPrintUsageFile(java.nio.file.Path):152:152 -> f
-    1:1:void setSeedFile(java.nio.file.Path):198:198 -> g
-    2:2:boolean isKeepParameterNames():230:230 -> g
-    1:1:boolean isObfuscating():122:122 -> h
-    1:1:boolean isOptimizing():126:126 -> i
-    1:1:boolean isShrinking():130:130 -> j
-    1:10:void synthesizeKeepRulesForRecompilation():278:287 -> k
-    11:11:void synthesizeKeepRulesForRecompilation():284:284 -> k
-    12:12:void synthesizeKeepRulesForRecompilation():283:283 -> k
-    1:1:void setIgnoreWarnings(boolean):108:108 -> setIgnoreWarnings
-    1:1:void setOverloadAggressively(boolean):266:266 -> setOverloadAggressively
-    1:1:void setPrintMapping(boolean):156:156 -> setPrintMapping
-    1:2:void setPrintMappingFile(java.nio.file.Path):160:161 -> setPrintMappingFile
-    1:1:void setPrintSeeds(boolean):202:202 -> setPrintSeeds
-    1:1:void setRenameSourceFileAttribute(java.lang.String):173:173 -> setRenameSourceFileAttribute
+    2:51:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):24:73 -> <init>
+    2:51:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.shaking.ProguardConfiguration$1):22 -> <init>
+    1:1:void addParsedConfiguration(java.lang.String):77:77 -> a
+    2:2:void addInjars(java.util.List):81:81 -> a
+    3:3:void setAllowAccessModification(boolean):103:103 -> a
+    4:4:void setApplyMappingFile(java.nio.file.Path):164:164 -> a
+    5:8:void setKeepParameterNames(boolean,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):226:229 -> a
+    9:9:void addAdaptClassStringsPattern(com.android.tools.r8.shaking.ProguardClassNameList):245:245 -> a
+    10:10:void addAdaptResourceFileContents(com.android.tools.r8.shaking.ProguardPathList):253:253 -> a
+    11:11:java.lang.String[] lambda$synthesizeKeepRulesForRecompilation$0(int):290:290 -> a
+    12:50:com.android.tools.r8.shaking.ProguardConfiguration buildRaw():295:333 -> a
+    51:53:void lambda$build$1(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder):348:350 -> a
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder addKeepAttributePatterns(java.util.List):176:176 -> addKeepAttributePatterns
+    1:1:void addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):181:181 -> addRule
+    1:1:void addLibraryJars(java.util.List):85:85 -> b
+    2:3:void setFlattenPackagePrefix(java.lang.String):98:99 -> b
+    4:4:void addDontNotePattern(com.android.tools.r8.shaking.ProguardClassNameList):189:189 -> b
+    5:5:void setClassObfuscationDictionary(java.nio.file.Path):205:205 -> b
+    6:6:void addAdaptResourceFilenames(com.android.tools.r8.shaking.ProguardPathList):249:249 -> b
+    7:7:void enableKeepDirectories():257:257 -> b
+    8:8:void setForceProguardCompatibility(boolean):265:265 -> b
+    1:20:com.android.tools.r8.shaking.ProguardConfiguration build():339:358 -> build
+    1:2:void setPackagePrefix(java.lang.String):93:94 -> c
+    3:3:void setPrintConfiguration(boolean):138:138 -> c
+    4:4:void addDontWarnPattern(com.android.tools.r8.shaking.ProguardClassNameList):185:185 -> c
+    5:5:void setObfuscationDictionary(java.nio.file.Path):201:201 -> c
+    6:6:void addKeepDirectories(com.android.tools.r8.shaking.ProguardPathList):261:261 -> c
+    7:7:void enableKeepRuleSynthesisForRecompilation():273:273 -> c
+    1:1:void setPrintUsage(boolean):147:147 -> d
+    2:2:void setPackageObfuscationDictionary(java.nio.file.Path):209:209 -> d
+    3:3:com.android.tools.r8.origin.Origin getKeepParameterNamesOptionOrigin():237:237 -> d
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableObfuscation():116:116 -> disableObfuscation
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableOptimization():111:111 -> disableOptimization
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableShrinking():133:133 -> disableShrinking
+    1:2:void setPrintConfigurationFile(java.nio.file.Path):142:143 -> e
+    3:3:void setVerbose(boolean):168:168 -> e
+    4:4:com.android.tools.r8.position.Position getKeepParameterNamesOptionPosition():241:241 -> e
+    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode getPackageObfuscationMode():89:89 -> f
+    2:2:void setPrintUsageFile(java.nio.file.Path):151:151 -> f
+    1:1:void setSeedFile(java.nio.file.Path):193:193 -> g
+    2:2:boolean isKeepParameterNames():233:233 -> g
+    1:1:boolean isObfuscating():121:121 -> h
+    1:1:boolean isOptimizing():125:125 -> i
+    1:1:boolean isOverloadAggressively():221:221 -> j
+    1:1:boolean isShrinking():129:129 -> k
+    1:1:boolean isUseUniqueClassMemberNames():217:217 -> l
+    1:10:void synthesizeKeepRulesForRecompilation():281:290 -> m
+    11:11:void synthesizeKeepRulesForRecompilation():287:287 -> m
+    12:12:void synthesizeKeepRulesForRecompilation():286:286 -> m
+    1:1:void setIgnoreWarnings(boolean):107:107 -> setIgnoreWarnings
+    1:1:void setOverloadAggressively(boolean):269:269 -> setOverloadAggressively
+    1:1:void setPrintMapping(boolean):155:155 -> setPrintMapping
+    1:2:void setPrintMappingFile(java.nio.file.Path):159:160 -> setPrintMappingFile
+    1:1:void setPrintSeeds(boolean):197:197 -> setPrintSeeds
+    1:1:void setRenameSourceFileAttribute(java.lang.String):172:172 -> setRenameSourceFileAttribute
+    1:1:void setUseUniqueClassMemberNames(boolean):213:213 -> setUseUniqueClassMemberNames
 com.android.tools.r8.shaking.ProguardConfigurationParser -> com.android.tools.r8.shaking.ProguardConfigurationParser:
     com.android.tools.r8.shaking.ProguardConfiguration$Builder configurationBuilder -> a
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
@@ -43656,57 +43009,55 @@
     java.util.List WARNED_CLASS_DESCRIPTOR_OPTIONS -> l
     java.util.List WARNED_FLAG_OPTIONS -> k
     boolean allowTestOptions -> d
-    1:52:void <clinit>():54:105 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):109:109 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean):113:118 -> <init>
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder access$000(com.android.tools.r8.shaking.ProguardConfigurationParser):45:45 -> a
-    2:2:java.util.List access$1000():45:45 -> a
-    3:3:java.lang.String access$1300(com.android.tools.r8.shaking.ProguardConfigurationParser,java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):45:45 -> a
-    4:11:void parse(java.util.List):162:169 -> a
-    12:13:void parse(java.util.List):166:167 -> a
-    14:20:void parse(java.util.List):166:172 -> a
-    21:27:java.lang.String getTextSourceSnippet(java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):1874:1880 -> a
-    1:1:boolean access$100(com.android.tools.r8.shaking.ProguardConfigurationParser):45:45 -> b
-    2:2:java.util.List access$1100():45:45 -> b
-    1:1:com.android.tools.r8.graph.DexItemFactory access$1200(com.android.tools.r8.shaking.ProguardConfigurationParser):45:45 -> c
-    2:2:java.util.List access$300():45:45 -> c
-    1:1:com.android.tools.r8.utils.Reporter access$200(com.android.tools.r8.shaking.ProguardConfigurationParser):45:45 -> d
-    2:2:java.util.List access$400():45:45 -> d
-    1:1:java.util.List access$500():45:45 -> e
-    1:1:java.util.List access$600():45:45 -> f
-    1:1:java.util.List access$700():45:45 -> g
-    1:2:com.android.tools.r8.shaking.ProguardConfiguration getConfig():140:141 -> getConfig
-    1:2:com.android.tools.r8.shaking.ProguardConfiguration getConfigRawForTesting():149:150 -> getConfigRawForTesting
-    1:1:java.util.List access$800():45:45 -> h
-    1:1:java.util.List access$900():45:45 -> i
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder getConfigurationBuilder():122:122 -> j
-    1:7:void validate():126:132 -> k
-    8:8:void validate():129:129 -> k
-    1:1:void parse(java.nio.file.Path):154:154 -> parse
-    2:2:void parse(com.android.tools.r8.shaking.ProguardConfigurationSource):158:158 -> parse
+    1:51:void <clinit>():53:103 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):107:107 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean):111:116 -> <init>
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder access$000(com.android.tools.r8.shaking.ProguardConfigurationParser):44:44 -> a
+    2:2:java.util.List access$1000():44:44 -> a
+    3:3:java.lang.String access$1300(com.android.tools.r8.shaking.ProguardConfigurationParser,java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):44:44 -> a
+    4:11:void parse(java.util.List):167:174 -> a
+    12:13:void parse(java.util.List):171:172 -> a
+    14:20:void parse(java.util.List):171:177 -> a
+    21:27:java.lang.String getTextSourceSnippet(java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):1866:1872 -> a
+    1:1:boolean access$100(com.android.tools.r8.shaking.ProguardConfigurationParser):44:44 -> b
+    2:2:java.util.List access$1100():44:44 -> b
+    1:1:com.android.tools.r8.graph.DexItemFactory access$1200(com.android.tools.r8.shaking.ProguardConfigurationParser):44:44 -> c
+    2:2:java.util.List access$300():44:44 -> c
+    1:1:com.android.tools.r8.utils.Reporter access$200(com.android.tools.r8.shaking.ProguardConfigurationParser):44:44 -> d
+    2:2:java.util.List access$400():44:44 -> d
+    1:1:java.util.List access$500():44:44 -> e
+    1:1:java.util.List access$600():44:44 -> f
+    1:1:java.util.List access$700():44:44 -> g
+    1:2:com.android.tools.r8.shaking.ProguardConfiguration getConfig():145:146 -> getConfig
+    1:2:com.android.tools.r8.shaking.ProguardConfiguration getConfigRawForTesting():154:155 -> getConfigRawForTesting
+    1:1:java.util.List access$800():44:44 -> h
+    1:1:java.util.List access$900():44:44 -> i
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder getConfigurationBuilder():120:120 -> j
+    1:7:void validate():124:130 -> k
+    8:15:void validate():127:134 -> k
+    1:1:void parse(java.nio.file.Path):159:159 -> parse
+    2:2:void parse(com.android.tools.r8.shaking.ProguardConfigurationSource):163:163 -> parse
 com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards -> com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards:
     java.util.List wildcards -> b
     java.lang.String pattern -> a
-    1:3:void <init>(java.lang.String,java.util.List):1888:1890 -> <init>
-    1:15:boolean hasUnusualCharacters():1902:1916 -> a
-    1:1:boolean isMatchAllNames():1898:1898 -> b
-    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):1894:1894 -> withoutWildcards
+    1:3:void <init>(java.lang.String,java.util.List):1880:1882 -> <init>
+    1:15:boolean hasUnusualCharacters():1894:1908 -> a
+    1:1:boolean isMatchAllNames():1890:1890 -> b
+    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):1886:1886 -> withoutWildcards
 com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation -> com.android.tools.r8.shaking.ProguardConfigurationParser$a:
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards patternWithWildcards -> a
     boolean negated -> b
-    1:3:void <init>(java.lang.String,java.util.List,boolean):1927:1929 -> <init>
+    1:3:void <init>(java.lang.String,java.util.List,boolean):1919:1921 -> <init>
 com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType -> com.android.tools.r8.shaking.ProguardConfigurationParser$b:
-    com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType CLASS_NAME -> b
-    com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType PACKAGE_NAME -> a
-    com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType ANY -> c
-    1:3:void <clinit>():176:178 -> <clinit>
-    4:4:void <clinit>():175:175 -> <clinit>
-    1:1:void <init>(java.lang.String,int):175:175 -> <init>
+    com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType ANY -> b
+    com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType CLASS_NAME -> a
+    1:2:void <clinit>():181:182 -> <clinit>
+    3:3:void <clinit>():180:180 -> <clinit>
+    1:1:void <init>(java.lang.String,int):180:180 -> <init>
 com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser -> com.android.tools.r8.shaking.ProguardConfigurationParser$c:
-    java.util.function.Predicate PACKAGE_NAME_PREDICATE -> j
+    boolean $assertionsDisabled -> k
     java.nio.file.Path baseDirectory -> g
-    boolean $assertionsDisabled -> l
-    com.android.tools.r8.shaking.ProguardConfigurationParser this$0 -> k
+    com.android.tools.r8.shaking.ProguardConfigurationParser this$0 -> j
     int lineStartPosition -> f
     java.lang.String name -> a
     int positionAfterInclude -> d
@@ -43715,398 +43066,393 @@
     java.lang.String contents -> b
     int position -> c
     java.util.function.Predicate CLASS_NAME_PREDICATE -> i
-    1:1:void <clinit>():181:181 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):191:191 -> <init>
-    2:1272:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):184:1454 -> <init>
-    1273:1276:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):192:195 -> <init>
-    1:4:void parse():200:203 -> a
-    5:7:void unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):420:422 -> a
-    8:8:void unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):420:420 -> a
-    9:11:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):579:581 -> a
-    12:43:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):767:798 -> a
-    12:43:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):582 -> a
-    44:58:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):804:818 -> a
-    44:58:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):800 -> a
-    44:58:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):582 -> a
-    59:65:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):583:589 -> a
-    66:75:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):588:597 -> a
-    76:78:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):660:662 -> a
-    79:79:com.android.tools.r8.shaking.InlineRule$Builder com.android.tools.r8.shaking.InlineRule$Builder.setType(com.android.tools.r8.shaking.InlineRule$Type):38:38 -> a
-    79:79:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):663 -> a
-    80:83:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):664:667 -> a
-    84:84:com.android.tools.r8.shaking.InlineRule com.android.tools.r8.shaking.InlineRule$Builder.build():44:44 -> a
-    84:84:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):668 -> a
-    85:107:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):850:872 -> a
-    85:107:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):759 -> a
-    108:125:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):885:902 -> a
-    108:125:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):760 -> a
-    126:126:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):761:761 -> a
-    127:137:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):910:920 -> a
-    127:137:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):762 -> a
-    138:138:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):919:919 -> a
-    138:138:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):762 -> a
-    139:140:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):929:930 -> a
-    139:140:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    141:143:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):942:944 -> a
-    141:143:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    141:143:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    144:192:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):952:1000 -> a
-    144:192:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):945 -> a
-    144:192:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    144:192:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    193:210:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):988:1005 -> a
-    193:210:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):945 -> a
-    193:210:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    193:210:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    211:216:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):979:984 -> a
-    211:216:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):945 -> a
-    211:216:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    211:216:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    217:218:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):974:975 -> a
-    217:218:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):945 -> a
-    217:218:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    217:218:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    219:220:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):969:970 -> a
-    219:220:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):945 -> a
-    219:220:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    219:220:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    221:222:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):964:965 -> a
-    221:222:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):945 -> a
-    221:222:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    221:222:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    223:224:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):959:960 -> a
-    223:224:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):945 -> a
-    223:224:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    223:224:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    225:258:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1017:1050 -> a
-    225:258:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    225:258:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    225:258:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    259:273:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1049:1063 -> a
-    259:273:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    259:273:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    259:273:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    274:288:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1062:1076 -> a
-    274:288:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    274:288:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    274:288:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    289:294:java.lang.String acceptFieldNameOrIntegerForReturn():1594:1599 -> a
-    289:294:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1077 -> a
-    289:294:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    289:294:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    289:294:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    295:296:char peekCharAt(int):1392:1393 -> a
-    295:296:java.lang.String acceptFieldNameOrIntegerForReturn():1599 -> a
-    295:296:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1077 -> a
-    295:296:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    295:296:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    295:296:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    297:309:java.lang.String acceptFieldNameOrIntegerForReturn():1603:1615 -> a
-    297:309:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1077 -> a
-    297:309:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    297:309:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    297:309:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    310:311:boolean isInteger(java.lang.String):1328:1329 -> a
-    310:311:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1079 -> a
-    310:311:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    310:311:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    310:311:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    312:326:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1080:1094 -> a
-    312:326:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    312:326:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    312:326:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    327:327:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1093:1093 -> a
-    327:327:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    327:327:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    327:327:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    328:340:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1091:1103 -> a
-    328:340:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    328:340:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    328:340:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    341:341:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1102:1102 -> a
-    341:341:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    341:341:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    341:341:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    342:347:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1101:1106 -> a
-    342:347:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    342:347:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    342:347:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    348:370:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1105:1127 -> a
-    348:370:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):946 -> a
-    348:370:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    348:370:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    371:371:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):947:947 -> a
-    371:371:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):932 -> a
-    371:371:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    372:375:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):933:936 -> a
-    372:375:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):763 -> a
-    376:376:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):904:904 -> a
-    376:376:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):760 -> a
-    377:378:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):880:881 -> a
-    379:382:boolean lambda$parseFileName$1(boolean,char,boolean,java.lang.Integer):1204:1207 -> a
-    383:383:boolean eof(int):1341:1341 -> a
-    384:385:boolean acceptChar(char):1363:1364 -> a
-    386:386:int remainingChars():1401:1401 -> a
-    386:386:boolean acceptString(java.lang.String):1411 -> a
-    387:395:boolean acceptString(java.lang.String):1411:1419 -> a
-    396:396:boolean lambda$acceptQuotedOrUnquotedString$4(char,java.lang.Integer):1429:1429 -> a
-    397:402:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1467:1472 -> a
-    403:429:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1477:1503 -> a
-    430:431:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1498:1499 -> a
-    432:442:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1498:1508 -> a
-    443:455:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1506:1518 -> a
-    456:511:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1517:1572 -> a
-    512:512:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1568:1568 -> a
-    513:513:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1562:1562 -> a
-    514:541:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1557:1584 -> a
-    542:549:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1583:1590 -> a
-    550:552:boolean lambda$acceptPattern$7(java.lang.Integer):1642:1644 -> a
-    553:567:java.lang.String acceptString(java.util.function.Predicate):1648:1662 -> a
-    568:570:void parseClassFilter(java.util.function.Consumer):1694:1696 -> a
-    571:571:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():102:102 -> a
-    571:571:void parseClassFilter(java.util.function.Consumer):1699 -> a
-    572:572:void parseClassFilter(java.util.function.Consumer):1699:1699 -> a
-    573:573:void parseClassFilter(java.util.function.Consumer):1698:1698 -> a
-    574:577:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1733:1736 -> a
-    578:579:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1816:1817 -> a
-    580:581:void com.android.tools.r8.shaking.ProguardRuleParserException.<init>(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.Throwable):27:28 -> a
-    580:581:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1817 -> a
-    582:583:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1826:1827 -> a
-    584:584:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1826:1826 -> a
-    585:586:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1836:1837 -> a
-    587:587:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1836:1836 -> a
-    588:593:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1842:1847 -> a
-    594:594:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1842:1842 -> a
-    595:598:com.android.tools.r8.position.Position getPosition(com.android.tools.r8.position.TextPosition):1851:1854 -> a
-    599:600:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):1867:1868 -> a
-    1:5:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):456:460 -> b
-    6:14:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):551:559 -> b
-    6:14:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):461 -> b
-    15:36:java.nio.file.Path parseFileName(boolean):1194:1215 -> b
-    37:37:java.nio.file.Path parseFileName(boolean):1213:1213 -> b
-    38:58:java.lang.String replaceSystemPropertyReferences(java.lang.String):1160:1180 -> b
-    38:58:java.nio.file.Path parseFileName(boolean):1218 -> b
-    59:71:java.lang.String replaceSystemPropertyReferences(java.lang.String):1178:1190 -> b
-    59:71:java.nio.file.Path parseFileName(boolean):1218 -> b
-    72:72:java.nio.file.Path parseFileName(boolean):1220:1220 -> b
-    73:73:java.nio.file.Path parseFileName(boolean):1209:1209 -> b
-    74:74:java.nio.file.Path parseFileName(boolean):1198:1198 -> b
-    75:75:int remainingChars():1401:1401 -> b
-    75:75:boolean acceptArobaseInclude():480 -> b
-    76:79:boolean acceptArobaseInclude():483:486 -> b
-    80:81:void expectChar(char):1405:1406 -> b
-    82:82:boolean lambda$acceptString$3(java.lang.Integer):1424:1424 -> b
-    83:87:void parsePathFilter(java.util.function.Consumer):1747:1751 -> b
-    88:88:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1806:1806 -> b
-    89:98:java.lang.String snippetForPosition():1782:1791 -> b
-    89:98:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1806 -> b
-    99:105:java.lang.String snippetForPosition():1787:1793 -> b
-    99:105:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1806 -> b
-    106:106:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1806:1806 -> b
-    107:108:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition):1821:1822 -> b
-    1:1:void unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):415:415 -> c
-    2:9:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):437:444 -> c
-    10:10:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):443:443 -> c
-    11:12:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1831:1832 -> c
-    11:12:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):451 -> c
-    13:13:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1831:1831 -> c
-    13:13:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):451 -> c
-    14:14:boolean skipFlag(java.lang.String):499:499 -> c
-    15:19:void expectClosingQuote(char):1376:1380 -> c
-    20:20:void expectClosingQuote(char):1378:1378 -> c
-    21:25:java.lang.Integer acceptInteger():1437:1441 -> c
-    26:32:boolean lambda$new$5(java.lang.Integer):1446:1452 -> c
-    1:4:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):426:429 -> d
-    5:5:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):428:428 -> d
-    6:15:boolean skipOptionWithClassSpec(java.lang.String):534:543 -> d
-    16:19:boolean hasNextChar(char):1345:1348 -> d
-    20:23:boolean lambda$new$6(java.lang.Integer):1456:1459 -> d
-    24:24:java.lang.String acceptPattern():1640:1640 -> d
+    1:1:void <clinit>():185:185 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):195:195 -> <init>
+    2:1278:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):188:1464 -> <init>
+    1279:1282:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):196:199 -> <init>
+    1:5:void parse():204:208 -> a
+    6:6:void parse():207:207 -> a
+    7:9:void unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):428:430 -> a
+    10:10:void unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):428:428 -> a
+    11:13:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):587:589 -> a
+    14:45:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):786:817 -> a
+    14:45:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):590 -> a
+    46:60:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):823:837 -> a
+    46:60:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):819 -> a
+    46:60:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):590 -> a
+    61:67:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):591:597 -> a
+    68:77:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):596:605 -> a
+    78:80:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):679:681 -> a
+    81:81:com.android.tools.r8.shaking.InlineRule$Builder com.android.tools.r8.shaking.InlineRule$Builder.setType(com.android.tools.r8.shaking.InlineRule$Type):38:38 -> a
+    81:81:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):682 -> a
+    82:85:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):683:686 -> a
+    86:86:com.android.tools.r8.shaking.InlineRule com.android.tools.r8.shaking.InlineRule$Builder.build():44:44 -> a
+    86:86:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):687 -> a
+    87:109:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):869:891 -> a
+    87:109:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):778 -> a
+    110:127:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):905:922 -> a
+    110:127:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):779 -> a
+    128:128:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):780:780 -> a
+    129:139:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):930:940 -> a
+    129:139:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):781 -> a
+    140:140:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):939:939 -> a
+    140:140:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):781 -> a
+    141:142:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):949:950 -> a
+    141:142:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    143:145:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):962:964 -> a
+    143:145:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    143:145:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    146:194:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):972:1020 -> a
+    146:194:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):965 -> a
+    146:194:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    146:194:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    195:212:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1008:1025 -> a
+    195:212:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):965 -> a
+    195:212:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    195:212:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    213:218:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):999:1004 -> a
+    213:218:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):965 -> a
+    213:218:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    213:218:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    219:220:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):994:995 -> a
+    219:220:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):965 -> a
+    219:220:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    219:220:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    221:222:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):989:990 -> a
+    221:222:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):965 -> a
+    221:222:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    221:222:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    223:224:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):984:985 -> a
+    223:224:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):965 -> a
+    223:224:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    223:224:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    225:226:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):979:980 -> a
+    225:226:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):965 -> a
+    225:226:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    225:226:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    227:260:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1037:1070 -> a
+    227:260:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    227:260:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    227:260:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    261:275:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1069:1083 -> a
+    261:275:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    261:275:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    261:275:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    276:290:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1082:1096 -> a
+    276:290:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    276:290:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    276:290:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    291:296:java.lang.String acceptFieldNameOrIntegerForReturn():1605:1610 -> a
+    291:296:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1097 -> a
+    291:296:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    291:296:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    291:296:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    297:298:char peekCharAt(int):1412:1413 -> a
+    297:298:java.lang.String acceptFieldNameOrIntegerForReturn():1610 -> a
+    297:298:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1097 -> a
+    297:298:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    297:298:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    297:298:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    299:311:java.lang.String acceptFieldNameOrIntegerForReturn():1614:1626 -> a
+    299:311:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1097 -> a
+    299:311:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    299:311:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    299:311:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    312:313:boolean isInteger(java.lang.String):1348:1349 -> a
+    312:313:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1099 -> a
+    312:313:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    312:313:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    312:313:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    314:328:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1100:1114 -> a
+    314:328:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    314:328:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    314:328:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    329:329:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1113:1113 -> a
+    329:329:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    329:329:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    329:329:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    330:342:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1111:1123 -> a
+    330:342:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    330:342:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    330:342:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    343:343:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1122:1122 -> a
+    343:343:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    343:343:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    343:343:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    344:349:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1121:1126 -> a
+    344:349:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    344:349:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    344:349:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    350:372:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1125:1147 -> a
+    350:372:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):966 -> a
+    350:372:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    350:372:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    373:373:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):967:967 -> a
+    373:373:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952 -> a
+    373:373:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    374:377:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):953:956 -> a
+    374:377:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):782 -> a
+    378:378:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):924:924 -> a
+    378:378:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):779 -> a
+    379:380:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):899:900 -> a
+    381:384:boolean lambda$parseFileName$1(boolean,char,boolean,java.lang.Integer):1224:1227 -> a
+    385:385:boolean eof(int):1361:1361 -> a
+    386:387:boolean acceptChar(char):1383:1384 -> a
+    388:388:int remainingChars():1421:1421 -> a
+    388:388:boolean acceptString(java.lang.String):1431 -> a
+    389:397:boolean acceptString(java.lang.String):1431:1439 -> a
+    398:398:boolean lambda$acceptQuotedOrUnquotedString$4(char,java.lang.Integer):1449:1449 -> a
+    399:404:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1480:1485 -> a
+    405:431:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1490:1516 -> a
+    432:433:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1511:1512 -> a
+    434:444:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1511:1521 -> a
+    445:457:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1519:1531 -> a
+    458:511:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1530:1583 -> a
+    512:512:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1579:1579 -> a
+    513:513:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1573:1573 -> a
+    514:539:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1570:1595 -> a
+    540:547:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1594:1601 -> a
+    548:550:boolean lambda$acceptPattern$6(java.lang.Integer):1653:1655 -> a
+    551:565:java.lang.String acceptString(java.util.function.Predicate):1659:1673 -> a
+    566:568:void parseClassFilter(java.util.function.Consumer):1686:1688 -> a
+    569:569:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():102:102 -> a
+    569:569:void parseClassFilter(java.util.function.Consumer):1691 -> a
+    570:570:void parseClassFilter(java.util.function.Consumer):1691:1691 -> a
+    571:571:void parseClassFilter(java.util.function.Consumer):1690:1690 -> a
+    572:575:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1725:1728 -> a
+    576:577:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1808:1809 -> a
+    578:579:void com.android.tools.r8.shaking.ProguardRuleParserException.<init>(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.Throwable):27:28 -> a
+    578:579:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1809 -> a
+    580:581:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition):1813:1814 -> a
+    582:583:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1823:1824 -> a
+    584:584:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1823:1823 -> a
+    585:590:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1829:1834 -> a
+    591:591:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1829:1829 -> a
+    592:595:com.android.tools.r8.position.Position getPosition(com.android.tools.r8.position.TextPosition):1843:1846 -> a
+    596:597:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):1859:1860 -> a
+    1:1:void unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):423:423 -> b
+    2:6:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):464:468 -> b
+    7:15:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):559:567 -> b
+    7:15:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):469 -> b
+    16:37:java.nio.file.Path parseFileName(boolean):1214:1235 -> b
+    38:38:java.nio.file.Path parseFileName(boolean):1233:1233 -> b
+    39:59:java.lang.String replaceSystemPropertyReferences(java.lang.String):1180:1200 -> b
+    39:59:java.nio.file.Path parseFileName(boolean):1238 -> b
+    60:72:java.lang.String replaceSystemPropertyReferences(java.lang.String):1198:1210 -> b
+    60:72:java.nio.file.Path parseFileName(boolean):1238 -> b
+    73:73:java.nio.file.Path parseFileName(boolean):1240:1240 -> b
+    74:74:java.nio.file.Path parseFileName(boolean):1229:1229 -> b
+    75:75:java.nio.file.Path parseFileName(boolean):1218:1218 -> b
+    76:76:int remainingChars():1421:1421 -> b
+    76:76:boolean acceptArobaseInclude():488 -> b
+    77:80:boolean acceptArobaseInclude():491:494 -> b
+    81:82:void expectChar(char):1425:1426 -> b
+    83:83:boolean lambda$acceptString$3(java.lang.Integer):1444:1444 -> b
+    84:88:void parsePathFilter(java.util.function.Consumer):1739:1743 -> b
+    89:89:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1798:1798 -> b
+    90:99:java.lang.String snippetForPosition():1774:1783 -> b
+    90:99:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1798 -> b
+    100:106:java.lang.String snippetForPosition():1779:1785 -> b
+    100:106:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1798 -> b
+    107:107:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1798:1798 -> b
+    1:8:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):445:452 -> c
+    9:17:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):451:459 -> c
+    18:18:boolean skipFlag(java.lang.String):507:507 -> c
+    19:23:void expectClosingQuote(char):1396:1400 -> c
+    24:24:void expectClosingQuote(char):1398:1398 -> c
+    25:29:java.lang.Integer acceptInteger():1457:1461 -> c
+    30:36:boolean lambda$new$5(java.lang.Integer):1466:1472 -> c
+    37:38:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1818:1819 -> c
+    39:39:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1818:1818 -> c
+    1:4:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):434:437 -> d
+    5:5:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):436:436 -> d
+    6:15:boolean skipOptionWithClassSpec(java.lang.String):542:551 -> d
+    16:17:boolean lambda$parseFileFilter$2(java.lang.Integer):1281:1282 -> d
+    18:21:boolean hasNextChar(char):1365:1368 -> d
+    22:22:java.lang.String acceptPattern():1651:1651 -> d
     boolean isQuote(char) -> e
-    1:7:boolean skipOptionWithOptionalSingleArg(java.lang.String):520:526 -> e
-    8:9:boolean lambda$parseFileFilter$2(java.lang.Integer):1261:1262 -> e
-    10:10:char acceptQuoteIfPresent():1372:1372 -> e
-    11:14:boolean hasNextChar(java.util.function.Predicate):1352:1355 -> e
-    11:14:char acceptQuoteIfPresent():1372 -> e
-    15:15:char readChar():1397:1397 -> e
-    15:15:char acceptQuoteIfPresent():1372 -> e
-    16:19:java.lang.String snippetForPosition(com.android.tools.r8.position.TextPosition):1798:1801 -> e
-    1:5:boolean skipOptionWithSingleArg(java.lang.String):509:513 -> f
-    6:6:boolean lambda$skipOptimizationName$0(java.lang.Integer):567:567 -> f
-    7:10:java.lang.String acceptQuotedOrUnquotedString():1428:1431 -> f
-    1:1:java.lang.String acceptString():1424:1424 -> g
-    2:5:void unacceptString(java.lang.String):1666:1669 -> g
-    6:6:boolean pathFilterMatcher(java.lang.Integer):1742:1742 -> g
-    1:1:boolean eof():1337:1337 -> h
-    1:1:com.android.tools.r8.position.TextPosition getPosition():1859:1859 -> i
-    2:2:int getColumn():1863:1863 -> i
-    2:2:com.android.tools.r8.position.TextPosition getPosition():1859 -> i
-    3:3:com.android.tools.r8.position.TextPosition getPosition():1859:1859 -> i
-    1:1:boolean isOptionalArgumentGiven():1359:1359 -> j
-    1:13:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():825:837 -> k
-    14:14:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():836:836 -> k
-    1:12:java.util.List parseArgumentList():1132:1143 -> l
-    13:22:java.util.List parseArgumentList():1140:1149 -> l
-    23:25:java.util.List parseArgumentList():1148:1150 -> l
-    26:33:java.util.List parseArgumentList():1147:1154 -> l
-    1:2:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1733:1734 -> m
-    1:2:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1726 -> m
-    3:4:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1727:1728 -> m
-    5:5:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1736:1736 -> m
-    5:5:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1726 -> m
-    1:1:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1713:1713 -> n
-    2:5:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1705:1708 -> n
-    2:5:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1715 -> n
-    6:9:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1706:1709 -> n
-    6:9:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1715 -> n
-    10:11:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1716:1717 -> n
-    1:9:java.util.List parseClassPath():1224:1232 -> o
-    1:14:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1238:1251 -> p
-    15:20:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1248:1253 -> p
-    1:7:java.lang.String parseFileFilter():1258:1264 -> q
-    1:10:void parseInclude():465:474 -> r
-    11:11:void parseInclude():471:471 -> r
-    1:2:boolean parseNegation():843:844 -> s
-    1:20:boolean parseOption():208:227 -> t
-    21:32:java.util.List acceptPatternList():1619:1630 -> t
-    21:32:void parseKeepAttributes():491 -> t
-    21:32:boolean parseOption():228 -> t
-    33:36:void parseKeepAttributes():492:495 -> t
-    33:36:boolean parseOption():228 -> t
-    37:37:void parseKeepAttributes():493:493 -> t
-    37:37:boolean parseOption():228 -> t
-    38:39:boolean parseOption():229:230 -> t
-    40:49:void parsePackageFilter(java.util.function.BiConsumer):1675:1684 -> t
-    40:49:boolean parseOption():230 -> t
-    50:53:void parsePackageFilter(java.util.function.BiConsumer):1683:1686 -> t
-    50:53:boolean parseOption():230 -> t
-    54:61:void parsePackageFilter(java.util.function.BiConsumer):1681:1688 -> t
-    54:61:boolean parseOption():230 -> t
-    62:64:boolean parseOption():231:233 -> t
-    65:72:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):614:621 -> t
-    65:72:boolean parseOption():234 -> t
-    73:77:boolean parseOption():235:239 -> t
-    78:82:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):711:715 -> t
-    78:82:boolean parseOption():240 -> t
-    83:85:com.android.tools.r8.shaking.ConstantArgumentRule com.android.tools.r8.shaking.ConstantArgumentRule$Builder.build():26:28 -> t
-    83:85:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):716 -> t
-    83:85:boolean parseOption():240 -> t
-    86:87:boolean parseOption():241:242 -> t
-    88:92:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):722:726 -> t
-    88:92:boolean parseOption():243 -> t
-    93:95:com.android.tools.r8.shaking.UnusedArgumentRule com.android.tools.r8.shaking.UnusedArgumentRule$Builder.build():26:28 -> t
-    93:95:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):727 -> t
-    93:95:boolean parseOption():243 -> t
-    96:100:boolean parseOption():244:248 -> t
-    101:107:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):602:608 -> t
-    101:107:boolean parseOption():249 -> t
-    108:108:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder.build():26:26 -> t
-    108:108:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):609 -> t
-    108:108:boolean parseOption():249 -> t
-    109:119:boolean parseOption():250:260 -> t
-    120:121:boolean parseOption():257:258 -> t
-    122:199:boolean parseOption():257:334 -> t
-    200:206:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1271:1277 -> t
-    200:206:boolean parseOption():335 -> t
-    207:207:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder.build():26:26 -> t
-    207:207:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1278 -> t
-    207:207:boolean parseOption():335 -> t
-    208:209:boolean parseOption():336:337 -> t
-    210:217:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1294:1301 -> t
-    210:217:boolean parseOption():338 -> t
-    218:222:boolean parseOption():339:343 -> t
-    223:250:boolean parseOption():342:369 -> t
-    251:255:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1284:1288 -> t
-    251:255:boolean parseOption():370 -> t
-    256:258:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder.build():26:28 -> t
-    256:258:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1289 -> t
-    256:258:boolean parseOption():370 -> t
-    259:270:boolean parseOption():371:382 -> t
-    271:271:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):627:627 -> t
-    271:271:boolean parseOption():382 -> t
-    272:272:com.android.tools.r8.shaking.ClassInlineRule$Builder com.android.tools.r8.shaking.ClassInlineRule$Builder.setType(com.android.tools.r8.shaking.ClassInlineRule$Type):31:31 -> t
-    272:272:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):627 -> t
-    272:272:boolean parseOption():382 -> t
-    273:276:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):628:631 -> t
-    273:276:boolean parseOption():382 -> t
-    277:279:com.android.tools.r8.shaking.ClassInlineRule com.android.tools.r8.shaking.ClassInlineRule$Builder.build():37:39 -> t
-    277:279:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):632 -> t
-    277:279:boolean parseOption():382 -> t
-    280:282:boolean parseOption():383:385 -> t
-    283:283:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):638:638 -> t
-    283:283:boolean parseOption():385 -> t
-    284:284:com.android.tools.r8.shaking.ClassMergingRule$Builder com.android.tools.r8.shaking.ClassMergingRule$Builder.setType(com.android.tools.r8.shaking.ClassMergingRule$Type):31:31 -> t
-    284:284:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):638 -> t
-    284:284:boolean parseOption():385 -> t
-    285:288:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):639:642 -> t
-    285:288:boolean parseOption():385 -> t
-    289:289:com.android.tools.r8.shaking.ClassMergingRule com.android.tools.r8.shaking.ClassMergingRule$Builder.build():37:37 -> t
-    289:289:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):643 -> t
-    289:289:boolean parseOption():385 -> t
-    290:292:boolean parseOption():386:388 -> t
-    293:293:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):650:650 -> t
-    293:293:boolean parseOption():389 -> t
-    294:294:com.android.tools.r8.shaking.MemberValuePropagationRule$Builder com.android.tools.r8.shaking.MemberValuePropagationRule$Builder.setType(com.android.tools.r8.shaking.MemberValuePropagationRule$Type):32:32 -> t
-    294:294:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):650 -> t
-    294:294:boolean parseOption():389 -> t
-    295:298:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):651:654 -> t
-    295:298:boolean parseOption():389 -> t
-    299:299:com.android.tools.r8.shaking.MemberValuePropagationRule com.android.tools.r8.shaking.MemberValuePropagationRule$Builder.build():38:38 -> t
-    299:299:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):655 -> t
-    299:299:boolean parseOption():389 -> t
-    300:308:boolean parseOption():390:398 -> t
-    309:315:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):674:680 -> t
-    309:315:boolean parseOption():398 -> t
-    316:316:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder.build():25:25 -> t
-    316:316:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):681 -> t
-    316:316:boolean parseOption():398 -> t
-    317:319:boolean parseOption():398:400 -> t
-    320:329:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):686:695 -> t
-    320:329:boolean parseOption():400 -> t
-    330:330:void com.android.tools.r8.shaking.ProguardIfRule$Builder.setSubsequentRule(com.android.tools.r8.shaking.ProguardKeepRule):39:39 -> t
-    330:330:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):696 -> t
-    330:330:boolean parseOption():400 -> t
-    331:333:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):697:699 -> t
-    331:333:boolean parseOption():400 -> t
-    334:335:com.android.tools.r8.shaking.ProguardIfRule com.android.tools.r8.shaking.ProguardIfRule$Builder.build():44:45 -> t
-    334:335:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):700 -> t
-    334:335:boolean parseOption():400 -> t
-    336:336:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):701:701 -> t
-    336:336:boolean parseOption():400 -> t
-    337:349:void verifyAndLinkBackReferences(java.lang.Iterable):731:743 -> t
-    337:349:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):701 -> t
-    337:349:boolean parseOption():400 -> t
-    350:353:void verifyAndLinkBackReferences(java.lang.Iterable):738:741 -> t
-    350:353:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):701 -> t
-    350:353:boolean parseOption():400 -> t
-    354:363:void verifyAndLinkBackReferences(java.lang.Iterable):738:747 -> t
-    354:363:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):701 -> t
-    354:363:boolean parseOption():400 -> t
-    364:364:boolean parseOption():400:400 -> t
-    365:366:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):704:705 -> t
-    365:366:boolean parseOption():400 -> t
-    367:367:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):704:704 -> t
-    367:367:boolean parseOption():400 -> t
-    368:375:boolean parseOption():402:409 -> t
-    1:1:java.lang.String acceptClassName():1462:1462 -> u
-    1:1:java.lang.String parsePackageNameOrEmptyString():1721 -> u
-    1:20:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1756:1775 -> v
-    21:26:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1772:1777 -> v
-    27:27:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1762:1762 -> v
-    1:1:char peekChar():1388:1388 -> w
-    1:4:void skipOptimizationName():564:567 -> x
-    1:2:void skipSingleArgument():571:572 -> y
-    3:3:char readChar():1397:1397 -> y
-    3:3:void skipSingleArgument():573 -> y
-    1:6:void skipWhitespace():1305:1310 -> z
-    7:14:void skipComment():1316:1323 -> z
-    7:14:void skipWhitespace():1312 -> z
+    1:7:boolean skipOptionWithOptionalSingleArg(java.lang.String):528:534 -> e
+    8:8:boolean lambda$skipOptimizationName$0(java.lang.Integer):575:575 -> e
+    9:9:char acceptQuoteIfPresent():1392:1392 -> e
+    10:13:boolean hasNextChar(java.util.function.Predicate):1372:1375 -> e
+    10:13:char acceptQuoteIfPresent():1392 -> e
+    14:14:char readChar():1417:1417 -> e
+    14:14:char acceptQuoteIfPresent():1392 -> e
+    15:18:java.lang.String snippetForPosition(com.android.tools.r8.position.TextPosition):1790:1793 -> e
+    1:5:boolean skipOptionWithSingleArg(java.lang.String):517:521 -> f
+    6:9:java.lang.String acceptQuotedOrUnquotedString():1448:1451 -> f
+    10:10:boolean pathFilterMatcher(java.lang.Integer):1734:1734 -> f
+    1:1:java.lang.String acceptString():1444:1444 -> g
+    2:5:void unacceptString(java.lang.String):1677:1680 -> g
+    1:1:boolean eof():1357:1357 -> h
+    1:1:com.android.tools.r8.position.TextPosition getPosition():1851:1851 -> i
+    2:2:int getColumn():1855:1855 -> i
+    2:2:com.android.tools.r8.position.TextPosition getPosition():1851 -> i
+    3:3:com.android.tools.r8.position.TextPosition getPosition():1851:1851 -> i
+    1:1:boolean isOptionalArgumentGiven():1379:1379 -> j
+    1:13:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():844:856 -> k
+    14:14:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():855:855 -> k
+    1:12:java.util.List parseArgumentList():1152:1163 -> l
+    13:22:java.util.List parseArgumentList():1160:1169 -> l
+    23:25:java.util.List parseArgumentList():1168:1170 -> l
+    26:33:java.util.List parseArgumentList():1167:1174 -> l
+    1:2:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1725:1726 -> m
+    1:2:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1718 -> m
+    3:4:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1719:1720 -> m
+    5:5:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1728:1728 -> m
+    5:5:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1718 -> m
+    1:1:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1705:1705 -> n
+    2:5:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1697:1700 -> n
+    2:5:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1707 -> n
+    6:9:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1698:1701 -> n
+    6:9:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1707 -> n
+    10:11:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1708:1709 -> n
+    1:9:java.util.List parseClassPath():1244:1252 -> o
+    1:14:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1258:1271 -> p
+    15:20:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1268:1273 -> p
+    1:7:java.lang.String parseFileFilter():1278:1284 -> q
+    1:10:void parseInclude():473:482 -> r
+    11:11:void parseInclude():479:479 -> r
+    1:2:boolean parseNegation():862:863 -> s
+    1:20:boolean parseOption():213:232 -> t
+    21:32:java.util.List acceptPatternList():1630:1641 -> t
+    21:32:void parseKeepAttributes():499 -> t
+    21:32:boolean parseOption():233 -> t
+    33:36:void parseKeepAttributes():500:503 -> t
+    33:36:boolean parseOption():233 -> t
+    37:37:void parseKeepAttributes():501:501 -> t
+    37:37:boolean parseOption():233 -> t
+    38:38:boolean parseOption():234:234 -> t
+    39:43:com.android.tools.r8.shaking.ProguardKeepPackageNamesRule parseKeepPackageNamesRule(com.android.tools.r8.position.Position):623:627 -> t
+    39:43:boolean parseOption():235 -> t
+    44:44:com.android.tools.r8.shaking.ProguardKeepPackageNamesRule com.android.tools.r8.shaking.ProguardKeepPackageNamesRule$Builder.build():26:26 -> t
+    44:44:com.android.tools.r8.shaking.ProguardKeepPackageNamesRule parseKeepPackageNamesRule(com.android.tools.r8.position.Position):628 -> t
+    44:44:boolean parseOption():235 -> t
+    45:48:boolean parseOption():236:239 -> t
+    49:56:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):633:640 -> t
+    49:56:boolean parseOption():240 -> t
+    57:61:boolean parseOption():241:245 -> t
+    62:66:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):730:734 -> t
+    62:66:boolean parseOption():246 -> t
+    67:69:com.android.tools.r8.shaking.ConstantArgumentRule com.android.tools.r8.shaking.ConstantArgumentRule$Builder.build():26:28 -> t
+    67:69:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):735 -> t
+    67:69:boolean parseOption():246 -> t
+    70:71:boolean parseOption():247:248 -> t
+    72:76:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):741:745 -> t
+    72:76:boolean parseOption():249 -> t
+    77:79:com.android.tools.r8.shaking.UnusedArgumentRule com.android.tools.r8.shaking.UnusedArgumentRule$Builder.build():26:28 -> t
+    77:79:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):746 -> t
+    77:79:boolean parseOption():249 -> t
+    80:84:boolean parseOption():250:254 -> t
+    85:91:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):610:616 -> t
+    85:91:boolean parseOption():255 -> t
+    92:92:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder.build():26:26 -> t
+    92:92:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):617 -> t
+    92:92:boolean parseOption():255 -> t
+    93:103:boolean parseOption():256:266 -> t
+    104:105:boolean parseOption():263:264 -> t
+    106:183:boolean parseOption():263:340 -> t
+    184:190:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1291:1297 -> t
+    184:190:boolean parseOption():341 -> t
+    191:191:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder.build():26:26 -> t
+    191:191:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1298 -> t
+    191:191:boolean parseOption():341 -> t
+    192:193:boolean parseOption():342:343 -> t
+    194:201:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1314:1321 -> t
+    194:201:boolean parseOption():344 -> t
+    202:206:boolean parseOption():345:349 -> t
+    207:234:boolean parseOption():348:375 -> t
+    235:239:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1304:1308 -> t
+    235:239:boolean parseOption():376 -> t
+    240:242:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder.build():26:28 -> t
+    240:242:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1309 -> t
+    240:242:boolean parseOption():376 -> t
+    243:254:boolean parseOption():377:388 -> t
+    255:255:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):646:646 -> t
+    255:255:boolean parseOption():388 -> t
+    256:256:com.android.tools.r8.shaking.ClassInlineRule$Builder com.android.tools.r8.shaking.ClassInlineRule$Builder.setType(com.android.tools.r8.shaking.ClassInlineRule$Type):31:31 -> t
+    256:256:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):646 -> t
+    256:256:boolean parseOption():388 -> t
+    257:260:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):647:650 -> t
+    257:260:boolean parseOption():388 -> t
+    261:263:com.android.tools.r8.shaking.ClassInlineRule com.android.tools.r8.shaking.ClassInlineRule$Builder.build():37:39 -> t
+    261:263:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):651 -> t
+    261:263:boolean parseOption():388 -> t
+    264:266:boolean parseOption():389:391 -> t
+    267:267:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):657:657 -> t
+    267:267:boolean parseOption():391 -> t
+    268:268:com.android.tools.r8.shaking.ClassMergingRule$Builder com.android.tools.r8.shaking.ClassMergingRule$Builder.setType(com.android.tools.r8.shaking.ClassMergingRule$Type):31:31 -> t
+    268:268:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):657 -> t
+    268:268:boolean parseOption():391 -> t
+    269:272:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):658:661 -> t
+    269:272:boolean parseOption():391 -> t
+    273:273:com.android.tools.r8.shaking.ClassMergingRule com.android.tools.r8.shaking.ClassMergingRule$Builder.build():37:37 -> t
+    273:273:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):662 -> t
+    273:273:boolean parseOption():391 -> t
+    274:276:boolean parseOption():392:394 -> t
+    277:277:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):669:669 -> t
+    277:277:boolean parseOption():395 -> t
+    278:278:com.android.tools.r8.shaking.MemberValuePropagationRule$Builder com.android.tools.r8.shaking.MemberValuePropagationRule$Builder.setType(com.android.tools.r8.shaking.MemberValuePropagationRule$Type):32:32 -> t
+    278:278:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):669 -> t
+    278:278:boolean parseOption():395 -> t
+    279:282:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):670:673 -> t
+    279:282:boolean parseOption():395 -> t
+    283:283:com.android.tools.r8.shaking.MemberValuePropagationRule com.android.tools.r8.shaking.MemberValuePropagationRule$Builder.build():38:38 -> t
+    283:283:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):674 -> t
+    283:283:boolean parseOption():395 -> t
+    284:294:boolean parseOption():396:406 -> t
+    295:301:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):693:699 -> t
+    295:301:boolean parseOption():406 -> t
+    302:302:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder.build():25:25 -> t
+    302:302:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):700 -> t
+    302:302:boolean parseOption():406 -> t
+    303:305:boolean parseOption():406:408 -> t
+    306:315:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):705:714 -> t
+    306:315:boolean parseOption():408 -> t
+    316:316:void com.android.tools.r8.shaking.ProguardIfRule$Builder.setSubsequentRule(com.android.tools.r8.shaking.ProguardKeepRule):39:39 -> t
+    316:316:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):715 -> t
+    316:316:boolean parseOption():408 -> t
+    317:319:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):716:718 -> t
+    317:319:boolean parseOption():408 -> t
+    320:321:com.android.tools.r8.shaking.ProguardIfRule com.android.tools.r8.shaking.ProguardIfRule$Builder.build():44:45 -> t
+    320:321:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):719 -> t
+    320:321:boolean parseOption():408 -> t
+    322:322:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):720:720 -> t
+    322:322:boolean parseOption():408 -> t
+    323:335:void verifyAndLinkBackReferences(java.lang.Iterable):750:762 -> t
+    323:335:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):720 -> t
+    323:335:boolean parseOption():408 -> t
+    336:339:void verifyAndLinkBackReferences(java.lang.Iterable):757:760 -> t
+    336:339:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):720 -> t
+    336:339:boolean parseOption():408 -> t
+    340:349:void verifyAndLinkBackReferences(java.lang.Iterable):757:766 -> t
+    340:349:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):720 -> t
+    340:349:boolean parseOption():408 -> t
+    350:350:boolean parseOption():408:408 -> t
+    351:352:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):723:724 -> t
+    351:352:boolean parseOption():408 -> t
+    353:353:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):723:723 -> t
+    353:353:boolean parseOption():408 -> t
+    354:361:boolean parseOption():410:417 -> t
+    1:1:java.lang.String acceptClassName():1475:1475 -> u
+    1:1:java.lang.String parsePackageNameOrEmptyString():1713 -> u
+    1:20:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1748:1767 -> v
+    21:26:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1764:1769 -> v
+    27:27:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1754:1754 -> v
+    1:1:char peekChar():1408:1408 -> w
+    1:4:void skipOptimizationName():572:575 -> x
+    1:2:void skipSingleArgument():579:580 -> y
+    3:3:char readChar():1417:1417 -> y
+    3:3:void skipSingleArgument():581 -> y
+    1:6:void skipWhitespace():1325:1330 -> z
+    7:14:void skipComment():1336:1343 -> z
+    7:14:void skipWhitespace():1332 -> z
 com.android.tools.r8.shaking.ProguardConfigurationRule -> com.android.tools.r8.shaking.ProguardConfigurationRule:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):29:29 -> <init>
     1:1:java.util.stream.Stream lambda$getWildcards$0(java.lang.Iterable):54:54 -> a
     2:6:java.lang.StringBuilder append(java.lang.StringBuilder,boolean):76:80 -> a
     1:5:boolean equals(java.lang.Object):62:66 -> equals
-    boolean applyToNonProgramClasses() -> f
+    boolean applyToLibraryClasses() -> f
     java.lang.String modifierString() -> g
     1:12:java.lang.Iterable getWildcards():45:56 -> getWildcards
     13:13:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable[]):487:487 -> getWildcards
@@ -44114,7 +43460,7 @@
     1:1:int hashCode():71:71 -> hashCode
 com.android.tools.r8.shaking.ProguardConfigurationSource -> com.android.tools.r8.shaking.ProguardConfigurationSource:
     java.nio.file.Path getBaseDirectory() -> a
-com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.shaking.ba:
+com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.shaking.T:
     byte[] bytes -> a
     com.android.tools.r8.origin.Origin origin -> b
     1:1:void <init>(java.io.InputStream,com.android.tools.r8.origin.Origin):24:24 -> <init>
@@ -44124,7 +43470,7 @@
     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.shaking.ca:
+com.android.tools.r8.shaking.ProguardConfigurationSourceFile -> com.android.tools.r8.shaking.U:
     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
@@ -44142,7 +43488,7 @@
     2:2:com.android.tools.r8.shaking.ProguardConfigurationSourceStrings createConfigurationForTesting(java.util.List):37 -> createConfigurationForTesting
     1:1:java.lang.String get():42:42 -> get
     1:1:com.android.tools.r8.origin.Origin getOrigin():57:57 -> getOrigin
-com.android.tools.r8.shaking.ProguardConfigurationUtils -> com.android.tools.r8.shaking.ga:
+com.android.tools.r8.shaking.ProguardConfigurationUtils -> com.android.tools.r8.shaking.Y:
     com.android.tools.r8.origin.Origin proguardCompatOrigin -> a
     com.android.tools.r8.origin.Origin synthesizedRecompilationOrigin -> b
     boolean $assertionsDisabled -> c
@@ -44161,25 +43507,25 @@
     137:146:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):179:188 -> a
     147:152:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):185:190 -> a
     153:153:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):181:181 -> a
-com.android.tools.r8.shaking.ProguardConfigurationUtils$1 -> com.android.tools.r8.shaking.da:
+com.android.tools.r8.shaking.ProguardConfigurationUtils$1 -> com.android.tools.r8.shaking.V:
     1:1:void <init>(com.android.tools.r8.origin.Origin):22:22 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationUtils$2 -> com.android.tools.r8.shaking.ea:
+com.android.tools.r8.shaking.ProguardConfigurationUtils$2 -> com.android.tools.r8.shaking.W:
     1:1:void <init>(com.android.tools.r8.origin.Origin):30:30 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationUtils$3 -> com.android.tools.r8.shaking.fa:
+com.android.tools.r8.shaking.ProguardConfigurationUtils$3 -> com.android.tools.r8.shaking.X:
     com.android.tools.r8.utils.AndroidApiLevel val$apiLevel -> e
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.AndroidApiLevel):91:91 -> <init>
     1:1:java.lang.String part():94:94 -> part
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule -> com.android.tools.r8.shaking.ja:
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule -> com.android.tools.r8.shaking.aa:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):45:45 -> <init>
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1):10 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder builder():51:51 -> builder
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1 -> com.android.tools.r8.shaking.ha:
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder -> com.android.tools.r8.shaking.ia:
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1 -> com.android.tools.r8.shaking.Z:
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder -> com.android.tools.r8.shaking.aa$a:
     1:1:void <init>():15:15 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1):12 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> g
 com.android.tools.r8.shaking.ProguardIfRule -> com.android.tools.r8.shaking.ProguardIfRule:
-    com.android.tools.r8.origin.Origin neverInlineOrigin -> q
+    com.android.tools.r8.origin.Origin neverInlineOrigin -> a
     1:2:void <clinit>():15:16 -> <clinit>
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardIfRule$1):13:13 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardKeepRule):63:63 -> <init>
@@ -44197,7 +43543,7 @@
     1:19:com.android.tools.r8.shaking.ProguardIfRule materialize():80:98 -> i
     1:14:com.android.tools.r8.shaking.ClassInlineRule neverClassInlineRuleForCondition():102:115 -> j
     1:20:com.android.tools.r8.shaking.InlineRule neverInlineRuleForCondition():142:161 -> k
-com.android.tools.r8.shaking.ProguardIfRule$1 -> com.android.tools.r8.shaking.ProguardIfRule$1:
+com.android.tools.r8.shaking.ProguardIfRule$1 -> com.android.tools.r8.shaking.ba:
     1:1:void <init>(com.android.tools.r8.origin.Origin):16:16 -> <init>
 com.android.tools.r8.shaking.ProguardIfRule$Builder -> com.android.tools.r8.shaking.ProguardIfRule$a:
     com.android.tools.r8.shaking.ProguardKeepRule subsequentRule -> q
@@ -44237,6 +43583,15 @@
     1:2:com.android.tools.r8.shaking.ProguardKeepAttributes fromPatterns(java.util.List):108:109 -> fromPatterns
     1:15:int hashCode():203:217 -> hashCode
     1:1:java.lang.String toString():296:296 -> toString
+com.android.tools.r8.shaking.ProguardKeepPackageNamesRule -> com.android.tools.r8.shaking.da:
+    1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):46:46 -> <init>
+    1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardKeepPackageNamesRule$1):10 -> <init>
+    1:1:com.android.tools.r8.shaking.ProguardKeepPackageNamesRule$Builder builder():52:52 -> builder
+com.android.tools.r8.shaking.ProguardKeepPackageNamesRule$1 -> com.android.tools.r8.shaking.ca:
+com.android.tools.r8.shaking.ProguardKeepPackageNamesRule$Builder -> com.android.tools.r8.shaking.da$a:
+    1:1:void <init>():16:16 -> <init>
+    1:1:void <init>(com.android.tools.r8.shaking.ProguardKeepPackageNamesRule$1):12 -> <init>
+    com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> g
 com.android.tools.r8.shaking.ProguardKeepRule -> com.android.tools.r8.shaking.ProguardKeepRule:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardKeepRuleType,com.android.tools.r8.shaking.ProguardKeepRuleModifiers):49:49 -> <init>
     1:8:void appendNonEmpty(java.lang.StringBuilder,java.lang.String,java.lang.Object,java.lang.String):97:104 -> a
@@ -44245,7 +43600,7 @@
     4:15:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):112:123 -> defaultKeepAllRule
     1:5:boolean equals(java.lang.Object):86:90 -> equals
     1:20:com.android.tools.r8.shaking.ProguardKeepRule materialize():62:81 -> i
-com.android.tools.r8.shaking.ProguardKeepRule$1 -> com.android.tools.r8.shaking.ProguardKeepRule$1:
+com.android.tools.r8.shaking.ProguardKeepRule$1 -> com.android.tools.r8.shaking.ea:
     1:1:void <init>(com.android.tools.r8.origin.Origin):113:113 -> <init>
 com.android.tools.r8.shaking.ProguardKeepRule$Builder -> com.android.tools.r8.shaking.ProguardKeepRule$Builder:
     1:1:void <init>():17:17 -> <init>
@@ -44253,8 +43608,8 @@
     com.android.tools.r8.shaking.ProguardKeepRule$Builder self() -> g
     1:1:com.android.tools.r8.shaking.ProguardClassSpecification$Builder self():14:14 -> g
 com.android.tools.r8.shaking.ProguardKeepRuleBase -> com.android.tools.r8.shaking.ProguardKeepRuleBase:
-    com.android.tools.r8.shaking.ProguardKeepRuleModifiers modifiers -> p
-    com.android.tools.r8.shaking.ProguardKeepRuleType type -> o
+    com.android.tools.r8.shaking.ProguardKeepRuleModifiers modifiers -> b
+    com.android.tools.r8.shaking.ProguardKeepRuleType type -> a
     1:5:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardKeepRuleType,com.android.tools.r8.shaking.ProguardKeepRuleModifiers):58:62 -> <init>
     1:12:boolean equals(java.lang.Object):75:86 -> equals
     1:1:java.lang.String modifierString():121:121 -> g
@@ -44285,6 +43640,7 @@
     1:6:boolean equals(java.lang.Object):63:68 -> equals
     1:4:int hashCode():76:79 -> hashCode
     1:6:java.lang.String toString():84:89 -> toString
+com.android.tools.r8.shaking.ProguardKeepRuleModifiers$1 -> com.android.tools.r8.shaking.fa:
 com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder -> com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder:
     boolean allowsShrinking -> a
     boolean allowsOptimization -> b
@@ -44348,7 +43704,7 @@
     37:45:java.lang.String toString():373:381 -> toString
     46:63:java.lang.String toString():370:387 -> toString
     64:97:java.lang.String toString():367:400 -> toString
-com.android.tools.r8.shaking.ProguardMemberRule$1 -> com.android.tools.r8.shaking.ProguardMemberRule$1:
+com.android.tools.r8.shaking.ProguardMemberRule$1 -> com.android.tools.r8.shaking.ga:
     int[] $SwitchMap$com$android$tools$r8$shaking$ProguardMemberType -> a
     1:1:void <clinit>():175:175 -> <clinit>
 com.android.tools.r8.shaking.ProguardMemberRule$Builder -> com.android.tools.r8.shaking.ProguardMemberRule$a:
@@ -44430,6 +43786,7 @@
     44:66:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):56:78 -> b
     67:111:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):43:87 -> b
     1:6:com.android.tools.r8.shaking.ProguardNameMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):23:28 -> create
+com.android.tools.r8.shaking.ProguardNameMatcher$1 -> com.android.tools.r8.shaking.ha:
 com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames -> com.android.tools.r8.shaking.ProguardNameMatcher$a:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> c
     1:1:void <init>():108:108 -> <init>
@@ -44458,34 +43815,6 @@
     1:1:int hashCode():214:214 -> hashCode
     1:1:boolean matches(java.lang.String):199:199 -> matches
     1:1:java.lang.String toString():204:204 -> toString
-com.android.tools.r8.shaking.ProguardPackageMatcher -> com.android.tools.r8.shaking.ProguardPackageMatcher:
-    java.lang.String pattern -> a
-    1:2:void <init>(java.lang.String):12:13 -> <init>
-    1:1:boolean matches(com.android.tools.r8.graph.DexType):17:17 -> a
-    2:47:boolean matchPackageNameImpl(java.lang.String,int,java.lang.String,int):22:67 -> a
-    48:48:boolean matchPackageNameImpl(java.lang.String,int,java.lang.String,int):60:60 -> a
-    49:55:boolean matchPackageNameImpl(java.lang.String,int,java.lang.String,int):29:35 -> a
-    56:56:boolean containsSeparatorsStartingAt(java.lang.String,int):77:77 -> a
-    56:56:boolean matchPackageNameImpl(java.lang.String,int,java.lang.String,int):39 -> a
-    57:86:boolean matchPackageNameImpl(java.lang.String,int,java.lang.String,int):44:73 -> a
-    1:5:boolean equals(java.lang.Object):85:89 -> equals
-    1:1:int hashCode():94:94 -> hashCode
-com.android.tools.r8.shaking.ProguardPackageNameList -> com.android.tools.r8.shaking.ProguardPackageNameList:
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap packageNames -> a
-    1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):39:40 -> <init>
-    1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.shaking.ProguardPackageNameList$1):12 -> <init>
-    1:1:com.android.tools.r8.shaking.ProguardPackageNameList$Builder builder():15:15 -> builder
-    1:15:boolean equals(java.lang.Object):74:88 -> equals
-    1:6:int hashCode():98:103 -> hashCode
-    1:4:boolean matches(com.android.tools.r8.graph.DexType):60:63 -> matches
-com.android.tools.r8.shaking.ProguardPackageNameList$Builder -> com.android.tools.r8.shaking.ProguardPackageNameList$Builder:
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap matchers -> a
-    1:1:void <init>():24:24 -> <init>
-    1:1:void <init>(com.android.tools.r8.shaking.ProguardPackageNameList$1):18 -> <init>
-    2:2:void <init>():21:21 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.ProguardPackageNameList$1):18 -> <init>
-    1:1:com.android.tools.r8.shaking.ProguardPackageNameList$Builder addPackageName(boolean,com.android.tools.r8.shaking.ProguardPackageMatcher):28:28 -> addPackageName
-    1:1:com.android.tools.r8.shaking.ProguardPackageNameList build():33:33 -> build
 com.android.tools.r8.shaking.ProguardPathFilter -> com.android.tools.r8.shaking.ProguardPathFilter:
     boolean enabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList patterns -> b
@@ -44496,6 +43825,7 @@
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder builder():14:14 -> a
     1:1:boolean isEnabled():55:55 -> b
     1:3:boolean matches(java.lang.String):59:61 -> matches
+com.android.tools.r8.shaking.ProguardPathFilter$1 -> com.android.tools.r8.shaking.ia:
 com.android.tools.r8.shaking.ProguardPathFilter$Builder -> com.android.tools.r8.shaking.ProguardPathFilter$a:
     boolean enabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder patterns -> b
@@ -44507,13 +43837,13 @@
     2:2:com.android.tools.r8.shaking.ProguardPathFilter build():40:40 -> a
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder disable():30:30 -> b
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder enable():35:35 -> c
-com.android.tools.r8.shaking.ProguardPathList -> com.android.tools.r8.shaking.la:
+com.android.tools.r8.shaking.ProguardPathList -> com.android.tools.r8.shaking.oa:
     1:1:void <init>():10:10 -> <init>
     boolean matches(java.lang.String) -> a
     1:1:com.android.tools.r8.shaking.ProguardPathList$Builder builder():13:13 -> a
     1:1:com.android.tools.r8.shaking.ProguardPathList emptyList():17:17 -> b
-com.android.tools.r8.shaking.ProguardPathList$1 -> com.android.tools.r8.shaking.ka:
-com.android.tools.r8.shaking.ProguardPathList$Builder -> com.android.tools.r8.shaking.la$a:
+com.android.tools.r8.shaking.ProguardPathList$1 -> com.android.tools.r8.shaking.ja:
+com.android.tools.r8.shaking.ProguardPathList$Builder -> com.android.tools.r8.shaking.ka:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder matchers -> a
     1:1:void <init>():26:26 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathList$1):22 -> <init>
@@ -44523,11 +43853,11 @@
     1:1:com.android.tools.r8.shaking.ProguardPathList$Builder addFileName(java.lang.String):30 -> a
     2:2:com.android.tools.r8.shaking.ProguardPathList$Builder addFileName(java.lang.String,boolean):34:34 -> a
     3:7:com.android.tools.r8.shaking.ProguardPathList build():39:43 -> a
-com.android.tools.r8.shaking.ProguardPathList$EmptyPathList -> com.android.tools.r8.shaking.ma:
+com.android.tools.r8.shaking.ProguardPathList$EmptyPathList -> com.android.tools.r8.shaking.la:
     1:1:void <init>():124:124 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathList$1):122 -> <init>
     boolean matches(java.lang.String) -> a
-com.android.tools.r8.shaking.ProguardPathList$FileNameMatcher -> com.android.tools.r8.shaking.na:
+com.android.tools.r8.shaking.ProguardPathList$FileNameMatcher -> com.android.tools.r8.shaking.ma:
     boolean negated -> a
     java.lang.String pattern -> b
     1:3:void <init>(boolean,java.lang.String):52:54 -> <init>
@@ -44539,7 +43869,7 @@
     34:34:boolean containsSeparatorsStartingAt(java.lang.String,int):98:98 -> a
     34:34:boolean matchImpl(java.lang.String,int,java.lang.String,int):70 -> a
     35:56:boolean matchImpl(java.lang.String,int,java.lang.String,int):73:94 -> a
-com.android.tools.r8.shaking.ProguardPathList$PathList -> com.android.tools.r8.shaking.oa:
+com.android.tools.r8.shaking.ProguardPathList$PathList -> com.android.tools.r8.shaking.na:
     java.util.List matchers -> a
     1:2:void <init>(java.util.List):106:107 -> <init>
     1:2:void <init>(java.util.List,com.android.tools.r8.shaking.ProguardPathList$1):103 -> <init>
@@ -44571,6 +43901,7 @@
     24:38:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):79:93 -> create
     39:39:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.graph.DexType):98:98 -> create
     com.android.tools.r8.shaking.ProguardTypeMatcher materialize() -> d
+com.android.tools.r8.shaking.ProguardTypeMatcher$1 -> com.android.tools.r8.shaking.pa:
 com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType -> com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType:
     1:2:void <clinit>():32:33 -> <clinit>
     3:3:void <clinit>():31:31 -> <clinit>
@@ -44672,8 +44003,8 @@
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):46:46 -> <init>
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1):10 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder builder():52:52 -> builder
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1 -> com.android.tools.r8.shaking.pa:
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder -> com.android.tools.r8.shaking.qa:
+com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1 -> com.android.tools.r8.shaking.qa:
+com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder -> com.android.tools.r8.shaking.ra$a:
     1:1:void <init>():16:16 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1):12 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> g
@@ -44703,148 +44034,148 @@
     1:1:java.lang.String getCaptured():51:51 -> c
     1:1:java.lang.String toString():76:76 -> toString
 com.android.tools.r8.shaking.RootSetBuilder -> com.android.tools.r8.shaking.RootSetBuilder:
-    java.util.Map mayHaveSideEffects -> s
-    java.util.Set ifRules -> y
+    java.util.Set identifierNameStrings -> w
+    java.util.Map dependentNoShrinking -> s
     com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.shaking.DexStringCache dexStringCache -> y
     java.lang.Iterable rules -> c
     java.util.LinkedHashMap reasonAsked -> g
-    java.util.Map assumedValues -> u
+    java.util.Map noSideEffects -> u
     com.android.tools.r8.graph.DirectMappedDexApplication application -> b
-    java.util.Set checkDiscarded -> i
+    java.util.Set rulesThatUseExtendsOrImplementsWrong -> i
     java.util.Set noOptimization -> e
-    java.util.Set neverClassInline -> o
-    java.util.Set neverPropagateValue -> q
-    com.android.tools.r8.utils.InternalOptions options -> w
-    java.util.Set forceInline -> k
-    java.util.Set keepParametersWithConstantValue -> m
-    java.util.Map dependentNoShrinking -> r
-    java.util.Map noSideEffects -> t
-    java.util.Set identifierNameStrings -> v
-    com.android.tools.r8.shaking.DexStringCache dexStringCache -> x
-    java.util.Set rulesThatUseExtendsOrImplementsWrong -> h
+    java.util.Set keepUnusedArguments -> o
+    java.util.Set neverMerge -> q
+    boolean $assertionsDisabled -> A
+    java.util.Set alwaysInline -> k
+    java.util.Set neverInline -> m
+    java.util.Map mayHaveSideEffects -> t
+    java.util.Set ifRules -> z
+    java.util.Map assumedValues -> v
+    java.util.Set keepPackageName -> h
     java.util.Map noShrinking -> d
-    java.util.Set alwaysInline -> j
-    boolean $assertionsDisabled -> z
+    java.util.Set checkDiscarded -> j
     java.util.Set noObfuscation -> f
-    java.util.Set neverMerge -> p
-    java.util.Set neverInline -> l
-    java.util.Set keepUnusedArguments -> n
-    1:1:void <clinit>():61:61 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,java.lang.Iterable):95:95 -> <init>
-    2:35:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,java.lang.Iterable):66:99 -> <init>
+    java.util.Set neverClassInline -> p
+    java.util.Set neverPropagateValue -> r
+    com.android.tools.r8.utils.InternalOptions options -> x
+    java.util.Set forceInline -> l
+    java.util.Set keepParametersWithConstantValue -> n
+    1:1:void <clinit>():62:62 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,java.lang.Iterable):97:97 -> <init>
+    2:36:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,java.lang.Iterable):67:101 -> <init>
     boolean lambda$process$0(com.android.tools.r8.graph.DexDefinition) -> a
-    1:1:com.android.tools.r8.graph.DirectMappedDexApplication access$100(com.android.tools.r8.shaking.RootSetBuilder):61:61 -> a
-    2:2:boolean access$1200(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):61:61 -> a
-    3:3:boolean access$1300(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):61:61 -> a
-    4:4:boolean access$1500(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):61:61 -> a
-    5:5:void access$1600(com.android.tools.r8.shaking.RootSetBuilder,java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):61:61 -> a
-    6:6:boolean access$1700(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):61:61 -> a
-    7:10:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):111:114 -> a
-    11:11:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):624:624 -> a
-    11:11:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):117 -> a
-    12:52:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):125:165 -> a
-    53:53:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):144:144 -> a
-    54:56:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):139:141 -> a
-    57:57:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):853:853 -> a
-    57:57:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):149 -> a
-    58:78:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):150:170 -> a
-    79:79:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):853:853 -> a
-    79:79:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):171 -> a
-    80:84:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):173:177 -> a
-    85:85:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):853:853 -> a
-    85:85:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):178 -> a
-    86:93:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):179:186 -> a
-    94:94:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):853:853 -> a
-    94:94:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):187 -> a
-    95:100:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):189:194 -> a
-    101:101:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):853:853 -> a
-    101:101:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):195 -> a
-    102:111:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):197:206 -> a
-    112:112:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):192:192 -> a
-    113:114:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):183:184 -> a
-    115:115:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):168:168 -> a
-    116:129:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):216:229 -> a
-    130:130:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):228:228 -> a
-    131:136:void lambda$runPerRule$4(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):231:236 -> a
-    137:137:com.android.tools.r8.shaking.RootSetBuilder$IfRuleEvaluator getIfRuleEvaluator(java.util.Set,java.util.Set,java.util.Set,java.util.concurrent.ExecutorService):289:289 -> a
-    138:147:com.android.tools.r8.graph.DexDefinition testAndGetPrecondition(com.android.tools.r8.graph.DexDefinition,java.util.Map):471:480 -> a
-    148:149:void lambda$markMatchingVisibleMethods$5(java.util.Map,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexEncodedMethod):503:504 -> a
-    150:151:void lambda$markMatchingMethods$7(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexEncodedMethod):525:526 -> a
-    152:160:void markMatchingVisibleFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean):537:545 -> a
-    161:161:void markMatchingFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map):554:554 -> a
-    162:163:void lambda$markMatchingFields$9(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexEncodedField):556:557 -> a
-    164:177:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):564:577 -> a
-    178:203:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):572:597 -> a
-    204:219:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):596:611 -> a
-    220:245:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):700:725 -> a
-    246:251:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):732:737 -> a
-    252:252:boolean lambda$anySourceMatchesInheritanceRuleDirectly$10(boolean,com.android.tools.r8.graph.DexType):736:736 -> a
-    253:253:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):742:742 -> a
-    254:257:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):755:758 -> a
-    254:257:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):743 -> a
-    258:260:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):778:780 -> a
-    261:265:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):797:801 -> a
-    266:279:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition):815:828 -> a
-    280:286:void markField(com.android.tools.r8.graph.DexEncodedField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition):838:844 -> a
-    287:306:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRule):857:876 -> a
-    307:326:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition):899:918 -> a
-    327:355:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition):915:943 -> a
-    356:366:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRule):880:890 -> a
-    356:366:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition):944 -> a
-    367:390:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition):946:969 -> a
-    391:391:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition):963:963 -> a
-    392:456:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition):960:1024 -> a
-    457:457:java.util.Map lambda$addItemToSets$13(com.android.tools.r8.graph.DexReference):930:930 -> a
-    1:1:java.util.Map access$1000(com.android.tools.r8.shaking.RootSetBuilder):61:61 -> b
-    2:2:boolean access$1800(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):61:61 -> b
-    3:3:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):155:155 -> b
-    4:27:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean):491:514 -> b
-    28:29:void lambda$markMatchingVisibleMethods$6(java.util.Map,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexEncodedMethod):511:512 -> b
-    30:30:void markMatchingMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map):523:523 -> b
-    31:32:void lambda$markMatchingVisibleFields$8(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexEncodedField):542:543 -> b
-    33:33:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):624:624 -> b
-    33:33:boolean access$1400(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):61 -> b
-    34:34:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):658:658 -> b
-    34:34:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):628 -> b
-    35:47:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):668:680 -> b
-    35:47:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):658 -> b
-    35:47:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):628 -> b
-    48:48:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):663:663 -> b
-    48:48:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):628 -> b
-    49:54:boolean satisfyImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):686:691 -> b
-    49:54:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):631 -> b
-    55:65:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):637:647 -> b
-    66:68:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):763:765 -> b
-    69:69:java.util.Set lambda$addItemToSets$14(com.android.tools.r8.graph.DexReference):931:931 -> b
+    1:1:com.android.tools.r8.graph.DirectMappedDexApplication access$100(com.android.tools.r8.shaking.RootSetBuilder):62:62 -> a
+    2:2:boolean access$1200(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):62:62 -> a
+    3:3:boolean access$1300(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):62:62 -> a
+    4:4:boolean access$1500(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):62:62 -> a
+    5:5:void access$1600(com.android.tools.r8.shaking.RootSetBuilder,java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):62:62 -> a
+    6:6:boolean access$1700(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):62:62 -> a
+    7:10:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):113:116 -> a
+    11:11:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):626:626 -> a
+    11:11:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):119 -> a
+    12:52:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):127:167 -> a
+    53:53:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):146:146 -> a
+    54:56:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):141:143 -> a
+    57:57:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):855:855 -> a
+    57:57:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):151 -> a
+    58:78:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):152:172 -> a
+    79:79:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):855:855 -> a
+    79:79:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):173 -> a
+    80:94:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):175:189 -> a
+    95:95:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):855:855 -> a
+    95:95:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):190 -> a
+    96:101:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):192:197 -> a
+    102:102:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):855:855 -> a
+    102:102:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):198 -> a
+    103:112:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):200:209 -> a
+    113:113:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):195:195 -> a
+    114:115:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):186:187 -> a
+    116:116:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):855:855 -> a
+    116:116:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):181 -> a
+    117:118:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):182:183 -> a
+    119:119:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):170:170 -> a
+    120:132:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):219:231 -> a
+    133:138:void lambda$runPerRule$4(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):232:237 -> a
+    139:139:com.android.tools.r8.shaking.RootSetBuilder$IfRuleEvaluator getIfRuleEvaluator(java.util.Set,java.util.Set,java.util.Set,java.util.concurrent.ExecutorService):291:291 -> a
+    140:149:com.android.tools.r8.graph.DexDefinition testAndGetPrecondition(com.android.tools.r8.graph.DexDefinition,java.util.Map):473:482 -> a
+    150:151:void lambda$markMatchingVisibleMethods$5(java.util.Map,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexEncodedMethod):505:506 -> a
+    152:153:void lambda$markMatchingMethods$7(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexEncodedMethod):527:528 -> a
+    154:162:void markMatchingVisibleFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean):539:547 -> a
+    163:163:void markMatchingFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map):556:556 -> a
+    164:165:void lambda$markMatchingFields$9(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexEncodedField):558:559 -> a
+    166:179:void writeSeeds(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):566:579 -> a
+    180:205:void writeSeeds(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):574:599 -> a
+    206:221:void writeSeeds(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):598:613 -> a
+    222:247:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):702:727 -> a
+    248:253:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):734:739 -> a
+    254:254:boolean lambda$anySourceMatchesInheritanceRuleDirectly$10(boolean,com.android.tools.r8.graph.DexType):738:738 -> a
+    255:255:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):744:744 -> a
+    256:259:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):757:760 -> a
+    256:259:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):745 -> a
+    260:262:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):780:782 -> a
+    263:267:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):799:803 -> a
+    268:281:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition):817:830 -> a
+    282:288:void markField(com.android.tools.r8.graph.DexEncodedField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition):840:846 -> a
+    289:308:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRule):859:878 -> a
+    309:328:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition):901:920 -> a
+    329:357:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition):917:945 -> a
+    358:368:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRule):882:892 -> a
+    358:368:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition):946 -> a
+    369:394:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition):948:973 -> a
+    395:395:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition):967:967 -> a
+    396:452:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition):964:1020 -> a
+    453:453:java.util.Map lambda$addItemToSets$13(com.android.tools.r8.graph.DexReference):932:932 -> a
+    1:1:java.util.Map access$1000(com.android.tools.r8.shaking.RootSetBuilder):62:62 -> b
+    2:2:boolean access$1800(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):62:62 -> b
+    3:3:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):157:157 -> b
+    4:27:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean):493:516 -> b
+    28:29:void lambda$markMatchingVisibleMethods$6(java.util.Map,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexEncodedMethod):513:514 -> b
+    30:30:void markMatchingMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map):525:525 -> b
+    31:32:void lambda$markMatchingVisibleFields$8(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexEncodedField):544:545 -> b
+    33:33:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):626:626 -> b
+    33:33:boolean access$1400(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):62 -> b
+    34:34:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):660:660 -> b
+    34:34:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):630 -> b
+    35:47:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):670:682 -> b
+    35:47:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):660 -> b
+    35:47:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):630 -> b
+    48:48:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):665:665 -> b
+    48:48:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):630 -> b
+    49:54:boolean satisfyImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):688:693 -> b
+    49:54:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):633 -> b
+    55:65:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):639:649 -> b
+    66:68:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):765:767 -> b
+    69:69:java.util.Set lambda$addItemToSets$14(com.android.tools.r8.graph.DexReference):933:933 -> b
     boolean lambda$process$2(com.android.tools.r8.graph.DexDefinition) -> c
-    1:1:java.lang.Iterable access$200(com.android.tools.r8.shaking.RootSetBuilder):61:61 -> c
-    2:3:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):619:620 -> c
-    4:4:java.util.Set lambda$addItemToSets$15(com.android.tools.r8.graph.DexReference):934:934 -> c
+    1:1:java.lang.Iterable access$200(com.android.tools.r8.shaking.RootSetBuilder):62:62 -> c
+    2:3:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):621:622 -> c
+    4:4:java.util.Set lambda$addItemToSets$15(com.android.tools.r8.graph.DexReference):936:936 -> c
     com.android.tools.r8.graph.DexReference lambda$addItemToSets$16(com.android.tools.r8.graph.DexReference) -> d
     boolean lambda$process$3(com.android.tools.r8.graph.DexDefinition) -> d
-    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.RootSetBuilder):61:61 -> d
-    2:2:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):615:615 -> d
-    1:1:com.android.tools.r8.utils.InternalOptions access$400(com.android.tools.r8.shaking.RootSetBuilder):61:61 -> e
-    2:2:java.util.Map lambda$includeDescriptor$11(com.android.tools.r8.graph.DexReference):872:872 -> e
-    1:1:java.util.Set access$500(com.android.tools.r8.shaking.RootSetBuilder):61:61 -> f
-    2:2:java.util.Set lambda$includeDescriptor$12(com.android.tools.r8.graph.DexReference):873:873 -> f
-    1:1:java.util.Set access$600(com.android.tools.r8.shaking.RootSetBuilder):61:61 -> g
-    1:1:java.util.Map access$700(com.android.tools.r8.shaking.RootSetBuilder):61:61 -> h
-    1:1:java.util.Set access$800(com.android.tools.r8.shaking.RootSetBuilder):61:61 -> i
-    1:1:java.util.Set access$900(com.android.tools.r8.shaking.RootSetBuilder):61:61 -> j
-    1:23:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):244:266 -> run
-    24:24:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):260:260 -> run
-com.android.tools.r8.shaking.RootSetBuilder$1 -> com.android.tools.r8.shaking.RootSetBuilder$1:
+    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.RootSetBuilder):62:62 -> d
+    2:2:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):617:617 -> d
+    1:1:com.android.tools.r8.utils.InternalOptions access$400(com.android.tools.r8.shaking.RootSetBuilder):62:62 -> e
+    2:2:java.util.Map lambda$includeDescriptor$11(com.android.tools.r8.graph.DexReference):874:874 -> e
+    1:1:java.util.Set access$500(com.android.tools.r8.shaking.RootSetBuilder):62:62 -> f
+    2:2:java.util.Set lambda$includeDescriptor$12(com.android.tools.r8.graph.DexReference):875:875 -> f
+    1:1:java.util.Set access$600(com.android.tools.r8.shaking.RootSetBuilder):62:62 -> g
+    1:1:java.util.Map access$700(com.android.tools.r8.shaking.RootSetBuilder):62:62 -> h
+    1:1:java.util.Set access$800(com.android.tools.r8.shaking.RootSetBuilder):62:62 -> i
+    1:1:java.util.Set access$900(com.android.tools.r8.shaking.RootSetBuilder):62:62 -> j
+    1:23:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):245:267 -> run
+    24:24:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):261:261 -> run
+com.android.tools.r8.shaking.RootSetBuilder$1 -> com.android.tools.r8.shaking.sa:
     int[] $SwitchMap$com$android$tools$r8$shaking$InlineRule$Type -> b
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassInlineRule$Type -> c
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassMergingRule$Type -> d
     int[] $SwitchMap$com$android$tools$r8$shaking$MemberValuePropagationRule$Type -> e
     int[] $SwitchMap$com$android$tools$r8$shaking$ProguardKeepRuleType -> a
-    1:1:void <clinit>():993:993 -> <clinit>
-    2:2:void <clinit>():983:983 -> <clinit>
-    3:3:void <clinit>():973:973 -> <clinit>
-    4:4:void <clinit>():958:958 -> <clinit>
-    5:5:void <clinit>():136:136 -> <clinit>
+    1:1:void <clinit>():997:997 -> <clinit>
+    2:2:void <clinit>():987:987 -> <clinit>
+    3:3:void <clinit>():977:977 -> <clinit>
+    4:4:void <clinit>():962:962 -> <clinit>
+    5:5:void <clinit>():138:138 -> <clinit>
 com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet -> com.android.tools.r8.shaking.RootSetBuilder$a:
     java.util.Map noShrinking -> c
     java.util.Set noOptimization -> d
@@ -44852,8 +44183,8 @@
     java.util.Set neverInline -> a
     java.util.Set neverClassInline -> b
     java.util.Map dependentNoShrinking -> f
-    1:7:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map):1372:1378 -> <init>
-    1:7:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,com.android.tools.r8.shaking.RootSetBuilder$1):1358 -> <init>
+    1:7:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map):1376:1382 -> <init>
+    1:7:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,com.android.tools.r8.shaking.RootSetBuilder$1):1362 -> <init>
 com.android.tools.r8.shaking.RootSetBuilder$IfRuleEvaluator -> com.android.tools.r8.shaking.RootSetBuilder$b:
     java.util.concurrent.ExecutorService executorService -> d
     java.util.Set targetedMethods -> c
@@ -44862,59 +44193,60 @@
     java.util.Set liveFields -> a
     java.util.Set liveMethods -> b
     com.android.tools.r8.shaking.RootSetBuilder this$0 -> f
-    1:1:void <clinit>():292:292 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.RootSetBuilder,java.util.Set,java.util.Set,java.util.Set,java.util.concurrent.ExecutorService):306:306 -> <init>
-    2:12:void <init>(com.android.tools.r8.shaking.RootSetBuilder,java.util.Set,java.util.Set,java.util.Set,java.util.concurrent.ExecutorService):300:310 -> <init>
-    1:44:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run(java.util.Set):314:357 -> a
-    45:45:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run(java.util.Set):349:349 -> a
-    46:75:void evaluateIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):366:395 -> a
-    76:85:void evaluateIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):393:402 -> a
-    86:104:void evaluateIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):400:418 -> a
-    105:106:boolean lambda$evaluateIfRule$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):397:398 -> a
-    107:108:boolean lambda$evaluateIfRule$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):404:405 -> a
-    109:123:void lambda$evaluateIfRule$3(java.util.Collection,com.android.tools.r8.shaking.ProguardIfRule,java.util.Set):421:435 -> a
-    124:125:boolean lambda$evaluateIfRule$2(java.util.Collection,java.util.Collection,com.android.tools.r8.shaking.ProguardMemberRule):432:433 -> a
-    126:145:void materializeIfRule(com.android.tools.r8.shaking.ProguardIfRule):441:460 -> a
+    1:1:void <clinit>():294:294 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.RootSetBuilder,java.util.Set,java.util.Set,java.util.Set,java.util.concurrent.ExecutorService):308:308 -> <init>
+    2:12:void <init>(com.android.tools.r8.shaking.RootSetBuilder,java.util.Set,java.util.Set,java.util.Set,java.util.concurrent.ExecutorService):302:312 -> <init>
+    1:44:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run(java.util.Set):316:359 -> a
+    45:45:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run(java.util.Set):351:351 -> a
+    46:75:void evaluateIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):368:397 -> a
+    76:85:void evaluateIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):395:404 -> a
+    86:104:void evaluateIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):402:420 -> a
+    105:106:boolean lambda$evaluateIfRule$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):399:400 -> a
+    107:108:boolean lambda$evaluateIfRule$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):406:407 -> a
+    109:123:void lambda$evaluateIfRule$3(java.util.Collection,com.android.tools.r8.shaking.ProguardIfRule,java.util.Set):423:437 -> a
+    124:125:boolean lambda$evaluateIfRule$2(java.util.Collection,java.util.Collection,com.android.tools.r8.shaking.ProguardMemberRule):434:435 -> a
+    126:145:void materializeIfRule(com.android.tools.r8.shaking.ProguardIfRule):443:462 -> a
 com.android.tools.r8.shaking.RootSetBuilder$RootSet -> com.android.tools.r8.shaking.RootSetBuilder$RootSet:
-    java.util.Map dependentNoShrinking -> q
-    java.util.Set ifRules -> s
-    java.util.Map mayHaveSideEffects -> n
-    java.util.Map noSideEffects -> o
-    java.util.Map assumedValues -> p
+    java.util.Map assumedValues -> q
+    java.util.Map dependentNoShrinking -> r
+    java.util.Set identifierNameStrings -> s
+    java.util.Set ifRules -> t
+    java.util.Map mayHaveSideEffects -> o
+    java.util.Map noSideEffects -> p
+    boolean $assertionsDisabled -> u
     java.util.Set noOptimization -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList reasonAsked -> d
-    boolean $assertionsDisabled -> t
     java.util.Map noShrinking -> a
-    java.util.Set forceInline -> g
-    java.util.Set neverInline -> h
-    java.util.Set keepConstantArguments -> i
-    java.util.Set keepUnusedArguments -> j
+    java.util.Set alwaysInline -> g
+    java.util.Set forceInline -> h
+    java.util.Set neverInline -> i
+    java.util.Set keepConstantArguments -> j
     java.util.Set noObfuscation -> c
-    java.util.Set checkDiscarded -> e
-    java.util.Set alwaysInline -> f
-    java.util.Set identifierNameStrings -> r
-    java.util.Set neverClassInline -> k
-    java.util.Set neverMerge -> l
-    java.util.Set neverPropagateValue -> m
-    1:1:void <clinit>():1029:1029 -> <clinit>
-    1:20:void <init>(java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set):1071:1090 -> <init>
-    1:20:void <init>(java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.shaking.RootSetBuilder$1):1029 -> <init>
+    java.util.Set keepPackageName -> e
+    java.util.Set checkDiscarded -> f
+    java.util.Set keepUnusedArguments -> k
+    java.util.Set neverClassInline -> l
+    java.util.Set neverMerge -> m
+    java.util.Set neverPropagateValue -> n
+    1:1:void <clinit>():1025:1025 -> <clinit>
+    1:21:void <init>(java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set):1069:1089 -> <init>
+    1:21:void <init>(java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.shaking.RootSetBuilder$1):1025 -> <init>
     1:5:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet):1137:1141 -> a
     6:6:void addDependentItems(java.util.Map):1147:1147 -> a
     7:8:void lambda$addDependentItems$1(com.android.tools.r8.graph.DexReference,java.util.Map):1150:1151 -> a
     9:10:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1155:1156 -> a
     11:11:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1155:1155 -> a
     12:16:void prune(com.android.tools.r8.graph.DexReference):1178:1182 -> a
-    17:26:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1191:1200 -> a
-    27:35:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):1238:1246 -> a
-    36:108:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1253:1325 -> a
-    109:109:java.util.Set lambda$verifyKeptItemsAreKept$2(com.android.tools.r8.graph.DexType):1271:1271 -> a
-    110:110:void lambda$toString$3(java.lang.StringBuilder,com.android.tools.r8.graph.DexReference):1351:1351 -> a
+    17:29:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness):1191:1203 -> a
+    30:38:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness):1241:1249 -> a
+    39:111:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1256:1328 -> a
+    112:112:java.util.Set lambda$verifyKeptItemsAreKept$2(com.android.tools.r8.graph.DexType):1274:1274 -> a
+    113:113:void lambda$toString$3(java.lang.StringBuilder,com.android.tools.r8.graph.DexReference):1355:1355 -> a
     1:1:java.util.Map lambda$addDependentItems$0(com.android.tools.r8.graph.DexReference):1150:1150 -> b
-    2:12:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1208:1218 -> b
-    1:5:boolean verifyKeptTypesAreLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1227:1231 -> c
-    1:21:java.lang.String toString():1333:1353 -> toString
-com.android.tools.r8.shaking.ScopedDexMethodSet -> com.android.tools.r8.shaking.sa:
+    2:12:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness):1211:1221 -> b
+    1:5:boolean verifyKeptTypesAreLive(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness):1230:1234 -> c
+    1:22:java.lang.String toString():1336:1357 -> toString
+com.android.tools.r8.shaking.ScopedDexMethodSet -> com.android.tools.r8.shaking.ta:
     java.util.Map items -> b
     com.android.tools.r8.com.google.common.base.Equivalence METHOD_EQUIVALENCE -> c
     com.android.tools.r8.shaking.ScopedDexMethodSet parent -> a
@@ -44933,7 +44265,7 @@
     6:6:com.android.tools.r8.shaking.ScopedDexMethodSet getParent():62:62 -> a
     1:1:com.android.tools.r8.shaking.ScopedDexMethodSet newNestedScope():30:30 -> b
     2:5:boolean addMethodIfMoreVisible(com.android.tools.r8.graph.DexEncodedMethod):52:55 -> b
-com.android.tools.r8.shaking.StaticClassMerger -> com.android.tools.r8.shaking.wa:
+com.android.tools.r8.shaking.StaticClassMerger -> com.android.tools.r8.shaking.xa:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
     com.android.tools.r8.com.google.common.base.Equivalence fieldEquivalence -> c
@@ -44943,52 +44275,52 @@
     com.android.tools.r8.com.google.common.base.Equivalence methodEquivalence -> d
     com.android.tools.r8.shaking.MainDexClasses mainDexClasses -> b
     java.util.Map representatives -> e
-    1:1:void <clinit>():59:59 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses):210:210 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses):200:219 -> <init>
-    1:1:com.android.tools.r8.com.google.common.base.Equivalence access$000(com.android.tools.r8.shaking.StaticClassMerger):59:59 -> a
-    2:4:com.android.tools.r8.graph.GraphLense run():223:225 -> a
-    5:9:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):313:317 -> a
-    5:9:com.android.tools.r8.graph.GraphLense run():226 -> a
-    10:39:boolean mergeGlobally(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):323:352 -> a
-    10:39:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):318 -> a
-    10:39:com.android.tools.r8.graph.GraphLense run():226 -> a
-    40:72:boolean mergeInsidePackage(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):359:391 -> a
-    40:72:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):319 -> a
-    40:72:com.android.tools.r8.graph.GraphLense run():226 -> a
-    73:85:com.android.tools.r8.graph.GraphLense buildGraphLense():240:252 -> a
-    73:85:com.android.tools.r8.graph.GraphLense run():236 -> a
-    86:95:com.android.tools.r8.graph.GraphLense buildGraphLense():241:250 -> a
-    86:95:com.android.tools.r8.graph.GraphLense run():236 -> a
-    96:96:boolean isValidRepresentative(com.android.tools.r8.graph.DexProgramClass):309:309 -> a
-    97:105:com.android.tools.r8.shaking.StaticClassMerger$Representative getOrCreateRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.graph.DexProgramClass):397:405 -> a
-    106:123:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.shaking.StaticClassMerger$Representative):409:426 -> a
-    124:124:void clearRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key):438:438 -> a
-    125:125:boolean lambda$mayMergeAcrossPackageBoundaries$2(com.android.tools.r8.graph.DexEncodedMethod):449:449 -> a
-    126:126:boolean lambda$mayMergeAcrossPackageBoundaries$3(com.android.tools.r8.graph.DexEncodedField):453:453 -> a
-    127:135:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):485:493 -> a
-    136:139:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):492:495 -> a
-    140:143:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):494:497 -> a
-    144:150:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):496:502 -> a
-    151:151:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper lambda$mergeMethods$5(com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexEncodedMethod):513:513 -> a
-    152:152:boolean lambda$mergeMethods$6(java.util.Set,com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexMethod):517:517 -> a
-    153:171:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):538:556 -> a
-    172:184:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):596:608 -> a
-    172:184:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):558 -> a
-    185:194:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):559:568 -> a
-    195:195:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper lambda$mergeFields$7(com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexEncodedField):550:550 -> a
-    196:196:boolean lambda$mergeFields$8(java.util.Set,com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexField):554:554 -> a
-    1:1:com.android.tools.r8.com.google.common.base.Equivalence access$100(com.android.tools.r8.shaking.StaticClassMerger):59:59 -> b
-    2:2:boolean lambda$satisfiesMergeCriteria$0(com.android.tools.r8.graph.DexEncodedField):267:267 -> b
-    3:27:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):444:468 -> b
-    28:28:boolean lambda$mayMergeAcrossPackageBoundaries$4(com.android.tools.r8.graph.DexEncodedMethod):461:461 -> b
-    29:39:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):510:520 -> b
-    40:53:com.android.tools.r8.graph.DexEncodedMethod renameMethodIfNeeded(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):576:589 -> b
-    40:53:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):522 -> b
-    54:60:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):523:529 -> b
-    1:49:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):256:304 -> c
-    50:55:boolean lambda$satisfiesMergeCriteria$1(com.android.tools.r8.graph.DexEncodedMethod):279:284 -> c
-com.android.tools.r8.shaking.StaticClassMerger$MergeGroup -> com.android.tools.r8.shaking.ua:
+    1:1:void <clinit>():60:60 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses):211:211 -> <init>
+    2:22:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses):201:221 -> <init>
+    1:1:com.android.tools.r8.com.google.common.base.Equivalence access$000(com.android.tools.r8.shaking.StaticClassMerger):60:60 -> a
+    2:4:com.android.tools.r8.graph.GraphLense run():225:227 -> a
+    5:9:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):315:319 -> a
+    5:9:com.android.tools.r8.graph.GraphLense run():228 -> a
+    10:39:boolean mergeGlobally(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):325:354 -> a
+    10:39:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):320 -> a
+    10:39:com.android.tools.r8.graph.GraphLense run():228 -> a
+    40:72:boolean mergeInsidePackage(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):361:393 -> a
+    40:72:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):321 -> a
+    40:72:com.android.tools.r8.graph.GraphLense run():228 -> a
+    73:85:com.android.tools.r8.graph.GraphLense buildGraphLense():242:254 -> a
+    73:85:com.android.tools.r8.graph.GraphLense run():238 -> a
+    86:95:com.android.tools.r8.graph.GraphLense buildGraphLense():243:252 -> a
+    86:95:com.android.tools.r8.graph.GraphLense run():238 -> a
+    96:96:boolean isValidRepresentative(com.android.tools.r8.graph.DexProgramClass):311:311 -> a
+    97:105:com.android.tools.r8.shaking.StaticClassMerger$Representative getOrCreateRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.graph.DexProgramClass):399:407 -> a
+    106:123:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.shaking.StaticClassMerger$Representative):411:428 -> a
+    124:124:void clearRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key):440:440 -> a
+    125:125:boolean lambda$mayMergeAcrossPackageBoundaries$2(com.android.tools.r8.graph.DexEncodedMethod):451:451 -> a
+    126:126:boolean lambda$mayMergeAcrossPackageBoundaries$3(com.android.tools.r8.graph.DexEncodedField):455:455 -> a
+    127:135:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):487:495 -> a
+    136:139:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):494:497 -> a
+    140:143:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):496:499 -> a
+    144:150:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):498:504 -> a
+    151:151:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper lambda$mergeMethods$5(com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexEncodedMethod):515:515 -> a
+    152:152:boolean lambda$mergeMethods$6(java.util.Set,com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexMethod):519:519 -> a
+    153:171:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):540:558 -> a
+    172:184:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):598:610 -> a
+    172:184:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):560 -> a
+    185:194:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):561:570 -> a
+    195:195:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper lambda$mergeFields$7(com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexEncodedField):552:552 -> a
+    196:196:boolean lambda$mergeFields$8(java.util.Set,com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexField):556:556 -> a
+    1:1:com.android.tools.r8.com.google.common.base.Equivalence access$100(com.android.tools.r8.shaking.StaticClassMerger):60:60 -> b
+    2:2:boolean lambda$satisfiesMergeCriteria$0(com.android.tools.r8.graph.DexEncodedField):269:269 -> b
+    3:27:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):446:470 -> b
+    28:28:boolean lambda$mayMergeAcrossPackageBoundaries$4(com.android.tools.r8.graph.DexEncodedMethod):463:463 -> b
+    29:39:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):512:522 -> b
+    40:53:com.android.tools.r8.graph.DexEncodedMethod renameMethodIfNeeded(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):578:591 -> b
+    40:53:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):524 -> b
+    54:60:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):525:531 -> b
+    1:49:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):258:306 -> c
+    50:55:boolean lambda$satisfiesMergeCriteria$1(com.android.tools.r8.graph.DexEncodedMethod):281:286 -> c
+com.android.tools.r8.shaking.StaticClassMerger$MergeGroup -> com.android.tools.r8.shaking.va:
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup DONT_MERGE -> d
     boolean $assertionsDisabled -> i
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key mainDexDependenciesGlobalKey -> f
@@ -44998,64 +44330,61 @@
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup NOT_MAIN_DEX -> c
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup MAIN_DEX_DEPENDENCIES -> b
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup MAIN_DEX_ROOTS -> a
-    1:5:void <clinit>():61:65 -> <clinit>
-    6:16:void <clinit>():61:71 -> <clinit>
-    1:1:void <init>(java.lang.String,int):61:61 -> <init>
-    1:9:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():113:121 -> a
-    10:10:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():119:119 -> a
-    11:11:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():117:117 -> a
-    12:13:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key key(java.lang.String):126:127 -> a
-    1:9:java.lang.String toString():132:140 -> toString
-com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key -> com.android.tools.r8.shaking.ta:
+    1:5:void <clinit>():62:66 -> <clinit>
+    6:16:void <clinit>():62:72 -> <clinit>
+    1:1:void <init>(java.lang.String,int):62:62 -> <init>
+    1:9:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():114:122 -> a
+    10:10:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():120:120 -> a
+    11:11:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():118:118 -> a
+    12:13:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key key(java.lang.String):127:128 -> a
+    1:9:java.lang.String toString():133:141 -> toString
+com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key -> com.android.tools.r8.shaking.ua:
     java.lang.String packageOrGlobal -> b
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup mergeGroup -> a
-    1:3:void <init>(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup,java.lang.String):77:79 -> <init>
-    1:1:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup getMergeGroup():83:83 -> a
-    1:5:boolean equals(java.lang.Object):104:108 -> equals
-    1:1:int hashCode():96:96 -> hashCode
-com.android.tools.r8.shaking.StaticClassMerger$Representative -> com.android.tools.r8.shaking.va:
+    1:3:void <init>(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup,java.lang.String):78:80 -> <init>
+    1:1:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup getMergeGroup():84:84 -> a
+    1:5:boolean equals(java.lang.Object):105:109 -> equals
+    1:1:int hashCode():97:97 -> hashCode
+com.android.tools.r8.shaking.StaticClassMerger$Representative -> com.android.tools.r8.shaking.wa:
     com.android.tools.r8.shaking.StaticClassMerger this$0 -> d
     com.android.tools.r8.graph.DexProgramClass clazz -> a
     com.android.tools.r8.com.google.common.collect.HashMultiset methodBuckets -> c
     com.android.tools.r8.com.google.common.collect.HashMultiset fieldBuckets -> b
-    1:1:void <init>(com.android.tools.r8.shaking.StaticClassMerger,com.android.tools.r8.graph.DexProgramClass):160:160 -> <init>
-    2:7:void <init>(com.android.tools.r8.shaking.StaticClassMerger,com.android.tools.r8.graph.DexProgramClass):157:162 -> <init>
-    1:1:com.android.tools.r8.graph.DexProgramClass access$200(com.android.tools.r8.shaking.StaticClassMerger$Representative):151:151 -> a
-    2:8:void include(com.android.tools.r8.graph.DexProgramClass):167:173 -> a
-    9:13:boolean isFull():183:187 -> a
-com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.shaking.xa:
+    1:1:void <init>(com.android.tools.r8.shaking.StaticClassMerger,com.android.tools.r8.graph.DexProgramClass):161:161 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.StaticClassMerger,com.android.tools.r8.graph.DexProgramClass):158:163 -> <init>
+    1:1:com.android.tools.r8.graph.DexProgramClass access$200(com.android.tools.r8.shaking.StaticClassMerger$Representative):152:152 -> a
+    2:8:void include(com.android.tools.r8.graph.DexProgramClass):168:174 -> a
+    9:13:boolean isFull():184:188 -> a
+com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.shaking.ya:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set prunedTypes -> d
-    boolean $assertionsDisabled -> e
     com.android.tools.r8.shaking.UsagePrinter usagePrinter -> c
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):37:37 -> <init>
-    2:12:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):35:45 -> <init>
-    boolean lambda$getNewProgramClasses$0(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.InnerClassAttribute) -> a
-    1:63:java.util.List getNewProgramClasses(java.util.List):73:135 -> a
-    64:69:boolean isAttributeReferencingPrunedItem(com.android.tools.r8.graph.EnclosingMethodAttribute):142:147 -> a
-    70:75:boolean isAttributeReferencingPrunedType(com.android.tools.r8.graph.InnerClassAttribute):151:156 -> a
-    76:77:int firstUnreachableIndex(java.util.List,java.util.function.Predicate):161:162 -> a
-    78:93:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):175:190 -> a
-    94:95:boolean isDefaultConstructor(com.android.tools.r8.graph.DexEncodedMethod):170:171 -> a
-    94:95:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):190 -> a
-    96:98:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):193:195 -> a
-    99:129:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):192:222 -> a
-    130:145:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):217:232 -> a
-    146:146:boolean lambda$reachableFields$1(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexField):238:238 -> a
-    147:147:java.util.Collection getRemovedClasses():269:269 -> a
-    1:12:com.android.tools.r8.graph.DexApplication run():49:60 -> b
-    13:14:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):68:69 -> b
-    13:14:com.android.tools.r8.graph.DexApplication run():60 -> b
-    15:17:com.android.tools.r8.graph.DexApplication run():60:62 -> b
-    18:47:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):236:265 -> b
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):38:38 -> <init>
+    2:12:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):36:46 -> <init>
+    1:51:java.util.List getNewProgramClasses(java.util.List):74:124 -> a
+    52:57:boolean isAttributeReferencingPrunedItem(com.android.tools.r8.graph.EnclosingMethodAttribute):131:136 -> a
+    58:80:boolean isAttributeReferencingPrunedType(com.android.tools.r8.graph.InnerClassAttribute):140:162 -> a
+    81:82:int firstUnreachableIndex(java.util.List,java.util.function.Predicate):167:168 -> a
+    83:98:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):181:196 -> a
+    99:100:boolean isDefaultConstructor(com.android.tools.r8.graph.DexEncodedMethod):176:177 -> a
+    99:100:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):196 -> a
+    101:103:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):199:201 -> a
+    104:134:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):198:228 -> a
+    135:150:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):223:238 -> a
+    151:153:boolean lambda$reachableFields$0(com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness,com.android.tools.r8.graph.DexField):245:247 -> a
+    154:154:java.util.Collection getRemovedClasses():278:278 -> a
+    1:12:com.android.tools.r8.graph.DexApplication run():50:61 -> b
+    13:14:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):69:70 -> b
+    13:14:com.android.tools.r8.graph.DexApplication run():61 -> b
+    15:17:com.android.tools.r8.graph.DexApplication run():61:63 -> b
+    18:50:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):242:274 -> b
 com.android.tools.r8.shaking.UnusedArgumentRule -> com.android.tools.r8.shaking.Aa:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.UnusedArgumentRule$1):10 -> <init>
     1:1:com.android.tools.r8.shaking.UnusedArgumentRule$Builder builder():74:74 -> builder
-com.android.tools.r8.shaking.UnusedArgumentRule$1 -> com.android.tools.r8.shaking.ya:
-com.android.tools.r8.shaking.UnusedArgumentRule$Builder -> com.android.tools.r8.shaking.za:
+com.android.tools.r8.shaking.UnusedArgumentRule$1 -> com.android.tools.r8.shaking.za:
+com.android.tools.r8.shaking.UnusedArgumentRule$Builder -> com.android.tools.r8.shaking.Aa$a:
     1:1:void <init>():16:16 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.UnusedArgumentRule$1):12 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> g
@@ -45084,11 +44413,11 @@
     void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void visited() -> b
     void visiting(com.android.tools.r8.graph.DexProgramClass) -> b
-com.android.tools.r8.shaking.VerticalClassMerger -> com.android.tools.r8.shaking.Oa:
-    com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> b
+com.android.tools.r8.shaking.VerticalClassMerger -> com.android.tools.r8.shaking.Ga:
     boolean $assertionsDisabled -> o
     com.android.tools.r8.graph.AppView appView -> c
     com.android.tools.r8.shaking.MainDexClasses mainDexClasses -> n
+    com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness appInfo -> b
     java.util.Collection invokes -> g
     java.util.Set mergeCandidates -> h
     com.android.tools.r8.graph.DexApplication application -> a
@@ -45100,59 +44429,59 @@
     com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder renamedMembersLense -> l
     java.util.Set pinnedTypes -> k
     java.util.List synthesizedBridges -> m
-    1:1:void <clinit>():91:91 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):232:232 -> <init>
-    2:36:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):208:242 -> <init>
-    37:75:void initializePinnedTypes(java.lang.Iterable):264:302 -> <init>
-    37:75:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):243 -> <init>
-    76:78:void initializeMergeCandidates(java.lang.Iterable):252:254 -> <init>
-    76:78:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):244 -> <init>
-    1:1:java.util.Set access$100(com.android.tools.r8.shaking.VerticalClassMerger):91:91 -> a
-    2:2:com.android.tools.r8.graph.DexProto access$1200(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):91:91 -> a
-    3:3:com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses getMergedClasses():248:248 -> a
-    4:21:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):307:324 -> a
-    22:31:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):331:340 -> a
-    32:66:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):353:387 -> a
-    67:76:boolean disallowInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):1621:1630 -> a
-    67:76:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):387 -> a
-    77:77:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):395:395 -> a
-    78:96:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):409:427 -> a
-    97:134:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):458:495 -> a
-    97:134:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):434 -> a
-    135:177:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):690:732 -> a
-    135:177:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):440 -> a
-    178:195:boolean fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):821:838 -> a
-    178:195:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):448 -> a
-    196:196:boolean lambda$isStillMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):420:420 -> a
-    197:252:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):618:673 -> a
-    253:256:void makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1400:1403 -> a
-    253:256:void access$1300(com.android.tools.r8.graph.DexEncodedMethod):91 -> a
-    257:260:com.android.tools.r8.graph.DexProto getStaticProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1407:1410 -> a
-    1:1:com.android.tools.r8.utils.Timing access$1000(com.android.tools.r8.shaking.VerticalClassMerger):91:91 -> b
-    2:59:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):744:801 -> b
-    60:60:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):796:796 -> b
-    61:61:java.util.Collection getRemovedClasses():1934:1934 -> b
-    1:1:com.android.tools.r8.ir.optimize.MethodPoolCollection access$1100(com.android.tools.r8.shaking.VerticalClassMerger):91:91 -> c
-    2:12:com.android.tools.r8.graph.GraphLense run():602:612 -> c
-    13:18:com.android.tools.r8.graph.GraphLense run():608:613 -> c
-    1:1:com.android.tools.r8.graph.DexApplication access$1400(com.android.tools.r8.shaking.VerticalClassMerger):91:91 -> d
-    2:7:com.android.tools.r8.graph.GraphLense mergeClasses():681:686 -> d
-    1:1:java.util.Map access$1500(com.android.tools.r8.shaking.VerticalClassMerger):91:91 -> e
-    1:1:java.util.Map access$1600(com.android.tools.r8.shaking.VerticalClassMerger):91:91 -> f
-    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder access$1700(com.android.tools.r8.shaking.VerticalClassMerger):91:91 -> g
-    1:1:java.util.List access$1800(com.android.tools.r8.shaking.VerticalClassMerger):91:91 -> h
-    1:4:java.util.Collection getInvokes():504:507 -> i
-    1:4:java.util.Collection access$1900(com.android.tools.r8.shaking.VerticalClassMerger):91 -> i
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness access$200(com.android.tools.r8.shaking.VerticalClassMerger):91:91 -> j
-    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):91:91 -> k
-    1:1:java.util.concurrent.ExecutorService access$900(com.android.tools.r8.shaking.VerticalClassMerger):91:91 -> l
+    1:1:void <clinit>():92:92 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):233:233 -> <init>
+    2:36:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):209:243 -> <init>
+    37:75:void initializePinnedTypes(java.lang.Iterable):265:303 -> <init>
+    37:75:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):244 -> <init>
+    76:78:void initializeMergeCandidates(java.lang.Iterable):253:255 -> <init>
+    76:78:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):245 -> <init>
+    1:1:java.util.Set access$100(com.android.tools.r8.shaking.VerticalClassMerger):92:92 -> a
+    2:2:com.android.tools.r8.graph.DexProto access$1200(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):92:92 -> a
+    3:3:com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses getMergedClasses():249:249 -> a
+    4:21:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):308:325 -> a
+    22:31:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):332:341 -> a
+    32:66:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):354:388 -> a
+    67:76:boolean disallowInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):1618:1627 -> a
+    67:76:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):388 -> a
+    77:77:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):396:396 -> a
+    78:96:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):410:428 -> a
+    97:134:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):459:496 -> a
+    97:134:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):435 -> a
+    135:177:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):687:729 -> a
+    135:177:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):441 -> a
+    178:195:boolean fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):818:835 -> a
+    178:195:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):449 -> a
+    196:196:boolean lambda$isStillMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):421:421 -> a
+    197:252:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):616:671 -> a
+    253:256:void makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1397:1400 -> a
+    253:256:void access$1300(com.android.tools.r8.graph.DexEncodedMethod):92 -> a
+    257:260:com.android.tools.r8.graph.DexProto getStaticProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1404:1407 -> a
+    1:1:com.android.tools.r8.utils.Timing access$1000(com.android.tools.r8.shaking.VerticalClassMerger):92:92 -> b
+    2:59:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):741:798 -> b
+    60:60:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):793:793 -> b
+    61:61:java.util.Collection getRemovedClasses():1931:1931 -> b
+    1:1:com.android.tools.r8.ir.optimize.MethodPoolCollection access$1100(com.android.tools.r8.shaking.VerticalClassMerger):92:92 -> c
+    2:12:com.android.tools.r8.graph.GraphLense run():600:610 -> c
+    13:18:com.android.tools.r8.graph.GraphLense run():606:611 -> c
+    1:1:com.android.tools.r8.graph.DexApplication access$1400(com.android.tools.r8.shaking.VerticalClassMerger):92:92 -> d
+    2:6:com.android.tools.r8.graph.GraphLense mergeClasses():679:683 -> d
+    1:1:java.util.Map access$1500(com.android.tools.r8.shaking.VerticalClassMerger):92:92 -> e
+    1:1:java.util.Map access$1600(com.android.tools.r8.shaking.VerticalClassMerger):92:92 -> f
+    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder access$1700(com.android.tools.r8.shaking.VerticalClassMerger):92:92 -> g
+    1:1:java.util.List access$1800(com.android.tools.r8.shaking.VerticalClassMerger):92:92 -> h
+    1:4:java.util.Collection getInvokes():505:508 -> i
+    1:4:java.util.Collection access$1900(com.android.tools.r8.shaking.VerticalClassMerger):92 -> i
+    1:1:com.android.tools.r8.shaking.Enqueuer$AppInfoWithLiveness access$200(com.android.tools.r8.shaking.VerticalClassMerger):92:92 -> j
+    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):92:92 -> k
+    1:1:java.util.concurrent.ExecutorService access$900(com.android.tools.r8.shaking.VerticalClassMerger):92:92 -> l
 com.android.tools.r8.shaking.VerticalClassMerger$1 -> com.android.tools.r8.shaking.Ea:
     int[] $SwitchMap$com$android$tools$r8$shaking$VerticalClassMerger$Rename -> b
     int[] $SwitchMap$com$android$tools$r8$ir$code$Invoke$Type -> c
     int[] $SwitchMap$com$android$tools$r8$shaking$VerticalClassMerger$AbortReason -> a
-    1:1:void <clinit>():1917:1917 -> <clinit>
-    2:2:void <clinit>():1334:1334 -> <clinit>
-    3:3:void <clinit>():143:143 -> <clinit>
+    1:1:void <clinit>():1914:1914 -> <clinit>
+    2:2:void <clinit>():1331:1331 -> <clinit>
+    3:3:void <clinit>():144:144 -> <clinit>
 com.android.tools.r8.shaking.VerticalClassMerger$AbortReason -> com.android.tools.r8.shaking.Fa:
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason RESOLUTION_FOR_FIELDS_MAY_CHANGE -> h
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason PINNED_SOURCE -> g
@@ -45169,11 +44498,11 @@
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason STATIC_INITIALIZERS -> j
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason RESOLUTION_FOR_METHODS_MAY_CHANGE -> i
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason[] $VALUES -> o
-    1:15:void <clinit>():121:135 -> <clinit>
-    16:16:void <clinit>():121:121 -> <clinit>
-    1:1:void <init>(java.lang.String,int):121:121 -> <init>
-    1:1:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason[] values():121:121 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.shaking.Ga:
+    1:15:void <clinit>():122:136 -> <clinit>
+    16:16:void <clinit>():122:122 -> <clinit>
+    1:1:void <init>(java.lang.String,int):122:122 -> <init>
+    1:1:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason[] values():122:122 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.shaking.Ga$a:
     com.android.tools.r8.graph.DexClass source -> a
     com.android.tools.r8.graph.DexClass target -> b
     com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder deferredRenamings -> c
@@ -45181,69 +44510,69 @@
     boolean abortMerge -> e
     boolean $assertionsDisabled -> g
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> f
-    1:1:void <clinit>():849:849 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):861:861 -> <init>
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.VerticalClassMerger$1):849 -> <init>
-    2:10:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):855:863 -> <init>
-    2:10:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.VerticalClassMerger$1):849 -> <init>
-    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):878:881 -> a
-    5:7:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):949:951 -> a
-    8:8:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):950:950 -> a
-    9:9:boolean lambda$merge$2(java.util.Set,com.android.tools.r8.graph.DexField):1010:1010 -> a
-    10:10:java.util.Set lambda$merge$3(com.android.tools.r8.graph.DexType):1054:1054 -> a
-    11:27:boolean restoreDebuggingState(java.util.stream.Stream):1060:1076 -> a
-    28:28:boolean restoreDebuggingState(java.util.stream.Stream):1075:1075 -> a
-    29:31:void lambda$restoreDebuggingState$4(com.android.tools.r8.graph.DexEncodedMethod):1062:1064 -> a
-    32:32:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder getRenamings():1084:1084 -> a
-    33:33:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1242:1242 -> a
-    34:37:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1264:1267 -> a
-    38:53:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1365:1380 -> a
-    38:53:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1268 -> a
-    54:55:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1269:1270 -> a
+    1:1:void <clinit>():846:846 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):858:858 -> <init>
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.VerticalClassMerger$1):846 -> <init>
+    2:10:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):852:860 -> <init>
+    2:10:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.VerticalClassMerger$1):846 -> <init>
+    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):875:878 -> a
+    5:7:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):946:948 -> a
+    8:8:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):947:947 -> a
+    9:9:boolean lambda$merge$2(java.util.Set,com.android.tools.r8.graph.DexField):1007:1007 -> a
+    10:10:java.util.Set lambda$merge$3(com.android.tools.r8.graph.DexType):1051:1051 -> a
+    11:27:boolean restoreDebuggingState(java.util.stream.Stream):1057:1073 -> a
+    28:28:boolean restoreDebuggingState(java.util.stream.Stream):1072:1072 -> a
+    29:31:void lambda$restoreDebuggingState$4(com.android.tools.r8.graph.DexEncodedMethod):1059:1061 -> a
+    32:32:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder getRenamings():1081:1081 -> a
+    33:33:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1239:1239 -> a
+    34:37:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1261:1264 -> a
+    38:53:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1362:1377 -> a
+    38:53:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1265 -> a
+    54:55:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1266:1267 -> a
     56:56:void com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):262:262 -> a
-    56:56:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1270 -> a
-    57:62:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1271:1276 -> a
-    63:67:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1285:1289 -> a
-    68:68:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1319:1319 -> a
-    69:97: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):1329:1357 -> a
-    98:122: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):1336:1360 -> a
-    1:5:void lambda$restoreDebuggingState$5(com.android.tools.r8.graph.DexEncodedMethod):1068:1072 -> b
-    6:6:java.util.List getSynthesizedBridges():1088:1088 -> b
-    1:2:boolean merge():870:871 -> c
-    3:4:void addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1247:1248 -> c
-    3:4:boolean merge():871 -> c
-    5:17:boolean merge():873:885 -> c
-    18:37:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1294:1313 -> c
-    18:37:boolean merge():888 -> c
-    38:38:boolean merge():889:889 -> c
-    39:48:boolean merge():886:895 -> c
-    49:58:boolean merge():892:901 -> c
-    59:59:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1168:1168 -> c
-    59:59:boolean merge():901 -> c
-    60:60:boolean merge():906:906 -> c
-    61:69:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1213:1221 -> c
-    61:69:boolean merge():907 -> c
-    70:79:boolean merge():909:918 -> c
-    80:116:boolean merge():917:953 -> c
-    117:117:boolean merge():946:946 -> c
-    118:128:void makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1384:1394 -> c
-    118:128:boolean merge():954 -> c
-    129:143:boolean merge():957:971 -> c
-    144:198:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1092:1146 -> c
-    144:198:boolean merge():971 -> c
-    199:199:boolean merge():972:972 -> c
-    200:200:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1168:1168 -> c
-    200:200:boolean merge():972 -> c
-    201:234:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1173:1206 -> c
-    201:234:boolean merge():980 -> c
-    235:245:boolean merge():981:991 -> c
-    246:271:boolean merge():990:1015 -> c
-    272:281:boolean merge():1013:1022 -> c
-    282:289:boolean merge():1020:1027 -> c
-    290:292:java.util.Set mergeArrays(java.lang.Object[],java.lang.Object[]):1253:1255 -> c
-    290:292:boolean merge():1027 -> c
-    293:318:boolean merge():1030:1055 -> c
-    319:320:boolean lambda$restoreDebuggingState$6(com.android.tools.r8.graph.DexEncodedMethod):1078:1079 -> c
+    56:56:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1267 -> a
+    57:62:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1268:1273 -> a
+    63:67:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1282:1286 -> a
+    68:68:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1316:1316 -> a
+    69:97: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):1326:1354 -> a
+    98:122: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):1333:1357 -> a
+    1:5:void lambda$restoreDebuggingState$5(com.android.tools.r8.graph.DexEncodedMethod):1065:1069 -> b
+    6:6:java.util.List getSynthesizedBridges():1085:1085 -> b
+    1:2:boolean merge():867:868 -> c
+    3:4:void addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1244:1245 -> c
+    3:4:boolean merge():868 -> c
+    5:17:boolean merge():870:882 -> c
+    18:37:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1291:1310 -> c
+    18:37:boolean merge():885 -> c
+    38:38:boolean merge():886:886 -> c
+    39:48:boolean merge():883:892 -> c
+    49:58:boolean merge():889:898 -> c
+    59:59:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1165:1165 -> c
+    59:59:boolean merge():898 -> c
+    60:60:boolean merge():903:903 -> c
+    61:69:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1210:1218 -> c
+    61:69:boolean merge():904 -> c
+    70:79:boolean merge():906:915 -> c
+    80:116:boolean merge():914:950 -> c
+    117:117:boolean merge():943:943 -> c
+    118:128:void makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1381:1391 -> c
+    118:128:boolean merge():951 -> c
+    129:143:boolean merge():954:968 -> c
+    144:198:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1089:1143 -> c
+    144:198:boolean merge():968 -> c
+    199:199:boolean merge():969:969 -> c
+    200:200:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1165:1165 -> c
+    200:200:boolean merge():969 -> c
+    201:234:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1170:1203 -> c
+    201:234:boolean merge():977 -> c
+    235:245:boolean merge():978:988 -> c
+    246:271:boolean merge():987:1012 -> c
+    272:281:boolean merge():1010:1019 -> c
+    282:289:boolean merge():1017:1024 -> c
+    290:292:java.util.Set mergeArrays(java.lang.Object[],java.lang.Object[]):1250:1252 -> c
+    290:292:boolean merge():1024 -> c
+    293:318:boolean merge():1027:1052 -> c
+    319:320:boolean lambda$restoreDebuggingState$6(com.android.tools.r8.graph.DexEncodedMethod):1075:1076 -> c
 com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.shaking.Ha:
     java.util.Map seenPositions -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap sourceProtoCache -> c
@@ -45253,127 +44582,127 @@
     boolean $assertionsDisabled -> h
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> g
     com.android.tools.r8.graph.DexType target -> e
-    1:1:void <clinit>():1510:1510 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1521:1521 -> <init>
-    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):1510 -> <init>
-    2:14:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1515:1527 -> <init>
-    2:14: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):1510 -> <init>
-    1:22:boolean mayCollide():1531:1552 -> a
-    23:24:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1564:1565 -> a
-    25:56:int computePositionsFor(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1584:1615 -> a
-    1:18:void fillSeenPositions():1557:1574 -> b
-com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.shaking.Ia:
+    1:1:void <clinit>():1507:1507 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1518:1518 -> <init>
+    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):1507 -> <init>
+    2:14:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1512:1524 -> <init>
+    2:14: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):1507 -> <init>
+    1:22:boolean mayCollide():1528:1549 -> a
+    23:24:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1561:1562 -> a
+    25:56:int computePositionsFor(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1581:1612 -> a
+    1:18:void fillSeenPositions():1554:1571 -> b
+com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.shaking.Ga$b:
     com.android.tools.r8.graph.AppView appView -> e
     boolean $assertionsDisabled -> g
     com.android.tools.r8.graph.DexMethod context -> d
     com.android.tools.r8.graph.DexClass source -> f
     boolean foundIllegalAccess -> c
-    1:1:void <clinit>():1720:1720 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1729:1729 -> <init>
-    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1722:1731 -> <init>
-    1:1:boolean foundIllegalAccess():1735:1735 -> a
-    2:2:void setContext(com.android.tools.r8.graph.DexEncodedMethod):1739:1739 -> a
-    3:6:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):1802:1805 -> a
-    7:7:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):1839:1839 -> a
-    1:4:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):1818:1821 -> b
-    5:5:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):1834:1834 -> b
-    1:4:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):1810:1813 -> c
-    5:5:boolean registerNewInstance(com.android.tools.r8.graph.DexType):1844:1844 -> c
-    6:6:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):1849:1849 -> c
-    1:4:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):1826:1829 -> d
-    5:5:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):1854:1854 -> d
-    6:6:boolean registerTypeReference(com.android.tools.r8.graph.DexType):1859:1859 -> d
-    1:10:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1743:1752 -> e
-    11:17:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1779:1785 -> e
-    18:21:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):1794:1797 -> e
-    1:12:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1760:1771 -> f
-com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.shaking.Ja:
+    1:1:void <clinit>():1717:1717 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1726:1726 -> <init>
+    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1719:1728 -> <init>
+    1:1:boolean foundIllegalAccess():1732:1732 -> a
+    2:2:void setContext(com.android.tools.r8.graph.DexEncodedMethod):1736:1736 -> a
+    3:6:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):1799:1802 -> a
+    7:7:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):1836:1836 -> a
+    1:4:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):1815:1818 -> b
+    5:5:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):1831:1831 -> b
+    1:4:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):1807:1810 -> c
+    5:5:boolean registerNewInstance(com.android.tools.r8.graph.DexType):1841:1841 -> c
+    6:6:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):1846:1846 -> c
+    1:4:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):1823:1826 -> d
+    5:5:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):1851:1851 -> d
+    6:6:boolean registerTypeReference(com.android.tools.r8.graph.DexType):1856:1856 -> d
+    1:10:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1740:1749 -> e
+    11:17:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1776:1782 -> e
+    18:21:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):1791:1794 -> e
+    1:12:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1757:1768 -> f
+com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.shaking.Ga$c:
     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):518:518 -> <init>
-    2:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):513:520 -> <init>
-    1:11:java.util.Collection get():525:535 -> a
-    12:26:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):567:581 -> a
-    12:26:java.util.Collection get():536 -> a
-    27:49:java.util.Collection get():537:559 -> a
-    50:50:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):543:543 -> a
-    51:58:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):587:594 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$Rename -> com.android.tools.r8.shaking.Ka:
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):519:519 -> <init>
+    2:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):514:521 -> <init>
+    1:9:java.util.Collection get():526:534 -> a
+    10:24:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):565:579 -> a
+    10:24:java.util.Collection get():535 -> a
+    25:46:java.util.Collection get():536:557 -> a
+    47:47:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):542:542 -> a
+    48:55:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):585:592 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$Rename -> com.android.tools.r8.shaking.Ia:
     com.android.tools.r8.shaking.VerticalClassMerger$Rename[] $VALUES -> d
     com.android.tools.r8.shaking.VerticalClassMerger$Rename IF_NEEDED -> b
     com.android.tools.r8.shaking.VerticalClassMerger$Rename ALWAYS -> a
     com.android.tools.r8.shaking.VerticalClassMerger$Rename NEVER -> c
-    1:3:void <clinit>():194:196 -> <clinit>
-    4:4:void <clinit>():193:193 -> <clinit>
-    1:1:void <init>(java.lang.String,int):193:193 -> <init>
-    1:1:com.android.tools.r8.shaking.VerticalClassMerger$Rename[] values():193:193 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLense -> com.android.tools.r8.shaking.La:
+    1:3:void <clinit>():195:197 -> <clinit>
+    4:4:void <clinit>():194:194 -> <clinit>
+    1:1:void <init>(java.lang.String,int):194:194 -> <init>
+    1:1:com.android.tools.r8.shaking.VerticalClassMerger$Rename[] values():194:194 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLense -> com.android.tools.r8.shaking.Ga$d:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> d
     com.android.tools.r8.graph.DexType target -> c
     com.android.tools.r8.graph.DexType source -> b
-    1:1:void <clinit>():1638:1638 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1643:1645 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1650:1650 -> a
-    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1655:1655 -> a
-    3:3:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1660:1660 -> a
-    4:21:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1682:1699 -> a
+    1:1:void <clinit>():1635:1635 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1640:1642 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1647:1647 -> a
+    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1652:1652 -> a
+    3:3:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1657:1657 -> a
+    4:21:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1679:1696 -> a
     boolean isContextFreeForMethods() -> b
-    1:1:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1665:1665 -> b
-    2:2:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):1670:1670 -> b
-    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):1675:1675 -> b
-    1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1709:1709 -> c
-    1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):1704:1704 -> f
-com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.shaking.Ma:
-    com.android.tools.r8.ir.code.Invoke$Type type -> g
-    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: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):1876:1881 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethod access$600(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):1863:1863 -> a
-    2:3:void updateMethodSignatures(java.util.function.Function):1896:1897 -> a
-    4:8:com.android.tools.r8.ir.conversion.SourceCode lambda$getSourceCodeProvider$0(com.android.tools.r8.ir.code.Position):1903:1907 -> a
-    9:19:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):1917:1927 -> a
-    20:20:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):1919:1919 -> a
-    1:1:java.util.function.Consumer getRegistryCallback():1916:1916 -> e
-    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1902:1902 -> f
-com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer -> com.android.tools.r8.shaking.Na:
+    1:1:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1662:1662 -> b
+    2:2:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):1667:1667 -> b
+    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):1672:1672 -> b
+    1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1706:1706 -> c
+    1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):1701:1701 -> f
+com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.shaking.Ga$e:
+    com.android.tools.r8.ir.code.Invoke$Type type -> f
+    com.android.tools.r8.graph.DexMethod invocationTarget -> e
+    boolean isInterface -> g
+    com.android.tools.r8.graph.DexMethod originalMethod -> d
+    com.android.tools.r8.graph.DexMethod method -> c
+    1:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):1873:1878 -> <init>
+    1:1:com.android.tools.r8.graph.DexMethod access$600(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):1860:1860 -> a
+    2:3:void updateMethodSignatures(java.util.function.Function):1893:1894 -> a
+    4:8:com.android.tools.r8.ir.conversion.SourceCode lambda$getSourceCodeProvider$0(com.android.tools.r8.ir.code.Position):1900:1904 -> a
+    9:19:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):1914:1924 -> a
+    20:20:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):1916:1916 -> a
+    1:1:java.util.function.Consumer getRegistryCallback():1913:1913 -> e
+    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1899:1899 -> f
+com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer -> com.android.tools.r8.shaking.Ga$f:
     java.util.Map protoFixupCache -> b
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> c
     com.android.tools.r8.graph.GraphLense$Builder lense -> a
-    1:4:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1413:1416 -> <init>
-    1:4:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.shaking.VerticalClassMerger$1):1413 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLense access$500(com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer,com.android.tools.r8.graph.GraphLense):1413:1413 -> a
-    2:15:com.android.tools.r8.graph.GraphLense fixupTypeReferences(com.android.tools.r8.graph.GraphLense):1420:1433 -> a
-    16:22:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1440:1446 -> a
-    23:31:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1455:1463 -> a
-    32:33:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1469:1470 -> a
-    34:37:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1474:1477 -> a
-    34:37:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1470 -> a
-    38:40:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):1502:1504 -> a
-    38:40:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1477 -> a
-    38:40:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1470 -> a
-    41:42:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1478:1479 -> a
-    41:42:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1470 -> a
-    43:43:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1470:1470 -> a
-    44:44:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1469:1469 -> a
-    45:55:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):1485:1495 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses -> com.android.tools.r8.shaking.Oa$a:
+    1:4:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1410:1413 -> <init>
+    1:4:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.shaking.VerticalClassMerger$1):1410 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLense access$500(com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer,com.android.tools.r8.graph.GraphLense):1410:1410 -> a
+    2:15:com.android.tools.r8.graph.GraphLense fixupTypeReferences(com.android.tools.r8.graph.GraphLense):1417:1430 -> a
+    16:22:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1437:1443 -> a
+    23:31:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1452:1460 -> a
+    32:33:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1466:1467 -> a
+    34:37:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1471:1474 -> a
+    34:37:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1467 -> a
+    38:40:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):1499:1501 -> a
+    38:40:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1474 -> a
+    38:40:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1467 -> a
+    41:42:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1475:1476 -> a
+    41:42:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1467 -> a
+    43:43:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1467:1467 -> a
+    44:44:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1466:1466 -> a
+    45:55:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):1482:1492 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses -> com.android.tools.r8.shaking.Ja:
     java.util.Map mergedClasses -> a
     java.util.Map sources -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():93:93 -> <clinit>
-    1:1:void <init>(java.util.Map,com.android.tools.r8.shaking.VerticalClassMerger$1):93:93 -> <init>
-    2:8:void <init>(java.util.Map):98:104 -> <init>
-    1:1:void lambda$new$1(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):102:102 -> a
-    2:2:java.util.List getSourcesFor(com.android.tools.r8.graph.DexType):108:108 -> a
-    1:2:com.android.tools.r8.graph.DexType getTargetFor(com.android.tools.r8.graph.DexType):112:113 -> b
-    1:1:boolean hasBeenMergedIntoSubtype(com.android.tools.r8.graph.DexType):117:117 -> c
-    1:1:java.util.List lambda$new$0(com.android.tools.r8.graph.DexType):102:102 -> d
-com.android.tools.r8.shaking.VerticalClassMergerGraphLense -> com.android.tools.r8.shaking.Qa:
+    1:1:void <clinit>():94:94 -> <clinit>
+    1:1:void <init>(java.util.Map,com.android.tools.r8.shaking.VerticalClassMerger$1):94:94 -> <init>
+    2:8:void <init>(java.util.Map):99:105 -> <init>
+    1:1:void lambda$new$1(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):103:103 -> a
+    2:2:java.util.List getSourcesFor(com.android.tools.r8.graph.DexType):109:109 -> a
+    1:2:com.android.tools.r8.graph.DexType getTargetFor(com.android.tools.r8.graph.DexType):113:114 -> b
+    1:1:boolean hasBeenMergedIntoSubtype(com.android.tools.r8.graph.DexType):118:118 -> c
+    1:1:java.util.List lambda$new$0(com.android.tools.r8.graph.DexType):103:103 -> d
+com.android.tools.r8.shaking.VerticalClassMergerGraphLense -> com.android.tools.r8.shaking.Ka:
     boolean $assertionsDisabled -> o
     java.util.Map originalMethodSignaturesForBridges -> n
     java.util.Map contextualVirtualToDirectMethodMaps -> l
@@ -45393,7 +44722,7 @@
     2:2:boolean isContextFreeForMethods():146:146 -> b
     1:7:boolean isContextFreeForMethod(com.android.tools.r8.graph.DexMethod):151:157 -> c
     1:12:java.util.Set lookupMethodInAllContexts(com.android.tools.r8.graph.DexMethod):130:141 -> e
-com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder -> com.android.tools.r8.shaking.Pa:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder -> com.android.tools.r8.shaking.Ka$a:
     java.util.Map methodMap -> b
     com.android.tools.r8.com.google.common.collect.BiMap fieldMap -> a
     java.util.Map contextualVirtualToDirectMethodMaps -> d
@@ -45474,7 +44803,6 @@
     1:1:void <init>():12:12 -> <init>
     2:2:void <init>(java.lang.String):17:17 -> <init>
 com.android.tools.r8.utils.Action -> com.android.tools.r8.utils.a:
-    void execute() -> a
 com.android.tools.r8.utils.AndroidApiLevel -> com.android.tools.r8.utils.AndroidApiLevel:
     com.android.tools.r8.utils.AndroidApiLevel[] $VALUES -> s
     com.android.tools.r8.utils.AndroidApiLevel Q -> b
@@ -45498,7 +44826,6 @@
     1:29:void <clinit>():12:40 -> <clinit>
     30:61:void <clinit>():11:42 -> <clinit>
     1:2:void <init>(java.lang.String,int,int):46:47 -> <init>
-    1:1:java.lang.String getName():55:55 -> a
     1:1:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):143:143 -> getAndroidApiLevel
     2:2:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):141:141 -> getAndroidApiLevel
     3:3:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):139:139 -> getAndroidApiLevel
@@ -45532,6 +44859,7 @@
     1:1:com.android.tools.r8.utils.AndroidApiLevel getDefault():59:59 -> getDefault
     1:1:com.android.tools.r8.utils.DexVersion getDexVersion():63:63 -> getDexVersion
     1:1:int getLevel():51:51 -> getLevel
+    1:1:java.lang.String getName():55:55 -> getName
 com.android.tools.r8.utils.AndroidApp -> com.android.tools.r8.utils.AndroidApp:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.StringResource proguardMapOutputData -> f
@@ -45588,7 +44916,7 @@
     1:3:void writeToZip(java.nio.file.Path,com.android.tools.r8.OutputMode):360:362 -> writeToZip
     4:12:void writeToZip(java.nio.file.Path,com.android.tools.r8.OutputMode):361:369 -> writeToZip
     13:19:void writeToZip(java.nio.file.Path,com.android.tools.r8.OutputMode):368:374 -> writeToZip
-com.android.tools.r8.utils.AndroidApp$1 -> com.android.tools.r8.utils.AndroidApp$1:
+com.android.tools.r8.utils.AndroidApp$1 -> com.android.tools.r8.utils.b:
     java.util.Set val$out -> a
     1:1:void <init>(com.android.tools.r8.utils.AndroidApp,java.util.Set):226:226 -> <init>
     1:6:void visit(com.android.tools.r8.DataEntryResource):236:241 -> visit
@@ -45660,13 +44988,13 @@
     1:7:com.android.tools.r8.utils.AndroidApp$Builder addMainDexListFiles(java.util.Collection):613:619 -> c
     8:8:com.android.tools.r8.utils.AndroidApp$Builder addMainDexListFiles(java.util.Collection):615:615 -> c
     9:9:boolean hasMainDexList():640:640 -> c
-com.android.tools.r8.utils.AndroidApp$Builder$1 -> com.android.tools.r8.utils.AndroidApp$Builder$1:
+com.android.tools.r8.utils.AndroidApp$Builder$1 -> com.android.tools.r8.utils.d:
     java.util.List val$finalDataResources -> b
     java.util.List val$finalProgramResources -> a
     1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder,java.util.List,java.util.List):664:664 -> <init>
     1:2:com.android.tools.r8.DataResourceProvider getDataResourceProvider():672:673 -> getDataResourceProvider
     1:1:java.util.Collection getProgramResources():667:667 -> getProgramResources
-com.android.tools.r8.utils.AndroidApp$Builder$1$1 -> com.android.tools.r8.utils.b:
+com.android.tools.r8.utils.AndroidApp$Builder$1$1 -> com.android.tools.r8.utils.c:
     com.android.tools.r8.utils.AndroidApp$Builder$1 this$1 -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():673:673 -> <clinit>
@@ -45694,11 +45022,11 @@
     1:68:com.android.tools.r8.ClassFileConsumer wrapClassFileConsumer(com.android.tools.r8.ClassFileConsumer):239:306 -> wrapClassFileConsumer
     1:73:com.android.tools.r8.DexIndexedConsumer wrapDexIndexedConsumer(com.android.tools.r8.DexIndexedConsumer):84:156 -> wrapDexIndexedConsumer
     1:14:com.android.tools.r8.ProgramConsumer wrapProgramConsumer(com.android.tools.r8.ProgramConsumer):52:65 -> wrapProgramConsumer
-com.android.tools.r8.utils.AndroidAppConsumers$1 -> com.android.tools.r8.utils.AndroidAppConsumers$1:
+com.android.tools.r8.utils.AndroidAppConsumers$1 -> com.android.tools.r8.utils.e:
     com.android.tools.r8.utils.AndroidAppConsumers this$0 -> b
     1:1:void <init>(com.android.tools.r8.utils.AndroidAppConsumers,com.android.tools.r8.StringConsumer):72:72 -> <init>
     1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):75:76 -> accept
-com.android.tools.r8.utils.AndroidAppConsumers$2 -> com.android.tools.r8.utils.AndroidAppConsumers$2:
+com.android.tools.r8.utils.AndroidAppConsumers$2 -> com.android.tools.r8.utils.g:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap files -> c
     com.android.tools.r8.DexIndexedConsumer val$consumer -> d
     com.android.tools.r8.utils.AndroidAppConsumers this$0 -> e
@@ -45712,14 +45040,14 @@
     8:8:com.android.tools.r8.DataResourceConsumer getDataResourceConsumer():117:117 -> finished
     8:8:void finished(com.android.tools.r8.DiagnosticsHandler):110 -> finished
     1:2:com.android.tools.r8.DataResourceConsumer getDataResourceConsumer():117:118 -> getDataResourceConsumer
-com.android.tools.r8.utils.AndroidAppConsumers$2$1 -> com.android.tools.r8.utils.c:
+com.android.tools.r8.utils.AndroidAppConsumers$2$1 -> com.android.tools.r8.utils.f:
     com.android.tools.r8.utils.AndroidAppConsumers$2 this$1 -> b
     com.android.tools.r8.DataResourceConsumer val$dataResourceConsumer -> a
     1:1:void <init>(com.android.tools.r8.utils.AndroidAppConsumers$2,com.android.tools.r8.DataResourceConsumer):118:118 -> <init>
     1:2:void accept(com.android.tools.r8.DataDirectoryResource,com.android.tools.r8.DiagnosticsHandler):123:124 -> accept
     3:11:void accept(com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):131:139 -> accept
     1:2:void finished(com.android.tools.r8.DiagnosticsHandler):145:146 -> finished
-com.android.tools.r8.utils.AndroidAppConsumers$3 -> com.android.tools.r8.utils.AndroidAppConsumers$3:
+com.android.tools.r8.utils.AndroidAppConsumers$3 -> com.android.tools.r8.utils.i:
     java.util.TreeMap files -> c
     com.android.tools.r8.utils.AndroidAppConsumers this$0 -> e
     com.android.tools.r8.DexFilePerClassFileConsumer val$consumer -> d
@@ -45733,14 +45061,14 @@
     8:8:com.android.tools.r8.DataResourceConsumer getDataResourceConsumer():199:199 -> finished
     8:8:void finished(com.android.tools.r8.DiagnosticsHandler):192 -> finished
     1:2:com.android.tools.r8.DataResourceConsumer getDataResourceConsumer():199:200 -> getDataResourceConsumer
-com.android.tools.r8.utils.AndroidAppConsumers$3$1 -> com.android.tools.r8.utils.d:
+com.android.tools.r8.utils.AndroidAppConsumers$3$1 -> com.android.tools.r8.utils.h:
     com.android.tools.r8.utils.AndroidAppConsumers$3 this$1 -> b
     com.android.tools.r8.DataResourceConsumer val$dataResourceConsumer -> a
     1:1:void <init>(com.android.tools.r8.utils.AndroidAppConsumers$3,com.android.tools.r8.DataResourceConsumer):200:200 -> <init>
     1:2:void accept(com.android.tools.r8.DataDirectoryResource,com.android.tools.r8.DiagnosticsHandler):205:206 -> accept
     3:11:void accept(com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):213:221 -> accept
     1:2:void finished(com.android.tools.r8.DiagnosticsHandler):227:228 -> finished
-com.android.tools.r8.utils.AndroidAppConsumers$4 -> com.android.tools.r8.utils.AndroidAppConsumers$4:
+com.android.tools.r8.utils.AndroidAppConsumers$4 -> com.android.tools.r8.utils.k:
     com.android.tools.r8.ClassFileConsumer val$consumer -> d
     com.android.tools.r8.utils.AndroidAppConsumers this$0 -> e
     java.util.List files -> c
@@ -45754,7 +45082,7 @@
     9:9:com.android.tools.r8.DataResourceConsumer getDataResourceConsumer():271:271 -> finished
     9:9:void finished(com.android.tools.r8.DiagnosticsHandler):264 -> finished
     1:2:com.android.tools.r8.DataResourceConsumer getDataResourceConsumer():271:272 -> getDataResourceConsumer
-com.android.tools.r8.utils.AndroidAppConsumers$4$1 -> com.android.tools.r8.utils.e:
+com.android.tools.r8.utils.AndroidAppConsumers$4$1 -> com.android.tools.r8.utils.j:
     com.android.tools.r8.utils.AndroidAppConsumers$4 this$1 -> b
     com.android.tools.r8.DataResourceConsumer val$dataResourceConsumer -> a
     1:1:void <init>(com.android.tools.r8.utils.AndroidAppConsumers$4,com.android.tools.r8.DataResourceConsumer):272:272 -> <init>
@@ -45766,7 +45094,7 @@
     java.util.Set descriptors -> a
     1:3:void <init>(java.util.Set,byte[]):320:322 -> <init>
     1:3:void <init>(java.util.Set,byte[],com.android.tools.r8.utils.AndroidAppConsumers$1):315 -> <init>
-com.android.tools.r8.utils.ArchiveBuilder -> com.android.tools.r8.utils.h:
+com.android.tools.r8.utils.ArchiveBuilder -> com.android.tools.r8.utils.n:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.origin.Origin origin -> b
     java.util.zip.ZipOutputStream stream -> c
@@ -45783,28 +45111,28 @@
     4:11:void writeDelayed(com.android.tools.r8.DiagnosticsHandler):67:74 -> a
     4:11:void close(com.android.tools.r8.DiagnosticsHandler):54 -> a
     12:17:void close(com.android.tools.r8.DiagnosticsHandler):55:60 -> a
-    18:23:void handleIOException(java.io.IOException,com.android.tools.r8.DiagnosticsHandler):100:105 -> a
-    24:24:void addDirectory(java.lang.String,com.android.tools.r8.DiagnosticsHandler):111:111 -> a
-    25:30:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):133:138 -> a
-    31:31:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):137:137 -> a
-    32:41:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):133:142 -> a
-    42:42:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):141:141 -> a
-    43:43:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):139:139 -> a
-    44:44:void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):148:148 -> a
-    45:48:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):171:174 -> a
-    49:53:void writeNextIfAvailable(com.android.tools.r8.DiagnosticsHandler):160:164 -> a
-    49:53:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):175 -> a
-    54:55:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:179 -> a
-    56:56:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:178 -> a
-    57:57:java.nio.file.Path getPath():190:190 -> a
-    1:6:java.util.zip.ZipOutputStream getStreamRaw():80:85 -> b
-    7:13:java.util.zip.ZipOutputStream getStream(com.android.tools.r8.DiagnosticsHandler):90:96 -> b
-    14:27:void writeDirectoryNow(java.lang.String,com.android.tools.r8.DiagnosticsHandler):115:128 -> b
-    28:30:void writeFileNow(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):153:155 -> b
+    18:23:java.util.zip.ZipOutputStream getStreamRaw():80:85 -> a
+    24:29:void handleIOException(java.io.IOException,com.android.tools.r8.DiagnosticsHandler):100:105 -> a
+    30:30:void addDirectory(java.lang.String,com.android.tools.r8.DiagnosticsHandler):111:111 -> a
+    31:36:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):133:138 -> a
+    37:37:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):137:137 -> a
+    38:47:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):133:142 -> a
+    48:48:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):141:141 -> a
+    49:49:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):139:139 -> a
+    50:50:void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):148:148 -> a
+    51:54:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):171:174 -> a
+    55:59:void writeNextIfAvailable(com.android.tools.r8.DiagnosticsHandler):160:164 -> a
+    55:59:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):175 -> a
+    60:61:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:179 -> a
+    62:62:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:178 -> a
+    1:7:java.util.zip.ZipOutputStream getStream(com.android.tools.r8.DiagnosticsHandler):90:96 -> b
+    8:21:void writeDirectoryNow(java.lang.String,com.android.tools.r8.DiagnosticsHandler):115:128 -> b
+    22:24:void writeFileNow(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):153:155 -> b
     1:1:com.android.tools.r8.origin.Origin getOrigin():185:185 -> getOrigin
+    1:1:java.nio.file.Path getPath():190:190 -> getPath
     1:2:void open():45:46 -> open
-com.android.tools.r8.utils.ArchiveBuilder$1 -> com.android.tools.r8.utils.f:
-com.android.tools.r8.utils.ArchiveBuilder$DelayedData -> com.android.tools.r8.utils.g:
+com.android.tools.r8.utils.ArchiveBuilder$1 -> com.android.tools.r8.utils.l:
+com.android.tools.r8.utils.ArchiveBuilder$DelayedData -> com.android.tools.r8.utils.m:
     com.android.tools.r8.ByteDataView content -> b
     java.lang.String name -> a
     boolean isDirectory -> c
@@ -45878,7 +45206,7 @@
     3:3:com.android.tools.r8.utils.CfgPrinter sp():65:65 -> d
     1:2:void printIndent():75:76 -> e
     1:1:java.lang.String toString():82:82 -> toString
-com.android.tools.r8.utils.ClassMap -> com.android.tools.r8.utils.k:
+com.android.tools.r8.utils.ClassMap -> com.android.tools.r8.utils.q:
     java.util.concurrent.ConcurrentHashMap classes -> a
     java.util.concurrent.atomic.AtomicReference classProvider -> b
     boolean $assertionsDisabled -> c
@@ -45897,8 +45225,8 @@
     10:10:java.util.Map getAllClassesInMap():140:140 -> b
     com.android.tools.r8.graph.ClassKind getClassKind() -> c
     1:1:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.utils.ClassMap$1 -> com.android.tools.r8.utils.i:
-com.android.tools.r8.utils.ClassMap$ConcurrentClassLoader -> com.android.tools.r8.utils.j:
+com.android.tools.r8.utils.ClassMap$1 -> com.android.tools.r8.utils.o:
+com.android.tools.r8.utils.ClassMap$ConcurrentClassLoader -> com.android.tools.r8.utils.p:
     boolean ready -> e
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexType type -> c
@@ -45915,7 +45243,7 @@
     1:1:java.lang.Object get():230:230 -> get
     2:42:com.android.tools.r8.graph.DexClass get():247:287 -> get
     43:43:com.android.tools.r8.graph.DexClass get():283:283 -> get
-com.android.tools.r8.utils.ClassProvider -> com.android.tools.r8.utils.p:
+com.android.tools.r8.utils.ClassProvider -> com.android.tools.r8.utils.v:
     com.android.tools.r8.graph.ClassKind classKind -> a
     1:2:void <init>(com.android.tools.r8.graph.ClassKind):30:31 -> <init>
     void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer) -> a
@@ -45926,8 +45254,8 @@
     3:3:com.android.tools.r8.utils.ClassProvider forPreloadedClasses(com.android.tools.r8.graph.ClassKind,java.util.Collection):68 -> a
     4:7:com.android.tools.r8.utils.ClassProvider forPreloadedClasses(com.android.tools.r8.graph.ClassKind,java.util.Collection):69:72 -> a
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():36:36 -> b
-com.android.tools.r8.utils.ClassProvider$1 -> com.android.tools.r8.utils.l:
-com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.tools.r8.utils.m:
+com.android.tools.r8.utils.ClassProvider$1 -> com.android.tools.r8.utils.r:
+com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.tools.r8.utils.s:
     com.android.tools.r8.graph.JarApplicationReader reader -> d
     com.android.tools.r8.graph.ClassKind classKind -> b
     com.android.tools.r8.ClassFileResourceProvider provider -> c
@@ -45938,21 +45266,21 @@
     12:18:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):99:105 -> a
     19:21:java.util.Collection collectTypes():112:114 -> a
     1:1:java.lang.String toString():121:121 -> toString
-com.android.tools.r8.utils.ClassProvider$CombinedClassProvider -> com.android.tools.r8.utils.n:
+com.android.tools.r8.utils.ClassProvider$CombinedClassProvider -> com.android.tools.r8.utils.t:
     java.util.List providers -> b
     1:2:void <init>(com.android.tools.r8.graph.ClassKind,java.util.List):155:156 -> <init>
     1:2:void <init>(com.android.tools.r8.graph.ClassKind,java.util.List,com.android.tools.r8.utils.ClassProvider$1):151 -> <init>
     1:2:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):161:162 -> a
     3:5:java.util.Collection collectTypes():168:170 -> a
     1:8:java.lang.String toString():177:184 -> toString
-com.android.tools.r8.utils.ClassProvider$PreloadedClassProvider -> com.android.tools.r8.utils.o:
+com.android.tools.r8.utils.ClassProvider$PreloadedClassProvider -> com.android.tools.r8.utils.u:
     com.android.tools.r8.com.google.common.collect.Multimap classes -> b
     1:2:void <init>(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.com.google.common.collect.Multimap):129:130 -> <init>
     1:2:void <init>(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.com.google.common.collect.Multimap,com.android.tools.r8.utils.ClassProvider$1):125 -> <init>
     1:2:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):135:136 -> a
     3:3:java.util.Collection collectTypes():142:142 -> a
     1:1:java.lang.String toString():147:147 -> toString
-com.android.tools.r8.utils.ClasspathClassCollection -> com.android.tools.r8.utils.q:
+com.android.tools.r8.utils.ClasspathClassCollection -> com.android.tools.r8.utils.w:
     1:1:void <init>(com.android.tools.r8.utils.ClassProvider):14:14 -> <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
@@ -45963,40 +45291,38 @@
 com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.utils.DescriptorUtils:
     java.util.Map typeNameToLetterMap -> a
     boolean $assertionsDisabled -> b
-    1:17:void <clinit>():18:34 -> <clinit>
-    1:12:java.lang.String internalToDescriptor(java.lang.String,boolean,boolean):40:51 -> a
-    13:17:java.lang.String internalToDescriptor(java.lang.String,boolean,boolean):50:54 -> a
-    18:18:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):168:168 -> a
-    19:19:java.lang.String primitiveDescriptorToJavaType(char):206:206 -> a
-    19:19:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):181 -> a
-    20:20:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):178:178 -> a
-    21:25:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):171:175 -> a
-    26:26:java.lang.String getPackageBinaryNameFromJavaType(java.lang.String):271:271 -> a
-    27:35:java.lang.String computeInnerClassSeparator(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.InternalOptions):314:322 -> a
-    36:42:java.lang.String computeInnerClassSeparator(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.InternalOptions):321:327 -> a
-    1:3:java.lang.String getPackageNameFromBinaryName(java.lang.String):378:380 -> b
-    1:26:boolean isClassDescriptor(java.lang.String):335:360 -> c
-    1:2:java.lang.String javaTypeToDescriptorIfValidJavaType(java.lang.String):90:91 -> d
-    1:7:java.lang.String descriptorToInternalName(java.lang.String):149:155 -> descriptorToInternalName
-    8:8:java.lang.String descriptorToInternalName(java.lang.String):153:153 -> descriptorToInternalName
-    1:1:java.lang.String descriptorToJavaType(java.lang.String):139:139 -> descriptorToJavaType
-    1:1:java.lang.String getBinaryNameFromJavaType(java.lang.String):281:281 -> getBinaryNameFromJavaType
-    1:3:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):259:261 -> getClassBinaryNameFromDescriptor
-    1:2:java.lang.String getClassNameFromDescriptor(java.lang.String):227:228 -> getClassNameFromDescriptor
-    1:2:java.lang.String getDescriptorFromClassBinaryName(java.lang.String):292:293 -> getDescriptorFromClassBinaryName
-    1:1:java.lang.String getPackageNameFromDescriptor(java.lang.String):249:249 -> getPackageNameFromDescriptor
-    1:3:java.lang.String getPathFromDescriptor(java.lang.String):428:430 -> getPathFromDescriptor
-    1:2:java.lang.String getPathFromJavaType(java.lang.String):434:435 -> getPathFromJavaType
-    1:1:java.lang.String getUnqualifiedClassNameFromDescriptor(java.lang.String):217:217 -> getUnqualifiedClassNameFromDescriptor
-    2:3:java.lang.String getUnqualifiedClassNameFromBinaryName(java.lang.String):308:309 -> getUnqualifiedClassNameFromDescriptor
-    2:3:java.lang.String getUnqualifiedClassNameFromDescriptor(java.lang.String):217 -> getUnqualifiedClassNameFromDescriptor
-    1:5:java.lang.String guessTypeDescriptor(java.nio.file.Path):400:404 -> guessTypeDescriptor
-    6:13:java.lang.String guessTypeDescriptor(java.lang.String):416:423 -> guessTypeDescriptor
-    14:14:java.lang.String guessTypeDescriptor(java.lang.String):421:421 -> guessTypeDescriptor
-    1:6:boolean isValidJavaType(java.lang.String):103:108 -> isValidJavaType
-    1:2:java.lang.String javaTypeToDescriptor(java.lang.String):64:65 -> javaTypeToDescriptor
-    1:2:java.lang.String javaTypeToDescriptorIgnorePrimitives(java.lang.String):79:80 -> javaTypeToDescriptorIgnorePrimitives
-    1:1:java.lang.String javaTypeToShorty(java.lang.String):129:129 -> javaTypeToShorty
+    1:17:void <clinit>():17:33 -> <clinit>
+    1:12:java.lang.String internalToDescriptor(java.lang.String,boolean,boolean):39:50 -> a
+    13:17:java.lang.String internalToDescriptor(java.lang.String,boolean,boolean):49:53 -> a
+    18:18:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):167:167 -> a
+    19:19:java.lang.String primitiveDescriptorToJavaType(char):205:205 -> a
+    19:19:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):180 -> a
+    20:20:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):177:177 -> a
+    21:25:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):170:174 -> a
+    26:26:java.lang.String getPackageBinaryNameFromJavaType(java.lang.String):270:270 -> a
+    1:26:boolean isClassDescriptor(java.lang.String):310:335 -> b
+    1:7:java.lang.String descriptorToInternalName(java.lang.String):148:154 -> descriptorToInternalName
+    8:8:java.lang.String descriptorToInternalName(java.lang.String):152:152 -> descriptorToInternalName
+    1:1:java.lang.String descriptorToJavaType(java.lang.String):138:138 -> descriptorToJavaType
+    1:1:java.lang.String getBinaryNameFromJavaType(java.lang.String):280:280 -> getBinaryNameFromJavaType
+    1:3:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):258:260 -> getClassBinaryNameFromDescriptor
+    1:2:java.lang.String getClassNameFromDescriptor(java.lang.String):226:227 -> getClassNameFromDescriptor
+    1:2:java.lang.String getDescriptorFromClassBinaryName(java.lang.String):291:292 -> getDescriptorFromClassBinaryName
+    1:1:java.lang.String getPackageNameFromDescriptor(java.lang.String):248:248 -> getPackageNameFromDescriptor
+    2:4:java.lang.String getPackageNameFromBinaryName(java.lang.String):353:355 -> getPackageNameFromDescriptor
+    2:4:java.lang.String getPackageNameFromDescriptor(java.lang.String):248 -> getPackageNameFromDescriptor
+    1:3:java.lang.String getPathFromDescriptor(java.lang.String):403:405 -> getPathFromDescriptor
+    1:2:java.lang.String getPathFromJavaType(java.lang.String):409:410 -> getPathFromJavaType
+    1:1:java.lang.String getSimpleClassNameFromDescriptor(java.lang.String):216:216 -> getSimpleClassNameFromDescriptor
+    2:6:java.lang.String getSimpleClassNameFromBinaryName(java.lang.String):302:306 -> getSimpleClassNameFromDescriptor
+    2:6:java.lang.String getSimpleClassNameFromDescriptor(java.lang.String):216 -> getSimpleClassNameFromDescriptor
+    1:5:java.lang.String guessTypeDescriptor(java.nio.file.Path):375:379 -> guessTypeDescriptor
+    6:13:java.lang.String guessTypeDescriptor(java.lang.String):391:398 -> guessTypeDescriptor
+    14:14:java.lang.String guessTypeDescriptor(java.lang.String):396:396 -> guessTypeDescriptor
+    1:6:boolean isValidJavaType(java.lang.String):102:107 -> isValidJavaType
+    1:2:java.lang.String javaTypeToDescriptor(java.lang.String):63:64 -> javaTypeToDescriptor
+    1:2:java.lang.String javaTypeToDescriptorIgnorePrimitives(java.lang.String):78:79 -> javaTypeToDescriptorIgnorePrimitives
+    1:1:java.lang.String javaTypeToShorty(java.lang.String):128:128 -> javaTypeToShorty
 com.android.tools.r8.utils.DexVersion -> com.android.tools.r8.utils.DexVersion:
     byte[] dexVersionBytes -> b
     com.android.tools.r8.utils.DexVersion[] $VALUES -> g
@@ -46015,19 +45341,19 @@
     39:39:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):44:44 -> a
     40:40:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):41:41 -> a
     1:1:boolean matchesApiLevel(com.android.tools.r8.utils.AndroidApiLevel):35:35 -> b
-    1:1:com.android.tools.r8.utils.DexVersion getDexVersion(int):88:88 -> c
-    2:2:com.android.tools.r8.utils.DexVersion getDexVersion(int):86:86 -> c
-    3:3:com.android.tools.r8.utils.DexVersion getDexVersion(int):84:84 -> c
-    4:4:com.android.tools.r8.utils.DexVersion getDexVersion(int):82:82 -> c
-    5:5:com.android.tools.r8.utils.DexVersion getDexVersion(int):80:80 -> c
+    2:2:com.android.tools.r8.utils.DexVersion getDexVersion(int):88:88 -> b
+    3:3:com.android.tools.r8.utils.DexVersion getDexVersion(int):86:86 -> b
+    4:4:com.android.tools.r8.utils.DexVersion getDexVersion(int):84:84 -> b
+    5:5:com.android.tools.r8.utils.DexVersion getDexVersion(int):82:82 -> b
+    6:6:com.android.tools.r8.utils.DexVersion getDexVersion(int):80:80 -> b
     1:1:byte[] getBytes():31:31 -> getBytes
-com.android.tools.r8.utils.DiagnosticWithThrowable -> com.android.tools.r8.utils.r:
+com.android.tools.r8.utils.DiagnosticWithThrowable -> com.android.tools.r8.utils.x:
     java.lang.Throwable throwable -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():9:9 -> <clinit>
     1:3:void <init>(java.lang.Throwable):13:15 -> <init>
     1:1:java.lang.Throwable getThrowable():19:19 -> getThrowable
-com.android.tools.r8.utils.DirectoryBuilder -> com.android.tools.r8.utils.s:
+com.android.tools.r8.utils.DirectoryBuilder -> com.android.tools.r8.utils.y:
     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>
@@ -46039,8 +45365,8 @@
     17:17:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):52:52 -> a
     18:23:void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):61:66 -> a
     24:24:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):73:73 -> a
-    25:25:java.nio.file.Path getPath():83:83 -> a
     1:1:com.android.tools.r8.origin.Origin getOrigin():78:78 -> getOrigin
+    1:1:java.nio.file.Path getPath():83:83 -> getPath
 com.android.tools.r8.utils.EncodedValueUtils -> com.android.tools.r8.utils.EncodedValueUtils:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():9:9 -> <clinit>
@@ -46066,7 +45392,7 @@
     14:14:java.lang.String getDiagnosticMessage():45:45 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():33:33 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():38:38 -> getPosition
-com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.utils.t:
+com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.utils.B:
     boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierPart(int) -> a
     1:1:void lambda$withConsumeResourceHandler$0(com.android.tools.r8.StringConsumer,java.lang.String,com.android.tools.r8.DiagnosticsHandler):24:24 -> a
     2:2:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):24:24 -> a
@@ -46084,8 +45410,8 @@
     56:65:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):82:91 -> a
     66:67:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):85:86 -> a
     1:1:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierStart(int):10:10 -> b
-com.android.tools.r8.utils.ExceptionUtils$CompileAction -> com.android.tools.r8.utils.t$a:
-com.android.tools.r8.utils.ExceptionUtils$MainAction -> com.android.tools.r8.utils.t$b:
+com.android.tools.r8.utils.ExceptionUtils$CompileAction -> com.android.tools.r8.utils.z:
+com.android.tools.r8.utils.ExceptionUtils$MainAction -> com.android.tools.r8.utils.A:
 com.android.tools.r8.utils.FeatureClassMapping -> com.android.tools.r8.utils.FeatureClassMapping:
     java.nio.file.Path mappingFile -> e
     java.util.HashSet mappings -> d
@@ -46118,7 +45444,7 @@
     2:12:com.android.tools.r8.utils.FeatureClassMapping fromSpecification(java.nio.file.Path,com.android.tools.r8.DiagnosticsHandler):97:107 -> fromSpecification
     13:14:com.android.tools.r8.utils.FeatureClassMapping fromSpecification(java.nio.file.Path,com.android.tools.r8.DiagnosticsHandler):102:103 -> fromSpecification
     1:1:java.lang.String getBaseName():64:64 -> getBaseName
-com.android.tools.r8.utils.FeatureClassMapping$1 -> com.android.tools.r8.utils.FeatureClassMapping$1:
+com.android.tools.r8.utils.FeatureClassMapping$1 -> com.android.tools.r8.utils.C:
     1:1:void <init>():92:92 -> <init>
 com.android.tools.r8.utils.FeatureClassMapping$FeatureMappingException -> com.android.tools.r8.utils.FeatureClassMapping$FeatureMappingException:
     1:1:void <init>(java.lang.String):260:260 -> <init>
@@ -46145,7 +45471,7 @@
 com.android.tools.r8.utils.FeatureClassMapping$SpecificationOrigin -> com.android.tools.r8.utils.FeatureClassMapping$d:
     1:1:void <init>(java.nio.file.Path):70:70 -> <init>
     1:1:java.lang.String part():75:75 -> part
-com.android.tools.r8.utils.FieldSignatureEquivalence -> com.android.tools.r8.utils.u:
+com.android.tools.r8.utils.FieldSignatureEquivalence -> com.android.tools.r8.utils.D:
     boolean ignoreName -> a
     com.android.tools.r8.utils.FieldSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     com.android.tools.r8.utils.FieldSignatureEquivalence INSTANCE -> b
@@ -46157,8 +45483,8 @@
     6:6:int doHash(java.lang.Object):14:14 -> a
     7:10:int doHash(com.android.tools.r8.graph.DexField):45:48 -> a
     7:10:int doHash(java.lang.Object):14 -> a
-    1:1:com.android.tools.r8.utils.FieldSignatureEquivalence get():28:28 -> c
-    1:1:com.android.tools.r8.utils.FieldSignatureEquivalence getEquivalenceIgnoreName():32:32 -> d
+    1:1:com.android.tools.r8.utils.FieldSignatureEquivalence getEquivalenceIgnoreName():32:32 -> c
+    1:1:com.android.tools.r8.utils.FieldSignatureEquivalence get():28:28 -> get
 com.android.tools.r8.utils.FileUtils -> com.android.tools.r8.utils.FileUtils:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
@@ -46179,13 +45505,11 @@
     1:6:java.lang.String withNativeFileSeparators(java.lang.String):172:177 -> withNativeFileSeparators
     1:1:void writeTextFile(java.nio.file.Path,java.util.List):80:80 -> writeTextFile
     2:2:void writeTextFile(java.nio.file.Path,java.lang.String[]):84:84 -> writeTextFile
-    1:1:com.android.tools.r8.ByteDataView com.android.tools.r8.ByteDataView.of(byte[]):17:17 -> writeToFile
-    1:1:void writeToFile(java.nio.file.Path,java.io.OutputStream,byte[]):153 -> writeToFile
-    2:2:void writeToFile(java.nio.file.Path,java.io.OutputStream,byte[]):153:153 -> writeToFile
-com.android.tools.r8.utils.FilteredArchiveClassFileProvider -> com.android.tools.r8.utils.v:
+    1:1:void writeToFile(java.nio.file.Path,java.io.OutputStream,byte[]):153:153 -> writeToFile
+com.android.tools.r8.utils.FilteredArchiveClassFileProvider -> com.android.tools.r8.utils.E:
     1:1:void <init>(com.android.tools.r8.shaking.FilteredClassPath):13:13 -> <init>
     1:1:boolean lambda$new$0(com.android.tools.r8.shaking.FilteredClassPath,java.lang.String):13:13 -> a
-com.android.tools.r8.utils.FlagFile$FlagFileOrigin -> com.android.tools.r8.utils.w:
+com.android.tools.r8.utils.FlagFile$FlagFileOrigin -> com.android.tools.r8.utils.F:
     java.nio.file.Path path -> e
     1:2:void <init>(java.nio.file.Path):22:23 -> <init>
     1:1:java.lang.String part():28:28 -> part
@@ -46208,7 +45532,7 @@
     3:4:java.util.List order(java.lang.Iterable):52:53 -> a
     5:5:java.util.List order(java.util.Collection):59:59 -> a
     1:1:com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering getInstance():47:47 -> getInstance
-com.android.tools.r8.utils.InternalArchiveClassFileProvider -> com.android.tools.r8.utils.x:
+com.android.tools.r8.utils.InternalArchiveClassFileProvider -> com.android.tools.r8.utils.G:
     java.util.Set descriptors -> c
     com.android.tools.r8.origin.Origin origin -> b
     java.util.zip.ZipFile openedZipFile -> d
@@ -46230,164 +45554,158 @@
     16:24:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):88:96 -> getProgramResource
 com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.utils.InternalOptions:
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> a
-    boolean hasMarker -> m
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> G
-    boolean enableSwitchMapRemoval -> i
-    boolean $assertionsDisabled -> J
-    java.nio.file.Path proguardCompatibilityRulesOutput -> H
-    int inliningControlFlowResolutionBlocksThreshold -> h
-    boolean quiet -> k
-    boolean printCfg -> u
-    java.util.Map missingEnclosingMembers -> y
-    boolean debugKeepRules -> w
-    java.util.List mainDexKeepRules -> x
-    boolean enableTreeShaking -> s
-    java.lang.String printCfgFile -> v
-    java.util.Set extensiveLoggingFilter -> o
-    boolean enableInitializedClassesAnalysis -> f
-    com.android.tools.r8.StringConsumer usageInformationConsumer -> E
-    com.android.tools.r8.StringConsumer mainDexListConsumer -> C
+    boolean enableValuePropagation -> i
+    java.util.List mainDexKeepRules -> v
+    boolean ignoreMainDexMissingClasses -> k
+    java.nio.file.Path proguardCompatibilityRulesOutput -> F
+    boolean debugKeepRules -> u
+    java.util.Map warningInvalidDebugInfo -> y
+    boolean printCfg -> s
+    java.util.Map missingEnclosingMembers -> w
+    java.lang.String printCfgFile -> t
+    com.android.tools.r8.dex.Marker marker -> m
+    java.util.Set extensiveFieldMinifierLoggingFilter -> o
+    boolean enableNonNullTracking -> f
+    java.util.function.Consumer syntheticProguardRulesConsumer -> G
+    boolean enableSwitchMapRemoval -> h
+    com.android.tools.r8.StringConsumer usageInformationConsumer -> C
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> E
+    com.android.tools.r8.StringConsumer mainDexListConsumer -> A
     boolean enableHorizontalClassMerging -> d
-    java.util.function.Consumer syntheticProguardRulesConsumer -> I
     java.util.List methodsFilter -> q
-    boolean useSmaliSyntax -> j
-    boolean ignoreMainDexMissingClasses -> l
-    java.util.Map warningInvalidParameterAnnotations -> z
+    boolean quiet -> j
+    boolean hasMarker -> l
+    int inliningControlFlowResolutionBlocksThreshold -> g
     boolean enableMainDexListCheck -> r
     com.android.tools.r8.utils.Reporter reporter -> b
-    boolean enableMinification -> t
-    java.util.Map warningInvalidDebugInfo -> A
-    com.android.tools.r8.dex.Marker marker -> n
-    boolean enableNonNullTracking -> e
+    java.util.Map warningInvalidParameterAnnotations -> x
+    boolean skipReadingDexCode -> z
+    boolean enableUnusedArgumentRemoval -> e
     java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> p
-    boolean enableServiceLoaderRewriting -> g
-    com.android.tools.r8.StringConsumer configurationConsumer -> F
-    boolean skipReadingDexCode -> B
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> D
+    boolean $assertionsDisabled -> H
+    com.android.tools.r8.StringConsumer configurationConsumer -> D
     boolean passthroughDexCode -> c
+    java.util.Set extensiveLoggingFilter -> n
+    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> B
     1:1:void <clinit>():43:43 -> <clinit>
     1:1:void <init>():70:70 -> <init>
-    2:191:void <init>():64:253 -> <init>
-    192:192:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():59:59 -> <init>
-    192:192:void <init>():254 -> <init>
-    193:368:void <init>():254:429 -> <init>
-    369:373:void <init>():71:75 -> <init>
-    374:374:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):79:79 -> <init>
-    375:564:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):64:253 -> <init>
-    565:565:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():59:59 -> <init>
-    565:565:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):254 -> <init>
-    566:741:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):254:429 -> <init>
-    742:749:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):80:87 -> <init>
-    750:750:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):91:91 -> <init>
-    751:940:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):64:253 -> <init>
-    941:941:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():59:59 -> <init>
-    941:941:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):254 -> <init>
-    942:1117:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):254:429 -> <init>
-    1118:1127:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):92:101 -> <init>
-    1:1:boolean canUseInvokePolymorphicOnVarHandle():631:631 -> A
-    1:1:boolean canUseJava8Methods():663:663 -> B
-    1:1:boolean canUseLongCompareAndObjectsNonNull():686:686 -> C
-    1:2:boolean canUseMultidex():681:682 -> D
-    1:1:boolean canUseNotInstruction():748:748 -> E
-    1:4:boolean canUseParameterNameAnnotations():697:700 -> F
-    1:1:boolean canUsePrivateInterfaceMethods():667:667 -> G
-    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():721:722 -> H
-    1:1:boolean canUseSuppressedExceptions():690:690 -> I
-    1:1:boolean canUseTwrCloseResourceMethod():659:659 -> J
-    1:2:void disableAllOptimizations():106:107 -> K
-    1:14:void disableGlobalOptimizations():111:124 -> L
-    1:1:com.android.tools.r8.ClassFileConsumer getClassFileConsumer():236:236 -> M
-    1:1:com.android.tools.r8.DexFilePerClassFileConsumer getDexFilePerClassFileConsumer():232:232 -> N
-    1:1:com.android.tools.r8.DexIndexedConsumer getDexIndexedConsumer():228:228 -> O
-    1:9:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():200:208 -> P
-    1:2:com.android.tools.r8.dex.Marker getMarker():191:192 -> Q
-    1:1:boolean hasConsumer():196:196 -> R
-    1:1:boolean hasMarker():182:182 -> S
-    1:1:boolean hasMethodsFilter():541:541 -> T
-    1:1:boolean isGeneratingClassFiles():224:224 -> U
-    1:1:boolean isGeneratingDex():212:212 -> V
-    1:1:boolean isGeneratingDexFilePerClassFile():220:220 -> W
-    1:1:boolean isGeneratingDexIndexed():216:216 -> X
-    1:6:boolean isInterfaceMethodDesugaringEnabled():672:677 -> Y
-    1:1:boolean isMinifying():287:287 -> Z
-    1:1:boolean assertionsEnabled():433:433 -> a
-    2:5:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):438:441 -> a
-    6:10:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):446:450 -> a
-    11:17:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):455:461 -> a
-    18:18:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):456:456 -> a
-    19:19:java.util.List lambda$warningInvalidDebugInfo$2(com.android.tools.r8.origin.Origin):460:460 -> a
-    20:25:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):546:551 -> a
-    26:27:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):626:627 -> a
-    1:1:boolean isShrinking():283:283 -> aa
-    1:1:java.util.List lambda$warningInvalidParameterAnnotations$1(com.android.tools.r8.origin.Origin):449:449 -> b
-    2:7:boolean methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):556:561 -> b
-    8:9:boolean canHaveArtInstanceOfVerifierBug():953:954 -> b
-    1:32:boolean printWarnings():467:498 -> ba
-    33:71:boolean printWarnings():494:532 -> ba
-    1:1:java.util.List lambda$warningMissingEnclosingMember$0(com.android.tools.r8.origin.Origin):440:440 -> c
-    2:2:boolean canHaveArtStringNewInitBug():878:878 -> c
-    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():320:320 -> ca
-    1:1:boolean canHaveArtCheckCastVerifierBug():998:998 -> canHaveArtCheckCastVerifierBug
-    1:1:boolean canHaveBoundsCheckEliminationBug():739:739 -> d
-    1:9:java.util.Set getExtensiveFieldMinifierLoggingFilter():337:345 -> da
-    1:1:boolean canHaveCmpIfFloatBug():831:831 -> e
-    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():350:358 -> ea
-    1:1:boolean canHaveCmpLongBug():803:803 -> f
-    1:9:java.util.Set getExtensiveLoggingFilter():324:332 -> fa
-    1:1:boolean canHaveDex2OatInliningIssue():870:870 -> g
+    2:172:void <init>():64:234 -> <init>
+    173:173:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():59:59 -> <init>
+    173:173:void <init>():235 -> <init>
+    174:341:void <init>():235:402 -> <init>
+    342:344:void <init>():71:73 -> <init>
+    345:345:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):77:77 -> <init>
+    346:516:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):64:234 -> <init>
+    517:517:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():59:59 -> <init>
+    517:517:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):235 -> <init>
+    518:685:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):235:402 -> <init>
+    686:690:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):78:82 -> <init>
+    691:691:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):86:86 -> <init>
+    692:862:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):64:234 -> <init>
+    863:863:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():59:59 -> <init>
+    863:863:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):235 -> <init>
+    864:1031:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):235:402 -> <init>
+    1032:1051:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):87:106 -> <init>
+    1:1:boolean canUseJava8Methods():634:634 -> A
+    1:1:boolean canUseLongCompareAndObjectsNonNull():657:657 -> B
+    1:2:boolean canUseMultidex():652:653 -> C
+    1:1:boolean canUseNotInstruction():719:719 -> D
+    1:4:boolean canUseParameterNameAnnotations():668:671 -> E
+    1:1:boolean canUsePrivateInterfaceMethods():638:638 -> F
+    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():692:693 -> G
+    1:1:boolean canUseSuppressedExceptions():661:661 -> H
+    1:1:boolean canUseTwrCloseResourceMethod():630:630 -> I
+    1:1:com.android.tools.r8.ClassFileConsumer getClassFileConsumer():217:217 -> J
+    1:1:com.android.tools.r8.DexFilePerClassFileConsumer getDexFilePerClassFileConsumer():213:213 -> K
+    1:1:com.android.tools.r8.DexIndexedConsumer getDexIndexedConsumer():209:209 -> L
+    1:9:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():181:189 -> M
+    1:2:com.android.tools.r8.dex.Marker getMarker():172:173 -> N
+    1:1:boolean hasConsumer():177:177 -> O
+    1:1:boolean hasMarker():163:163 -> P
+    1:1:boolean hasMethodsFilter():514:514 -> Q
+    1:1:boolean isGeneratingClassFiles():205:205 -> R
+    1:1:boolean isGeneratingDex():193:193 -> S
+    1:1:boolean isGeneratingDexFilePerClassFile():201:201 -> T
+    1:1:boolean isGeneratingDexIndexed():197:197 -> U
+    1:6:boolean isInterfaceMethodDesugaringEnabled():643:648 -> V
+    1:32:boolean printWarnings():440:471 -> W
+    33:71:boolean printWarnings():467:505 -> W
+    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():293:293 -> X
+    1:9:java.util.Set getExtensiveFieldMinifierLoggingFilter():310:318 -> Y
+    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():323:331 -> Z
+    1:1:boolean assertionsEnabled():406:406 -> a
+    2:5:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):411:414 -> a
+    6:10:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):419:423 -> a
+    11:17:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):428:434 -> a
+    18:18:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):429:429 -> a
+    19:19:java.util.List lambda$warningInvalidDebugInfo$2(com.android.tools.r8.origin.Origin):433:433 -> a
+    20:25:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):519:524 -> a
+    26:27:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):597:598 -> a
+    1:9:java.util.Set getExtensiveLoggingFilter():297:305 -> aa
+    1:1:java.util.List lambda$warningInvalidParameterAnnotations$1(com.android.tools.r8.origin.Origin):422:422 -> b
+    2:7:boolean methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):529:534 -> b
+    8:9:boolean canHaveArtInstanceOfVerifierBug():923:924 -> b
+    1:1:java.util.List lambda$warningMissingEnclosingMember$0(com.android.tools.r8.origin.Origin):413:413 -> c
+    2:2:boolean canHaveArtStringNewInitBug():849:849 -> c
+    1:1:boolean canHaveArtCheckCastVerifierBug():968:968 -> canHaveArtCheckCastVerifierBug
+    1:1:boolean canHaveBoundsCheckEliminationBug():710:710 -> d
+    1:1:boolean canHaveCmpIfFloatBug():802:802 -> e
+    1:1:boolean canHaveCmpLongBug():774:774 -> f
+    1:1:boolean canHaveDex2OatInliningIssue():841:841 -> g
     1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():57:57 -> getProguardConfiguration
-    1:1:boolean canHaveDex2OatLinkedListBug():862:862 -> h
-    1:1:boolean canHaveExceptionTargetingLoopHeaderBug():911:911 -> i
-    1:1:boolean canHaveExceptionTypeBug():990:990 -> j
-    1:1:boolean canHaveForwardingInitInliningBug():899:899 -> k
-    boolean canHaveIncorrectJoinForArrayOfInterfacesBug() -> l
-    1:1:boolean canHaveLongToIntBug():977:977 -> m
-    1:1:boolean canHaveMul2AddrBug():853:853 -> n
-    1:1:boolean canHaveNumberConversionRegisterAllocationBug():886:886 -> o
-    1:1:boolean canHaveOverlappingLongRegisterBug():770:770 -> p
-    1:1:boolean canHaveThisJitCodeDebuggingBug():764:764 -> q
-    1:1:boolean canHaveThisTypeVerifierBug():755:755 -> r
-    1:1:boolean canHaveTracingPastInstructionsStreamBug():926:926 -> s
-    1:2:void setMarker(com.android.tools.r8.dex.Marker):186:187 -> setMarker
-    1:4:void signalFinishedToConsumers():240:243 -> signalFinishedToConsumers
-    1:1:boolean canLeaveStaticInterfaceMethodInvokes():655:655 -> t
-    1:1:boolean canUseConstantMethodHandle():639:639 -> u
-    1:1:boolean canUseConstantMethodType():643:643 -> v
-    1:1:boolean canUseDefaultAndStaticInterfaceMethods():651:651 -> w
-    1:2:boolean canUseFilledNewArrayOfObjects():712:713 -> x
-    1:1:boolean canUseInvokeCustom():647:647 -> y
-    1:1:boolean canUseInvokePolymorphic():635:635 -> z
+    1:1:boolean canHaveDex2OatLinkedListBug():833:833 -> h
+    1:1:boolean canHaveExceptionTargetingLoopHeaderBug():882:882 -> i
+    1:1:boolean canHaveExceptionTypeBug():960:960 -> j
+    1:1:boolean canHaveForwardingInitInliningBug():870:870 -> k
+    1:1:boolean canHaveLongToIntBug():947:947 -> l
+    1:1:boolean canHaveMul2AddrBug():824:824 -> m
+    1:1:boolean canHaveNumberConversionRegisterAllocationBug():857:857 -> n
+    1:1:boolean canHaveOverlappingLongRegisterBug():741:741 -> o
+    1:1:boolean canHaveThisJitCodeDebuggingBug():735:735 -> p
+    1:1:boolean canHaveThisTypeVerifierBug():726:726 -> q
+    1:1:boolean canHaveTracingPastInstructionsStreamBug():896:896 -> r
+    1:1:boolean canLeaveStaticInterfaceMethodInvokes():626:626 -> s
+    1:2:void setMarker(com.android.tools.r8.dex.Marker):167:168 -> setMarker
+    1:4:void signalFinishedToConsumers():221:224 -> signalFinishedToConsumers
+    1:1:boolean canUseConstantMethodHandle():610:610 -> t
+    1:1:boolean canUseConstantMethodType():614:614 -> u
+    1:1:boolean canUseDefaultAndStaticInterfaceMethods():622:622 -> v
+    1:2:boolean canUseFilledNewArrayOfObjects():683:684 -> w
+    1:1:boolean canUseInvokeCustom():618:618 -> x
+    1:1:boolean canUseInvokePolymorphic():606:606 -> y
+    1:1:boolean canUseInvokePolymorphicOnVarHandle():602:602 -> z
 com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.utils.InternalOptions$a:
     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):368:371 -> <init>
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):341:344 -> <init>
 com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.utils.InternalOptions$LineNumberOptimization:
     1:2:void <clinit>():50:51 -> <clinit>
     3:3:void <clinit>():49:49 -> <clinit>
     1:1:void <init>(java.lang.String,int):49:49 -> <init>
 com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.utils.InternalOptions$OutlineOptions:
-    1:9:void <init>():573:581 -> <init>
+    boolean enabled -> a
+    1:9:void <init>():546:554 -> <init>
 com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode:
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode NONE -> a
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] $VALUES -> b
-    1:5:void <clinit>():566:570 -> <clinit>
-    6:6:void <clinit>():564:564 -> <clinit>
-    1:1:void <init>(java.lang.String,int):564:564 -> <init>
-    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] values():564:564 -> a
+    1:5:void <clinit>():539:543 -> <clinit>
+    6:6:void <clinit>():537:537 -> <clinit>
+    1:1:void <init>(java.lang.String,int):537:537 -> <init>
+    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] values():537:537 -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.utils.InternalOptions$TestingOptions:
     boolean alwaysUsePessimisticRegisterAllocation -> a
     boolean dontCreateMarkerInD8 -> b
-    1:26:void <init>():584:609 -> <init>
+    1:24:void <init>():557:580 -> <init>
 com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions:
-    1:3:void <init>():611:613 -> <init>
-    1:4:java.util.Comparator createInterfaceMethodOrdering(com.android.tools.r8.naming.InterfaceMethodNameMinifier):617:620 -> a
-    5:5:int lambda$createInterfaceMethodOrdering$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):618:618 -> a
+    1:3:void <init>():582:584 -> <init>
+    1:4:java.util.Comparator createInterfaceMethodOrdering(com.android.tools.r8.naming.InterfaceMethodNameMinifier):588:591 -> a
+    5:5:int lambda$createInterfaceMethodOrdering$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):589:589 -> a
 com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.utils.InternalOptions$b:
     com.android.tools.r8.graph.DexType type -> b
     int version -> a
-    1:3:void <init>(int,com.android.tools.r8.graph.DexType):380:382 -> <init>
-com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.utils.y:
+    1:3:void <init>(int,com.android.tools.r8.graph.DexType):353:355 -> <init>
+com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.utils.H:
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> a
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> b
     com.android.tools.r8.utils.InternalOutputMode ClassFile -> c
@@ -46396,14 +45714,14 @@
     1:1:void <init>(java.lang.String,int):7:7 -> <init>
     1:1:boolean isGeneratingClassFiles():13:13 -> a
     1:1:boolean isGeneratingDex():17:17 -> b
-com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.utils.z:
+com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.utils.I:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:4:java.lang.Object peekNext(java.util.ListIterator):20:23 -> a
     5:8:void removeIf(java.util.Iterator,java.util.function.Predicate):30:33 -> a
     9:21:boolean anyRemainingMatch(java.util.ListIterator,java.util.function.Predicate):43:55 -> a
     1:3:java.lang.Object peekPrevious(java.util.ListIterator):13:15 -> b
-com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.utils.B:
+com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.utils.K:
     int columnCapacity -> b
     int rowCapacity -> a
     1:3:void <init>(int,int,float):31:33 -> <init>
@@ -46412,7 +45730,7 @@
     1:1:com.android.tools.r8.utils.LRUCacheTable create(int,int):37:37 -> b
     2:2:java.lang.Object get(java.lang.Object,java.lang.Object):55:55 -> b
     1:1:boolean removeEldestEntry(java.util.Map$Entry):42:42 -> removeEldestEntry
-com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.utils.A:
+com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.utils.J:
     int columnCapacity -> a
     1:2:void <init>(int,float):17:18 -> <init>
     1:1:boolean removeEldestEntry(java.util.Map$Entry):23:23 -> removeEldestEntry
@@ -46427,13 +45745,13 @@
     1:5:void putUleb128(com.android.tools.r8.dex.DexOutputBuffer,int):48:52 -> putUleb128
     1:1:int sizeAsSleb128(int):110:110 -> sizeAsSleb128
     1:1:int sizeAsUleb128(int):57:57 -> sizeAsUleb128
-com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.utils.C:
+com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.utils.L:
     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
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():34:34 -> c
     1:1:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.utils.J:
+com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.utils.Q:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():54:54 -> <clinit>
     1:13:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):167:179 -> a
@@ -46461,7 +45779,7 @@
     275:288:int getMethodStartLine(com.android.tools.r8.graph.DexEncodedMethod):305:318 -> a
     289:289:void sortMethods(java.util.List):327:327 -> a
     290:291:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):329:330 -> a
-    292:292:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):791:791 -> a
+    292:292:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):762:762 -> a
     292:292:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):333 -> a
     293:293:void addFieldsToClassNaming(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):354:354 -> a
     294:300:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):356:362 -> a
@@ -46475,7 +45793,7 @@
     318:318:java.util.List lambda$groupMethodsByRenamedName$5(com.android.tools.r8.graph.DexString):376:376 -> a
     319:324:boolean doesContainPositions(com.android.tools.r8.graph.DexCode):396:401 -> a
     325:327:boolean doesContainPositions(com.android.tools.r8.graph.CfCode):409:411 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.utils.D:
+com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.utils.M:
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> i
     com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter val$positionEventEmitter -> h
     boolean $assertionsDisabled -> l
@@ -46494,11 +45812,11 @@
     32:33:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):497:498 -> a
     34:35:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):503:504 -> a
     1:3:void flushPc():441:443 -> d
-com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.utils.E:
+com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.utils.N:
     1:1:void <init>():63:63 -> <init>
     1:1:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):63 -> <init>
     1:1:com.android.tools.r8.ir.code.Position createRemappedPosition(int,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):67:67 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.utils.F:
+com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.utils.O:
     int obfuscatedLine -> d
     int originalLine -> b
     com.android.tools.r8.ir.code.Position caller -> c
@@ -46509,7 +45827,7 @@
     1:1:int access$200(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):148:148 -> b
     1:1:int access$300(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):148:148 -> c
     1:1:com.android.tools.r8.ir.code.Position access$400(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):148:148 -> d
-com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.utils.G:
+com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.utils.P:
     boolean $assertionsDisabled -> e
     int nextOptimizedLineNumber -> d
     com.android.tools.r8.graph.DexMethod previousMethod -> b
@@ -46519,7 +45837,7 @@
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):77:77 -> <init>
     2:10:void <init>(com.android.tools.r8.utils.InternalOptions):73:81 -> <init>
     1:12:com.android.tools.r8.ir.code.Position createRemappedPosition(int,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):87:98 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.utils.H:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.utils.Q$a:
     java.util.List processedEvents -> f
     boolean $assertionsDisabled -> g
     int previousPc -> d
@@ -46538,7 +45856,7 @@
     4:16:void emitPositionEvents(int,com.android.tools.r8.ir.code.Position):126:138 -> a
     4:16:void access$800(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int,com.android.tools.r8.ir.code.Position):105 -> a
     17:18:int getStartLine():142:143 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.utils.I:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.utils.S:
     com.android.tools.r8.ir.code.Position createRemappedPosition(int,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position) -> a
 com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.utils.ListUtils:
     1:3:java.util.List map(java.util.Collection,java.util.function.Function):15:17 -> map
@@ -46564,7 +45882,7 @@
     11:11:com.android.tools.r8.graph.DexType parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):22:22 -> parseEntry
     1:16:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory):35:50 -> parseList
     17:17:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory):37:37 -> parseList
-com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.utils.K:
+com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.utils.T:
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE -> b
     boolean ignoreName -> a
@@ -46576,9 +45894,9 @@
     6:6:int doHash(java.lang.Object):15:15 -> a
     7:10:int doHash(com.android.tools.r8.graph.DexMethod):47:50 -> a
     7:10:int doHash(java.lang.Object):15 -> a
-    1:1:com.android.tools.r8.utils.MethodJavaSignatureEquivalence get():30:30 -> c
-    1:1:com.android.tools.r8.utils.MethodJavaSignatureEquivalence getEquivalenceIgnoreName():34:34 -> d
-com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.utils.L:
+    1:1:com.android.tools.r8.utils.MethodJavaSignatureEquivalence getEquivalenceIgnoreName():34:34 -> c
+    1:1:com.android.tools.r8.utils.MethodJavaSignatureEquivalence get():30:30 -> get
+com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.utils.U:
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE -> b
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     boolean ignoreName -> a
@@ -46590,14 +45908,14 @@
     6:6:int doHash(java.lang.Object):14:14 -> a
     7:10:int doHash(com.android.tools.r8.graph.DexMethod):45:48 -> a
     7:10:int doHash(java.lang.Object):14 -> a
-    1:1:com.android.tools.r8.utils.MethodSignatureEquivalence get():28:28 -> c
-    1:1:com.android.tools.r8.utils.MethodSignatureEquivalence getEquivalenceIgnoreName():32:32 -> d
+    1:1:com.android.tools.r8.utils.MethodSignatureEquivalence getEquivalenceIgnoreName():32:32 -> c
+    1:1:com.android.tools.r8.utils.MethodSignatureEquivalence get():28:28 -> get
 com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.utils.OffOrAuto:
     com.android.tools.r8.utils.OffOrAuto[] $VALUES -> a
     1:1:void <clinit>():11:11 -> <clinit>
     2:2:void <clinit>():10:10 -> <clinit>
     1:1:void <init>(java.lang.String,int):10:10 -> <init>
-com.android.tools.r8.utils.OneShotByteResource -> com.android.tools.r8.utils.M:
+com.android.tools.r8.utils.OneShotByteResource -> com.android.tools.r8.utils.V:
     com.android.tools.r8.origin.Origin origin -> a
     java.util.Set classDescriptors -> d
     boolean $assertionsDisabled -> e
@@ -46610,7 +45928,7 @@
     1:1:java.util.Set getClassDescriptors():54:54 -> getClassDescriptors
     1:1:com.android.tools.r8.ProgramResource$Kind getKind():41:41 -> getKind
     1:1:com.android.tools.r8.origin.Origin getOrigin():36:36 -> getOrigin
-com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.utils.N:
+com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.utils.X:
     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
@@ -46618,14 +45936,14 @@
     19:19:java.lang.String tryParseSingle(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String,java.lang.String):41:41 -> a
     20:27:java.lang.Boolean tryParseBoolean(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):60:67 -> a
     1:11:java.util.List tryParseMulti(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):18:28 -> b
-com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.utils.N$a:
+com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.utils.W:
     java.lang.String[] args -> a
     int nextIndex -> b
     1:1:void <init>(java.lang.String[]):76:76 -> <init>
     2:5:void <init>(java.lang.String[]):74:77 -> <init>
     1:1:java.lang.String head():81:81 -> a
     1:5:java.lang.String next():85:89 -> b
-com.android.tools.r8.utils.OrderedMergingIterator -> com.android.tools.r8.utils.O:
+com.android.tools.r8.utils.OrderedMergingIterator -> com.android.tools.r8.utils.Y:
     java.util.List other -> b
     java.util.List one -> a
     int otherIndex -> d
@@ -46648,13 +45966,12 @@
     17:17:com.android.tools.r8.graph.KeyedDexItem next():44 -> next
     18:25:com.android.tools.r8.graph.KeyedDexItem next():46:53 -> next
     26:26:com.android.tools.r8.graph.KeyedDexItem next():51:51 -> next
-com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.utils.P:
+com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.utils.Z:
     void addDirectory(java.lang.String,com.android.tools.r8.DiagnosticsHandler) -> a
     void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler) -> a
     void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler) -> a
     void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler) -> a
     void close(com.android.tools.r8.DiagnosticsHandler) -> a
-    java.nio.file.Path getPath() -> a
 com.android.tools.r8.utils.Pair -> com.android.tools.r8.utils.Pair:
     java.lang.Object second -> b
     java.lang.Object first -> a
@@ -46675,6 +45992,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$1 -> com.android.tools.r8.utils.aa:
 com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.utils.PreloadedClassFileProvider$Builder:
     java.util.Map content -> a
     boolean $assertionsDisabled -> b
@@ -46689,7 +46007,7 @@
     java.lang.String descriptor -> e
     1:2:void <init>(java.lang.String):25:26 -> <init>
     1:1:java.lang.String part():31:31 -> part
-com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.utils.Q:
+com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.utils.ba:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(java.util.concurrent.ConcurrentHashMap):34:34 -> <init>
@@ -46713,19 +46031,21 @@
     1:1:void <init>():24:24 -> <init>
     2:2:void <init>(com.android.tools.r8.DiagnosticsHandler):27:27 -> <init>
     3:12:void <init>(com.android.tools.r8.DiagnosticsHandler):19:28 -> <init>
-    1:1:void error(java.lang.String):49:49 -> a
-    2:5:void error(com.android.tools.r8.Diagnostic,java.lang.Throwable):53:56 -> a
-    6:8:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    9:27:void failIfPendingErrors():89:107 -> a
-    28:28:java.lang.Throwable addSuppressedExceptions(java.lang.Throwable):111:111 -> a
-    1:2:java.lang.RuntimeException fatalError(java.lang.String):63:64 -> b
-    3:5:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic,java.lang.Throwable):80:82 -> b
+    1:4:void error(com.android.tools.r8.Diagnostic,java.lang.Throwable):53:56 -> a
+    5:7:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
+    8:26:void failIfPendingErrors():89:107 -> a
+    27:27:java.lang.Throwable addSuppressedExceptions(java.lang.Throwable):111:111 -> a
+    1:3:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic,java.lang.Throwable):80:82 -> b
     1:3:void error(com.android.tools.r8.Diagnostic):43:45 -> error
+    4:4:void error(java.lang.String):49:49 -> error
+    1:2:java.lang.RuntimeException fatalError(java.lang.String):63:64 -> fatalError
     1:1:void info(com.android.tools.r8.Diagnostic):33:33 -> info
     1:1:void warning(com.android.tools.r8.Diagnostic):38:38 -> warning
-com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.utils.Reporter$1:
+com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.utils.ca:
     1:1:void <init>():24:24 -> <init>
-com.android.tools.r8.utils.SingletonEquivalence -> com.android.tools.r8.utils.S:
+com.android.tools.r8.utils.SelfRetraceTest -> com.android.tools.r8.utils.da:
+    1:1:void <init>():9:9 -> <init>
+com.android.tools.r8.utils.SingletonEquivalence -> com.android.tools.r8.utils.ea:
     1:1:void <init>():11:11 -> <init>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
     int doHash(java.lang.Object) -> a
@@ -46750,7 +46070,7 @@
     20:28:java.lang.String hexString(int,int,boolean):217:225 -> a
     29:37:java.lang.String hexString(long,int,boolean):234:242 -> a
     29:37:java.lang.String hexString(long,int):230 -> a
-    38:57:java.lang.String numberToIdentifier(char[],int,boolean):267:286 -> a
+    38:57:java.lang.String numberToIdentifier(char[],int,boolean):263:282 -> a
     1:1:java.lang.StringBuilder append(java.lang.StringBuilder,java.util.Collection):106:106 -> append
     2:12:java.lang.StringBuilder append(java.lang.StringBuilder,java.util.Collection,java.lang.String,com.android.tools.r8.utils.StringUtils$BraceType):111:121 -> append
     1:3:java.lang.StringBuilder appendRightPadded(java.lang.StringBuilder,java.lang.String,int):98:100 -> b
@@ -46780,9 +46100,9 @@
     1:2:java.util.concurrent.ExecutorService getExecutorService(int):48:49 -> getExecutorService
     3:3:java.util.concurrent.ExecutorService getExecutorService(com.android.tools.r8.utils.InternalOptions):53:53 -> getExecutorService
     1:2:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int):41:42 -> getExecutorServiceForProcessors
-com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.utils.T:
-com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.utils.U:
-com.android.tools.r8.utils.ThrowingFunction -> com.android.tools.r8.utils.V:
+com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.utils.fa:
+com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.utils.ga:
+com.android.tools.r8.utils.ThrowingFunction -> com.android.tools.r8.utils.ha:
 com.android.tools.r8.utils.Timing -> com.android.tools.r8.utils.Timing:
     java.util.Stack stack -> a
     1:1:void <init>():25:25 -> <init>
@@ -46854,8 +46174,6 @@
     56:57:boolean isDexFile(java.lang.String):99:100 -> a
     1:8:boolean isClassFile(java.lang.String):104:111 -> isClassFile
     1:1:java.util.List unzip(java.lang.String,java.io.File):48:48 -> unzip
-    1:1:com.android.tools.r8.ByteDataView com.android.tools.r8.ByteDataView.of(byte[]):17:17 -> writeToZipStream
-    1:1:void writeToZipStream(java.util.zip.ZipOutputStream,java.lang.String,byte[],int):77 -> writeToZipStream
-    2:2:void writeToZipStream(java.util.zip.ZipOutputStream,java.lang.String,byte[],int):77:77 -> writeToZipStream
+    1:1:void writeToZipStream(java.util.zip.ZipOutputStream,java.lang.String,byte[],int):77:77 -> writeToZipStream
 com.android.tools.r8.utils.ZipUtils$OnEntryHandler -> com.android.tools.r8.utils.ZipUtils$a:
     void onEntry(java.util.zip.ZipEntry,java.io.InputStream) -> a